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 000000000..f49a31e3e Binary files /dev/null and b/data/magic-mana-large-extra-udelude.mse-symbol-font/mana_t.png differ 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 000000000..f49a31e3e Binary files /dev/null and b/data/magic-mana-large-extra.mse-symbol-font/mana_t.png differ 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-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.mse-game/language_map b/data/magic.mse-game/language_map index 719c1509b..0504683a2 100644 --- a/data/magic.mse-game/language_map +++ b/data/magic.mse-game/language_map @@ -7800,6 +7800,7 @@ languages := [ ] ], "English (British)": [ + code : "en" spellcheck_code : "en_GB" fallback : "English" pt_separator : "/" @@ -7809,6 +7810,7 @@ languages := [ keyword_types : ["old","core","expert","pseudo","action","custom"] ], "English (Canadian)": [ + code : "en" spellcheck_code : "en_CA" fallback : "English" pt_separator : "/"