Corrected Magic sorting script.

Updated some gold, colorless, and light artifact frames.
Added machinery for tri-hybrid mana.
Added watermarks to magic-new-flip.
Updated watermarks.
Updated Vanguard keywords to version in Magic.
Fixed font_color scripts in magic-new-flip, magic-new-promo, and magic-new-textless.

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

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

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

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

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:

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

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

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

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: "(^|[^/])<match>($|[^/])",
 				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: "(^|[^/])<match>($|[^/])",
+				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: "(^|[^/])<match>($|[^/])",
+				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: "(^|[^/])<match>($|[^/])",
+				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: "(^|[^/])<match>($|[^/])",
+				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: "(^|[^/])<match>($|[^/])",
+				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: "[(](<param-[a-z]*>)?<match>|[ ]*: <param-cost><match>|—<match>",
+			in_context: "[(](<param-[a-z]*>)?<match>|[ ]*: <param-cost><match>|—<match>| — <match>",
 			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

data/vanguard.mse-game/game

@@ -160,7 +160,7 @@ init script:
 		# step 8 : post ( capitalization
 		replace_rule(
 			match: "[a-z]",
-			in_context: "[(](<param-[a-z]*>)?<match>|[ ]*: <param-cost><match>",
+			in_context: "[(](<param-[a-z]*>)?<match>|[ ]*: <param-cost><match>|—<match>| — <match>",
 			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 "<something>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: <atom-param>name</atom-param>cycling<atom-param>cost</atom-param>
+	match: <atom-param>prefix</atom-param>cycling<atom-param>cost</atom-param>
 	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 <atom-param>name</atom-param> <atom-param>cost</atom-param>
+	keyword: Splice (Mana Cost)
+	match: Splice onto <atom-param>name</atom-param> <atom-param>mana</atom-param>
+	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 <atom-param>name</atom-param>—<atom-param>action</atom-param>
 	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: <atom-param>name</atom-param> offering
+	match: <atom-param>prefix</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.
 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: <atom-param>name</atom-param>walk
+	match: <atom-param>prefix</atom-param>walk
 	mode: core
 	reminder: This creature is unblockable as long as defending player controls a {param1}.
 keyword: