diff --git a/data/magic-firepenguinmastertokens.mse-style/lcard.jpg b/data/magic-firepenguinmastertokens.mse-style/clcard.jpg similarity index 100% rename from data/magic-firepenguinmastertokens.mse-style/lcard.jpg rename to data/magic-firepenguinmastertokens.mse-style/clcard.jpg diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend.png deleted file mode 100644 index 7f185ee7..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_3.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_3.png deleted file mode 100644 index b08247a2..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_3.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_3_typeline.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_3_typeline.png deleted file mode 100644 index 9538972e..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_3_typeline.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_4.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_4.png deleted file mode 100644 index 2bdfc198..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_4.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_4_textbox.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_4_textbox.png deleted file mode 100644 index 05b63fbf..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_4_textbox.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_4_typeline.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_4_typeline.png deleted file mode 100644 index 9538972e..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_4_typeline.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5a.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5a.png deleted file mode 100644 index 9d7e2f43..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5a.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5a_textbox.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5a_textbox.png deleted file mode 100644 index 8a59e527..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5a_textbox.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5a_typeline.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5a_typeline.png deleted file mode 100644 index 9538972e..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5a_typeline.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_1.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_1.png deleted file mode 100644 index efb1b0d9..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_1.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_1_textbox.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_1_textbox.png deleted file mode 100644 index 620afa2a..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_1_textbox.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_1_typeline.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_1_typeline.png deleted file mode 100644 index 6898f54d..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_1_typeline.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_2.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_2.png deleted file mode 100644 index 60481644..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_2.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_2_textbox.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_2_textbox.png deleted file mode 100644 index c90a75d1..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_2_textbox.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_2_typeline.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_2_typeline.png deleted file mode 100644 index 5a162073..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_2_typeline.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_3.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_3.png deleted file mode 100644 index 898897b0..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_3.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_3_textbox.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_3_textbox.png deleted file mode 100644 index e9de0075..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_3_textbox.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_3_typeline.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_3_typeline.png deleted file mode 100644 index fe175928..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_3_typeline.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_4.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_4.png deleted file mode 100644 index 1ff0df3e..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_4.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_4_textbox.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_4_textbox.png deleted file mode 100644 index b78c5e0b..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_4_textbox.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_4_typeline.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_4_typeline.png deleted file mode 100644 index 163e31ae..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5alt_4_typeline.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5b.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5b.png deleted file mode 100644 index 6b0b69d5..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5b.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5b_textbox.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5b_textbox.png deleted file mode 100644 index b4c59cf1..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5b_textbox.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5b_typeline.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5b_typeline.png deleted file mode 100644 index bc160124..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_5b_typeline.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_nt.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_nt.png deleted file mode 100644 index 71ff9cb3..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_nt.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_nt_textbox.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_nt_textbox.png deleted file mode 100644 index 05b63fbf..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_nt_textbox.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_textbox.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_textbox.png deleted file mode 100644 index 1fa81a79..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_textbox.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_typeline.png b/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_typeline.png deleted file mode 100644 index 45278c1a..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_typeline.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/multicolor_dual_blend.png b/data/magic-firepenguinmastertokens.mse-style/multicolor_blend_card.png similarity index 100% rename from data/magic-firepenguinmastertokens.mse-style/multicolor_dual_blend.png rename to data/magic-firepenguinmastertokens.mse-style/multicolor_blend_card.png diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_3_textbox.png b/data/magic-firepenguinmastertokens.mse-style/multicolor_blend_textbox.png similarity index 100% rename from data/magic-firepenguinmastertokens.mse-style/hybrid_blend_3_textbox.png rename to data/magic-firepenguinmastertokens.mse-style/multicolor_blend_textbox.png diff --git a/data/magic-firepenguinmastertokens.mse-style/hybrid_blend_nt_typeline.png b/data/magic-firepenguinmastertokens.mse-style/multicolor_blend_typeline.png similarity index 100% rename from data/magic-firepenguinmastertokens.mse-style/hybrid_blend_nt_typeline.png rename to data/magic-firepenguinmastertokens.mse-style/multicolor_blend_typeline.png diff --git a/data/magic-firepenguinmastertokens.mse-style/multicolor_dual_blend_textbox.png b/data/magic-firepenguinmastertokens.mse-style/multicolor_dual_blend_textbox.png deleted file mode 100644 index 05b63fbf..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/multicolor_dual_blend_textbox.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/multicolor_dual_blend_typeline.png b/data/magic-firepenguinmastertokens.mse-style/multicolor_dual_blend_typeline.png deleted file mode 100644 index 063a5bfe..00000000 Binary files a/data/magic-firepenguinmastertokens.mse-style/multicolor_dual_blend_typeline.png and /dev/null differ diff --git a/data/magic-firepenguinmastertokens.mse-style/style b/data/magic-firepenguinmastertokens.mse-style/style index 86c087ae..b5cbe588 100644 --- a/data/magic-firepenguinmastertokens.mse-style/style +++ b/data/magic-firepenguinmastertokens.mse-style/style @@ -12,23 +12,15 @@ card dpi: 300 ############################################################## Extra scripts init script: - # Load blend scripts for hybrids/multicolors - include file: magic-blends.mse-include/blend-scripts - - # Which green template should be used? green_template := { if input == "g" then ( - if styling.green_style == "light" then "lg" - else "g" + if styling.green_style == "light" then "lg" + else "g" ) else input } - - card_template := { green_template() + "card.jpg" } - land_template := { green_template() + "lcard.jpg" } - typeline_template := { green_template() + "typeline.png" } - typelineland_template := { green_template() + "ltypeline.png" } - textbox_template := { green_template() + "textbox.png" } - textboxland_template := { green_template() + "ltextbox.png" } + suffix := [card: "card.jpg", textbox: "textbox.png", typeline: "typeline.png"] + template := { green_template() + suffix[type] } + land_template := { (if input == "a" then "c" else green_template()) + "l" + suffix[type] } # Use the normal tap symbol mana_t := { @@ -40,14 +32,9 @@ 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? - black_font_colors := filter_rule(match:"^(hybrid 2 color [^/]*/ )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid 4 color [^/]*/[^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(hybrid 5 color horizontal [^/]*/[^/]*/[^/]*/[^/]*/ )?(white)") - white_font_colors := filter_rule(match:"^(hybrid 2 color overlay green / white|hybrid 2 color overlay red / white)") - font_color := { - if white_font_colors(input: card.card_color) != "" then rgb(255,255,255) - else if black_font_colors(input: card.card_color) != "" then rgb(0,0,0) - else rgb(255,255,255) - } + # Only white cards use a black font + # TODO: also for some overlays involving white + font_colors_white := { input != "w" } ############################################################## Extra style styling field: @@ -125,7 +112,7 @@ card style: z index: -2 render style: image popup style: in place - include file: magic-blends.mse-include/card-backgrounds + image: { card_background() } ############################# Name line name: @@ -291,7 +278,7 @@ card style: font: name: MPlantin-Italic size: 8 - color: { font_color() } + color: { font_color(card.card_color) } symbol font: name: magic-paintbrush size: 14 @@ -306,7 +293,7 @@ card style: font: name: MPlantin size: 7 - color: { font_color() } + color: { font_color(card.card_color) } ############################################################## Extra card fields @@ -319,15 +306,17 @@ extra card field: extra card field: type: choice name: textbox - include file: magic-blends.mse-include/card-colors - default: card.card_color + script: card.card_color show statistics: false + editable: false + save value: false extra card field: type: choice - name: type image - include file: magic-blends.mse-include/card-colors - default: card.card_color + name: typeline + script: card.card_color show statistics: false + editable: false + save value: false extra card style: pt symbols: @@ -348,12 +337,11 @@ extra card style: render style: image popup style: in place visible: - { if card.rule_text != "" then 1 - else if number_of_items(in:"" + card.flavor_text) > 21 then 1 - else 0 } - include file: magic-blends.mse-include/card-textboxes + { card.rule_text != "" or + (number_of_items(in:"" + card.flavor_text) > 21) } + image: { card_textbox() } z index: 2 - type image: + typeline: left: 53 top: 463 width: 304 @@ -361,5 +349,5 @@ extra card style: render style: image popup style: in place visible: { card.type != "" or card.illustrator != "" or card.copyright != "" } - include file: magic-blends.mse-include/card-typelines + image: { card_typeline() } z index: 2