diff --git a/data/magic-firepenguinmaster.mse-style/lcard.jpg b/data/magic-firepenguinmaster.mse-style/clcard.jpg similarity index 100% rename from data/magic-firepenguinmaster.mse-style/lcard.jpg rename to data/magic-firepenguinmaster.mse-style/clcard.jpg diff --git a/data/magic-firepenguinmaster.mse-style/hybrid_blend.png b/data/magic-firepenguinmaster.mse-style/hybrid_blend.png deleted file mode 100644 index 7f185ee7..00000000 Binary files a/data/magic-firepenguinmaster.mse-style/hybrid_blend.png and /dev/null differ diff --git a/data/magic-firepenguinmaster.mse-style/hybrid_blend_3.png b/data/magic-firepenguinmaster.mse-style/hybrid_blend_3.png deleted file mode 100644 index b08247a2..00000000 Binary files a/data/magic-firepenguinmaster.mse-style/hybrid_blend_3.png and /dev/null differ diff --git a/data/magic-firepenguinmaster.mse-style/hybrid_blend_4.png b/data/magic-firepenguinmaster.mse-style/hybrid_blend_4.png deleted file mode 100644 index 2bdfc198..00000000 Binary files a/data/magic-firepenguinmaster.mse-style/hybrid_blend_4.png and /dev/null differ diff --git a/data/magic-firepenguinmaster.mse-style/hybrid_blend_5a.png b/data/magic-firepenguinmaster.mse-style/hybrid_blend_5a.png deleted file mode 100644 index 9d7e2f43..00000000 Binary files a/data/magic-firepenguinmaster.mse-style/hybrid_blend_5a.png and /dev/null differ diff --git a/data/magic-firepenguinmaster.mse-style/hybrid_blend_5alt_1.png b/data/magic-firepenguinmaster.mse-style/hybrid_blend_5alt_1.png deleted file mode 100644 index efb1b0d9..00000000 Binary files a/data/magic-firepenguinmaster.mse-style/hybrid_blend_5alt_1.png and /dev/null differ diff --git a/data/magic-firepenguinmaster.mse-style/hybrid_blend_5alt_2.png b/data/magic-firepenguinmaster.mse-style/hybrid_blend_5alt_2.png deleted file mode 100644 index 60481644..00000000 Binary files a/data/magic-firepenguinmaster.mse-style/hybrid_blend_5alt_2.png and /dev/null differ diff --git a/data/magic-firepenguinmaster.mse-style/hybrid_blend_5alt_3.png b/data/magic-firepenguinmaster.mse-style/hybrid_blend_5alt_3.png deleted file mode 100644 index 898897b0..00000000 Binary files a/data/magic-firepenguinmaster.mse-style/hybrid_blend_5alt_3.png and /dev/null differ diff --git a/data/magic-firepenguinmaster.mse-style/hybrid_blend_5alt_4.png b/data/magic-firepenguinmaster.mse-style/hybrid_blend_5alt_4.png deleted file mode 100644 index 1ff0df3e..00000000 Binary files a/data/magic-firepenguinmaster.mse-style/hybrid_blend_5alt_4.png and /dev/null differ diff --git a/data/magic-firepenguinmaster.mse-style/hybrid_blend_5b.png b/data/magic-firepenguinmaster.mse-style/hybrid_blend_5b.png deleted file mode 100644 index 6b0b69d5..00000000 Binary files a/data/magic-firepenguinmaster.mse-style/hybrid_blend_5b.png and /dev/null differ diff --git a/data/magic-firepenguinmaster.mse-style/hybrid_blend_nt.png b/data/magic-firepenguinmaster.mse-style/hybrid_blend_nt.png deleted file mode 100644 index 71ff9cb3..00000000 Binary files a/data/magic-firepenguinmaster.mse-style/hybrid_blend_nt.png and /dev/null differ diff --git a/data/magic-firepenguinmaster.mse-style/multicolor_dual_blend.png b/data/magic-firepenguinmaster.mse-style/multicolor_blend_card.png similarity index 100% rename from data/magic-firepenguinmaster.mse-style/multicolor_dual_blend.png rename to data/magic-firepenguinmaster.mse-style/multicolor_blend_card.png diff --git a/data/magic-firepenguinmaster.mse-style/style b/data/magic-firepenguinmaster.mse-style/style index 8b53963f..d344983b 100644 --- a/data/magic-firepenguinmaster.mse-style/style +++ b/data/magic-firepenguinmaster.mse-style/style @@ -1,4 +1,4 @@ -mse version: 0.3.2 +mse version: 0.3.4 game: magic full name: FPM's Normal Magic short name: FPM Normal @@ -15,18 +15,14 @@ card dpi: 150 ############################################################## Extra scripts init script: - # Load blend scripts for hybrids/multicolors - include file: magic-blends.mse-include/blend-scripts - 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 := { @@ -38,15 +34,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 options @@ -127,7 +117,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 +281,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 +296,7 @@ card style: font: name: MPlantin size: 7 - color: { font_color() } + color: { font_color(card.card_color) } ############################################################## Extra card fields