From b7fb27fbb5399918dd0440d62e93c45aa92dc68f Mon Sep 17 00:00:00 2001 From: GenevensiS <66968533+G-e-n-e-v-e-n-s-i-S@users.noreply.github.com> Date: Sun, 11 Feb 2024 04:37:08 +0100 Subject: [PATCH] Fix various template warnings (#32) - Missing : - Deprecated = - Not valid color name - Must always return statement --- data/magic-crystal.mse-style/style | 2 +- data/magic-fkih.mse-style/style | 12 +- data/magic-future-artbg.mse-style/style | 2 +- data/magic-future-clear.mse-style/style | 2 +- data/magic-future-flip.mse-style/style | 2 +- data/magic-future-mirrored.mse-style/style | 2 +- .../style | 2 +- .../magic-future-planeswalker.mse-style/style | 2 +- .../magic-future-split-facing.mse-style/style | 4 +- data/magic-future-split.mse-style/style | 4 +- .../style | 2 +- data/magic-future.mse-style/style | 2 +- data/magic-m15-GoodBad.mse-style/style | 6 +- data/magic-m15-meld-3in1.mse-style/style | 4 +- .../game_scripts | 106 +++++++++-------- .../mana_t.png | Bin 0 -> 7173 bytes .../mana_t.png | Bin 0 -> 7173 bytes data/magic-new-extra.mse-style/style | 112 +++++++++--------- data/magic-new-split-clear.mse-style/style | 4 +- data/magic-new-split-fuse.mse-style/style | 2 +- data/magic-new-unset-gmorph.mse-style/style | 2 +- data/magic-rulestip.mse-style/style | 2 +- data/magic-scifi.mse-style/style | 3 - data/magic-space-xerent.mse-style/style | 2 +- data/magic-sync.mse-style/style | 1 - data/magic-urban.mse-style/style | 2 +- 26 files changed, 141 insertions(+), 143 deletions(-) create mode 100644 data/magic-mana-large-extra-udelude.mse-symbol-font/mana_t.png create mode 100644 data/magic-mana-large-extra.mse-symbol-font/mana_t.png diff --git a/data/magic-crystal.mse-style/style b/data/magic-crystal.mse-style/style index 92cae2b6e..ed3181727 100644 --- a/data/magic-crystal.mse-style/style +++ b/data/magic-crystal.mse-style/style @@ -51,7 +51,7 @@ init script: # Use guild mana symbols? guild_mana := { styling.use_guild_mana_symbols } - pt := { if card.pt != "" then "-pt"} + pt := { if card.pt != "" then "-pt" else ""} ############################################################## Set info fields set info style: diff --git a/data/magic-fkih.mse-style/style b/data/magic-fkih.mse-style/style index 41dda8830..5630a5be2 100644 --- a/data/magic-fkih.mse-style/style +++ b/data/magic-fkih.mse-style/style @@ -140,8 +140,8 @@ card style: name: MatrixBoldSmallCaps size: 18 color: - { if styling.font_color = "white" then rgb(255,255,255) - else if styling.font_color = "black" then rgb(0,0,0) + { if styling.font_color == "white" then rgb(255,255,255) + else if styling.font_color == "black" then rgb(0,0,0) else rgb(0,0,0) } casting cost: left: 325 @@ -187,8 +187,8 @@ card style: name: Matrix size: 16 color: - { if styling.font_color = "white" then rgb(255,255,255) - else if styling.font_color = "black" then rgb(0,0,0) + { if styling.font_color == "white" then rgb(255,255,255) + else if styling.font_color == "black" then rgb(0,0,0) else rgb(0,0,0) } scale down to: 6 separator color: rgb(128,128,128) @@ -287,8 +287,8 @@ card style: size: 8 weight: bold color: - { if styling.font_color = "white" then rgb(255,255,255) - else if styling.font_color = "black" then rgb(0,0,0) + { if styling.font_color == "white" then rgb(255,255,255) + else if styling.font_color == "black" then rgb(0,0,0) else rgb(0,0,0) } copyright line: left: 28 diff --git a/data/magic-future-artbg.mse-style/style b/data/magic-future-artbg.mse-style/style index 7203a2ec8..46c8b234d 100644 --- a/data/magic-future-artbg.mse-style/style +++ b/data/magic-future-artbg.mse-style/style @@ -532,7 +532,7 @@ extra card style: visible: { card.pt != "" } render style: image image: { card_ptbox() } - paintbrush + paintbrush: right: { ( if card.pt != "" then 275 else 338 ) - card_style.illustrator.content_width } top : 476 width: 40 diff --git a/data/magic-future-clear.mse-style/style b/data/magic-future-clear.mse-style/style index 770e874c1..4a7fcc543 100644 --- a/data/magic-future-clear.mse-style/style +++ b/data/magic-future-clear.mse-style/style @@ -345,7 +345,7 @@ extra card style: choice images: frame: frame.png pt: pt_frame.png - paintbrush + paintbrush: right: { ( if card.pt != "" then 275 else 338 ) - card_style.illustrator.content_width } top : 474 width: 40 diff --git a/data/magic-future-flip.mse-style/style b/data/magic-future-flip.mse-style/style index dc7053dde..db60979e0 100644 --- a/data/magic-future-flip.mse-style/style +++ b/data/magic-future-flip.mse-style/style @@ -691,7 +691,7 @@ extra card style: visible: { card.pt_2 != "" } render style: image image: { flip_ptbox2() } - paintbrush + paintbrush: right: { 353 - card_style.illustrator.content_width } top : 478 width: 40 diff --git a/data/magic-future-mirrored.mse-style/style b/data/magic-future-mirrored.mse-style/style index cf0a8dafa..edf9eefad 100644 --- a/data/magic-future-mirrored.mse-style/style +++ b/data/magic-future-mirrored.mse-style/style @@ -588,7 +588,7 @@ extra card style: visible: { card.pt != "" } render style: image image: { card_ptbox() } - paintbrush + paintbrush: left: { if card.pt != "" then 92 else 30 } top : 476 width: 40 diff --git a/data/magic-future-planeswalker-horizontal.mse-style/style b/data/magic-future-planeswalker-horizontal.mse-style/style index b8a743e0b..9864935e7 100644 --- a/data/magic-future-planeswalker-horizontal.mse-style/style +++ b/data/magic-future-planeswalker-horizontal.mse-style/style @@ -524,7 +524,7 @@ extra card field: script: ":" save value: false extra card style: - paintbrush + paintbrush: left: 505 top : { 215 + card_style.illustrator.content_width * 0.5 } width: 40 diff --git a/data/magic-future-planeswalker.mse-style/style b/data/magic-future-planeswalker.mse-style/style index d9be82c97..f8bf55729 100644 --- a/data/magic-future-planeswalker.mse-style/style +++ b/data/magic-future-planeswalker.mse-style/style @@ -631,7 +631,7 @@ extra card style: popup style: in place image: { card_typeline() } z index: 3 - paintbrush + paintbrush: left: 30 top : 476 width: 40 diff --git a/data/magic-future-split-facing.mse-style/style b/data/magic-future-split-facing.mse-style/style index 87bd15e69..2a9df2420 100644 --- a/data/magic-future-split-facing.mse-style/style +++ b/data/magic-future-split-facing.mse-style/style @@ -777,7 +777,7 @@ extra card style: visible: { card.pt_2 != "" } render style: image image: { flip_ptbox2() } - paintbrush + paintbrush: right: { ( if card.pt != "" then 195 else 241 ) - card_style.illustrator.content_width } top : 334 width: 25 @@ -797,7 +797,7 @@ extra card style: angle: 90 render style: image image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"} - paintbrush 2 + paintbrush 2: right: { 492 - card_style.illustrator_2.content_width } top : 334 width: 25 diff --git a/data/magic-future-split.mse-style/style b/data/magic-future-split.mse-style/style index 998a5c032..93c6a63e1 100644 --- a/data/magic-future-split.mse-style/style +++ b/data/magic-future-split.mse-style/style @@ -829,7 +829,7 @@ extra card style: visible: { card.pt_2 != "" } render style: image image: { card_ptbox() } - paintbrush + paintbrush: right: { ( if card.pt != "" then 195 else 241 ) - card_style.illustrator.content_width } top : 334 width: 25 @@ -849,7 +849,7 @@ extra card style: angle: 90 render style: image image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"} - paintbrush 2 + paintbrush 2: right: { ( if card.pt_2 != "" then 446 else 492 ) - card_style.illustrator_2.content_width } top : 334 width: 25 diff --git a/data/magic-future-textless-clear.mse-style/style b/data/magic-future-textless-clear.mse-style/style index c0a0d3148..7b9a26cbf 100644 --- a/data/magic-future-textless-clear.mse-style/style +++ b/data/magic-future-textless-clear.mse-style/style @@ -265,7 +265,7 @@ extra card style: choice images: frame: frame.png pt: pt_frame.png - paintbrush + paintbrush: right: { ( if card.pt != "" then 275 else 338 ) - card_style.illustrator.content_width } top : 479 width: 40 diff --git a/data/magic-future.mse-style/style b/data/magic-future.mse-style/style index d5ebe7b5e..09be4d641 100644 --- a/data/magic-future.mse-style/style +++ b/data/magic-future.mse-style/style @@ -530,7 +530,7 @@ extra card style: visible: { card.pt != "" } render style: image image: { card_ptbox() } - paintbrush + paintbrush: right: { ( if card.pt != "" then 275 else 338 ) - card_style.illustrator.content_width } top : 476 width: 40 diff --git a/data/magic-m15-GoodBad.mse-style/style b/data/magic-m15-GoodBad.mse-style/style index 421103aa6..2ff1a14ee 100644 --- a/data/magic-m15-GoodBad.mse-style/style +++ b/data/magic-m15-GoodBad.mse-style/style @@ -141,7 +141,7 @@ styling field: name: promo description: Is this card a promo card, with the "P" rarity? initial: no -styling field +styling field: type: boolean name: masterpiece description: Is this card a Masterpiece? @@ -304,9 +304,7 @@ card style: name: MPlantin italic name: MPlantin-Italic size: 10 - color: if (card.color == "black" ) - then "white" - else "black" + color: { if card.card_color == "black" then "white" else "black" } symbol font: name: { styling.text_box_mana_symbols } size: 11.5 diff --git a/data/magic-m15-meld-3in1.mse-style/style b/data/magic-m15-meld-3in1.mse-style/style index 5f617f32b..eb1722878 100644 --- a/data/magic-m15-meld-3in1.mse-style/style +++ b/data/magic-m15-meld-3in1.mse-style/style @@ -644,7 +644,7 @@ card style: name: Beleren Bold size: {if styling.three_cards == "yes" then 8 else 16 } color: black - separator color: red + separator color: red pt 2: z index: 2 left: 143 @@ -928,7 +928,7 @@ extra card field: editable: true save value: true description: The image of the card -extra card field +extra card field: type: choice name: change focus choice: diff --git a/data/magic-m15-planeswalker-extra-purple.mse-style/game_scripts b/data/magic-m15-planeswalker-extra-purple.mse-style/game_scripts index da12227fa..879e0d201 100644 --- a/data/magic-m15-planeswalker-extra-purple.mse-style/game_scripts +++ b/data/magic-m15-planeswalker-extra-purple.mse-style/game_scripts @@ -29,13 +29,13 @@ # Names of colors color_name := { - if input = "W" then "white" - else if input = "U" then "blue" - else if input = "B" then "black" - else if input = "R" then "red" - else if input = "G" then "green" - else if input = "P" then "purple" - else if input = "K" then "pink" + if input == "W" then "white" + else if input == "U" then "blue" + else if input == "B" then "black" + else if input == "R" then "red" + else if input == "G" then "green" + else if input == "P" then "purple" + else if input == "K" then "pink" else "" } color_names_6 := { color_name(colors.0) + ", " + color_name(colors.1) + ", " + color_name(colors.2) + ", " + color_name(colors.3) + ", " + color_name(colors.4) + ", " + color_name(colors.5) } @@ -45,7 +45,7 @@ color_filterS := sort_text@(order: "") mana_to_color := { count := number_of_items(in: colors) - if hybrid == "" and snow = "" and contains(type, match:"Artifact") then + if hybrid == "" and snow == "" and contains(type, match:"Artifact") then # not a hybrid, not snow costed, but artifact if count == 0 then "colorless" else if count == 1 then color_names_1() + ", artifact" @@ -146,7 +146,7 @@ if text != "" then ( if contains(text, match: "all colors") then ( colors := "WUPBRG" - if land = "land" then land_multicolor() + if land == "land" then land_multicolor() else mana_to_color(hybrid: "") ) else ( colors := "" @@ -157,11 +157,13 @@ if contains(text, match: "red") then colors := colors + "R" if contains(text, match: "green") then colors := colors + "G" if contains(text, match: "pink") then colors := colors + "K" - if land = "land" then land_multicolor() + if land == "land" then land_multicolor() else mana_to_color(hybrid: "") ) ) + else "" ) + else "" } card_color := { @@ -202,52 +204,52 @@ # normal/token, color, shifted, split hybrid_color_pair_sort := { colors := sort_text(casting_cost, order: "") - if colors = "WU" then "HA" - else if colors = "UP" then "HB" - else if colors = "PB" then "HC" - else if colors = "BR" then "HD" - else if colors = "RG" then "HE" - else if colors = "GW" then "HF" - else if colors = "WP" then "HG" - else if colors = "UB" then "HH" - else if colors = "PR" then "HI" - else if colors = "BG" then "HJ" - else if colors = "RW" then "HJAA" - else if colors = "GU" then "HJAB" - else if colors = "WB" then "HJAC" - else if colors = "UR" then "HJAD" - else if colors = "PG" then "HJAE" - else if colors = "WK" then "HJBA" - else if colors = "UK" then "HJBB" - else if colors = "BK" then "HJBC" - else if colors = "RK" then "HJBD" - else if colors = "GK" then "HJBE" - else if colors = "PK" then "HJBF" + if colors == "WU" then "HA" + else if colors == "UP" then "HB" + else if colors == "PB" then "HC" + else if colors == "BR" then "HD" + else if colors == "RG" then "HE" + else if colors == "GW" then "HF" + else if colors == "WP" then "HG" + else if colors == "UB" then "HH" + else if colors == "PR" then "HI" + else if colors == "BG" then "HJ" + else if colors == "RW" then "HJAA" + else if colors == "GU" then "HJAB" + else if colors == "WB" then "HJAC" + else if colors == "UR" then "HJAD" + else if colors == "PG" then "HJAE" + else if colors == "WK" then "HJBA" + else if colors == "UK" then "HJBB" + else if colors == "BK" then "HJBC" + else if colors == "RK" then "HJBD" + else if colors == "GK" then "HJBE" + else if colors == "PK" then "HJBF" else "HK" } multi_color_pair_sort := { colors := sort_text(casting_cost, order: "") - if colors = "WU" then "GA" - else if colors = "UP" then "GB" - else if colors = "PB" then "GC" - else if colors = "BR" then "GD" - else if colors = "RG" then "GE" - else if colors = "GW" then "GF" - else if colors = "WP" then "GG" - else if colors = "UB" then "GH" - else if colors = "PR" then "GI" - else if colors = "BG" then "GJ" - else if colors = "RW" then "GJAA" - else if colors = "GU" then "GJAB" - else if colors = "WB" then "GJAC" - else if colors = "UR" then "GJAD" - else if colors = "PG" then "GJAE" - else if colors = "WK" then "GJBA" - else if colors = "UK" then "GJBB" - else if colors = "BK" then "GJBC" - else if colors = "RK" then "GJBD" - else if colors = "GK" then "GJBE" - else if colors = "PK" then "GJBF" + if colors == "WU" then "GA" + else if colors == "UP" then "GB" + else if colors == "PB" then "GC" + else if colors == "BR" then "GD" + else if colors == "RG" then "GE" + else if colors == "GW" then "GF" + else if colors == "WP" then "GG" + else if colors == "UB" then "GH" + else if colors == "PR" then "GI" + else if colors == "BG" then "GJ" + else if colors == "RW" then "GJAA" + else if colors == "GU" then "GJAB" + else if colors == "WB" then "GJAC" + else if colors == "UR" then "GJAD" + else if colors == "PG" then "GJAE" + else if colors == "WK" then "GJBA" + else if colors == "UK" then "GJBB" + else if colors == "BK" then "GJBC" + else if colors == "RK" then "GJBD" + else if colors == "GK" then "GJBE" + else if colors == "PK" then "GJBF" else if contains(card.casting_cost, match:"/") then "GL" else "GK" } diff --git a/data/magic-mana-large-extra-udelude.mse-symbol-font/mana_t.png b/data/magic-mana-large-extra-udelude.mse-symbol-font/mana_t.png new file mode 100644 index 0000000000000000000000000000000000000000..f49a31e3e386add597c8a1e5159811af869e107c GIT binary patch literal 7173 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 Hu0mjf_I!IC literal 0 HcmV?d00001 diff --git a/data/magic-mana-large-extra.mse-symbol-font/mana_t.png b/data/magic-mana-large-extra.mse-symbol-font/mana_t.png new file mode 100644 index 0000000000000000000000000000000000000000..f49a31e3e386add597c8a1e5159811af869e107c GIT binary patch literal 7173 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 Hu0mjf_I!IC literal 0 HcmV?d00001 diff --git a/data/magic-new-extra.mse-style/style b/data/magic-new-extra.mse-style/style index ed4b1a1e7..4f181b443 100644 --- a/data/magic-new-extra.mse-style/style +++ b/data/magic-new-extra.mse-style/style @@ -1052,16 +1052,16 @@ init script: # Names of colors color_name := { - if input = "W" then "white" - else if input = "U" then "blue" - else if input = "B" then "black" - else if input = "R" then "red" - else if input = "G" then "green" - else if input = "L" then "yellow" - else if input = "P" then "purple" - else if input = "O" then "orange" - else if input = "E" then "brown" - else if input = "K" then "pink" + if input == "W" then "white" + else if input == "U" then "blue" + else if input == "B" then "black" + else if input == "R" then "red" + else if input == "G" then "green" + else if input == "L" then "yellow" + else if input == "P" then "purple" + else if input == "O" then "orange" + else if input == "E" then "brown" + else if input == "K" then "pink" else "" } color_names_6 := { color_name(colors.0) + ", " + color_name(colors.1) + ", " + color_name(colors.2) + ", " + color_name(colors.3) + ", " + color_name(colors.4) + ", " + color_name(colors.5) } @@ -1071,7 +1071,7 @@ init script: color_filterS := sort_text@(order: "") mana_to_color := { count := number_of_items(in: colors) - if hybrid == "" and snow = "" and contains(type, match:"Artifact") then + if hybrid == "" and snow == "" and contains(type, match:"Artifact") then # not a hybrid, not snow costed, but artifact if count == 0 then "colorless" else if count == 1 then color_names_1() + ", artifact" @@ -1172,7 +1172,7 @@ init script: if text != "" then ( if contains(text, match: "all colors") then ( colors := "WUBRGLPOEK" - if land = "land" then land_multicolor() + if land == "land" then land_multicolor() else mana_to_color(hybrid: "") ) else ( colors := "" @@ -1186,11 +1186,13 @@ init script: if contains(text, match: "orange") then colors := colors + "O" if contains(text, match: "brown") then colors := colors + "E" if contains(text, match: "pink") then colors := colors + "K" - if land = "land" then land_multicolor() + if land == "land" then land_multicolor() else mana_to_color(hybrid: "") ) ) + else "" ) + else "" } card_color := { @@ -1232,53 +1234,53 @@ init script: hybrid_color_pair_sort := { colors := sort_text(casting_cost, order: "") if not set.sort_hybrid_in_pairs then "HK" - else if colors = "WU" then "HA" - else if colors = "UB" then "HB" - else if colors = "BR" then "HC" - else if colors = "RG" then "HD" - else if colors = "WG" then "HE" - else if colors = "WB" then "HF" - else if colors = "UR" then "HG" - else if colors = "BG" then "HH" - else if colors = "WR" then "HI" - else if colors = "UG" then "HJ" - else if colors = "WP" then "HJA" - else if colors = "UP" then "HJB" - else if colors = "BP" then "HJC" - else if colors = "RP" then "HJD" - else if colors = "GP" then "HJE" - else if colors = "WO" then "HJF" - else if colors = "UO" then "HJG" - else if colors = "BO" then "HJH" - else if colors = "RO" then "HJI" - else if colors = "GO" then "HJM" - else if colors = "PO" then "HJN" + else if colors == "WU" then "HA" + else if colors == "UB" then "HB" + else if colors == "BR" then "HC" + else if colors == "RG" then "HD" + else if colors == "WG" then "HE" + else if colors == "WB" then "HF" + else if colors == "UR" then "HG" + else if colors == "BG" then "HH" + else if colors == "WR" then "HI" + else if colors == "UG" then "HJ" + else if colors == "WP" then "HJA" + else if colors == "UP" then "HJB" + else if colors == "BP" then "HJC" + else if colors == "RP" then "HJD" + else if colors == "GP" then "HJE" + else if colors == "WO" then "HJF" + else if colors == "UO" then "HJG" + else if colors == "BO" then "HJH" + else if colors == "RO" then "HJI" + else if colors == "GO" then "HJM" + else if colors == "PO" then "HJN" else "HK" } multi_color_pair_sort := { colors := sort_text(casting_cost, order: "") if not set.sort_multicolor_in_pairs then "GK" - else if colors = "WU" then "GA" - else if colors = "UB" then "GB" - else if colors = "BR" then "GC" - else if colors = "RG" then "GD" - else if colors = "WG" then "GE" - else if colors = "WB" then "GF" - else if colors = "UR" then "GG" - else if colors = "BG" then "GH" - else if colors = "WR" then "GI" - else if colors = "UG" then "GJ" - else if colors = "WP" then "GJA" - else if colors = "UP" then "GJB" - else if colors = "BP" then "GJC" - else if colors = "RP" then "GJD" - else if colors = "GP" then "GJE" - else if colors = "WO" then "GJF" - else if colors = "UO" then "GJG" - else if colors = "BO" then "GJH" - else if colors = "RO" then "GJI" - else if colors = "GO" then "GJM" - else if colors = "PO" then "GJN" + else if colors == "WU" then "GA" + else if colors == "UB" then "GB" + else if colors == "BR" then "GC" + else if colors == "RG" then "GD" + else if colors == "WG" then "GE" + else if colors == "WB" then "GF" + else if colors == "UR" then "GG" + else if colors == "BG" then "GH" + else if colors == "WR" then "GI" + else if colors == "UG" then "GJ" + else if colors == "WP" then "GJA" + else if colors == "UP" then "GJB" + else if colors == "BP" then "GJC" + else if colors == "RP" then "GJD" + else if colors == "GP" then "GJE" + else if colors == "WO" then "GJF" + else if colors == "UO" then "GJG" + else if colors == "BO" then "GJH" + else if colors == "RO" then "GJI" + else if colors == "GO" then "GJM" + else if colors == "PO" then "GJN" else if contains(card.casting_cost, match:"/") then "GL" else "GK" } diff --git a/data/magic-new-split-clear.mse-style/style b/data/magic-new-split-clear.mse-style/style index 803b311d7..980f5e2e7 100644 --- a/data/magic-new-split-clear.mse-style/style +++ b/data/magic-new-split-clear.mse-style/style @@ -597,7 +597,7 @@ extra card style: angle: 90 render style: image image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"} - paintbrush + paintbrush: left: 25 top: 337 width: {if contains(styling.clear_side, match:"left") then 21 else 0} @@ -607,7 +607,7 @@ extra card style: choice images: black: /magic-future-common.mse-include/paintbrush_black.png white: /magic-future-common.mse-include/paintbrush_white.png - paintbrush 2 + paintbrush 2: left: 277 top: 337 width: {if contains(styling.clear_side, match:"right") then 21 else 0} diff --git a/data/magic-new-split-fuse.mse-style/style b/data/magic-new-split-fuse.mse-style/style index 9f05fadb7..442f58ab6 100644 --- a/data/magic-new-split-fuse.mse-style/style +++ b/data/magic-new-split-fuse.mse-style/style @@ -520,7 +520,7 @@ card style: size: 14 weight: bold color: black - separator color: red + separator color: red ############################# Card sorting / numbering ############################# Copyright stuff illustrator: diff --git a/data/magic-new-unset-gmorph.mse-style/style b/data/magic-new-unset-gmorph.mse-style/style index fa718a354..6f2fd45f2 100644 --- a/data/magic-new-unset-gmorph.mse-style/style +++ b/data/magic-new-unset-gmorph.mse-style/style @@ -422,7 +422,7 @@ extra card style: visible: { card.pt != "" } render style: image image: { card_ptbox() } - paintbrush + paintbrush: left: 28 top: 479 width: 32 diff --git a/data/magic-rulestip.mse-style/style b/data/magic-rulestip.mse-style/style index 80c4e48a4..74e41fb9f 100644 --- a/data/magic-rulestip.mse-style/style +++ b/data/magic-rulestip.mse-style/style @@ -98,7 +98,7 @@ styling field: name: use guild mana symbols description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana. initial: no -styling field +styling field: type: boolean name: set logo initial: yes diff --git a/data/magic-scifi.mse-style/style b/data/magic-scifi.mse-style/style index 5611b0819..2e9a46360 100644 --- a/data/magic-scifi.mse-style/style +++ b/data/magic-scifi.mse-style/style @@ -25,9 +25,6 @@ depends on: depends on: package: magic-mana-small.mse-symbol-font version: 2007-09-23 -depends on: - package: magic-mana-small-stroked.mse-symbol-font - version: 2020-02-07 card width: 375 card height: 523 diff --git a/data/magic-space-xerent.mse-style/style b/data/magic-space-xerent.mse-style/style index 9b364d77a..db8594a22 100644 --- a/data/magic-space-xerent.mse-style/style +++ b/data/magic-space-xerent.mse-style/style @@ -363,7 +363,7 @@ extra card style: visible: { card.pt != "" } render style: image image: { card_ptbox() } - paintbrush + paintbrush: left: 325 top: 484 width: 25 diff --git a/data/magic-sync.mse-style/style b/data/magic-sync.mse-style/style index ed15bbaad..95ad6a4a9 100644 --- a/data/magic-sync.mse-style/style +++ b/data/magic-sync.mse-style/style @@ -256,7 +256,6 @@ card style: rare: script: symbol_variation(symbol: set.symbol, variation: "rare") mythic rare: script: symbol_variation(symbol: set.symbol, variation: "mythic rare") special: script: symbol_variation(symbol: set.symbol, variation: "special") - constructed: script: symbol_variation(symbol: set.symbol, variation: "constructed") ############################# Text box text: left: 29 diff --git a/data/magic-urban.mse-style/style b/data/magic-urban.mse-style/style index 9d19f6a7f..e241aa78b 100644 --- a/data/magic-urban.mse-style/style +++ b/data/magic-urban.mse-style/style @@ -362,7 +362,7 @@ extra card style: shadow displacement y: 0 shadow blur: 2 separator color: red - paintbrush + paintbrush: right: { 330 - card_style.illustrator.content_width } top: 260 width: 50