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.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@294 0fc631ac-6414-0410-93d0-97cfa31319b6

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"))

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

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")

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")

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")

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
 	

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: ".</param-action><.>"
 			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
 		replace_rule(
 		 	match: "[(][^)\n]*[)]?",
@@ -1110,7 +1103,7 @@ keyword:
 	keyword: Cardcycling
 	match: <atom-param>name</atom-param>cycling <atom-param>mana</atom-param>
 	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: Cardcycling
 	match: <atom-param>name</atom-param>cycling—<atom-param>action</atom-param>
@@ -1240,7 +1233,7 @@ keyword:
 	keyword: Offering
 	match: <atom-param>name</atom-param> 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.
+	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 <atom-param>number</atom-param>
@@ -1311,7 +1304,7 @@ keyword:
 	keyword: Landwalk
 	match: <atom-param>name</atom-param>walk
 	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: Protection from
 	match: Protection from <atom-param>name</atom-param>

data/vanguard.mse-game/game

@@ -131,14 +131,6 @@ init script:
 		replace_rule(
 			match: ".</param-action><.>"
 			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
 		replace_rule(
 		 	match: "[(][^)\n]*[)]?",
@@ -502,7 +494,7 @@ keyword:
 	keyword: Cardcycling
 	match: <atom-param>name</atom-param>cycling <atom-param>mana</atom-param>
 	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: Cardcycling
 	match: <atom-param>name</atom-param>cycling—<atom-param>action</atom-param>
@@ -632,7 +624,7 @@ keyword:
 	keyword: Offering
 	match: <atom-param>name</atom-param> 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.
+	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 <atom-param>number</atom-param>
@@ -703,7 +695,7 @@ keyword:
 	keyword: Landwalk
 	match: <atom-param>name</atom-param>walk
 	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: Protection from
 	match: Protection from <atom-param>name</atom-param>