diff --git a/data/magic-firepenguinmaster.mse-style/style b/data/magic-firepenguinmaster.mse-style/style index b1ab4f6f..8b53963f 100644 --- a/data/magic-firepenguinmaster.mse-style/style +++ b/data/magic-firepenguinmaster.mse-style/style @@ -26,7 +26,7 @@ init script: } card_template := { green_template() + "card.jpg" } - pt_template := { green_template() + "pt.jpg" } + land_template := { green_template() + "lcard.jpg" } # Use the normal tap symbol mana_t := { diff --git a/data/magic-new-flip.mse-style/style b/data/magic-new-flip.mse-style/style index b380df22..e818d58f 100644 --- a/data/magic-new-flip.mse-style/style +++ b/data/magic-new-flip.mse-style/style @@ -21,11 +21,26 @@ init script: include file: magic-default-image.mse-include/scripts # Should hybrids have a grey name? - # Not supported (yet) + # Should hybrids have a grey name? mask_hybrid_with_land := { false } # We have no land templates - land_template := { "acard.jpg" } + # Which artifact template should be used? + land_to_artifact := { + if input == "w" or input == "u" or input == "b" or input == "r" or input == "g" or input == "m" then "" + else input + } + + land_to_artifact_pt := { + if input == "wl" or input == "ul" or input == "bl" or input == "rl" or input == "gl" or input == "ml" then "c" + else input + } + + land_template := { land_to_artifact() + "ccard.jpg" } + pt_template := { land_to_artifact_pt() + "pt.jpg" } + pt2_template := { land_to_artifact_pt() + "pt.jpg" } + land_hybrid_pt := { "cpt.jpg" } + land_hybrid_pt2 := { "cpt.jpg" } # Use the normal tap symbol mana_t := { diff --git a/data/magic-new-token.mse-style/2acard.jpg b/data/magic-new-token.mse-style/2acard.jpg new file mode 100644 index 00000000..b11c29d3 Binary files /dev/null and b/data/magic-new-token.mse-style/2acard.jpg differ diff --git a/data/magic-new-token.mse-style/2apt.jpg b/data/magic-new-token.mse-style/2apt.jpg new file mode 100644 index 00000000..0ca3fe72 Binary files /dev/null and b/data/magic-new-token.mse-style/2apt.jpg differ diff --git a/data/magic-new-token.mse-style/2bcard.jpg b/data/magic-new-token.mse-style/2bcard.jpg new file mode 100644 index 00000000..f7ed7c79 Binary files /dev/null and b/data/magic-new-token.mse-style/2bcard.jpg differ diff --git a/data/magic-new-token.mse-style/2bpt.jpg b/data/magic-new-token.mse-style/2bpt.jpg new file mode 100644 index 00000000..22d8fa47 Binary files /dev/null and b/data/magic-new-token.mse-style/2bpt.jpg differ diff --git a/data/magic-new-token.mse-style/2ccard.jpg b/data/magic-new-token.mse-style/2ccard.jpg new file mode 100644 index 00000000..f3ee46fe Binary files /dev/null and b/data/magic-new-token.mse-style/2ccard.jpg differ diff --git a/data/magic-new-token.mse-style/2cpt.jpg b/data/magic-new-token.mse-style/2cpt.jpg new file mode 100644 index 00000000..9483ddde Binary files /dev/null and b/data/magic-new-token.mse-style/2cpt.jpg differ diff --git a/data/magic-new-token.mse-style/2gcard.jpg b/data/magic-new-token.mse-style/2gcard.jpg new file mode 100644 index 00000000..c1f8dcad Binary files /dev/null and b/data/magic-new-token.mse-style/2gcard.jpg differ diff --git a/data/magic-new-token.mse-style/2gpt.jpg b/data/magic-new-token.mse-style/2gpt.jpg new file mode 100644 index 00000000..1d0cdc64 Binary files /dev/null and b/data/magic-new-token.mse-style/2gpt.jpg differ diff --git a/data/magic-new-token.mse-style/2hybrid_blend_nt.png b/data/magic-new-token.mse-style/2hybrid_blend_nt.png new file mode 100644 index 00000000..35690cd3 Binary files /dev/null and b/data/magic-new-token.mse-style/2hybrid_blend_nt.png differ diff --git a/data/magic-new-token.mse-style/2imagemask.png b/data/magic-new-token.mse-style/2imagemask.png new file mode 100644 index 00000000..8b7f158d Binary files /dev/null and b/data/magic-new-token.mse-style/2imagemask.png differ diff --git a/data/magic-new-token.mse-style/2mcard.jpg b/data/magic-new-token.mse-style/2mcard.jpg new file mode 100644 index 00000000..b319a284 Binary files /dev/null and b/data/magic-new-token.mse-style/2mcard.jpg differ diff --git a/data/magic-new-token.mse-style/2mpt.jpg b/data/magic-new-token.mse-style/2mpt.jpg new file mode 100644 index 00000000..21362fec Binary files /dev/null and b/data/magic-new-token.mse-style/2mpt.jpg differ diff --git a/data/magic-new-token.mse-style/2multicolor_dual_blend.png b/data/magic-new-token.mse-style/2multicolor_dual_blend.png new file mode 100644 index 00000000..57118e23 Binary files /dev/null and b/data/magic-new-token.mse-style/2multicolor_dual_blend.png differ diff --git a/data/magic-new-token.mse-style/2rcard.jpg b/data/magic-new-token.mse-style/2rcard.jpg new file mode 100644 index 00000000..b30df6ee Binary files /dev/null and b/data/magic-new-token.mse-style/2rcard.jpg differ diff --git a/data/magic-new-token.mse-style/2rpt.jpg b/data/magic-new-token.mse-style/2rpt.jpg new file mode 100644 index 00000000..b043dcd9 Binary files /dev/null and b/data/magic-new-token.mse-style/2rpt.jpg differ diff --git a/data/magic-new-token.mse-style/2ucard.jpg b/data/magic-new-token.mse-style/2ucard.jpg new file mode 100644 index 00000000..a2f83a2f Binary files /dev/null and b/data/magic-new-token.mse-style/2ucard.jpg differ diff --git a/data/magic-new-token.mse-style/2upt.jpg b/data/magic-new-token.mse-style/2upt.jpg new file mode 100644 index 00000000..84142491 Binary files /dev/null and b/data/magic-new-token.mse-style/2upt.jpg differ diff --git a/data/magic-new-token.mse-style/2wcard.jpg b/data/magic-new-token.mse-style/2wcard.jpg new file mode 100644 index 00000000..e5c766bc Binary files /dev/null and b/data/magic-new-token.mse-style/2wcard.jpg differ diff --git a/data/magic-new-token.mse-style/2wpt.jpg b/data/magic-new-token.mse-style/2wpt.jpg new file mode 100644 index 00000000..3f8a9ff0 Binary files /dev/null and b/data/magic-new-token.mse-style/2wpt.jpg 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..489c036c 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/multicolor_dual_blend_pt.png b/data/magic-new-token.mse-style/multicolor_dual_blend_pt.png new file mode 100644 index 00000000..0558fb3d Binary files /dev/null and b/data/magic-new-token.mse-style/multicolor_dual_blend_pt.png differ diff --git a/data/magic-new-token.mse-style/style b/data/magic-new-token.mse-style/style index 9254ad9b..a60cd034 100644 --- a/data/magic-new-token.mse-style/style +++ b/data/magic-new-token.mse-style/style @@ -24,7 +24,46 @@ init script: mask_hybrid_with_land := { false } # We have no land templates - land_template := { "acard.jpg" } + # Which artifact template should be used? + text_sensor := { 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 + } + + 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 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 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" } # Use the normal tap symbol small_mana_t := "mana_t.png" @@ -159,10 +198,22 @@ card style: ############################# Image image: left: 30 - top: 59 + top: + script: if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then + 58 + else + 59 width: 315 - height: 366 - mask: imagemask.png + height: + script: if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then + 288 + else + 366 + mask: + script: if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then + "2imagemask.png" + else + "imagemask.png" z index: 1 @@ -170,7 +221,11 @@ card style: type: left: 35 - top: 433 + top: + script: if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then + 350 + else + 433 width: 286 height: 20 alignment: top shrink-overflow @@ -180,13 +235,17 @@ card style: padding right: 2 font: name: Matrix - size: 14 + size: 15 color: rgb(0,0,0) separator color: rgb(128,128,128) rarity: left: 320 - top: 432 + top: + script: if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then + 351 + else + 432 width: 22 height: 22 z index: 1 @@ -200,6 +259,46 @@ card style: special: script: symbol_variation(symbol: set.symbol, variation: "special") ############################# Text box + text: + left: 31 + top: + if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then + 388 + else + 300 + width: 311 + height: 80 + font: + name: MPlantin + italic name: MPlantin-Italic + size: 15 + scale down to: 6 + color: rgb(0,0,0) + symbol font: + name: + script: + if styling.popup_mana_symbols + then "magic-mana-large" + else "magic-mana-small" + size: 14 + 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 == "" + then "middle center" + else "middle left" + z index: 2 + padding left: 6 + padding top: 2 + padding right: 4 + padding bottom: 2 + line height hard: 1.2 + line height line: 1.5 ############################# PT pt: @@ -211,7 +310,7 @@ card style: alignment: center middle shrink-overflow font: name: Mplantin - size: 18 + size: 16 weight: bold color: rgb(0,0,0) separator color: rgb(200,0,0) @@ -226,7 +325,7 @@ card style: z index: 1 font: name: Matrix - size: 10 + size: 11 weight: bold color: script: font_color() @@ -239,7 +338,7 @@ card style: z index: 1 font: name: MPlantin - size: 6.5 + size: 7.5 color: script: font_color()