diff --git a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend.png b/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend.png deleted file mode 100644 index 7f185ee7..00000000 Binary files a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend.png and /dev/null differ diff --git a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_3.png b/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_3.png deleted file mode 100644 index b08247a2..00000000 Binary files a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_3.png and /dev/null differ diff --git a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_4.png b/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_4.png deleted file mode 100644 index 2bdfc198..00000000 Binary files a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_4.png and /dev/null differ diff --git a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_5a.png b/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_5a.png deleted file mode 100644 index 9d7e2f43..00000000 Binary files a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_5a.png and /dev/null differ diff --git a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_5alt_1.png b/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_5alt_1.png deleted file mode 100644 index efb1b0d9..00000000 Binary files a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_5alt_1.png and /dev/null differ diff --git a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_5alt_2.png b/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_5alt_2.png deleted file mode 100644 index 60481644..00000000 Binary files a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_5alt_2.png and /dev/null differ diff --git a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_5alt_3.png b/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_5alt_3.png deleted file mode 100644 index 898897b0..00000000 Binary files a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_5alt_3.png and /dev/null differ diff --git a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_5alt_4.png b/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_5alt_4.png deleted file mode 100644 index 1ff0df3e..00000000 Binary files a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_5alt_4.png and /dev/null differ diff --git a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_5b.png b/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_5b.png deleted file mode 100644 index 6b0b69d5..00000000 Binary files a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_5b.png and /dev/null differ diff --git a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_nt.png b/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_nt.png deleted file mode 100644 index 71ff9cb3..00000000 Binary files a/data/magic-firepenguinmaster-flip.mse-style/hybrid_blend_nt.png and /dev/null differ diff --git a/data/magic-firepenguinmaster-flip.mse-style/multicolor_dual_blend.png b/data/magic-firepenguinmaster-flip.mse-style/multicolor_blend_card.png similarity index 100% rename from data/magic-firepenguinmaster-flip.mse-style/multicolor_dual_blend.png rename to data/magic-firepenguinmaster-flip.mse-style/multicolor_blend_card.png diff --git a/data/magic-firepenguinmaster-flip.mse-style/ptshieldsword-2.png b/data/magic-firepenguinmaster-flip.mse-style/ptshieldsword-2.png deleted file mode 100644 index 84f6968c..00000000 Binary files a/data/magic-firepenguinmaster-flip.mse-style/ptshieldsword-2.png and /dev/null differ diff --git a/data/magic-firepenguinmaster-flip.mse-style/style b/data/magic-firepenguinmaster-flip.mse-style/style index b119160e..24dad456 100644 --- a/data/magic-firepenguinmaster-flip.mse-style/style +++ b/data/magic-firepenguinmaster-flip.mse-style/style @@ -1,4 +1,4 @@ -mse version: 0.3.2 +mse version: 0.3.4 game: magic full name: FPM's Flip Magic short name: FPM Flip @@ -13,10 +13,10 @@ card dpi: 150 init script: # Load blend scripts for hybrids/multicolors - include file: magic-blends.mse-include/blend-scripts + include file: magic-default-image.mse-include/scripts # We have no land templates - land_template := { "ccard.jpg" } + land_template := { "c{type}.jpg" } # Use the normal tap symbol mana_t := { @@ -28,14 +28,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 @@ -102,7 +97,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: @@ -180,8 +175,9 @@ card style: height: 20 width: 14 render style: image + angle: 180 choice images: - tombstone: tombstone-2.png + tombstone: tombstone.png ############################# Image image: @@ -382,7 +378,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 @@ -396,7 +392,7 @@ card style: font: name: MPlantin size: 7 - color: { font_color() } + color: { font_color(card.card_color) } ############################################################## Extra card fields @@ -430,5 +426,6 @@ extra card style: z index: 1 visible: { card.power_2 != "" or card.toughness_2 != "" } render style: image + angle: 180 choice images: - shieldsword: ptshieldsword-2.png + shieldsword: ptshieldsword.png diff --git a/data/magic-firepenguinmaster-flip.mse-style/tombstone-2.png b/data/magic-firepenguinmaster-flip.mse-style/tombstone-2.png deleted file mode 100644 index 2efafd9c..00000000 Binary files a/data/magic-firepenguinmaster-flip.mse-style/tombstone-2.png and /dev/null differ diff --git a/data/magic-firepenguinmasterpromo.mse-style/lcard.jpg b/data/magic-firepenguinmasterpromo.mse-style/clcard.jpg similarity index 100% rename from data/magic-firepenguinmasterpromo.mse-style/lcard.jpg rename to data/magic-firepenguinmasterpromo.mse-style/clcard.jpg diff --git a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend.png b/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend.png deleted file mode 100644 index 7f185ee7..00000000 Binary files a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend.png and /dev/null differ diff --git a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_3.png b/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_3.png deleted file mode 100644 index b08247a2..00000000 Binary files a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_3.png and /dev/null differ diff --git a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_4.png b/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_4.png deleted file mode 100644 index 2bdfc198..00000000 Binary files a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_4.png and /dev/null differ diff --git a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_5a.png b/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_5a.png deleted file mode 100644 index 9d7e2f43..00000000 Binary files a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_5a.png and /dev/null differ diff --git a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_5alt_1.png b/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_5alt_1.png deleted file mode 100644 index efb1b0d9..00000000 Binary files a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_5alt_1.png and /dev/null differ diff --git a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_5alt_2.png b/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_5alt_2.png deleted file mode 100644 index 60481644..00000000 Binary files a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_5alt_2.png and /dev/null differ diff --git a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_5alt_3.png b/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_5alt_3.png deleted file mode 100644 index 898897b0..00000000 Binary files a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_5alt_3.png and /dev/null differ diff --git a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_5alt_4.png b/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_5alt_4.png deleted file mode 100644 index 1ff0df3e..00000000 Binary files a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_5alt_4.png and /dev/null differ diff --git a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_5b.png b/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_5b.png deleted file mode 100644 index 6b0b69d5..00000000 Binary files a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_5b.png and /dev/null differ diff --git a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_nt.png b/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_nt.png deleted file mode 100644 index 71ff9cb3..00000000 Binary files a/data/magic-firepenguinmasterpromo.mse-style/hybrid_blend_nt.png and /dev/null differ diff --git a/data/magic-firepenguinmasterpromo.mse-style/multicolor_dual_blend.png b/data/magic-firepenguinmasterpromo.mse-style/multicolor_blend_card.png similarity index 100% rename from data/magic-firepenguinmasterpromo.mse-style/multicolor_dual_blend.png rename to data/magic-firepenguinmasterpromo.mse-style/multicolor_blend_card.png diff --git a/data/magic-firepenguinmasterpromo.mse-style/style b/data/magic-firepenguinmasterpromo.mse-style/style index 9f72ab31..3ba8f899 100644 --- a/data/magic-firepenguinmasterpromo.mse-style/style +++ b/data/magic-firepenguinmasterpromo.mse-style/style @@ -1,4 +1,4 @@ -mse version: 0.2.7 +mse version: 0.3.4 game: magic full name: FPM's Promo Magic short name: FPM Promo @@ -12,19 +12,14 @@ 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" } + template := { green_template() + "{type}.jpg" } + land_template := { (if input == "a" then "c" else green_template()) + "l{type}.jpg" } # Use the normal tap symbol mana_t := { @@ -35,15 +30,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? - 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) - } + ############################################################## Extra style styling field: @@ -121,7 +108,7 @@ card style: z index: -2 render style: image popup style: in place - include file: magic-blends.mse-include/card-backgrounds + image: { card_background() } font color: left: 25 top: 508 diff --git a/data/magic-firepenguinmastersplit.mse-style/lcard.jpg b/data/magic-firepenguinmastersplit.mse-style/clcard.jpg similarity index 100% rename from data/magic-firepenguinmastersplit.mse-style/lcard.jpg rename to data/magic-firepenguinmastersplit.mse-style/clcard.jpg diff --git a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend.png b/data/magic-firepenguinmastersplit.mse-style/hybrid_blend.png deleted file mode 100644 index 1cb26a98..00000000 Binary files a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend.png and /dev/null differ diff --git a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_3.png b/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_3.png deleted file mode 100644 index 26b960a2..00000000 Binary files a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_3.png and /dev/null differ diff --git a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_4.png b/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_4.png deleted file mode 100644 index 18f8682d..00000000 Binary files a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_4.png and /dev/null differ diff --git a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_5a.png b/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_5a.png deleted file mode 100644 index d1bb83f2..00000000 Binary files a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_5a.png and /dev/null differ diff --git a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_5alt_1.png b/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_5alt_1.png deleted file mode 100644 index ab636884..00000000 Binary files a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_5alt_1.png and /dev/null differ diff --git a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_5alt_2.png b/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_5alt_2.png deleted file mode 100644 index 3e7fdb04..00000000 Binary files a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_5alt_2.png and /dev/null differ diff --git a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_5alt_3.png b/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_5alt_3.png deleted file mode 100644 index 8067f1c7..00000000 Binary files a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_5alt_3.png and /dev/null differ diff --git a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_5alt_4.png b/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_5alt_4.png deleted file mode 100644 index 0f72dc12..00000000 Binary files a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_5alt_4.png and /dev/null differ diff --git a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_5b.png b/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_5b.png deleted file mode 100644 index c1143737..00000000 Binary files a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_5b.png and /dev/null differ diff --git a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_nt.png b/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_nt.png deleted file mode 100644 index 846735e7..00000000 Binary files a/data/magic-firepenguinmastersplit.mse-style/hybrid_blend_nt.png and /dev/null differ diff --git a/data/magic-firepenguinmastersplit.mse-style/multicolor_dual_blend.png b/data/magic-firepenguinmastersplit.mse-style/multicolor_blend_card.png similarity index 100% rename from data/magic-firepenguinmastersplit.mse-style/multicolor_dual_blend.png rename to data/magic-firepenguinmastersplit.mse-style/multicolor_blend_card.png diff --git a/data/magic-firepenguinmastersplit.mse-style/style b/data/magic-firepenguinmastersplit.mse-style/style index d5962160..6ffae8f0 100644 --- a/data/magic-firepenguinmastersplit.mse-style/style +++ b/data/magic-firepenguinmastersplit.mse-style/style @@ -1,4 +1,4 @@ -mse version: 0.3.2 +mse version: 0.3.4 game: magic full name: FPM's Split Magic short name: FPM Split @@ -9,23 +9,23 @@ card width: 523 card height: 375 card dpi: 150 -#Made by the forum members of the MSE2 Forums. Special thanks to Artfreakwiu who did the start and the bulk of the work, RoatheEternal for testing and graphics, BunnieRein (for finally making the casting cost work), FirePenguinMaster for making the frames to begin with, and Twanvl for making MSE2 to begin with. +# Made by the forum members of the MSE2 Forums. +# Special thanks to Artfreakwiu who did the start and the bulk of the work, +# RoatheEternal for testing and graphics, +# BunnieRein (for finally making the casting cost work), +# FirePenguinMaster for making the frames to begin with, +# and Twanvl for making MSE2 to begin with. ############################################################## 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" } + template := { green_template() + "{type}.jpg" } + land_template := { (if input == "a" then "c" else green_template()) + "l{type}.jpg" } # Use the normal tap symbol mana_t := { @@ -37,19 +37,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) - } - font_color_2 := { - if white_font_colors(input: card.card_color_2) != "" then rgb(255,255,255) - else if black_font_colors(input: card.card_color_2) != "" 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: @@ -123,7 +113,7 @@ card style: z index: -2 render style: image popup style: in place - include file: magic-blends.mse-include/card-backgrounds + image: { card_background() } card color 2: left: 271.49 top: 18 @@ -132,7 +122,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: @@ -428,7 +418,7 @@ card style: font: name: MPlantin-Italic size: 5.54 - color: { font_color() } + color: { font_color(card.card_color) } symbol font: name: magic-paintbrush size: 9.7 @@ -442,7 +432,7 @@ card style: font: name: MPlantin-Italic size: 5.54 - color: { font_color_2() } + color: { font_color(card.card_color_2) } symbol font: name: magic-paintbrush size: 9.7 @@ -456,7 +446,7 @@ card style: font: name: MPlantin size: 4.85 - color: { font_color() } + color: { font_color(card.card_color) } copyright line 2: left: 298.51 top : 348 @@ -467,7 +457,7 @@ card style: font: name: MPlantin size: 4.85 - color: { font_color_2() } + color: { font_color(card.card_color_2) } ############################################################## Extra card fields