diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_bgw.png b/data/magic-mana-beveled.mse-symbol-font/mana_bgw.png new file mode 100644 index 00000000..2bad2ffa Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_bgw.png differ diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_brg.png b/data/magic-mana-beveled.mse-symbol-font/mana_brg.png new file mode 100644 index 00000000..0e243261 Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_brg.png differ diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_gub.png b/data/magic-mana-beveled.mse-symbol-font/mana_gub.png new file mode 100644 index 00000000..3a2bac9f Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_gub.png differ diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_gwu.png b/data/magic-mana-beveled.mse-symbol-font/mana_gwu.png new file mode 100644 index 00000000..9e15c03f Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_gwu.png differ diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_rgw.png b/data/magic-mana-beveled.mse-symbol-font/mana_rgw.png new file mode 100644 index 00000000..56f3d8df Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_rgw.png differ diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_rwu.png b/data/magic-mana-beveled.mse-symbol-font/mana_rwu.png new file mode 100644 index 00000000..15ed10f1 Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_rwu.png differ diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_ubr.png b/data/magic-mana-beveled.mse-symbol-font/mana_ubr.png new file mode 100644 index 00000000..522a5f20 Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_ubr.png differ diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_urg.png b/data/magic-mana-beveled.mse-symbol-font/mana_urg.png new file mode 100644 index 00000000..436a9ef8 Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_urg.png differ diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_wbr.png b/data/magic-mana-beveled.mse-symbol-font/mana_wbr.png new file mode 100644 index 00000000..760a83cf Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_wbr.png differ diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_wub.png b/data/magic-mana-beveled.mse-symbol-font/mana_wub.png new file mode 100644 index 00000000..68e5fdff Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_wub.png differ diff --git a/data/magic-mana-beveled.mse-symbol-font/symbol-font b/data/magic-mana-beveled.mse-symbol-font/symbol-font index 85b3add9..984815c4 100644 --- a/data/magic-mana-beveled.mse-symbol-font/symbol-font +++ b/data/magic-mana-beveled.mse-symbol-font/symbol-font @@ -45,6 +45,36 @@ symbol: symbol: code: G/U image: mana_gu.png +symbol: + code: B/G/W + image: mana_bgw.png +symbol: + code: G/B/R + image: mana_brg.png +symbol: + code: G/U/B + image: mana_gub.png +symbol: + code: G/W/U + image: mana_gwu.png +symbol: + code: R/G/W + image: mana_rgw.png +symbol: + code: R/W/U + image: mana_rwu.png +symbol: + code: U/B/R + image: mana_ubr.png +symbol: + code: U/R/G + image: mana_urg.png +symbol: + code: W/B/R + image: mana_wbr.png +symbol: + code: W/U/B + image: mana_wub.png symbol: code: 1/2 image: mana_1_half.png diff --git a/data/magic-mana-large.mse-symbol-font/mana_bgw.png b/data/magic-mana-large.mse-symbol-font/mana_bgw.png new file mode 100644 index 00000000..cf88d012 Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_bgw.png differ diff --git a/data/magic-mana-large.mse-symbol-font/mana_brg.png b/data/magic-mana-large.mse-symbol-font/mana_brg.png new file mode 100644 index 00000000..4bd18032 Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_brg.png differ diff --git a/data/magic-mana-large.mse-symbol-font/mana_gub.png b/data/magic-mana-large.mse-symbol-font/mana_gub.png new file mode 100644 index 00000000..9e0ccd8a Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_gub.png differ diff --git a/data/magic-mana-large.mse-symbol-font/mana_gwu.png b/data/magic-mana-large.mse-symbol-font/mana_gwu.png new file mode 100644 index 00000000..66449d83 Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_gwu.png differ diff --git a/data/magic-mana-large.mse-symbol-font/mana_rgw.png b/data/magic-mana-large.mse-symbol-font/mana_rgw.png new file mode 100644 index 00000000..8c73bf7a Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_rgw.png differ diff --git a/data/magic-mana-large.mse-symbol-font/mana_rwu.png b/data/magic-mana-large.mse-symbol-font/mana_rwu.png new file mode 100644 index 00000000..0933983c Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_rwu.png differ diff --git a/data/magic-mana-large.mse-symbol-font/mana_ubr.png b/data/magic-mana-large.mse-symbol-font/mana_ubr.png new file mode 100644 index 00000000..f6c853d2 Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_ubr.png differ diff --git a/data/magic-mana-large.mse-symbol-font/mana_urg.png b/data/magic-mana-large.mse-symbol-font/mana_urg.png new file mode 100644 index 00000000..92bf4531 Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_urg.png differ diff --git a/data/magic-mana-large.mse-symbol-font/mana_wbr.png b/data/magic-mana-large.mse-symbol-font/mana_wbr.png new file mode 100644 index 00000000..0abcda6b Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_wbr.png differ diff --git a/data/magic-mana-large.mse-symbol-font/mana_wub.png b/data/magic-mana-large.mse-symbol-font/mana_wub.png new file mode 100644 index 00000000..963e9fe5 Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_wub.png differ diff --git a/data/magic-mana-large.mse-symbol-font/symbol-font b/data/magic-mana-large.mse-symbol-font/symbol-font index 36da1e9c..c0c79917 100644 --- a/data/magic-mana-large.mse-symbol-font/symbol-font +++ b/data/magic-mana-large.mse-symbol-font/symbol-font @@ -56,6 +56,46 @@ symbol: code: G/U image: mana_gu.png image font size: 145 +symbol: + code: B/G/W + image: mana_bgw.png + image font size: 145 +symbol: + code: G/B/R + image: mana_brg.png + image font size: 145 +symbol: + code: G/U/B + image: mana_gub.png + image font size: 145 +symbol: + code: G/W/U + image: mana_gwu.png + image font size: 145 +symbol: + code: R/G/W + image: mana_rgw.png + image font size: 145 +symbol: + code: R/W/U + image: mana_rwu.png + image font size: 145 +symbol: + code: U/B/R + image: mana_ubr.png + image font size: 145 +symbol: + code: U/R/G + image: mana_urg.png + image font size: 145 +symbol: + code: W/B/R + image: mana_wbr.png + image font size: 145 +symbol: + code: W/U/B + image: mana_wub.png + image font size: 145 symbol: code: 1/2 image: mana_1_half.png diff --git a/data/magic-mana-small.mse-symbol-font/mana_bgw.png b/data/magic-mana-small.mse-symbol-font/mana_bgw.png new file mode 100644 index 00000000..b470babd Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_bgw.png differ diff --git a/data/magic-mana-small.mse-symbol-font/mana_brg.png b/data/magic-mana-small.mse-symbol-font/mana_brg.png new file mode 100644 index 00000000..9c97bebd Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_brg.png differ diff --git a/data/magic-mana-small.mse-symbol-font/mana_gub.png b/data/magic-mana-small.mse-symbol-font/mana_gub.png new file mode 100644 index 00000000..625d9208 Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_gub.png differ diff --git a/data/magic-mana-small.mse-symbol-font/mana_gwu.png b/data/magic-mana-small.mse-symbol-font/mana_gwu.png new file mode 100644 index 00000000..ed66dbc2 Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_gwu.png differ diff --git a/data/magic-mana-small.mse-symbol-font/mana_rgw.png b/data/magic-mana-small.mse-symbol-font/mana_rgw.png new file mode 100644 index 00000000..1f1178fe Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_rgw.png differ diff --git a/data/magic-mana-small.mse-symbol-font/mana_rwu.png b/data/magic-mana-small.mse-symbol-font/mana_rwu.png new file mode 100644 index 00000000..8e116c91 Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_rwu.png differ diff --git a/data/magic-mana-small.mse-symbol-font/mana_ubr.png b/data/magic-mana-small.mse-symbol-font/mana_ubr.png new file mode 100644 index 00000000..f837b34a Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_ubr.png differ diff --git a/data/magic-mana-small.mse-symbol-font/mana_urg.png b/data/magic-mana-small.mse-symbol-font/mana_urg.png new file mode 100644 index 00000000..4e27e9de Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_urg.png differ diff --git a/data/magic-mana-small.mse-symbol-font/mana_wbr.png b/data/magic-mana-small.mse-symbol-font/mana_wbr.png new file mode 100644 index 00000000..9566e789 Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_wbr.png differ diff --git a/data/magic-mana-small.mse-symbol-font/mana_wub.png b/data/magic-mana-small.mse-symbol-font/mana_wub.png new file mode 100644 index 00000000..421ae814 Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_wub.png differ diff --git a/data/magic-mana-small.mse-symbol-font/symbol-font b/data/magic-mana-small.mse-symbol-font/symbol-font index 7a077613..1e965791 100644 --- a/data/magic-mana-small.mse-symbol-font/symbol-font +++ b/data/magic-mana-small.mse-symbol-font/symbol-font @@ -113,6 +113,46 @@ symbol: code: G/U image: mana_gu.png image font size: 145 +symbol: + code: B/G/W + image: mana_bgw.png + image font size: 145 +symbol: + code: G/B/R + image: mana_brg.png + image font size: 145 +symbol: + code: G/U/B + image: mana_gub.png + image font size: 145 +symbol: + code: G/W/U + image: mana_gwu.png + image font size: 145 +symbol: + code: R/G/W + image: mana_rgw.png + image font size: 145 +symbol: + code: R/W/U + image: mana_rwu.png + image font size: 145 +symbol: + code: U/B/R + image: mana_ubr.png + image font size: 145 +symbol: + code: U/R/G + image: mana_urg.png + image font size: 145 +symbol: + code: W/B/R + image: mana_wbr.png + image font size: 145 +symbol: + code: W/U/B + image: mana_wub.png + image font size: 145 symbol: code: 1/2 image: mana_1_half.png diff --git a/data/magic-new-flip.mse-style/style b/data/magic-new-flip.mse-style/style index 250bba83..b61da316 100644 --- a/data/magic-new-flip.mse-style/style +++ b/data/magic-new-flip.mse-style/style @@ -35,12 +35,10 @@ 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 )?black|^land") + white_font_colors := filter_rule(match:"^(hybrid 2 color )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(black|land|hybrid 4 color white / blue / black / red)") font_color := { - if white_font_colors(input:card.card_color) != "" then - rgb(255,255,255) - else - rgb(0,0,0) + if white_font_colors(input: card.card_color) != "" then rgb(255,255,255) + else rgb(0,0,0) } @@ -287,6 +285,25 @@ card style: padding bottom: -1 line height hard: 1.2 line height line: 1.5 + watermark: + left: 151 + top : 58 + width: 69 + height: 69 + z index: 1 + render style: image + alignment: middle center + include file: magic-watermarks.mse-include/watermarks + watermark 2: + left: 151 + top : 378 + width: 69 + height: 69 + angle: 180 + z index: 1 + render style: image + alignment: middle center + include file: magic-watermarks.mse-include/watermarks ############################# PT pt: diff --git a/data/magic-new-promo.mse-style/mcard.jpg b/data/magic-new-promo.mse-style/mcard.jpg index 1353c701..642a2dfd 100644 Binary files a/data/magic-new-promo.mse-style/mcard.jpg and b/data/magic-new-promo.mse-style/mcard.jpg differ diff --git a/data/magic-new-promo.mse-style/mpt.jpg b/data/magic-new-promo.mse-style/mpt.jpg index 34ece905..9751565f 100644 Binary files a/data/magic-new-promo.mse-style/mpt.jpg and b/data/magic-new-promo.mse-style/mpt.jpg differ diff --git a/data/magic-new-promo.mse-style/oacard.jpg b/data/magic-new-promo.mse-style/oacard.jpg index 5bc83794..8cd6a34e 100644 Binary files a/data/magic-new-promo.mse-style/oacard.jpg and b/data/magic-new-promo.mse-style/oacard.jpg differ diff --git a/data/magic-new-promo.mse-style/style b/data/magic-new-promo.mse-style/style index 1a3aa188..e362c472 100644 --- a/data/magic-new-promo.mse-style/style +++ b/data/magic-new-promo.mse-style/style @@ -36,12 +36,10 @@ 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)?black|^land") + white_font_colors := filter_rule(match:"^(hybrid 2 color )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(black|land|hybrid 4 color white / blue / black / red)") font_color := { - if white_font_colors(input:card.card_color) != "" then - rgb(255,255,255) - else - rgb(0,0,0) + if white_font_colors(input: card.card_color) != "" then rgb(255,255,255) + else rgb(0,0,0) } diff --git a/data/magic-new-split.mse-style/cpt.jpg b/data/magic-new-split.mse-style/cpt.jpg index e7f399b2..c68a7b54 100644 Binary files a/data/magic-new-split.mse-style/cpt.jpg and b/data/magic-new-split.mse-style/cpt.jpg differ diff --git a/data/magic-new-split.mse-style/mcard.jpg b/data/magic-new-split.mse-style/mcard.jpg index 61b9349d..e17bfe7f 100644 Binary files a/data/magic-new-split.mse-style/mcard.jpg and b/data/magic-new-split.mse-style/mcard.jpg differ diff --git a/data/magic-new-split.mse-style/mpt.jpg b/data/magic-new-split.mse-style/mpt.jpg index 92272d64..5d80d372 100644 Binary files a/data/magic-new-split.mse-style/mpt.jpg and b/data/magic-new-split.mse-style/mpt.jpg differ diff --git a/data/magic-new-split.mse-style/oacard.jpg b/data/magic-new-split.mse-style/oacard.jpg index f29ff278..2424d091 100644 Binary files a/data/magic-new-split.mse-style/oacard.jpg and b/data/magic-new-split.mse-style/oacard.jpg differ diff --git a/data/magic-new.mse-style/ccard.jpg b/data/magic-new.mse-style/ccard.jpg index f8460852..19114cc9 100644 Binary files a/data/magic-new.mse-style/ccard.jpg and b/data/magic-new.mse-style/ccard.jpg differ diff --git a/data/magic-new.mse-style/cpt.jpg b/data/magic-new.mse-style/cpt.jpg index 5ce32cf2..fea0fc61 100644 Binary files a/data/magic-new.mse-style/cpt.jpg and b/data/magic-new.mse-style/cpt.jpg differ diff --git a/data/magic-planeshifted.mse-style/ccard.jpg b/data/magic-planeshifted.mse-style/ccard.jpg index e1a414e6..19114cc9 100644 Binary files a/data/magic-planeshifted.mse-style/ccard.jpg and b/data/magic-planeshifted.mse-style/ccard.jpg differ diff --git a/data/magic-planeshifted.mse-style/cpt.png b/data/magic-planeshifted.mse-style/cpt.png index 34a93f5d..c250e580 100644 Binary files a/data/magic-planeshifted.mse-style/cpt.png and b/data/magic-planeshifted.mse-style/cpt.png differ diff --git a/data/magic-textless.mse-style/style b/data/magic-textless.mse-style/style index 30e3edc8..a7cbe49a 100644 --- a/data/magic-textless.mse-style/style +++ b/data/magic-textless.mse-style/style @@ -38,12 +38,10 @@ 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)?black|^land") + white_font_colors := filter_rule(match:"^(hybrid 2 color )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(black|land|hybrid 4 color white / blue / black / red)") font_color := { - if white_font_colors(input:card.card_color) != "" then - rgb(255,255,255) - else - rgb(0,0,0) + if white_font_colors(input: card.card_color) != "" then rgb(255,255,255) + else rgb(0,0,0) } ############################################################## Extra style options diff --git a/data/magic-watermarks.mse-include/watermark_dcipromo.png b/data/magic-watermarks.mse-include/watermark_dcipromo.png deleted file mode 100644 index 601d423f..00000000 Binary files a/data/magic-watermarks.mse-include/watermark_dcipromo.png and /dev/null differ diff --git a/data/magic-watermarks.mse-include/watermark_fnmpromo.png b/data/magic-watermarks.mse-include/watermark_fnmpromo.png deleted file mode 100644 index 737f8874..00000000 Binary files a/data/magic-watermarks.mse-include/watermark_fnmpromo.png and /dev/null differ diff --git a/data/magic-watermarks.mse-include/watermark_s.png b/data/magic-watermarks.mse-include/watermark_s.png index ebb8c789..7aae1182 100644 Binary files a/data/magic-watermarks.mse-include/watermark_s.png and b/data/magic-watermarks.mse-include/watermark_s.png differ diff --git a/data/magic-watermarks.mse-include/watermark_t.png b/data/magic-watermarks.mse-include/watermark_t.png deleted file mode 100644 index 47274c02..00000000 Binary files a/data/magic-watermarks.mse-include/watermark_t.png and /dev/null differ diff --git a/data/magic-watermarks.mse-include/watermarks b/data/magic-watermarks.mse-include/watermarks index 36e9975b..45e91b42 100644 --- a/data/magic-watermarks.mse-include/watermarks +++ b/data/magic-watermarks.mse-include/watermarks @@ -7,7 +7,6 @@ choice images: mana symbol red: /magic-watermarks.mse-include/watermark_r.png mana symbol green: /magic-watermarks.mse-include/watermark_g.png mana symbol snow: /magic-watermarks.mse-include/watermark_s.png - mana symbol tap: /magic-watermarks.mse-include/watermark_t.png guild symbol Azorius Senate (W/U): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_azorius.png") guild symbol House Dimir (U/B): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_dimir.png") guild symbol Cult of Rakdos (B/R): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_rakados.png") @@ -28,5 +27,3 @@ choice images: xander hybrid mana G/W: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_gwmana.png") xander hybrid mana R/W: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_rwmana.png") xander hybrid mana W/U: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_wumana.png") - promo symbol DCI: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_dcipromo.png") - promo symbol FNM: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_fnmpromo.png") diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index 298dc31c..d3910574 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -13,9 +13,29 @@ init script: mana_sort := sort_rule(order: "XYZ[0123456789]S(WUBRG)") # correctly sort guild mana mana_sort_guild := replace_rule( # swap these: - match: "U/W|B/U|R/B|G/B|W/G|B/W|R/U|G/B|W/R|U/G", + match: "U/W|B/U|R/B|G/R|W/G|B/W|R/U|G/B|W/R|U/G", in_context: "(^|[^/])($|[^/])", replace: {input[2] + "/" + input[0]}) + + replace_rule( + match: "W/B/U|W/R/B|U/R/B|U/G/R|B/G/R|B/W/G|R/W/G|R/U/W|G/U/W|G/B/U", + in_context: "(^|[^/])($|[^/])", + replace: {input[0] + "/" + input[4] + "/" + input[2]}) + + replace_rule( + match: "B/U/W|R/B/W|R/B/U|G/R/U|G/R/B|W/G/B|W/G/R|U/W/R|U/W/G|B/U/G", + in_context: "(^|[^/])($|[^/])", + replace: {input[4] + "/" + input[2] + "/" + input[0]}) + + replace_rule( + match: "U/W/B|B/W/R|B/U/R|R/U/G|R/B/G|G/B/W|G/R/W|W/R/U|W/G/U|U/G/B", + in_context: "(^|[^/])($|[^/])", + replace: {input[2] + "/" + input[0] + "/" + input[4]}) + + replace_rule( + match: "U/B/W|B/R/U|R/G/B|G/W/R|W/U/G|B/R/W|R/G/U|G/W/B|W/U/R|U/B/G", + in_context: "(^|[^/])($|[^/])", + replace: {input[4] + "/" + input[0] + "/" + input[2]}) + + replace_rule( + match: "B/W/U|R/U/B|G/B/R|W/R/G|U/G/W|R/W/B|G/U/R|W/B/G|U/R/W|B/G/U", + in_context: "(^|[^/])($|[^/])", + replace: {input[2] + "/" + input[4] + "/" + input[0]}) + replace_rule( match: "T", replace: "" ) @@ -62,6 +82,7 @@ init script: else # hybrid if count == 2 then "hybrid 2 color " + color_name(colors[0]) + " / " + color_name(colors[1]) + else if count == 3 then "hybrid 3 color " + color_name(colors[0]) + " / " + color_name(colors[1]) + " / " + color_name(colors[2]) else "multicolor" } @@ -97,11 +118,12 @@ init script: ) }; - # Index for sorting, white cards are first, so white->1, blue->2, .. , - # multi->6, hybrid->7, arti->8, land->9, basic land->10 + # Index for sorting, white cards are first, so white->A, blue->B, .. , + # multi->F, hybrid->G, arti->H, land->J, basic land->I is_multicolor := filter_rule(match: "^multicolor") + {input != ""}; is_hybrid := filter_rule(match: "^hybrid") + {input != ""}; is_colorless := filter_rule(match: "^colorless") + {input != ""}; + is_artifact := filter_rule(match: "^artifact") + {input != ""}; sort_index := { if card.card_color=="white" then "A" else if card.card_color=="blue" then "B" @@ -110,7 +132,7 @@ init script: else if card.card_color=="green" then "E" else if is_multicolor(card.card_color) then "F" else if is_hybrid (card.card_color) then "G" - else if is_colorless (card.card_color) then "H" + else if is_colorless (card.card_color) or is_artifact (card.card_color) then "H" else if card.super_type!="Basic Land" then "I" else "J" }; @@ -226,7 +248,7 @@ init script: # step 8 : post ( capitalization replace_rule( match: "[a-z]", - in_context: "[(]()?|[ ]*: |—", + in_context: "[(]()?|[ ]*: |—| — ", replace: { to_upper() }) #character filter for title line @@ -602,7 +624,6 @@ card field: choice: red choice: green choice: snow - choice: tap choice: name: guild symbol choice: Azorius Senate (W/U) @@ -627,10 +648,6 @@ card field: choice: G/W choice: R/W choice: W/U - choice: - name: promo symbol - choice: DCI - choice: FNM description: A watermark for below the textbox, this can be a big mana symbol used on basic lands, or a guild symbol ############################# PT @@ -837,7 +854,6 @@ card field: choice: red choice: green choice: snow - choice: tap choice: name: xander hybrid mana choice: B/R @@ -862,10 +878,6 @@ card field: choice: The Golgari (B/G) choice: Boros Legion (R/W) choice: The Simic (G/U) - choice: - name: promo symbol - choice: DCI - choice: FNM description: A watermark for below the textbox, this can be a big mana symbol used on basic lands, a special symbol, or a guild symbol card field: type: text @@ -1139,7 +1151,7 @@ keyword parameter type: example: Forest ############################# All Magic keywords -# By JrEye and Neko_Asakami +# By JrEye and Neko_Asakami, Updated by Pichoro and Buttock1234 keyword: keyword: Flying diff --git a/data/vanguard.mse-game/game b/data/vanguard.mse-game/game index e5af311d..883afdba 100644 --- a/data/vanguard.mse-game/game +++ b/data/vanguard.mse-game/game @@ -160,7 +160,7 @@ init script: # step 8 : post ( capitalization replace_rule( match: "[a-z]", - in_context: "[(]()?|[ ]*: ", + in_context: "[(]()?|[ ]*: |—| — ", replace: { to_upper() }) @@ -422,14 +422,14 @@ keyword parameter type: name: name match: [^(.,\n]+ keyword parameter type: - name: land + name: prefix description: Prefix for things like "walk" optional: false - match: [A-Z][a-z]* + match: [A-Z][a-z, ]* example: Forest ############################# All Magic keywords -# By JrEye and Neko_Asakami, updated by Buttock1234 and Pichoro +# By JrEye and Neko_Asakami, Updated by Pichoro and Buttock1234 keyword: keyword: Flying @@ -528,7 +528,7 @@ keyword: reminder: At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost. keyword: keyword: Cardcycling - match: namecyclingcost + match: prefixcyclingcost mode: expert reminder: {format_cost(param2,add:"")}, Discard this card: Search your library for a {param1} card, reveal it, and put it into your hand. Then shuffle your library. keyword: @@ -612,13 +612,18 @@ keyword: mode: expert reminder: This comes into play with a +1/+1 counter on it for each color of mana used to pay its cost. If it is not a creature, use charge counters instead. keyword: - keyword: Splice - match: Splice onto name cost + keyword: Splice (Mana Cost) + match: Splice onto name mana + mode: expert + reminder: As you play a {param1} spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card’s effects to that spell. +keyword: + keyword: Splice (Alternative Cost) + match: Splice onto name—action mode: expert reminder: As you play a {param1} spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card’s effects to that spell. keyword: keyword: Offering - match: name offering + match: prefix offering mode: expert reminder: You may play this card any time you could play an instant by sacrificing a {param1} and paying the difference in mana costs between this and the sacrificed {param1}. Mana cost includes color. keyword: @@ -674,7 +679,7 @@ keyword: reminder: If defending player is wearing any clothing made of denim, this creature is unblockable. keyword: keyword: Landwalk - match: namewalk + match: prefixwalk mode: core reminder: This creature is unblockable as long as defending player controls a {param1}. keyword: