New masks for colored artifacts in magic-future-textless.

New land hybrid masks for old style templates.
Added colored Xander Hybrid Mana Watermarks (in addition to colorless).
Removed an un-needed mask from magic-old-split.
Removed an un-needed ptbox from magic-future-textless.

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

data/magic-future-textless.mse-style/style

@@ -45,7 +45,7 @@ init script:
 			)
 		else if artifact then 
 			masked_blend(
-				mask:  "multicolor_blend_{type}.png",
+				mask:  "artifact_blend_{type}.png",
 				dark:  template("a"),
 				light: base,
 			)
@@ -86,6 +86,14 @@ styling field:
 	choice: modern
 	choice: old
 	choice: diagonal T
+styling field:
+	type: choice
+	name: font color
+	description: What color should the font on cards be?
+	initial: automatic
+	choice: automatic
+	choice: black
+	choice: white
 
 styling style:
 	use guild mana symbols:

data/magic-old-split.mse-style/style

@@ -26,6 +26,46 @@ init script:
 	
 	# Only white cards use a black font
 	font_colors_white := { input != "w" }
+	
+	#Multicolor lands blend differently than hybrids.
+	#Did it this way because was getting longer other way, due to redefining color_background parts.
+	color_combination := {
+		# The base hybrid, without the outer frame blended over it
+		base := base_hybrid[shape][color_count]()
+		
+		# Put a frame around it?
+		if type == "card" and land and color_count == 2 and shape != "overlay" and styling.alpha_style_blending then
+			masked_blend(
+				mask:  "alpha_blend.png",
+				dark:  land_template(colors[0]),
+				light: land_template(colors[1]),
+			)
+		else if land then
+			masked_blend(
+				mask:  "land_blend_{type}.png",
+				dark:  land_template("c"),
+				light: base,
+			)
+		else if multi then 
+			masked_blend(
+				mask:  "multicolor_blend_{type}.png",
+				dark:  template("m"),
+				light: base,
+			)
+		else if artifact then 
+			masked_blend(
+				mask:  "multicolor_blend_{type}.png",
+				dark:  template("a"),
+				light: base,
+			)
+		else if color_count > 1 and mask_hybrid_with_land() then
+			masked_blend(
+				mask:  "hybrid_blend_{type}.png",
+				dark:  land_template("c"),
+				light: base,
+			)
+		else base
+	}
 
 ############################################################## Set info fields
 set info style:

data/magic-old.mse-style/style

@@ -31,16 +31,44 @@ init script:
 	# Only white cards use a black font
 	font_colors_white := { input != "w" }
 	
-	# Alpha style lands?
-	color_combination_std := color_combination
+	# Alpha style lands?  Different blending for multicolored lands.
+	#Did it this way because was getting longer other way, due to redefining color_background parts.
 	color_combination := {
+		# The base hybrid, without the outer frame blended over it
+		base := base_hybrid[shape][color_count]()
+		
+		# Put a frame around it?
 		if type == "card" and land and color_count == 2 and shape != "overlay" and styling.alpha_style_blending then
 			masked_blend(
 				mask:  "alpha_blend.png",
 				dark:  land_template(colors[0]),
 				light: land_template(colors[1]),
 			)
-		else color_combination_std()
+		else if land then
+			masked_blend(
+				mask:  "land_blend_{type}.png",
+				dark:  land_template("c"),
+				light: base,
+			)
+		else if multi then 
+			masked_blend(
+				mask:  "multicolor_blend_{type}.png",
+				dark:  template("m"),
+				light: base,
+			)
+		else if artifact then 
+			masked_blend(
+				mask:  "multicolor_blend_{type}.png",
+				dark:  template("a"),
+				light: base,
+			)
+		else if color_count > 1 and mask_hybrid_with_land() then
+			masked_blend(
+				mask:  "hybrid_blend_{type}.png",
+				dark:  land_template("c"),
+				light: base,
+			)
+		else base
 	}
 
 ############################################################## Set info fields

data/magic-watermarks.mse-include/watermark-names

@@ -36,5 +36,17 @@ choice:
 	choice: G/W
 	choice: R/W
 	choice: W/U
+choice:
+	name: colored xander hybrid mana
+	choice: B/R
+	choice: U/B
+	choice: B/G
+	choice: R/G
+	choice: G/U
+	choice: U/R
+	choice: W/B
+	choice: G/W
+	choice: R/W
+	choice: W/U
 choice:
 	name: set symbol

data/magic-watermarks.mse-include/watermarks

@@ -30,6 +30,17 @@ choice images:
 	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")
 	
+	colored xander hybrid mana B/R:			/magic-watermarks.mse-include/watermark_brmana_colored.png
+	colored xander hybrid mana U/B:			/magic-watermarks.mse-include/watermark_ubmana_colored.png
+	colored xander hybrid mana B/G:			/magic-watermarks.mse-include/watermark_bgmana_colored.png
+	colored xander hybrid mana R/G:			/magic-watermarks.mse-include/watermark_rgmana_colored.png
+	colored xander hybrid mana G/U:			/magic-watermarks.mse-include/watermark_gumana_colored.png
+	colored xander hybrid mana U/R:			/magic-watermarks.mse-include/watermark_urmana_colored.png
+	colored xander hybrid mana W/B:			/magic-watermarks.mse-include/watermark_wbmana_colored.png
+	colored xander hybrid mana G/W:			/magic-watermarks.mse-include/watermark_gwmana_colored.png
+	colored xander hybrid mana R/W:			/magic-watermarks.mse-include/watermark_rwmana_colored.png
+	colored xander hybrid mana W/U:			/magic-watermarks.mse-include/watermark_wumana_colored.png
+	
 	set symbol:
 		{ set_combine(combine:"shadow",
 		   set_alpha(