diff --git a/data/magic-new-token.mse-style/apt.png b/data/magic-new-token.mse-style/apt.png new file mode 100644 index 00000000..5e7c5fd4 Binary files /dev/null and b/data/magic-new-token.mse-style/apt.png differ diff --git a/data/magic-new-token.mse-style/apt0.jpg b/data/magic-new-token.mse-style/apt0.jpg deleted file mode 100644 index 694890e9..00000000 Binary files a/data/magic-new-token.mse-style/apt0.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/apt1.jpg b/data/magic-new-token.mse-style/apt1.jpg deleted file mode 100644 index 7b06ee7e..00000000 Binary files a/data/magic-new-token.mse-style/apt1.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/apt2.jpg b/data/magic-new-token.mse-style/apt2.jpg deleted file mode 100644 index 7aba1859..00000000 Binary files a/data/magic-new-token.mse-style/apt2.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/artifact_blend_pt.png b/data/magic-new-token.mse-style/artifact_blend_pt.png new file mode 100644 index 00000000..152e950f Binary files /dev/null and b/data/magic-new-token.mse-style/artifact_blend_pt.png differ diff --git a/data/magic-new-token.mse-style/artifact_blend_pt0.png b/data/magic-new-token.mse-style/artifact_blend_pt0.png deleted file mode 100644 index 08bbb035..00000000 Binary files a/data/magic-new-token.mse-style/artifact_blend_pt0.png and /dev/null differ diff --git a/data/magic-new-token.mse-style/artifact_blend_pt1.png b/data/magic-new-token.mse-style/artifact_blend_pt1.png deleted file mode 100644 index 045ef573..00000000 Binary files a/data/magic-new-token.mse-style/artifact_blend_pt1.png and /dev/null differ diff --git a/data/magic-new-token.mse-style/artifact_blend_pt2.png b/data/magic-new-token.mse-style/artifact_blend_pt2.png deleted file mode 100644 index 0c9478f0..00000000 Binary files a/data/magic-new-token.mse-style/artifact_blend_pt2.png and /dev/null differ diff --git a/data/magic-new-token.mse-style/blcard0.jpg b/data/magic-new-token.mse-style/blcard0.jpg new file mode 100644 index 00000000..fffec1ee Binary files /dev/null and b/data/magic-new-token.mse-style/blcard0.jpg differ diff --git a/data/magic-new-token.mse-style/blcard1.jpg b/data/magic-new-token.mse-style/blcard1.jpg new file mode 100644 index 00000000..c3659c66 Binary files /dev/null and b/data/magic-new-token.mse-style/blcard1.jpg differ diff --git a/data/magic-new-token.mse-style/blcard2.jpg b/data/magic-new-token.mse-style/blcard2.jpg new file mode 100644 index 00000000..9b0146a7 Binary files /dev/null and b/data/magic-new-token.mse-style/blcard2.jpg differ diff --git a/data/magic-new-token.mse-style/bpt.png b/data/magic-new-token.mse-style/bpt.png new file mode 100644 index 00000000..89559acc Binary files /dev/null and b/data/magic-new-token.mse-style/bpt.png differ diff --git a/data/magic-new-token.mse-style/bpt0.jpg b/data/magic-new-token.mse-style/bpt0.jpg deleted file mode 100644 index 5a2e12e7..00000000 Binary files a/data/magic-new-token.mse-style/bpt0.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/bpt1.jpg b/data/magic-new-token.mse-style/bpt1.jpg deleted file mode 100644 index 5e6b1186..00000000 Binary files a/data/magic-new-token.mse-style/bpt1.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/bpt2.jpg b/data/magic-new-token.mse-style/bpt2.jpg deleted file mode 100644 index 22d8fa47..00000000 Binary files a/data/magic-new-token.mse-style/bpt2.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/clcard0.jpg b/data/magic-new-token.mse-style/clcard0.jpg new file mode 100644 index 00000000..ebbbb710 Binary files /dev/null and b/data/magic-new-token.mse-style/clcard0.jpg differ diff --git a/data/magic-new-token.mse-style/clcard1.jpg b/data/magic-new-token.mse-style/clcard1.jpg new file mode 100644 index 00000000..b2b2b8d3 Binary files /dev/null and b/data/magic-new-token.mse-style/clcard1.jpg differ diff --git a/data/magic-new-token.mse-style/clcard2.jpg b/data/magic-new-token.mse-style/clcard2.jpg new file mode 100644 index 00000000..04cd2f28 Binary files /dev/null and b/data/magic-new-token.mse-style/clcard2.jpg differ diff --git a/data/magic-new-token.mse-style/cpt.png b/data/magic-new-token.mse-style/cpt.png new file mode 100644 index 00000000..eed705cb Binary files /dev/null and b/data/magic-new-token.mse-style/cpt.png differ diff --git a/data/magic-new-token.mse-style/cpt0.jpg b/data/magic-new-token.mse-style/cpt0.jpg deleted file mode 100644 index 8eb615bf..00000000 Binary files a/data/magic-new-token.mse-style/cpt0.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/cpt1.jpg b/data/magic-new-token.mse-style/cpt1.jpg deleted file mode 100644 index b9b73529..00000000 Binary files a/data/magic-new-token.mse-style/cpt1.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/cpt2.jpg b/data/magic-new-token.mse-style/cpt2.jpg deleted file mode 100644 index 9483ddde..00000000 Binary files a/data/magic-new-token.mse-style/cpt2.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/glcard0.jpg b/data/magic-new-token.mse-style/glcard0.jpg new file mode 100644 index 00000000..5388cb18 Binary files /dev/null and b/data/magic-new-token.mse-style/glcard0.jpg differ diff --git a/data/magic-new-token.mse-style/glcard1.jpg b/data/magic-new-token.mse-style/glcard1.jpg new file mode 100644 index 00000000..df02b840 Binary files /dev/null and b/data/magic-new-token.mse-style/glcard1.jpg differ diff --git a/data/magic-new-token.mse-style/glcard2.jpg b/data/magic-new-token.mse-style/glcard2.jpg new file mode 100644 index 00000000..fdfdc0a8 Binary files /dev/null and b/data/magic-new-token.mse-style/glcard2.jpg differ diff --git a/data/magic-new-token.mse-style/gpt.png b/data/magic-new-token.mse-style/gpt.png new file mode 100644 index 00000000..3fdbc4b1 Binary files /dev/null and b/data/magic-new-token.mse-style/gpt.png differ diff --git a/data/magic-new-token.mse-style/gpt0.jpg b/data/magic-new-token.mse-style/gpt0.jpg deleted file mode 100644 index 369e51a1..00000000 Binary files a/data/magic-new-token.mse-style/gpt0.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/gpt1.jpg b/data/magic-new-token.mse-style/gpt1.jpg deleted file mode 100644 index aeaf77ab..00000000 Binary files a/data/magic-new-token.mse-style/gpt1.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/gpt2.jpg b/data/magic-new-token.mse-style/gpt2.jpg deleted file mode 100644 index 1d0cdc64..00000000 Binary files a/data/magic-new-token.mse-style/gpt2.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/hybrid_blend_pt.png b/data/magic-new-token.mse-style/hybrid_blend_pt.png new file mode 100644 index 00000000..4bb0da34 Binary files /dev/null and b/data/magic-new-token.mse-style/hybrid_blend_pt.png differ diff --git a/data/magic-new-token.mse-style/hybrid_blend_pt0.png b/data/magic-new-token.mse-style/hybrid_blend_pt0.png deleted file mode 100644 index b06f45bf..00000000 Binary files a/data/magic-new-token.mse-style/hybrid_blend_pt0.png and /dev/null differ diff --git a/data/magic-new-token.mse-style/hybrid_blend_pt1.png b/data/magic-new-token.mse-style/hybrid_blend_pt1.png deleted file mode 100644 index cd29ec1b..00000000 Binary files a/data/magic-new-token.mse-style/hybrid_blend_pt1.png and /dev/null differ diff --git a/data/magic-new-token.mse-style/hybrid_blend_pt2.png b/data/magic-new-token.mse-style/hybrid_blend_pt2.png deleted file mode 100644 index 907d3849..00000000 Binary files a/data/magic-new-token.mse-style/hybrid_blend_pt2.png and /dev/null differ diff --git a/data/magic-new-token.mse-style/mlcard0.jpg b/data/magic-new-token.mse-style/mlcard0.jpg new file mode 100644 index 00000000..28fc1dee Binary files /dev/null and b/data/magic-new-token.mse-style/mlcard0.jpg differ diff --git a/data/magic-new-token.mse-style/mlcard1.jpg b/data/magic-new-token.mse-style/mlcard1.jpg new file mode 100644 index 00000000..3586763f Binary files /dev/null and b/data/magic-new-token.mse-style/mlcard1.jpg differ diff --git a/data/magic-new-token.mse-style/mlcard2.jpg b/data/magic-new-token.mse-style/mlcard2.jpg new file mode 100644 index 00000000..ab22d322 Binary files /dev/null and b/data/magic-new-token.mse-style/mlcard2.jpg differ diff --git a/data/magic-new-token.mse-style/mpt.png b/data/magic-new-token.mse-style/mpt.png new file mode 100644 index 00000000..e1070af8 Binary files /dev/null and b/data/magic-new-token.mse-style/mpt.png differ diff --git a/data/magic-new-token.mse-style/mpt0.jpg b/data/magic-new-token.mse-style/mpt0.jpg deleted file mode 100644 index 13402560..00000000 Binary files a/data/magic-new-token.mse-style/mpt0.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/mpt1.jpg b/data/magic-new-token.mse-style/mpt1.jpg deleted file mode 100644 index fe6096e6..00000000 Binary files a/data/magic-new-token.mse-style/mpt1.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/mpt2.jpg b/data/magic-new-token.mse-style/mpt2.jpg deleted file mode 100644 index 21362fec..00000000 Binary files a/data/magic-new-token.mse-style/mpt2.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/multicolor_blend_pt0.png b/data/magic-new-token.mse-style/multicolor_blend_pt.png similarity index 100% rename from data/magic-new-token.mse-style/multicolor_blend_pt0.png rename to data/magic-new-token.mse-style/multicolor_blend_pt.png diff --git a/data/magic-new-token.mse-style/multicolor_blend_pt1.png b/data/magic-new-token.mse-style/multicolor_blend_pt1.png deleted file mode 100644 index dafe8f2c..00000000 Binary files a/data/magic-new-token.mse-style/multicolor_blend_pt1.png and /dev/null differ diff --git a/data/magic-new-token.mse-style/multicolor_blend_pt2.png b/data/magic-new-token.mse-style/multicolor_blend_pt2.png deleted file mode 100644 index 168e206f..00000000 Binary files a/data/magic-new-token.mse-style/multicolor_blend_pt2.png and /dev/null differ diff --git a/data/magic-new-token.mse-style/rlcard0.jpg b/data/magic-new-token.mse-style/rlcard0.jpg new file mode 100644 index 00000000..b7e342e1 Binary files /dev/null and b/data/magic-new-token.mse-style/rlcard0.jpg differ diff --git a/data/magic-new-token.mse-style/rlcard1.jpg b/data/magic-new-token.mse-style/rlcard1.jpg new file mode 100644 index 00000000..db4cdd2f Binary files /dev/null and b/data/magic-new-token.mse-style/rlcard1.jpg differ diff --git a/data/magic-new-token.mse-style/rlcard2.jpg b/data/magic-new-token.mse-style/rlcard2.jpg new file mode 100644 index 00000000..313e698b Binary files /dev/null and b/data/magic-new-token.mse-style/rlcard2.jpg differ diff --git a/data/magic-new-token.mse-style/rpt.png b/data/magic-new-token.mse-style/rpt.png new file mode 100644 index 00000000..699c647f Binary files /dev/null and b/data/magic-new-token.mse-style/rpt.png differ diff --git a/data/magic-new-token.mse-style/rpt0.jpg b/data/magic-new-token.mse-style/rpt0.jpg deleted file mode 100644 index d37c1f86..00000000 Binary files a/data/magic-new-token.mse-style/rpt0.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/rpt1.jpg b/data/magic-new-token.mse-style/rpt1.jpg deleted file mode 100644 index 267922f7..00000000 Binary files a/data/magic-new-token.mse-style/rpt1.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/rpt2.jpg b/data/magic-new-token.mse-style/rpt2.jpg deleted file mode 100644 index b043dcd9..00000000 Binary files a/data/magic-new-token.mse-style/rpt2.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/style b/data/magic-new-token.mse-style/style index 3301b666..d4109b22 100644 --- a/data/magic-new-token.mse-style/style +++ b/data/magic-new-token.mse-style/style @@ -6,7 +6,7 @@ installer group: magic/new style/tokens icon: card-sample.png position hint: 007 -version: 2009-07-20 +version: 2010-07-25 depends on: package: magic.mse-game version: 2008-06-02 @@ -39,8 +39,10 @@ init script: else "2" # large textbox } - land_template := { "c{type}.jpg" } - colored_lands := false + template_suffix := [card0: "card0.jpg", card1: "card1.jpg", card2: "card2.jpg", pt: "pt.png"] + land_note := [card0: "l", card1: "l", card2: "l", pt: ""] + template := { input + template_suffix[type] } + land_template := { (if input == "a" then "c" else input) + land_note[type] + template_suffix[type] } # Use the normal tap symbol mana_t := { @@ -53,7 +55,7 @@ init script: guild_mana := { styling.use_guild_mana_symbols } # We have no land template - font_colors_white := { input == "b" } + font_colors_white := { input == "b" or input == "l" } # AE replacement shouldn't happen in the title, or else MSE compresses the symbol name_filter := { input } @@ -366,14 +368,14 @@ extra card style: { if text_shape() == "2" then 275 else 271 } top: - { if text_shape() == "2" then 463 + { if text_shape() == "2" then 466 else 461 } width: 81 height: 42 z index: 1 visible: { card.pt != "" } render style: image - image: { color_background(type:"pt" + text_shape(), base_hybrid:pt_hybrid) } + image: { card_ptbox() } foil layer: left: 0 top : 0 diff --git a/data/magic-new-token.mse-style/ulcard0.jpg b/data/magic-new-token.mse-style/ulcard0.jpg new file mode 100644 index 00000000..f463f761 Binary files /dev/null and b/data/magic-new-token.mse-style/ulcard0.jpg differ diff --git a/data/magic-new-token.mse-style/ulcard1.jpg b/data/magic-new-token.mse-style/ulcard1.jpg new file mode 100644 index 00000000..b0df11fc Binary files /dev/null and b/data/magic-new-token.mse-style/ulcard1.jpg differ diff --git a/data/magic-new-token.mse-style/ulcard2.jpg b/data/magic-new-token.mse-style/ulcard2.jpg new file mode 100644 index 00000000..77b89b9f Binary files /dev/null and b/data/magic-new-token.mse-style/ulcard2.jpg differ diff --git a/data/magic-new-token.mse-style/upt.png b/data/magic-new-token.mse-style/upt.png new file mode 100644 index 00000000..e19f11d7 Binary files /dev/null and b/data/magic-new-token.mse-style/upt.png differ diff --git a/data/magic-new-token.mse-style/upt0.jpg b/data/magic-new-token.mse-style/upt0.jpg deleted file mode 100644 index 442d88de..00000000 Binary files a/data/magic-new-token.mse-style/upt0.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/upt1.jpg b/data/magic-new-token.mse-style/upt1.jpg deleted file mode 100644 index dc733241..00000000 Binary files a/data/magic-new-token.mse-style/upt1.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/upt2.jpg b/data/magic-new-token.mse-style/upt2.jpg deleted file mode 100644 index 84142491..00000000 Binary files a/data/magic-new-token.mse-style/upt2.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/wlcard0.jpg b/data/magic-new-token.mse-style/wlcard0.jpg new file mode 100644 index 00000000..7d262866 Binary files /dev/null and b/data/magic-new-token.mse-style/wlcard0.jpg differ diff --git a/data/magic-new-token.mse-style/wlcard1.jpg b/data/magic-new-token.mse-style/wlcard1.jpg new file mode 100644 index 00000000..35036741 Binary files /dev/null and b/data/magic-new-token.mse-style/wlcard1.jpg differ diff --git a/data/magic-new-token.mse-style/wlcard2.jpg b/data/magic-new-token.mse-style/wlcard2.jpg new file mode 100644 index 00000000..1c2386ec Binary files /dev/null and b/data/magic-new-token.mse-style/wlcard2.jpg differ diff --git a/data/magic-new-token.mse-style/wpt.png b/data/magic-new-token.mse-style/wpt.png new file mode 100644 index 00000000..ebdd1807 Binary files /dev/null and b/data/magic-new-token.mse-style/wpt.png differ diff --git a/data/magic-new-token.mse-style/wpt0.jpg b/data/magic-new-token.mse-style/wpt0.jpg deleted file mode 100644 index f1534868..00000000 Binary files a/data/magic-new-token.mse-style/wpt0.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/wpt1.jpg b/data/magic-new-token.mse-style/wpt1.jpg deleted file mode 100644 index cf23e47a..00000000 Binary files a/data/magic-new-token.mse-style/wpt1.jpg and /dev/null differ diff --git a/data/magic-new-token.mse-style/wpt2.jpg b/data/magic-new-token.mse-style/wpt2.jpg deleted file mode 100644 index 3f8a9ff0..00000000 Binary files a/data/magic-new-token.mse-style/wpt2.jpg and /dev/null differ