Updated most of the templates for the new color system; also tweaked the hybrid blends a bit for some templates

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

data/magic-blends.mse-include/card-colors

@@ -1,34 +0,0 @@
-# A lot less colors then it used to be
-# Included by a game file
-
-empty choice: colorless
-choice: white
-choice: blue
-choice: black
-choice: red
-choice:
-	name: green
-	line below: true
-choice: artifact
-choice: land
-choice: multicolor
-choice:
-	name: hybrid
-	enabled: { card_color_color_count(card.card_color) >= 2 }
-	line below: true
-choice:
-	name: radial
-	enabled: { card_color_color_count(card.card_color) >= 2 }
-choice:
-	name: horizontal
-	enabled: { card_color_color_count(card.card_color) >= 2 }
-choice:
-	name: vertical
-	enabled: { card_color_color_count(card.card_color) >= 2 }
-choice:
-	name: reversed
-	enabled: { card_color_color_count(card.card_color) >= 2 and not chosen(choice:"overlay",card.card_color) }
-choice:
-	name: overlay
-	enabled: { card_color_color_count(card.card_color) == 2 and chosen(choice:"hybrid",card.card_color) }
-script: card_color_filter(value)

data/magic-blends.mse-include/new-blends

@@ -9,7 +9,7 @@
 mask_hybrid_with_land	:= { false }
 template		:= { input + "{type}.jpg" }
 land_template		:= { (if input == "a" then "c" else input) + "l{type}.jpg" }
-hybrid_previews         := "land,hybrid"
+hybrid_previews         := "hybrid"
 
 ########################################################################
 # Combining multiple colors (hybrids)
@@ -437,13 +437,19 @@ color_background := {
 	color_count := number_of_items(in: colors)
 	if colors == "" then colors == "c"
 	
+	# 'shape' / type of hybrid
+	shape := if      chosen(choice:"horizontal") then "horizontal"
+	         else if chosen(choice:"vertical")   then "vertical"
+	         else if chosen(choice:"overlay")    then "overlay"
+	         else                                     "radial"
+	
+	# Determine background (allows styles to hook something else here)
+	color_combination()
+}
+
+color_combination := {
 	# The base hybrid, without the outer frame blended over it
-	base := base_hybrid
-	[	if      chosen(choice:"horizontal") then "horizontal"
-		else if chosen(choice:"vertical")   then "vertical"
-		else if chosen(choice:"overlay")    then "overlay"
-		else                                     "radial"
-	][color_count]()
+	base := base_hybrid[shape][color_count]()
 	
 	# Put a frame around it?
 	if multi then