From ae8122d63854c8eeacc32a9a3e166ab3d3e6e843 Mon Sep 17 00:00:00 2001 From: twanvl Date: Mon, 2 Jul 2007 21:33:38 +0000 Subject: [PATCH] Conversion of new style tokens to new color system git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@471 0fc631ac-6414-0410-93d0-97cfa31319b6 --- .../{acard.jpg => acard0.jpg} | Bin .../{1acard.jpg => acard1.jpg} | Bin .../{2acard.jpg => acard2.jpg} | Bin .../{apt.jpg => apt0.jpg} | Bin .../{1apt.jpg => apt1.jpg} | Bin .../{2apt.jpg => apt2.jpg} | Bin .../{bcard.jpg => bcard0.jpg} | Bin .../{1bcard.jpg => bcard1.jpg} | Bin .../{2bcard.jpg => bcard2.jpg} | Bin .../{bpt.jpg => bpt0.jpg} | Bin .../{1bpt.jpg => bpt1.jpg} | Bin .../{2bpt.jpg => bpt2.jpg} | Bin .../{ccard.jpg => ccard0.jpg} | Bin .../{1ccard.jpg => ccard1.jpg} | Bin .../{2ccard.jpg => ccard2.jpg} | Bin .../{cpt.jpg => cpt0.jpg} | Bin .../{1cpt.jpg => cpt1.jpg} | Bin .../{2cpt.jpg => cpt2.jpg} | Bin .../{gcard.jpg => gcard0.jpg} | Bin .../{1gcard.jpg => gcard1.jpg} | Bin .../{2gcard.jpg => gcard2.jpg} | Bin .../{gpt.jpg => gpt0.jpg} | Bin .../{1gpt.jpg => gpt1.jpg} | Bin .../{2gpt.jpg => gpt2.jpg} | Bin ...id_blend_nt.png => hybrid_blend_card0.png} | Bin ...id_blend_nt.png => hybrid_blend_card1.png} | Bin ...id_blend_nt.png => hybrid_blend_card2.png} | Bin .../{imagemask.png => imagemask0.png} | Bin .../{1imagemask.png => imagemask1.png} | Bin .../{2imagemask.png => imagemask2.png} | Bin .../{mcard.jpg => mcard0.jpg} | Bin .../{1mcard.jpg => mcard1.jpg} | Bin .../{2mcard.jpg => mcard2.jpg} | Bin .../{mpt.jpg => mpt0.jpg} | Bin .../{1mpt.jpg => mpt1.jpg} | Bin .../{2mpt.jpg => mpt2.jpg} | Bin ...l_blend.png => multicolor_blend_card0.png} | Bin ...l_blend.png => multicolor_blend_card1.png} | Bin ...l_blend.png => multicolor_blend_card2.png} | Bin ...l_blend_pt.png => multicolor_blend_pt.png} | Bin .../{rcard.jpg => rcard0.jpg} | Bin .../{1rcard.jpg => rcard1.jpg} | Bin .../{2rcard.jpg => rcard2.jpg} | Bin .../{rpt.jpg => rpt0.jpg} | Bin .../{1rpt.jpg => rpt1.jpg} | Bin .../{2rpt.jpg => rpt2.jpg} | Bin data/magic-new-token.mse-style/style | 227 ++++++------------ .../{ucard.jpg => ucard0.jpg} | Bin .../{1ucard.jpg => ucard1.jpg} | Bin .../{2ucard.jpg => ucard2.jpg} | Bin .../{upt.jpg => upt0.jpg} | Bin .../{1upt.jpg => upt1.jpg} | Bin .../{2upt.jpg => upt2.jpg} | Bin .../{wcard.jpg => wcard0.jpg} | Bin .../{1wcard.jpg => wcard1.jpg} | Bin .../{2wcard.jpg => wcard2.jpg} | Bin .../{wpt.jpg => wpt0.jpg} | Bin .../{1wpt.jpg => wpt1.jpg} | Bin .../{2wpt.jpg => wpt2.jpg} | Bin 59 files changed, 75 insertions(+), 152 deletions(-) rename data/magic-new-token.mse-style/{acard.jpg => acard0.jpg} (100%) rename data/magic-new-token.mse-style/{1acard.jpg => acard1.jpg} (100%) rename data/magic-new-token.mse-style/{2acard.jpg => acard2.jpg} (100%) rename data/magic-new-token.mse-style/{apt.jpg => apt0.jpg} (100%) rename data/magic-new-token.mse-style/{1apt.jpg => apt1.jpg} (100%) rename data/magic-new-token.mse-style/{2apt.jpg => apt2.jpg} (100%) rename data/magic-new-token.mse-style/{bcard.jpg => bcard0.jpg} (100%) rename data/magic-new-token.mse-style/{1bcard.jpg => bcard1.jpg} (100%) rename data/magic-new-token.mse-style/{2bcard.jpg => bcard2.jpg} (100%) rename data/magic-new-token.mse-style/{bpt.jpg => bpt0.jpg} (100%) rename data/magic-new-token.mse-style/{1bpt.jpg => bpt1.jpg} (100%) rename data/magic-new-token.mse-style/{2bpt.jpg => bpt2.jpg} (100%) rename data/magic-new-token.mse-style/{ccard.jpg => ccard0.jpg} (100%) rename data/magic-new-token.mse-style/{1ccard.jpg => ccard1.jpg} (100%) rename data/magic-new-token.mse-style/{2ccard.jpg => ccard2.jpg} (100%) rename data/magic-new-token.mse-style/{cpt.jpg => cpt0.jpg} (100%) rename data/magic-new-token.mse-style/{1cpt.jpg => cpt1.jpg} (100%) rename data/magic-new-token.mse-style/{2cpt.jpg => cpt2.jpg} (100%) rename data/magic-new-token.mse-style/{gcard.jpg => gcard0.jpg} (100%) rename data/magic-new-token.mse-style/{1gcard.jpg => gcard1.jpg} (100%) rename data/magic-new-token.mse-style/{2gcard.jpg => gcard2.jpg} (100%) rename data/magic-new-token.mse-style/{gpt.jpg => gpt0.jpg} (100%) rename data/magic-new-token.mse-style/{1gpt.jpg => gpt1.jpg} (100%) rename data/magic-new-token.mse-style/{2gpt.jpg => gpt2.jpg} (100%) rename data/magic-new-token.mse-style/{hybrid_blend_nt.png => hybrid_blend_card0.png} (100%) rename data/magic-new-token.mse-style/{1hybrid_blend_nt.png => hybrid_blend_card1.png} (100%) rename data/magic-new-token.mse-style/{2hybrid_blend_nt.png => hybrid_blend_card2.png} (100%) rename data/magic-new-token.mse-style/{imagemask.png => imagemask0.png} (100%) rename data/magic-new-token.mse-style/{1imagemask.png => imagemask1.png} (100%) rename data/magic-new-token.mse-style/{2imagemask.png => imagemask2.png} (100%) rename data/magic-new-token.mse-style/{mcard.jpg => mcard0.jpg} (100%) rename data/magic-new-token.mse-style/{1mcard.jpg => mcard1.jpg} (100%) rename data/magic-new-token.mse-style/{2mcard.jpg => mcard2.jpg} (100%) rename data/magic-new-token.mse-style/{mpt.jpg => mpt0.jpg} (100%) rename data/magic-new-token.mse-style/{1mpt.jpg => mpt1.jpg} (100%) rename data/magic-new-token.mse-style/{2mpt.jpg => mpt2.jpg} (100%) rename data/magic-new-token.mse-style/{multicolor_dual_blend.png => multicolor_blend_card0.png} (100%) rename data/magic-new-token.mse-style/{1multicolor_dual_blend.png => multicolor_blend_card1.png} (100%) rename data/magic-new-token.mse-style/{2multicolor_dual_blend.png => multicolor_blend_card2.png} (100%) rename data/magic-new-token.mse-style/{multicolor_dual_blend_pt.png => multicolor_blend_pt.png} (100%) rename data/magic-new-token.mse-style/{rcard.jpg => rcard0.jpg} (100%) rename data/magic-new-token.mse-style/{1rcard.jpg => rcard1.jpg} (100%) rename data/magic-new-token.mse-style/{2rcard.jpg => rcard2.jpg} (100%) rename data/magic-new-token.mse-style/{rpt.jpg => rpt0.jpg} (100%) rename data/magic-new-token.mse-style/{1rpt.jpg => rpt1.jpg} (100%) rename data/magic-new-token.mse-style/{2rpt.jpg => rpt2.jpg} (100%) rename data/magic-new-token.mse-style/{ucard.jpg => ucard0.jpg} (100%) rename data/magic-new-token.mse-style/{1ucard.jpg => ucard1.jpg} (100%) rename data/magic-new-token.mse-style/{2ucard.jpg => ucard2.jpg} (100%) rename data/magic-new-token.mse-style/{upt.jpg => upt0.jpg} (100%) rename data/magic-new-token.mse-style/{1upt.jpg => upt1.jpg} (100%) rename data/magic-new-token.mse-style/{2upt.jpg => upt2.jpg} (100%) rename data/magic-new-token.mse-style/{wcard.jpg => wcard0.jpg} (100%) rename data/magic-new-token.mse-style/{1wcard.jpg => wcard1.jpg} (100%) rename data/magic-new-token.mse-style/{2wcard.jpg => wcard2.jpg} (100%) rename data/magic-new-token.mse-style/{wpt.jpg => wpt0.jpg} (100%) rename data/magic-new-token.mse-style/{1wpt.jpg => wpt1.jpg} (100%) rename data/magic-new-token.mse-style/{2wpt.jpg => wpt2.jpg} (100%) diff --git a/data/magic-new-token.mse-style/acard.jpg b/data/magic-new-token.mse-style/acard0.jpg similarity index 100% rename from data/magic-new-token.mse-style/acard.jpg rename to data/magic-new-token.mse-style/acard0.jpg diff --git a/data/magic-new-token.mse-style/1acard.jpg b/data/magic-new-token.mse-style/acard1.jpg similarity index 100% rename from data/magic-new-token.mse-style/1acard.jpg rename to data/magic-new-token.mse-style/acard1.jpg diff --git a/data/magic-new-token.mse-style/2acard.jpg b/data/magic-new-token.mse-style/acard2.jpg similarity index 100% rename from data/magic-new-token.mse-style/2acard.jpg rename to data/magic-new-token.mse-style/acard2.jpg diff --git a/data/magic-new-token.mse-style/apt.jpg b/data/magic-new-token.mse-style/apt0.jpg similarity index 100% rename from data/magic-new-token.mse-style/apt.jpg rename to data/magic-new-token.mse-style/apt0.jpg diff --git a/data/magic-new-token.mse-style/1apt.jpg b/data/magic-new-token.mse-style/apt1.jpg similarity index 100% rename from data/magic-new-token.mse-style/1apt.jpg rename to data/magic-new-token.mse-style/apt1.jpg diff --git a/data/magic-new-token.mse-style/2apt.jpg b/data/magic-new-token.mse-style/apt2.jpg similarity index 100% rename from data/magic-new-token.mse-style/2apt.jpg rename to data/magic-new-token.mse-style/apt2.jpg diff --git a/data/magic-new-token.mse-style/bcard.jpg b/data/magic-new-token.mse-style/bcard0.jpg similarity index 100% rename from data/magic-new-token.mse-style/bcard.jpg rename to data/magic-new-token.mse-style/bcard0.jpg diff --git a/data/magic-new-token.mse-style/1bcard.jpg b/data/magic-new-token.mse-style/bcard1.jpg similarity index 100% rename from data/magic-new-token.mse-style/1bcard.jpg rename to data/magic-new-token.mse-style/bcard1.jpg diff --git a/data/magic-new-token.mse-style/2bcard.jpg b/data/magic-new-token.mse-style/bcard2.jpg similarity index 100% rename from data/magic-new-token.mse-style/2bcard.jpg rename to data/magic-new-token.mse-style/bcard2.jpg diff --git a/data/magic-new-token.mse-style/bpt.jpg b/data/magic-new-token.mse-style/bpt0.jpg similarity index 100% rename from data/magic-new-token.mse-style/bpt.jpg rename to data/magic-new-token.mse-style/bpt0.jpg diff --git a/data/magic-new-token.mse-style/1bpt.jpg b/data/magic-new-token.mse-style/bpt1.jpg similarity index 100% rename from data/magic-new-token.mse-style/1bpt.jpg rename to data/magic-new-token.mse-style/bpt1.jpg diff --git a/data/magic-new-token.mse-style/2bpt.jpg b/data/magic-new-token.mse-style/bpt2.jpg similarity index 100% rename from data/magic-new-token.mse-style/2bpt.jpg rename to data/magic-new-token.mse-style/bpt2.jpg diff --git a/data/magic-new-token.mse-style/ccard.jpg b/data/magic-new-token.mse-style/ccard0.jpg similarity index 100% rename from data/magic-new-token.mse-style/ccard.jpg rename to data/magic-new-token.mse-style/ccard0.jpg diff --git a/data/magic-new-token.mse-style/1ccard.jpg b/data/magic-new-token.mse-style/ccard1.jpg similarity index 100% rename from data/magic-new-token.mse-style/1ccard.jpg rename to data/magic-new-token.mse-style/ccard1.jpg diff --git a/data/magic-new-token.mse-style/2ccard.jpg b/data/magic-new-token.mse-style/ccard2.jpg similarity index 100% rename from data/magic-new-token.mse-style/2ccard.jpg rename to data/magic-new-token.mse-style/ccard2.jpg diff --git a/data/magic-new-token.mse-style/cpt.jpg b/data/magic-new-token.mse-style/cpt0.jpg similarity index 100% rename from data/magic-new-token.mse-style/cpt.jpg rename to data/magic-new-token.mse-style/cpt0.jpg diff --git a/data/magic-new-token.mse-style/1cpt.jpg b/data/magic-new-token.mse-style/cpt1.jpg similarity index 100% rename from data/magic-new-token.mse-style/1cpt.jpg rename to data/magic-new-token.mse-style/cpt1.jpg diff --git a/data/magic-new-token.mse-style/2cpt.jpg b/data/magic-new-token.mse-style/cpt2.jpg similarity index 100% rename from data/magic-new-token.mse-style/2cpt.jpg rename to data/magic-new-token.mse-style/cpt2.jpg diff --git a/data/magic-new-token.mse-style/gcard.jpg b/data/magic-new-token.mse-style/gcard0.jpg similarity index 100% rename from data/magic-new-token.mse-style/gcard.jpg rename to data/magic-new-token.mse-style/gcard0.jpg diff --git a/data/magic-new-token.mse-style/1gcard.jpg b/data/magic-new-token.mse-style/gcard1.jpg similarity index 100% rename from data/magic-new-token.mse-style/1gcard.jpg rename to data/magic-new-token.mse-style/gcard1.jpg diff --git a/data/magic-new-token.mse-style/2gcard.jpg b/data/magic-new-token.mse-style/gcard2.jpg similarity index 100% rename from data/magic-new-token.mse-style/2gcard.jpg rename to data/magic-new-token.mse-style/gcard2.jpg diff --git a/data/magic-new-token.mse-style/gpt.jpg b/data/magic-new-token.mse-style/gpt0.jpg similarity index 100% rename from data/magic-new-token.mse-style/gpt.jpg rename to data/magic-new-token.mse-style/gpt0.jpg diff --git a/data/magic-new-token.mse-style/1gpt.jpg b/data/magic-new-token.mse-style/gpt1.jpg similarity index 100% rename from data/magic-new-token.mse-style/1gpt.jpg rename to data/magic-new-token.mse-style/gpt1.jpg diff --git a/data/magic-new-token.mse-style/2gpt.jpg b/data/magic-new-token.mse-style/gpt2.jpg similarity index 100% rename from data/magic-new-token.mse-style/2gpt.jpg rename to data/magic-new-token.mse-style/gpt2.jpg diff --git a/data/magic-new-token.mse-style/hybrid_blend_nt.png b/data/magic-new-token.mse-style/hybrid_blend_card0.png similarity index 100% rename from data/magic-new-token.mse-style/hybrid_blend_nt.png rename to data/magic-new-token.mse-style/hybrid_blend_card0.png diff --git a/data/magic-new-token.mse-style/1hybrid_blend_nt.png b/data/magic-new-token.mse-style/hybrid_blend_card1.png similarity index 100% rename from data/magic-new-token.mse-style/1hybrid_blend_nt.png rename to data/magic-new-token.mse-style/hybrid_blend_card1.png diff --git a/data/magic-new-token.mse-style/2hybrid_blend_nt.png b/data/magic-new-token.mse-style/hybrid_blend_card2.png similarity index 100% rename from data/magic-new-token.mse-style/2hybrid_blend_nt.png rename to data/magic-new-token.mse-style/hybrid_blend_card2.png diff --git a/data/magic-new-token.mse-style/imagemask.png b/data/magic-new-token.mse-style/imagemask0.png similarity index 100% rename from data/magic-new-token.mse-style/imagemask.png rename to data/magic-new-token.mse-style/imagemask0.png diff --git a/data/magic-new-token.mse-style/1imagemask.png b/data/magic-new-token.mse-style/imagemask1.png similarity index 100% rename from data/magic-new-token.mse-style/1imagemask.png rename to data/magic-new-token.mse-style/imagemask1.png diff --git a/data/magic-new-token.mse-style/2imagemask.png b/data/magic-new-token.mse-style/imagemask2.png similarity index 100% rename from data/magic-new-token.mse-style/2imagemask.png rename to data/magic-new-token.mse-style/imagemask2.png diff --git a/data/magic-new-token.mse-style/mcard.jpg b/data/magic-new-token.mse-style/mcard0.jpg similarity index 100% rename from data/magic-new-token.mse-style/mcard.jpg rename to data/magic-new-token.mse-style/mcard0.jpg diff --git a/data/magic-new-token.mse-style/1mcard.jpg b/data/magic-new-token.mse-style/mcard1.jpg similarity index 100% rename from data/magic-new-token.mse-style/1mcard.jpg rename to data/magic-new-token.mse-style/mcard1.jpg diff --git a/data/magic-new-token.mse-style/2mcard.jpg b/data/magic-new-token.mse-style/mcard2.jpg similarity index 100% rename from data/magic-new-token.mse-style/2mcard.jpg rename to data/magic-new-token.mse-style/mcard2.jpg diff --git a/data/magic-new-token.mse-style/mpt.jpg b/data/magic-new-token.mse-style/mpt0.jpg similarity index 100% rename from data/magic-new-token.mse-style/mpt.jpg rename to data/magic-new-token.mse-style/mpt0.jpg diff --git a/data/magic-new-token.mse-style/1mpt.jpg b/data/magic-new-token.mse-style/mpt1.jpg similarity index 100% rename from data/magic-new-token.mse-style/1mpt.jpg rename to data/magic-new-token.mse-style/mpt1.jpg diff --git a/data/magic-new-token.mse-style/2mpt.jpg b/data/magic-new-token.mse-style/mpt2.jpg similarity index 100% rename from data/magic-new-token.mse-style/2mpt.jpg rename to data/magic-new-token.mse-style/mpt2.jpg diff --git a/data/magic-new-token.mse-style/multicolor_dual_blend.png b/data/magic-new-token.mse-style/multicolor_blend_card0.png similarity index 100% rename from data/magic-new-token.mse-style/multicolor_dual_blend.png rename to data/magic-new-token.mse-style/multicolor_blend_card0.png diff --git a/data/magic-new-token.mse-style/1multicolor_dual_blend.png b/data/magic-new-token.mse-style/multicolor_blend_card1.png similarity index 100% rename from data/magic-new-token.mse-style/1multicolor_dual_blend.png rename to data/magic-new-token.mse-style/multicolor_blend_card1.png diff --git a/data/magic-new-token.mse-style/2multicolor_dual_blend.png b/data/magic-new-token.mse-style/multicolor_blend_card2.png similarity index 100% rename from data/magic-new-token.mse-style/2multicolor_dual_blend.png rename to data/magic-new-token.mse-style/multicolor_blend_card2.png diff --git a/data/magic-new-token.mse-style/multicolor_dual_blend_pt.png b/data/magic-new-token.mse-style/multicolor_blend_pt.png similarity index 100% rename from data/magic-new-token.mse-style/multicolor_dual_blend_pt.png rename to data/magic-new-token.mse-style/multicolor_blend_pt.png diff --git a/data/magic-new-token.mse-style/rcard.jpg b/data/magic-new-token.mse-style/rcard0.jpg similarity index 100% rename from data/magic-new-token.mse-style/rcard.jpg rename to data/magic-new-token.mse-style/rcard0.jpg diff --git a/data/magic-new-token.mse-style/1rcard.jpg b/data/magic-new-token.mse-style/rcard1.jpg similarity index 100% rename from data/magic-new-token.mse-style/1rcard.jpg rename to data/magic-new-token.mse-style/rcard1.jpg diff --git a/data/magic-new-token.mse-style/2rcard.jpg b/data/magic-new-token.mse-style/rcard2.jpg similarity index 100% rename from data/magic-new-token.mse-style/2rcard.jpg rename to data/magic-new-token.mse-style/rcard2.jpg diff --git a/data/magic-new-token.mse-style/rpt.jpg b/data/magic-new-token.mse-style/rpt0.jpg similarity index 100% rename from data/magic-new-token.mse-style/rpt.jpg rename to data/magic-new-token.mse-style/rpt0.jpg diff --git a/data/magic-new-token.mse-style/1rpt.jpg b/data/magic-new-token.mse-style/rpt1.jpg similarity index 100% rename from data/magic-new-token.mse-style/1rpt.jpg rename to data/magic-new-token.mse-style/rpt1.jpg diff --git a/data/magic-new-token.mse-style/2rpt.jpg b/data/magic-new-token.mse-style/rpt2.jpg similarity index 100% rename from data/magic-new-token.mse-style/2rpt.jpg rename to data/magic-new-token.mse-style/rpt2.jpg diff --git a/data/magic-new-token.mse-style/style b/data/magic-new-token.mse-style/style index 9dbda055..20c4d7e9 100644 --- a/data/magic-new-token.mse-style/style +++ b/data/magic-new-token.mse-style/style @@ -1,4 +1,4 @@ -mse version: 0.3.3 +mse version: 0.3.4 game: magic short name: Modern Token full name: Post 8th Tokens @@ -21,65 +21,23 @@ card dpi: 150 ##############################P############################### Extra scripts init script: - # Load blend scripts for hybrids/multicolors - include file: magic-blends.mse-include/blend-scripts + # Load scripts for default images include file: magic-default-image.mse-include/scripts - - # Should hybrids have a grey name? - mask_hybrid_with_land := { false } - - # We have no land templates - # Which artifact template should be used? - text_sensor := { + + # What should the textbox look like? + text_shape := { if styling.one_textline_tokens - and card_style.text.content_lines == 1 - and card.flavor_text == "" then "1" - else if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then "2" - else "" } - - land_to_artifact := { - if input == "w" or input == "u" or input == "b" or input == "r" or input == "g" or input == "m" then "" - else input + and card_style.text.content_lines <= 2 + and card.flavor_text == "" then "1" # small + else if card.rule_text != "" or + number_of_items(in:"" + card.flavor_text) > 21 then "2" # large + else "0" # none } - land_to_artifact_pt := { - if input == "l" or input == "wl" or input == "ul" or input == "bl" or input == "rl" or input == "gl" or input == "ml" then "c" - else input - } - - card_hybrid_nt := { - if mask_hybrid_with_land() then - masked_blend( - mask: ( - if styling.one_textline_tokens - and card_style.text.content_lines == 1 - and card.flavor_text == "" then "1hybrid_blend_nt.png" - else if card.rule_text != "" then "2hybrid_blend_nt.png" - else "hybrid_blend_nt.png" ), - dark: land_template(""), - light: input, - ) - else input - } - multi_hybrid := { - masked_blend( - mask: ( - if styling.one_textline_tokens - and card_style.text.content_lines == 1 - and card.flavor_text == "" then "1multicolor_dual_blend.png" - else if card.rule_text != "" then "2multicolor_dual_blend.png" - else "multicolor_dual_blend.png" ), - dark: ( - if card.rule_text != "" then "2mcard.jpg" - else "mcard.jpg" ), - light: input, - ) - } - card_template := { text_sensor() + input + "card.jpg" } - land_template := { text_sensor() + land_to_artifact() + "ccard.jpg" } - pt_template := { text_sensor() + land_to_artifact_pt() + "pt.jpg" } - land_hybrid_pt := { text_sensor() + "cpt.jpg" } - + suffix := "" + template := { input + "{type}{suffix}.jpg" } + land_template := { "c{type}{suffix}.jpg" } + # Use the normal tap symbol mana_t := { if styling.tap_symbol == "old" then "old" @@ -89,13 +47,7 @@ init script: # Use guild mana symbols? guild_mana := { styling.use_guild_mana_symbols } - - # Does the card have a color that requires a white font for copyright/artist? - white_font_colors := filter_rule(match:"^(hybrid 2 color )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(black|hybrid 4 color white / blue / black / red|hybrid 2 color overlay blue / black|hybrid 2 color overlay black / red|hybrid 2 color overlay black / green)") - font_color := { - if white_font_colors(input: card.card_color) != "" then rgb(255,255,255) - else rgb(0,0,0) - } + ############################################################## Set info fields @@ -162,7 +114,7 @@ card style: z index: -2 render style: image popup style: in place - include file: magic-blends.mse-include/card-backgrounds + image: { color_background(type:"card" + text_shape(), base_hybrid:card_hybrid) } ###################C######### Name line name: @@ -183,26 +135,13 @@ card style: ############################# Image image: left: 30 - top: - script: if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then - 58 - else - 59 + top: { if text_shape() == 2 then 58 else 59 } width: 315 height: - script: if styling.one_textline_tokens and card_style.text.content_lines == 1and card.flavor_text == "" then - 349 - else if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then - 288 - else - 366 - mask: - script: if styling.one_textline_tokens and card_style.text.content_lines == 1and card.flavor_text == "" then - "1imagemask.png" - else if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then - "2imagemask.png" - else - "imagemask.png" + { if text_shape() == "1" then 349 + else if text_shape() == "2" then 288 + else 366 } + mask: { "imagemask{text_shape()}.png" } z index: 1 @@ -211,12 +150,9 @@ card style: type: left: 35 top: - script: if styling.one_textline_tokens and card_style.text.content_lines == 1and card.flavor_text == "" then - 414 - else if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then - 350 - else - 433 + { if text_shape() == "1" then 414 + else if text_shape() == "2" then 350 + else 433 } width: 286 height: 20 alignment: top shrink-overflow @@ -233,12 +169,9 @@ card style: rarity: left: 320 top: - script: if styling.one_textline_tokens and card_style.text.content_lines == 1and card.flavor_text == "" then - 415 - else if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then - 351 - else - 432 + { if text_shape() == "1" then 415 + else if text_shape() == "2" then 351 + else 432 } width: 22 height: 22 z index: 1 @@ -249,21 +182,19 @@ card style: common: script: symbol_variation(symbol: set.symbol, variation: "common") uncommon: script: symbol_variation(symbol: set.symbol, variation: "uncommon") rare: script: symbol_variation(symbol: set.symbol, variation: "rare") - special: script: symbol_variation(symbol: set.symbol, variation: "special") + special: script: symbol_variation(symbol: set.symbol, variation: "special") ############################# Text box text: left: 31 top: - script: - if styling.one_textline_tokens and card_style.text.content_lines == 1and card.flavor_text == "" then 444 - else if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then 388 - else 300 + { if text_shape() == "1" then 444 + else if text_shape() == "2" then 388 + else 300 } width: 311 height: - script: - if styling.one_textline_tokens and card_style.text.content_lines == 1and card.flavor_text == "" then 22 - else 80 + { if text_shape() == "1" then 22 + else 80 } font: name: MPlantin italic name: MPlantin-Italic @@ -280,12 +211,12 @@ card style: alignment: script: if not contains(match:",", card.rule_text) and - not contains(match: ".", card.rule_text) and - not contains(match: ";", card.rule_text) and - not contains(match: ":", card.rule_text) and - not contains (match: "!", card.rule_text) and - not contains (match: "?", card.rule_text) and - card.flavor_text == "" + not contains(match: ".", card.rule_text) and + not contains(match: ";", card.rule_text) and + not contains(match: ":", card.rule_text) and + not contains (match: "!", card.rule_text) and + not contains (match: "?", card.rule_text) and + card.flavor_text == "" then "middle center" else "middle left" z index: 2 @@ -323,8 +254,7 @@ card style: name: Matrix size: 11 weight: bold - color: - script: font_color() + color: { font_color(card.card_color) } symbol font: name: magic-paintbrush size: 10.5 @@ -338,8 +268,7 @@ card style: font: name: MPlantin size: 7.5 - color: - script: font_color() + color: { font_color(card.card_color) } ############################################################## Extra card fields @@ -348,6 +277,8 @@ extra card field: name: pt box script: card.card_color editable: false + save value: false + show statistics: false extra card field: type: choice name: name box @@ -377,46 +308,38 @@ extra card style: width: 90 height: 50 z index: 1 - visible: - script: card.pt != "" + visible: { card.pt != "" } render style: image mask: mask_pt.png - include file: magic-blends.mse-include/card-ptboxes -# name box: -# left: script: card_style.name.content_width * -.5 + 172 -# top: 25 -# width: script: card_style.name.content_width + 1 -# height: 35 -# z index: 2 -# visible: -# script: card.name != "" -# render style: image -# mask: name_mask.png -# choice images: -# black: name.jpg + image: { card_ptbox(suffix: text_shape()) } -# name box left: -# right: script: card_style.name.content_width * -.5 + 172 -# top: 25 -# width: 15 -# height: 35 -# z index: 2 -# visible: -# script: card.name != "" -# render style: image -# mask: name_l_mask.png -# choice images: -# black: name_l.jpg - -# name box right: -# left: script: card_style.name.content_width * .5 + 173 -# top: 25 -# width: 15 -# height: 35 -# z index: 2 -# visible: -# script: card.name != "" -# render style: image -# mask: name_r_mask.png -# choice images: -# black: name_r.jpg + name box: + left: { card_style.name.content_width * -0.5 + 187.5 } + top: 25 + width: { card_style.name.content_width + 1 } + height: 35 + z index: 2 + visible: { card.name != "" } + render style: image + choice images: + black: name.jpg + name box left: + right: { card_style.name.content_width * -0.5 + 187.5 } + top: 25 + width: 15 + height: 35 + z index: 2 + visible: { card.name != "" } + render style: image + choice images: + black: name_l.jpg + name box right: + left: { card_style.name.content_width * 0.5 + 188.5 } + top: 25 + width: 15 + height: 35 + z index: 2 + visible: { card.name != "" } + render style: image + choice images: + black: name_r.jpg diff --git a/data/magic-new-token.mse-style/ucard.jpg b/data/magic-new-token.mse-style/ucard0.jpg similarity index 100% rename from data/magic-new-token.mse-style/ucard.jpg rename to data/magic-new-token.mse-style/ucard0.jpg diff --git a/data/magic-new-token.mse-style/1ucard.jpg b/data/magic-new-token.mse-style/ucard1.jpg similarity index 100% rename from data/magic-new-token.mse-style/1ucard.jpg rename to data/magic-new-token.mse-style/ucard1.jpg diff --git a/data/magic-new-token.mse-style/2ucard.jpg b/data/magic-new-token.mse-style/ucard2.jpg similarity index 100% rename from data/magic-new-token.mse-style/2ucard.jpg rename to data/magic-new-token.mse-style/ucard2.jpg diff --git a/data/magic-new-token.mse-style/upt.jpg b/data/magic-new-token.mse-style/upt0.jpg similarity index 100% rename from data/magic-new-token.mse-style/upt.jpg rename to data/magic-new-token.mse-style/upt0.jpg diff --git a/data/magic-new-token.mse-style/1upt.jpg b/data/magic-new-token.mse-style/upt1.jpg similarity index 100% rename from data/magic-new-token.mse-style/1upt.jpg rename to data/magic-new-token.mse-style/upt1.jpg diff --git a/data/magic-new-token.mse-style/2upt.jpg b/data/magic-new-token.mse-style/upt2.jpg similarity index 100% rename from data/magic-new-token.mse-style/2upt.jpg rename to data/magic-new-token.mse-style/upt2.jpg diff --git a/data/magic-new-token.mse-style/wcard.jpg b/data/magic-new-token.mse-style/wcard0.jpg similarity index 100% rename from data/magic-new-token.mse-style/wcard.jpg rename to data/magic-new-token.mse-style/wcard0.jpg diff --git a/data/magic-new-token.mse-style/1wcard.jpg b/data/magic-new-token.mse-style/wcard1.jpg similarity index 100% rename from data/magic-new-token.mse-style/1wcard.jpg rename to data/magic-new-token.mse-style/wcard1.jpg diff --git a/data/magic-new-token.mse-style/2wcard.jpg b/data/magic-new-token.mse-style/wcard2.jpg similarity index 100% rename from data/magic-new-token.mse-style/2wcard.jpg rename to data/magic-new-token.mse-style/wcard2.jpg diff --git a/data/magic-new-token.mse-style/wpt.jpg b/data/magic-new-token.mse-style/wpt0.jpg similarity index 100% rename from data/magic-new-token.mse-style/wpt.jpg rename to data/magic-new-token.mse-style/wpt0.jpg diff --git a/data/magic-new-token.mse-style/1wpt.jpg b/data/magic-new-token.mse-style/wpt1.jpg similarity index 100% rename from data/magic-new-token.mse-style/1wpt.jpg rename to data/magic-new-token.mse-style/wpt1.jpg diff --git a/data/magic-new-token.mse-style/2wpt.jpg b/data/magic-new-token.mse-style/wpt2.jpg similarity index 100% rename from data/magic-new-token.mse-style/2wpt.jpg rename to data/magic-new-token.mse-style/wpt2.jpg