From 0fd8c42a8d9d151197382b1829d75e91e3bf5f9e Mon Sep 17 00:00:00 2001 From: pichoro Date: Thu, 7 Jun 2007 02:53:39 +0000 Subject: [PATCH] Lots of font size alterations. Fixed a problem with Magic textless that prevented pt box display. Added most (but not all) of overlay hybrid scripts. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@413 0fc631ac-6414-0410-93d0-97cfa31319b6 --- data/magic-blends.mse-include/blend-scripts | 53 +++++++++++++++++-- .../magic-blends.mse-include/card-backgrounds | 10 ++++ data/magic-blends.mse-include/card-colors | 12 +++++ data/magic-blends.mse-include/card-ptboxes | 10 ++++ data/magic-blends.mse-include/card-textboxes | 10 ++++ data/magic-blends.mse-include/card-typelines | 10 ++++ data/magic-blends.mse-include/flip-ptboxes | 10 ++++ data/magic-blends.mse-include/flip-ptboxes2 | 10 ++++ data/magic-default-image.mse-include/scripts | 12 ++++- data/magic-extended-art.mse-style/style | 16 +++--- .../style | 4 +- data/magic-firepenguinmaster.mse-style/style | 4 +- .../style | 4 +- .../style | 7 ++- .../style | 4 +- data/magic-new-flip.mse-style/style | 6 +-- data/magic-new-promo.mse-style/style | 6 +-- data/magic-new-split.mse-style/style | 6 +-- data/magic-new.mse-style/style | 2 +- data/magic-planeshifted.mse-style/style | 2 +- data/magic-textless.mse-style/style | 40 ++++++++------ 21 files changed, 193 insertions(+), 45 deletions(-) diff --git a/data/magic-blends.mse-include/blend-scripts b/data/magic-blends.mse-include/blend-scripts index 55235a69..ed5b8d71 100644 --- a/data/magic-blends.mse-include/blend-scripts +++ b/data/magic-blends.mse-include/blend-scripts @@ -59,6 +59,16 @@ card_hybrid_2v := { ) ) } +# 'overlay' 2 color hybrid +card_hybrid_overlay := { + card_hybrid_nt( + combine_blend( + image1: card_template(input[0]), + image2: card_template(input[1]), + combine: "symmetric overlay" + ) + ) +} # 'star' 3 color hybrid card_hybrid_3 := { card_hybrid_nt( @@ -657,7 +667,7 @@ land_hybrid_6h_typeline := { ) } # horizontal 7 color hybrid -card_hybrid_7h_typeline := { +land_hybrid_7h_typeline := { card_hybrid_nt( linear_blend( image1: typelineland_template(input[0]) @@ -876,7 +886,7 @@ land_hybrid_6h_textbox := { ) } # horizontal 7 color hybrid -card_hybrid_7h_textbox := { +land_hybrid_7h_textbox := { card_hybrid_nt( linear_blend( image1: textboxland_template(input[0]) @@ -946,6 +956,16 @@ card_hybrid_2v_typeline := { ) ) } +# 'overlay' 2 color pt hybrid +card_hybrid_overlay_typeline := { + card_hybrid_nt( + combine_blend( + image1: typeline_template(input[0]), + image2: typeline_template(input[1]), + combine: "symmetric overlay" + ) + ) +} # 'star' 3 color hybrid card_hybrid_3_typeline := { card_hybrid_nt_typeline( @@ -1177,6 +1197,16 @@ card_hybrid_2v_textbox := { ) ) } +# 'overlay' 2 color pt hybrid +card_hybrid_overlay_textbox := { + card_hybrid_nt( + combine_blend( + image1: textbox_template(input[0]), + image2: textbox_template(input[1]), + combine: "symmetric overlay" + ) + ) +} # 'star' 3 color hybrid card_hybrid_3_textbox := { card_hybrid_nt_textbox( @@ -1381,6 +1411,14 @@ card_hybrid_pt := { then land_hybrid_pt() else pt_template() } +# 'overlay' 2 color pt hybrid +card_hybrid_pt_overlay := { + combine_blend( + image1: pt_template(input[0]), + image2: pt_template(input[1]), + combine: "symmetric overlay" + ) +} # Mask part of the input p/t box with the "hpt.jpg" file land_hybrid_pt := { masked_blend( @@ -1389,7 +1427,6 @@ land_hybrid_pt := { light: pt_template(), ) } - # Multicolor blend for pt box multi_hybrid_pt := { masked_blend( @@ -1430,6 +1467,16 @@ card_hybrid_pt2 := { then land_hybrid_pt2() else pt2_template() } +# 'overlay' 2 color pt hybrid +card_hybrid_pt2_overlay := { + card_hybrid_nt( + combine_blend( + image1: pt2_template(input[0]), + image2: pt2_template(input[1]), + combine: "symmetric overlay" + ) + ) +} # Mask part of the input p/t box with the "hpt.jpg" file land_hybrid_pt2 := { masked_blend( diff --git a/data/magic-blends.mse-include/card-backgrounds b/data/magic-blends.mse-include/card-backgrounds index a8150155..87b5b7b8 100644 --- a/data/magic-blends.mse-include/card-backgrounds +++ b/data/magic-blends.mse-include/card-backgrounds @@ -71,6 +71,16 @@ choice images: hybrid 2 color artifact / black : script: card_hybrid_2("ab") hybrid 2 color artifact / red : script: card_hybrid_2("ar") hybrid 2 color artifact / green : script: card_hybrid_2("ag") + hybrid 2 color overlay white / blue : script: card_hybrid_overlay("wu") + hybrid 2 color overlay blue / black : script: card_hybrid_overlay("ub") + hybrid 2 color overlay black / red : script: card_hybrid_overlay("br") + hybrid 2 color overlay red / green : script: card_hybrid_overlay("rg") + hybrid 2 color overlay green / white : script: card_hybrid_overlay("gw") + hybrid 2 color overlay white / black : script: card_hybrid_overlay("wb") + hybrid 2 color overlay blue / red : script: card_hybrid_overlay("ur") + hybrid 2 color overlay black / green : script: card_hybrid_overlay("bg") + hybrid 2 color overlay red / white : script: card_hybrid_overlay("rw") + hybrid 2 color overlay green / blue : script: card_hybrid_overlay("gu") hybrid 3 color white / blue / black : script: card_hybrid_3("wub") hybrid 3 color blue / black / red : script: card_hybrid_3("ubr") hybrid 3 color black / red / green : script: card_hybrid_3("brg") diff --git a/data/magic-blends.mse-include/card-colors b/data/magic-blends.mse-include/card-colors index e55efd1e..1b2664f7 100644 --- a/data/magic-blends.mse-include/card-colors +++ b/data/magic-blends.mse-include/card-colors @@ -88,6 +88,18 @@ choice: choice: artifact / black choice: artifact / red choice: artifact / green + choice: + name: overlay + choice: white / blue + choice: blue / black + choice: black / red + choice: red / green + choice: green / white + choice: white / black + choice: blue / red + choice: black / green + choice: red / white + choice: green / blue choice: name: 3 color choice: white / blue / black diff --git a/data/magic-blends.mse-include/card-ptboxes b/data/magic-blends.mse-include/card-ptboxes index d61cef87..81ce0ae3 100644 --- a/data/magic-blends.mse-include/card-ptboxes +++ b/data/magic-blends.mse-include/card-ptboxes @@ -71,6 +71,16 @@ choice images: hybrid 2 color artifact / black : script: card_hybrid_pt("b") hybrid 2 color artifact / red : script: card_hybrid_pt("r") hybrid 2 color artifact / green : script: card_hybrid_pt("g") + hybrid 2 color overlay white / blue : script: card_hybrid_pt_overlay("wu") + hybrid 2 color overlay blue / black : script: card_hybrid_pt_overlay("ub") + hybrid 2 color overlay black / red : script: card_hybrid_pt_overlay("br") + hybrid 2 color overlay red / green : script: card_hybrid_pt_overlay("rg") + hybrid 2 color overlay green / white : script: card_hybrid_pt_overlay("gw") + hybrid 2 color overlay white / black : script: card_hybrid_pt_overlay("wb") + hybrid 2 color overlay blue / red : script: card_hybrid_pt_overlay("ur") + hybrid 2 color overlay black / green : script: card_hybrid_pt_overlay("bg") + hybrid 2 color overlay red / white : script: card_hybrid_pt_overlay("rw") + hybrid 2 color overlay green / blue : script: card_hybrid_pt_overlay("gu") hybrid 3 color white / blue / black : script: card_hybrid_pt("b") hybrid 3 color blue / black / red : script: card_hybrid_pt("r") hybrid 3 color black / red / green : script: card_hybrid_pt("g") diff --git a/data/magic-blends.mse-include/card-textboxes b/data/magic-blends.mse-include/card-textboxes index 89cebd83..18f158b5 100644 --- a/data/magic-blends.mse-include/card-textboxes +++ b/data/magic-blends.mse-include/card-textboxes @@ -71,6 +71,16 @@ choice images: hybrid 2 color artifact / black : script: card_hybrid_2_textbox("ab") hybrid 2 color artifact / red : script: card_hybrid_2_textbox("ar") hybrid 2 color artifact / green : script: card_hybrid_2_textbox("ag") + hybrid 2 color overlay white / blue : script: card_hybrid_overlay_textbox("wu") + hybrid 2 color overlay blue / black : script: card_hybrid_overlay_textbox("ub") + hybrid 2 color overlay black / red : script: card_hybrid_overlay_textbox("br") + hybrid 2 color overlay red / green : script: card_hybrid_overlay_textbox("rg") + hybrid 2 color overlay green / white : script: card_hybrid_overlay_textbox("gw") + hybrid 2 color overlay white / black : script: card_hybrid_overlay_textbox("wb") + hybrid 2 color overlay blue / red : script: card_hybrid_overlay_textbox("ur") + hybrid 2 color overlay black / green : script: card_hybrid_overlay_textbox("bg") + hybrid 2 color overlay red / white : script: card_hybrid_overlay_textbox("rw") + hybrid 2 color overlay green / blue : script: card_hybrid_overlay_textbox("gu") hybrid 3 color white / blue / black : script: card_hybrid_3_textbox("wub") hybrid 3 color blue / black / red : script: card_hybrid_3_textbox("ubr") hybrid 3 color black / red / green : script: card_hybrid_3_textbox("brg") diff --git a/data/magic-blends.mse-include/card-typelines b/data/magic-blends.mse-include/card-typelines index a0ecde0f..d93e2b8f 100644 --- a/data/magic-blends.mse-include/card-typelines +++ b/data/magic-blends.mse-include/card-typelines @@ -76,6 +76,16 @@ choice images: hybrid 2 color artifact / black : script: card_hybrid_2_typeline("ab") hybrid 2 color artifact / red : script: card_hybrid_2_typeline("ar") hybrid 2 color artifact / green : script: card_hybrid_2_typeline("ag") + hybrid 2 color overlay white / blue : script: card_hybrid_overlay_typeline("wu") + hybrid 2 color overlay blue / black : script: card_hybrid_overlay_typeline("ub") + hybrid 2 color overlay black / red : script: card_hybrid_overlay_typeline("br") + hybrid 2 color overlay red / green : script: card_hybrid_overlay_typeline("rg") + hybrid 2 color overlay green / white : script: card_hybrid_overlay_typeline("gw") + hybrid 2 color overlay white / black : script: card_hybrid_overlay_typeline("wb") + hybrid 2 color overlay blue / red : script: card_hybrid_overlay_typeline("ur") + hybrid 2 color overlay black / green : script: card_hybrid_overlay_typeline("bg") + hybrid 2 color overlay red / white : script: card_hybrid_overlay_typeline("rw") + hybrid 2 color overlay green / blue : script: card_hybrid_overlay_typeline("gu") hybrid 3 color white / blue / black : script: card_hybrid_3_typeline("wub") hybrid 3 color blue / black / red : script: card_hybrid_3_typeline("ubr") hybrid 3 color black / red / green : script: card_hybrid_3_typeline("brg") diff --git a/data/magic-blends.mse-include/flip-ptboxes b/data/magic-blends.mse-include/flip-ptboxes index c5641a40..33f67397 100644 --- a/data/magic-blends.mse-include/flip-ptboxes +++ b/data/magic-blends.mse-include/flip-ptboxes @@ -72,6 +72,16 @@ choice images: hybrid 2 color artifact / black : script: card_hybrid_pt("b") hybrid 2 color artifact / red : script: card_hybrid_pt("r") hybrid 2 color artifact / green : script: card_hybrid_pt("g") + hybrid 2 color overlay white / blue : script: card_hybrid_pt_overlay("wu") + hybrid 2 color overlay blue / black : script: card_hybrid_pt_overlay("ub") + hybrid 2 color overlay black / red : script: card_hybrid_pt_overlay("br") + hybrid 2 color overlay red / green : script: card_hybrid_pt_overlay("rg") + hybrid 2 color overlay green / white : script: card_hybrid_pt_overlay("gw") + hybrid 2 color overlay white / black : script: card_hybrid_pt_overlay("wb") + hybrid 2 color overlay blue / red : script: card_hybrid_pt_overlay("ur") + hybrid 2 color overlay black / green : script: card_hybrid_pt_overlay("bg") + hybrid 2 color overlay red / white : script: card_hybrid_pt_overlay("rw") + hybrid 2 color overlay green / blue : script: card_hybrid_pt_overlay("gu") hybrid 3 color white / blue / black : script: card_hybrid_pt("u") hybrid 3 color blue / black / red : script: card_hybrid_pt("b") hybrid 3 color black / red / green : script: card_hybrid_pt("r") diff --git a/data/magic-blends.mse-include/flip-ptboxes2 b/data/magic-blends.mse-include/flip-ptboxes2 index 701764a8..4eaec96c 100644 --- a/data/magic-blends.mse-include/flip-ptboxes2 +++ b/data/magic-blends.mse-include/flip-ptboxes2 @@ -71,6 +71,16 @@ choice images: hybrid 2 color artifact / black : script: card_hybrid_pt2("a") hybrid 2 color artifact / red : script: card_hybrid_pt2("a") hybrid 2 color artifact / green : script: card_hybrid_pt2("a") + hybrid 2 color overlay white / blue : script: card_hybrid_pt2_overlay("wu") + hybrid 2 color overlay blue / black : script: card_hybrid_pt2_overlay("ub") + hybrid 2 color overlay black / red : script: card_hybrid_pt2_overlay("br") + hybrid 2 color overlay red / green : script: card_hybrid_pt2_overlay("rg") + hybrid 2 color overlay green / white : script: card_hybrid_pt2_overlay("gw") + hybrid 2 color overlay white / black : script: card_hybrid_pt2_overlay("wb") + hybrid 2 color overlay blue / red : script: card_hybrid_pt2_overlay("ur") + hybrid 2 color overlay black / green : script: card_hybrid_pt2_overlay("bg") + hybrid 2 color overlay red / white : script: card_hybrid_pt2_overlay("rw") + hybrid 2 color overlay green / blue : script: card_hybrid_pt2_overlay("gu") hybrid 3 color white / blue / black : script: card_hybrid_pt2("b") hybrid 3 color blue / black / red : script: card_hybrid_pt2("r") hybrid 3 color black / red / green : script: card_hybrid_pt2("g") diff --git a/data/magic-default-image.mse-include/scripts b/data/magic-default-image.mse-include/scripts index 8c0a2e04..69668ce0 100644 --- a/data/magic-default-image.mse-include/scripts +++ b/data/magic-default-image.mse-include/scripts @@ -33,7 +33,17 @@ default_image := { else if input == "hybrid 2 color blue / red" then default_image_2(image1:"blue.jpg", image2:"red.jpg" ) else if input == "hybrid 2 color black / green" then default_image_2(image1:"black.jpg", image2:"green.jpg") else if input == "hybrid 2 color red / white" then default_image_2(image1:"red.jpg", image2:"white.jpg") - else if input == "hybrid 2 color green / blue" then default_image_2(image1:"green.jpg", image2:"blue.jpg" ) + else if input == "hybrid 2 color overlay green / blue" then default_image_2(image1:"green.jpg", image2:"blue.jpg" ) + else if input == "hybrid 2 color overlay white / blue" then default_image_2(image1:"white.jpg", image2:"blue.jpg" ) + else if input == "hybrid 2 color overlay blue / black" then default_image_2(image1:"blue.jpg", image2:"black.jpg") + else if input == "hybrid 2 color overlay black / red" then default_image_2(image1:"black.jpg", image2:"red.jpg" ) + else if input == "hybrid 2 color overlay red / green" then default_image_2(image1:"red.jpg", image2:"green.jpg") + else if input == "hybrid 2 color overlay green / white" then default_image_2(image1:"green.jpg", image2:"white.jpg") + else if input == "hybrid 2 color overlay white / black" then default_image_2(image1:"white.jpg", image2:"black.jpg") + else if input == "hybrid 2 color overlay blue / red" then default_image_2(image1:"blue.jpg", image2:"red.jpg" ) + else if input == "hybrid 2 color overlay black / green" then default_image_2(image1:"black.jpg", image2:"green.jpg") + else if input == "hybrid 2 color overlay red / white" then default_image_2(image1:"red.jpg", image2:"white.jpg") + else if input == "hybrid 2 color overlay green / blue" then default_image_2(image1:"green.jpg", image2:"blue.jpg" ) else if is_artifact() then default_image_1("artifact.jpg") else if is_colorless() then default_image_1("colorless.jpg") else default_image_1("multicolor.jpg") diff --git a/data/magic-extended-art.mse-style/style b/data/magic-extended-art.mse-style/style index ef964287..837f9e5e 100644 --- a/data/magic-extended-art.mse-style/style +++ b/data/magic-extended-art.mse-style/style @@ -40,7 +40,7 @@ init script: 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|land|hybrid 4 color w/u/b/r)") + white_font_colors := filter_rule(match:"^(hybrid 2 color )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(black|land|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) @@ -174,10 +174,10 @@ card style: separator color: rgb(128,128,128) rarity: - left: 324 + left: 322 top : 445 - width: 18 - height: 18 + width: 22 + height: 22 z index: 3 render style: image choice images: @@ -200,9 +200,9 @@ card style: size: 12 scale down to: 8 shadow color: rgb(0,0,0) - shadow displacement x: -2 - shadow displacement y: 2 - color: rgb(211,211,209) + shadow displacement x: -1 + shadow displacement y: 1 + color: rgb(255,255,255) symbol font: name: script: @@ -255,7 +255,7 @@ card style: z index: 1 font: name: MPlantin - size: 6 + size: 6.5 color: { font_color() } ############################################################## Extra card fields diff --git a/data/magic-firepenguinmaster-flip.mse-style/style b/data/magic-firepenguinmaster-flip.mse-style/style index 2eeb01fa..117b0827 100644 --- a/data/magic-firepenguinmaster-flip.mse-style/style +++ b/data/magic-firepenguinmaster-flip.mse-style/style @@ -30,8 +30,10 @@ init script: # 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 black_font_colors(input: card.card_color) != "" then rgb(0,0,0) + 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) } diff --git a/data/magic-firepenguinmaster.mse-style/style b/data/magic-firepenguinmaster.mse-style/style index f627b5c6..3777e63b 100644 --- a/data/magic-firepenguinmaster.mse-style/style +++ b/data/magic-firepenguinmaster.mse-style/style @@ -42,8 +42,10 @@ init script: # 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 black_font_colors(input: card.card_color) != "" then rgb(0,0,0) + 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) } diff --git a/data/magic-firepenguinmasterpromo.mse-style/style b/data/magic-firepenguinmasterpromo.mse-style/style index 5f9c99ea..3175042d 100644 --- a/data/magic-firepenguinmasterpromo.mse-style/style +++ b/data/magic-firepenguinmasterpromo.mse-style/style @@ -38,8 +38,10 @@ init script: # 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 black_font_colors(input: card.card_color) != "" then rgb(0,0,0) + 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) } diff --git a/data/magic-firepenguinmastersplit.mse-style/style b/data/magic-firepenguinmastersplit.mse-style/style index de6edf9e..bbc71160 100644 --- a/data/magic-firepenguinmastersplit.mse-style/style +++ b/data/magic-firepenguinmastersplit.mse-style/style @@ -39,12 +39,15 @@ init script: # 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 black_font_colors(input: card.card_color) != "" then rgb(0,0,0) + 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 black_font_colors(input: card.card_color_2) != "" then rgb(0,0,0) + 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) } diff --git a/data/magic-firepenguinmastertokens.mse-style/style b/data/magic-firepenguinmastertokens.mse-style/style index 622795bc..561be783 100644 --- a/data/magic-firepenguinmastertokens.mse-style/style +++ b/data/magic-firepenguinmastertokens.mse-style/style @@ -42,8 +42,10 @@ init script: # 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 black_font_colors(input: card.card_color) != "" then rgb(0,0,0) + 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) } diff --git a/data/magic-new-flip.mse-style/style b/data/magic-new-flip.mse-style/style index 0cc080fa..4d2fcc15 100644 --- a/data/magic-new-flip.mse-style/style +++ b/data/magic-new-flip.mse-style/style @@ -37,7 +37,7 @@ init script: 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|land|hybrid 4 color white / blue / black / red)") + white_font_colors := filter_rule(match:"^(hybrid 2 color )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(black|land|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) @@ -346,7 +346,7 @@ card style: z index: 1 font: name: Matrix - size: 12 + size: 10 color: { font_color() } copyright line: @@ -357,7 +357,7 @@ card style: z index: 1 font: name: MPlantin - size: 8 + size: 6.5 color: { font_color() } ############################################################## Extra card fields diff --git a/data/magic-new-promo.mse-style/style b/data/magic-new-promo.mse-style/style index 7f5c2922..15e3a36b 100644 --- a/data/magic-new-promo.mse-style/style +++ b/data/magic-new-promo.mse-style/style @@ -38,7 +38,7 @@ init script: 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|land|hybrid 4 color white / blue / black / red)") + white_font_colors := filter_rule(match:"^(hybrid 2 color )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(black|land|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) @@ -248,7 +248,7 @@ card style: z index: 1 font: name: Matrix - size: 12 + size: 10 color: script: font_color() @@ -260,7 +260,7 @@ card style: z index: 1 font: name: MPlantin - size: 8 + size: 6.5 color: { font_color() } ############################################################## Extra card fields diff --git a/data/magic-new-split.mse-style/style b/data/magic-new-split.mse-style/style index 48f221fc..1625fb29 100644 --- a/data/magic-new-split.mse-style/style +++ b/data/magic-new-split.mse-style/style @@ -37,7 +37,7 @@ init script: 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|land|hybrid 4 color white / blue / black / red)") + white_font_colors := filter_rule(match:"^(hybrid 2 color )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(black|land|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) @@ -338,7 +338,7 @@ card style: alignment: center middle font: name: Mplantin - size: 14 + size: 13 weight: bold color: rgb(0,0,0) separator color: rgb(200,0,0) @@ -352,7 +352,7 @@ card style: alignment: center middle font: name: Mplantin - size: 14 + size: 13 weight: bold color: rgb(0,0,0) separator color: rgb(200,0,0) diff --git a/data/magic-new.mse-style/style b/data/magic-new.mse-style/style index 00f94898..1eda4b1e 100644 --- a/data/magic-new.mse-style/style +++ b/data/magic-new.mse-style/style @@ -49,7 +49,7 @@ init script: 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|land|hybrid 4 color white / blue / black / red)") + white_font_colors := filter_rule(match:"^(hybrid 2 color )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(black|land|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) diff --git a/data/magic-planeshifted.mse-style/style b/data/magic-planeshifted.mse-style/style index 11730f92..2d1f8574 100644 --- a/data/magic-planeshifted.mse-style/style +++ b/data/magic-planeshifted.mse-style/style @@ -32,7 +32,7 @@ init script: 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|land|hybrid 4 color white / blue / black / red)") + white_font_colors := filter_rule(match:"^(hybrid 2 color )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(black|land|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) diff --git a/data/magic-textless.mse-style/style b/data/magic-textless.mse-style/style index e2d1cc0a..dcaf4945 100644 --- a/data/magic-textless.mse-style/style +++ b/data/magic-textless.mse-style/style @@ -39,7 +39,7 @@ init script: 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|land|hybrid 4 color white / blue / black / red)") + white_font_colors := filter_rule(match:"^(hybrid 2 color )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(black|land|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) @@ -185,19 +185,6 @@ card style: weight: bold color: rgb(0,0,0) separator color: rgb(200,0,0) - - pt box: - left: 277 - top: 442 - width: 81 - height: 42 - z index: 1 - visible: - script: card.pt != "" - render style: image - mask: mask_pt.png - include file: magic-blends.mse-include/card-ptboxes - ############################# Card sorting / numbering ############################# Copyright stuff @@ -209,7 +196,7 @@ card style: z index: 1 font: name: Matrix - size: 12 + size: 10 color: script: font_color() @@ -221,6 +208,27 @@ card style: z index: 1 font: name: MPlantin - size: 8 + size: 6.5 color: script: font_color() + +############################################################## Extra card fields + +extra card field: + type: choice + name: pt box + script: card.card_color + editable: false + +extra card style: + pt box: + left: 277 + top: 442 + width: 81 + height: 42 + z index: 1 + visible: + script: card.pt != "" + render style: image + mask: mask_pt.png + include file: magic-blends.mse-include/card-ptboxes