Commit 329974b2 authored by pichoro's avatar pichoro

Removed <a> tags and all instances of them.

Updated Magic Old to have colored lands.
Added colorless frame to all templates.  Same as artifact in all but Magic New.
Altered script to make colorless default.  Becomes artifact when "Artifact" is type.
parent 79b9ef15
...@@ -9,7 +9,8 @@ choice images: ...@@ -9,7 +9,8 @@ choice images:
black : script: card_template("b") black : script: card_template("b")
red : script: card_template("r") red : script: card_template("r")
green : script: card_template("g") 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 : script: card_template("m")
multicolor 2 color white / blue : script: multi_hybrid(card_hybrid_2("wu")) multicolor 2 color white / blue : script: multi_hybrid(card_hybrid_2("wu"))
multicolor 2 color blue / black : script: multi_hybrid(card_hybrid_2("ub")) multicolor 2 color blue / black : script: multi_hybrid(card_hybrid_2("ub"))
......
...@@ -7,6 +7,7 @@ choice: black ...@@ -7,6 +7,7 @@ choice: black
choice: red choice: red
choice: green choice: green
choice: colorless choice: colorless
choice: artifact
choice: choice:
name: multicolor name: multicolor
group choice: normal group choice: normal
......
...@@ -9,7 +9,8 @@ choice images: ...@@ -9,7 +9,8 @@ choice images:
black : script: pt_template("b") black : script: pt_template("b")
red : script: pt_template("r") red : script: pt_template("r")
green : script: pt_template("g") 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 : script: pt_template("m")
multicolor 2 color white / blue : script: multi_hybrid_pt("u") multicolor 2 color white / blue : script: multi_hybrid_pt("u")
multicolor 2 color blue / black : script: multi_hybrid_pt("b") multicolor 2 color blue / black : script: multi_hybrid_pt("b")
......
...@@ -9,7 +9,8 @@ choice images: ...@@ -9,7 +9,8 @@ choice images:
black : script: pt_template("b") black : script: pt_template("b")
red : script: pt_template("r") red : script: pt_template("r")
green : script: pt_template("g") 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 : script: pt_template("m")
multicolor 2 color white / blue : script: multi_hybrid_pt("u") multicolor 2 color white / blue : script: multi_hybrid_pt("u")
multicolor 2 color blue / black : script: multi_hybrid_pt("b") multicolor 2 color blue / black : script: multi_hybrid_pt("b")
......
...@@ -9,7 +9,8 @@ choice images: ...@@ -9,7 +9,8 @@ choice images:
black : script: pt2_template("b") black : script: pt2_template("b")
red : script: pt2_template("r") red : script: pt2_template("r")
green : script: pt2_template("g") 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 : script: pt2_template("m")
multicolor 2 color white / blue : script: multi_hybrid_pt2("w") multicolor 2 color white / blue : script: multi_hybrid_pt2("w")
multicolor 2 color blue / black : script: multi_hybrid_pt2("u") multicolor 2 color blue / black : script: multi_hybrid_pt2("u")
......
...@@ -21,9 +21,6 @@ init script: ...@@ -21,9 +21,6 @@ init script:
# Load blend scripts for hybrids/multicolors # Load blend scripts for hybrids/multicolors
include file: magic-blends.mse-include/blend-scripts 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 # Horizontal 5 color blends are not supported
card_hybrid_5b := card_hybrid_5 card_hybrid_5b := card_hybrid_5
......
...@@ -144,12 +144,13 @@ init script: ...@@ -144,12 +144,13 @@ init script:
}; };
# The color of a card # The color of a card
is_artifact := filter_rule(match: "(?i)Artifact") + {input != ""};
is_land := filter_rule(match: "(?i)Land") + {input != ""}; is_land := filter_rule(match: "(?i)Land") + {input != ""};
card_color := { card_color := {
# usually the color of mana # usually the color of mana
mana_color := mana_to_color(casting_cost); mana_color := mana_to_color(casting_cost);
if mana_color == "colorless" and is_land(input: card.super_type) if mana_color == "colorless" and is_land(input: card.super_type) then land_to_color()
then land_to_color() else if mana_color == "colorless" and is_artifact(input: card.super_type) then "artifact"
else mana_color else mana_color
}; };
...@@ -228,14 +229,6 @@ init script: ...@@ -228,14 +229,6 @@ init script:
replace_rule( replace_rule(
match: ".</param-action><.>" match: ".</param-action><.>"
replace: "" ) + replace: "" ) +
# step 6e : "an" for parameters starting with vowels
replace_rule(
match: "<a>",
in_context: "<match>[ ]<param-name>?[aeiouAEIOU]",
replace: "an" ) +
replace_rule(
match: "<a>",
replace: "a" ) +
# step 7 : italic reminder text # step 7 : italic reminder text
replace_rule( replace_rule(
match: "[(][^)\n]*[)]?", match: "[(][^)\n]*[)]?",
...@@ -1110,7 +1103,7 @@ keyword: ...@@ -1110,7 +1103,7 @@ keyword:
keyword: Cardcycling keyword: Cardcycling
match: <atom-param>name</atom-param>cycling <atom-param>mana</atom-param> match: <atom-param>name</atom-param>cycling <atom-param>mana</atom-param>
mode: expert mode: expert
reminder: {param2}, Discard this card: Search your library for <a> {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:
keyword: Cardcycling keyword: Cardcycling
match: <atom-param>name</atom-param>cycling—<atom-param>action</atom-param> match: <atom-param>name</atom-param>cycling—<atom-param>action</atom-param>
...@@ -1240,7 +1233,7 @@ keyword: ...@@ -1240,7 +1233,7 @@ keyword:
keyword: Offering keyword: Offering
match: <atom-param>name</atom-param> offering match: <atom-param>name</atom-param> offering
mode: expert 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. 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:
keyword: Bushido keyword: Bushido
match: Bushido <atom-param>number</atom-param> match: Bushido <atom-param>number</atom-param>
...@@ -1311,7 +1304,7 @@ keyword: ...@@ -1311,7 +1304,7 @@ keyword:
keyword: Landwalk keyword: Landwalk
match: <atom-param>name</atom-param>walk match: <atom-param>name</atom-param>walk
mode: core mode: core
reminder: This creature is unblockable as long as defending player controls <a> {param1}. reminder: This creature is unblockable as long as defending player controls a {param1}.
keyword: keyword:
keyword: Protection from keyword: Protection from
match: Protection from <atom-param>name</atom-param> match: Protection from <atom-param>name</atom-param>
......
...@@ -131,14 +131,6 @@ init script: ...@@ -131,14 +131,6 @@ init script:
replace_rule( replace_rule(
match: ".</param-action><.>" match: ".</param-action><.>"
replace: "" ) + replace: "" ) +
# step 6e : "an" for parameters starting with vowels
replace_rule(
match: "<a>",
in_context: "<match>[ ]<param-name>?[aeiouAEIOU]",
replace: "an" ) +
replace_rule(
match: "<a>",
replace: "a" ) +
# step 7 : italic reminder text # step 7 : italic reminder text
replace_rule( replace_rule(
match: "[(][^)\n]*[)]?", match: "[(][^)\n]*[)]?",
...@@ -502,7 +494,7 @@ keyword: ...@@ -502,7 +494,7 @@ keyword:
keyword: Cardcycling keyword: Cardcycling
match: <atom-param>name</atom-param>cycling <atom-param>mana</atom-param> match: <atom-param>name</atom-param>cycling <atom-param>mana</atom-param>
mode: expert mode: expert
reminder: {param2}, Discard this card: Search your library for <a> {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:
keyword: Cardcycling keyword: Cardcycling
match: <atom-param>name</atom-param>cycling—<atom-param>action</atom-param> match: <atom-param>name</atom-param>cycling—<atom-param>action</atom-param>
...@@ -632,7 +624,7 @@ keyword: ...@@ -632,7 +624,7 @@ keyword:
keyword: Offering keyword: Offering
match: <atom-param>name</atom-param> offering match: <atom-param>name</atom-param> offering
mode: expert 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. 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:
keyword: Bushido keyword: Bushido
match: Bushido <atom-param>number</atom-param> match: Bushido <atom-param>number</atom-param>
...@@ -703,7 +695,7 @@ keyword: ...@@ -703,7 +695,7 @@ keyword:
keyword: Landwalk keyword: Landwalk
match: <atom-param>name</atom-param>walk match: <atom-param>name</atom-param>walk
mode: core mode: core
reminder: This creature is unblockable as long as defending player controls <a> {param1}. reminder: This creature is unblockable as long as defending player controls a {param1}.
keyword: keyword:
keyword: Protection from keyword: Protection from
match: Protection from <atom-param>name</atom-param> match: Protection from <atom-param>name</atom-param>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment