diff --git a/data/magic-blends.mse-include/card-backgrounds b/data/magic-blends.mse-include/card-backgrounds index 9a18b66a..aafbcb3c 100644 --- a/data/magic-blends.mse-include/card-backgrounds +++ b/data/magic-blends.mse-include/card-backgrounds @@ -9,7 +9,8 @@ choice images: black : script: card_template("b") red : script: card_template("r") green : script: card_template("g") - colorless : script: card_template("a") + colorless : script: card_template("c") + artifact : script: card_template("a") multicolor : script: card_template("m") multicolor 2 color white / blue : script: multi_hybrid(card_hybrid_2("wu")) multicolor 2 color blue / black : script: multi_hybrid(card_hybrid_2("ub")) diff --git a/data/magic-blends.mse-include/card-colors b/data/magic-blends.mse-include/card-colors index 5c89648c..776245bb 100644 --- a/data/magic-blends.mse-include/card-colors +++ b/data/magic-blends.mse-include/card-colors @@ -7,6 +7,7 @@ choice: black choice: red choice: green choice: colorless +choice: artifact choice: name: multicolor group choice: normal diff --git a/data/magic-blends.mse-include/card-ptboxes b/data/magic-blends.mse-include/card-ptboxes index 615a6e1c..5867c3ad 100644 --- a/data/magic-blends.mse-include/card-ptboxes +++ b/data/magic-blends.mse-include/card-ptboxes @@ -9,7 +9,8 @@ choice images: black : script: pt_template("b") red : script: pt_template("r") green : script: pt_template("g") - colorless : script: pt_template("a") + colorless : script: pt_template("c") + artifact : script: pt_template("a") multicolor : script: pt_template("m") multicolor 2 color white / blue : script: multi_hybrid_pt("u") multicolor 2 color blue / black : script: multi_hybrid_pt("b") diff --git a/data/magic-blends.mse-include/flip-ptboxes b/data/magic-blends.mse-include/flip-ptboxes index 7856fb9b..a876e760 100644 --- a/data/magic-blends.mse-include/flip-ptboxes +++ b/data/magic-blends.mse-include/flip-ptboxes @@ -9,7 +9,8 @@ choice images: black : script: pt_template("b") red : script: pt_template("r") green : script: pt_template("g") - colorless : script: pt_template("a") + colorless : script: pt_template("c") + artifact : script: pt_template("a") multicolor : script: pt_template("m") multicolor 2 color white / blue : script: multi_hybrid_pt("u") multicolor 2 color blue / black : script: multi_hybrid_pt("b") diff --git a/data/magic-blends.mse-include/flip-ptboxes2 b/data/magic-blends.mse-include/flip-ptboxes2 index d693dcc5..0590ca5a 100644 --- a/data/magic-blends.mse-include/flip-ptboxes2 +++ b/data/magic-blends.mse-include/flip-ptboxes2 @@ -9,7 +9,8 @@ choice images: black : script: pt2_template("b") red : script: pt2_template("r") green : script: pt2_template("g") - colorless : script: pt2_template("a") + colorless : script: pt2_template("c") + artifact : script: pt2_template("a") multicolor : script: pt2_template("m") multicolor 2 color white / blue : script: multi_hybrid_pt2("w") multicolor 2 color blue / black : script: multi_hybrid_pt2("u") diff --git a/data/magic-new-flip.mse-style/ccard.jpg b/data/magic-new-flip.mse-style/ccard.jpg new file mode 100644 index 00000000..6c9d08c9 Binary files /dev/null and b/data/magic-new-flip.mse-style/ccard.jpg differ diff --git a/data/magic-new-flip.mse-style/cpt.jpg b/data/magic-new-flip.mse-style/cpt.jpg new file mode 100644 index 00000000..1cd306d6 Binary files /dev/null and b/data/magic-new-flip.mse-style/cpt.jpg differ diff --git a/data/magic-new-flip.mse-style/cpt2.jpg b/data/magic-new-flip.mse-style/cpt2.jpg new file mode 100644 index 00000000..efe0a4b8 Binary files /dev/null and b/data/magic-new-flip.mse-style/cpt2.jpg differ diff --git a/data/magic-new-promo.mse-style/ccard.jpg b/data/magic-new-promo.mse-style/ccard.jpg new file mode 100644 index 00000000..6c985f40 Binary files /dev/null and b/data/magic-new-promo.mse-style/ccard.jpg differ diff --git a/data/magic-new-promo.mse-style/cpt.jpg b/data/magic-new-promo.mse-style/cpt.jpg new file mode 100644 index 00000000..94198d3f Binary files /dev/null and b/data/magic-new-promo.mse-style/cpt.jpg differ diff --git a/data/magic-new-split.mse-style/ccard.jpg b/data/magic-new-split.mse-style/ccard.jpg new file mode 100644 index 00000000..471b38f1 Binary files /dev/null and b/data/magic-new-split.mse-style/ccard.jpg differ diff --git a/data/magic-new-split.mse-style/cpt.jpg b/data/magic-new-split.mse-style/cpt.jpg new file mode 100644 index 00000000..e7f399b2 Binary files /dev/null and b/data/magic-new-split.mse-style/cpt.jpg differ diff --git a/data/magic-new.mse-style/ccard.JPG b/data/magic-new.mse-style/ccard.JPG new file mode 100644 index 00000000..f8460852 Binary files /dev/null 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 new file mode 100644 index 00000000..5ce32cf2 Binary files /dev/null and b/data/magic-new.mse-style/cpt.jpg differ diff --git a/data/magic-old-token.mse-style/ccard.jpg b/data/magic-old-token.mse-style/ccard.jpg new file mode 100644 index 00000000..e3fca026 Binary files /dev/null and b/data/magic-old-token.mse-style/ccard.jpg differ diff --git a/data/magic-old.mse-style/blcard.JPG b/data/magic-old.mse-style/blcard.JPG new file mode 100644 index 00000000..28655e78 Binary files /dev/null and b/data/magic-old.mse-style/blcard.JPG differ diff --git a/data/magic-old.mse-style/ccard.jpg b/data/magic-old.mse-style/ccard.jpg new file mode 100644 index 00000000..a59ba3ce Binary files /dev/null and b/data/magic-old.mse-style/ccard.jpg differ diff --git a/data/magic-old.mse-style/glcard.JPG b/data/magic-old.mse-style/glcard.JPG new file mode 100644 index 00000000..d11cfd6c Binary files /dev/null and b/data/magic-old.mse-style/glcard.JPG differ diff --git a/data/magic-old.mse-style/mlcard.jpg b/data/magic-old.mse-style/mlcard.jpg new file mode 100644 index 00000000..ee890f61 Binary files /dev/null and b/data/magic-old.mse-style/mlcard.jpg differ diff --git a/data/magic-old.mse-style/rlcard.JPG b/data/magic-old.mse-style/rlcard.JPG new file mode 100644 index 00000000..a7663aa3 Binary files /dev/null and b/data/magic-old.mse-style/rlcard.JPG differ diff --git a/data/magic-old.mse-style/style b/data/magic-old.mse-style/style index db8ea19a..04200697 100644 --- a/data/magic-old.mse-style/style +++ b/data/magic-old.mse-style/style @@ -21,9 +21,6 @@ init script: # Load blend scripts for hybrids/multicolors include file: magic-blends.mse-include/blend-scripts - # There are currently no colored lands - land_template := { "lcard.jpg" } - # Horizontal 5 color blends are not supported card_hybrid_5b := card_hybrid_5 diff --git a/data/magic-old.mse-style/ulcard.JPG b/data/magic-old.mse-style/ulcard.JPG new file mode 100644 index 00000000..d1ef3fe1 Binary files /dev/null and b/data/magic-old.mse-style/ulcard.JPG differ diff --git a/data/magic-old.mse-style/wlcard.JPG b/data/magic-old.mse-style/wlcard.JPG new file mode 100644 index 00000000..16747827 Binary files /dev/null and b/data/magic-old.mse-style/wlcard.JPG differ diff --git a/data/magic-textless.mse-style/ccard.jpg b/data/magic-textless.mse-style/ccard.jpg new file mode 100644 index 00000000..470718ec Binary files /dev/null and b/data/magic-textless.mse-style/ccard.jpg differ diff --git a/data/magic-textless.mse-style/cpt.jpg b/data/magic-textless.mse-style/cpt.jpg new file mode 100644 index 00000000..94198d3f Binary files /dev/null and b/data/magic-textless.mse-style/cpt.jpg differ diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index 8767c645..80fd43f8 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -144,12 +144,13 @@ init script: }; # The color of a card + is_artifact := filter_rule(match: "(?i)Artifact") + {input != ""}; is_land := filter_rule(match: "(?i)Land") + {input != ""}; card_color := { # usually the color of mana mana_color := mana_to_color(casting_cost); - if mana_color == "colorless" and is_land(input: card.super_type) - then land_to_color() + if mana_color == "colorless" and is_land(input: card.super_type) then land_to_color() + else if mana_color == "colorless" and is_artifact(input: card.super_type) then "artifact" else mana_color }; @@ -228,14 +229,6 @@ init script: replace_rule( match: ".<.>" replace: "" ) + - # step 6e : "an" for parameters starting with vowels - replace_rule( - match: "", - in_context: "[ ]?[aeiouAEIOU]", - replace: "an" ) + - replace_rule( - match: "", - replace: "a" ) + # step 7 : italic reminder text replace_rule( match: "[(][^)\n]*[)]?", @@ -1110,7 +1103,7 @@ keyword: keyword: Cardcycling match: namecycling mana mode: expert - reminder: {param2}, Discard this card: Search your library for {param1} card, reveal it, and put it into your hand. Then shuffle your library. + reminder: {param2}, Discard this card: Search your library for a {param1} card, reveal it, and put it into your hand. Then shuffle your library. keyword: keyword: Cardcycling match: namecycling—action @@ -1240,7 +1233,7 @@ keyword: keyword: Offering match: name offering mode: expert - reminder: You may play this card any time you could play an instant by sacrificing {param1} and paying the difference in mana costs between this and the sacrificed {param1}. Mana cost includes color. + 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: keyword: Bushido match: Bushido number @@ -1311,7 +1304,7 @@ keyword: keyword: Landwalk match: namewalk mode: core - reminder: This creature is unblockable as long as defending player controls {param1}. + reminder: This creature is unblockable as long as defending player controls a {param1}. keyword: keyword: Protection from match: Protection from name diff --git a/data/vanguard.mse-game/game b/data/vanguard.mse-game/game index 44f17186..a94d1f67 100644 --- a/data/vanguard.mse-game/game +++ b/data/vanguard.mse-game/game @@ -131,14 +131,6 @@ init script: replace_rule( match: ".<.>" replace: "" ) + - # step 6e : "an" for parameters starting with vowels - replace_rule( - match: "", - in_context: "[ ]?[aeiouAEIOU]", - replace: "an" ) + - replace_rule( - match: "", - replace: "a" ) + # step 7 : italic reminder text replace_rule( match: "[(][^)\n]*[)]?", @@ -502,7 +494,7 @@ keyword: keyword: Cardcycling match: namecycling mana mode: expert - reminder: {param2}, Discard this card: Search your library for {param1} card, reveal it, and put it into your hand. Then shuffle your library. + reminder: {param2}, Discard this card: Search your library for a {param1} card, reveal it, and put it into your hand. Then shuffle your library. keyword: keyword: Cardcycling match: namecycling—action @@ -632,7 +624,7 @@ keyword: keyword: Offering match: name offering mode: expert - reminder: You may play this card any time you could play an instant by sacrificing {param1} and paying the difference in mana costs between this and the sacrificed {param1}. Mana cost includes color. + 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: keyword: Bushido match: Bushido number @@ -703,7 +695,7 @@ keyword: keyword: Landwalk match: namewalk mode: core - reminder: This creature is unblockable as long as defending player controls {param1}. + reminder: This creature is unblockable as long as defending player controls a {param1}. keyword: keyword: Protection from match: Protection from name