diff --git a/data/magic-m15-altered.mse-style/artifact_blend_inverted.png b/data/magic-m15-altered.mse-style/artifact_blend_inverted.png new file mode 100644 index 000000000..0a7f20ca2 Binary files /dev/null and b/data/magic-m15-altered.mse-style/artifact_blend_inverted.png differ diff --git a/data/magic-m15-altered.mse-style/artifact_blend_invertedpt.png b/data/magic-m15-altered.mse-style/artifact_blend_invertedpt.png new file mode 100644 index 000000000..fd16e5a87 Binary files /dev/null and b/data/magic-m15-altered.mse-style/artifact_blend_invertedpt.png differ diff --git a/data/magic-m15-altered.mse-style/style b/data/magic-m15-altered.mse-style/style index b67db98bd..7fdf977cc 100644 --- a/data/magic-m15-altered.mse-style/style +++ b/data/magic-m15-altered.mse-style/style @@ -53,10 +53,10 @@ init script: #Should multicolor lands with basic land types have a colored name? mask_multi_land_with_color := { styling.colored_multicolor_land_name } - base_template_prefix := [card: "" alias: "alias/" snow:"snow/" snowtexture:"snow/" devoid:"devoid/" nyx: "nyx/" miracle: "miracles/" node:"nodes/" promo: "promo/" crown: "legend/" cons:"conspiracy/" curtain: "curtains/" fnm: "fnm/", fnmpt: "paradox/", inverted: "inverted/", invertedpt: "inverted/", map: "maps/" energy: "energies/", mappt: "maps/" pt: "", slide: "masks/", slide2: "masks/", arrow: "arrows/", arrow2: "arrows/", arrow3: "arrows/", season: "season/" stamp: "" identity: "/magic-identity-new.mse-include/", puma: "puma/"] - shifted_template_prefix := [card: "shifted/" alias: "shifted/" snow:"snow/" snowtexture:"snow/" devoid:"devoid/" nyx: "nyx/" miracle: "shifted/" node:"shifted/" promo: "promo/" crown: "shifted/" cons:"conspiracy/" curtain: "curtains/" fnm:"fnm/", fnmpt: "paradox/", inverted: "inverted/", invertedpt: "inverted/", map: "maps/" energy: "energies/", mappt: "maps/" pt: "shifted/", slide: "shifted/", slide2: "shifted/", arrow: "arrows/", arrow2: "arrows/", arrow3: "arrows/", season: "season/" stamp: "shifted/" identity: "/magic-identity-new.mse-include/", puma: "puma/shifted/"] + base_template_prefix := [card: "" alias: "alias/" snow:"snow/" snowtexture:"snow/" devoid:"devoid/" nyx: "nyx/" miracle: "miracles/" node:"nodes/" promo: "promo/" crown: "legend/" cons:"conspiracy/" curtain: "curtains/" fnm: "fnm/", fnmpt: "paradox/", inverted: "inverted/", invertedpt: "inverted/", map: "maps/" energy: "energies/", mappt: "maps/" pt: "", slide: "masks/", slide2: "masks/", slide3: "masks/", arrow: "arrows/", arrow2: "arrows/", arrow3: "arrows/", season: "season/" stamp: "" identity: "/magic-identity-new.mse-include/", puma: "puma/"] + shifted_template_prefix := [card: "shifted/" alias: "shifted/" snow:"snow/" snowtexture:"snow/" devoid:"devoid/" nyx: "nyx/" miracle: "shifted/" node:"shifted/" promo: "promo/" crown: "shifted/" cons:"conspiracy/" curtain: "curtains/" fnm:"fnm/", fnmpt: "paradox/", inverted: "inverted/", invertedpt: "inverted/", map: "maps/" energy: "energies/", mappt: "maps/" pt: "shifted/", slide: "shifted/", slide2: "shifted/", slide3: "shifted/", arrow: "arrows/", arrow2: "arrows/", arrow3: "arrows/", season: "season/" stamp: "shifted/" identity: "/magic-identity-new.mse-include/", puma: "puma/shifted/"] template_prefix := { if type == "miracle" and pure_snow() then [miracle:"snow/"] else if is_shifted() then shifted_template_prefix else base_template_prefix } - template_suffix := [card: "card.jpg" node:"node.png" alias:"alias.png" devoid:"card.png" snow:"card.jpg" snowtexture:"snow.png" nyx: "nyx.png" miracle: "miracle.png" promo: "card.jpg" crown: "crown.png" cons:"cons.png" curtain: "card.png" fnm:"card.png", fnmpt: "pt.png", inverted: "card.png", invertedpt: "pt.png", map: "card.png", energy: "card.png", mappt: "pt.png" pt: "pt.png", slide: "slide.png", slide2: "slide2.png", stamp: "stamp.jpg", arrow: "arrow.png", arrow2: "arrow2.png", arrow3: "arrow3.png", season: "flag.png" identity: "identity.png", puma: "puma.png"] + template_suffix := [card: "card.jpg" node:"node.png" alias:"alias.png" devoid:"card.png" snow:"card.jpg" snowtexture:"snow.png" nyx: "nyx.png" miracle: "miracle.png" promo: "card.jpg" crown: "crown.png" cons:"cons.png" curtain: "card.png" fnm:"card.png", fnmpt: "pt.png", inverted: "card.png", invertedpt: "pt.png", map: "card.png", energy: "card.png", mappt: "pt.png" pt: "pt.png", slide: "slide.png", slide2: "slide2.png", slide3: "slide3.png", stamp: "stamp.jpg", arrow: "arrow.png", arrow2: "arrow2.png", arrow3: "arrow3.png", season: "flag.png" identity: "identity.png", puma: "puma.png"] template := { crown_lead(type) + template_prefix()[type] + input + crown_follow(type) + template_suffix[type] } land_template := { crown_lead(type) + template_prefix()[type] + (if input == "a" then "c" else input) + (if landless(type) then "" else "l") + crown_follow(type) + template_suffix[type] } # Use land templates for previews because they show more contrast diff --git a/data/magic-m15-sketch.mse-style/style b/data/magic-m15-sketch.mse-style/style index c49cc97b3..f3e923632 100644 --- a/data/magic-m15-sketch.mse-style/style +++ b/data/magic-m15-sketch.mse-style/style @@ -335,9 +335,9 @@ card style: ############################# Text box text: left: 29 - top: 327 + top: {327-(-chop_top())} width: 314 - height: 154 + bottom: {481-chop_bot()} font: name: MPlantin italic name: MPlantin-Italic diff --git a/data/magic.mse-game/script b/data/magic.mse-game/script index a5fc588ed..88e386286 100644 --- a/data/magic.mse-game/script +++ b/data/magic.mse-game/script @@ -33,6 +33,15 @@ card_is_wedge := { color_string := card_color_to_letters(input) if color_string == "WUR" or color_string == "WBR" or color_string == "WBG" or color_string == "UBG" or color_string == "URG" then true else false } +list_colors := { + list := trim_colors(input) + cc := length(comma_count(list)) + if cc == 1 then + list := replace(list, match:", ", replace:" and ") + if cc > 1 then + list := replace(list, match:", ", replace:", and ", in_context:"[^ ]+$") + list +} # A mana cost can contain both normal and guild mana mana_filter := to_upper + { if chosen(set.mana_cost_sorting, choice: "unsorted") then mana_unsort()