Updated FPM templates (except for the tokens) to new color system

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

data/magic-firepenguinmaster.mse-style/style

@@ -1,4 +1,4 @@
-mse version: 0.3.2
+mse version: 0.3.4
 game: magic
 full name: FPM's Normal Magic
 short name: FPM Normal
@@ -15,18 +15,14 @@ card dpi: 150
 ############################################################## Extra scripts
 
 init script:
-	# Load blend scripts for hybrids/multicolors
-	include file: magic-blends.mse-include/blend-scripts
-	
 	green_template := {
 		if input == "g" then (
-			if       styling.green_style == "light" then "lg"
-			else                                            "g"
+			if   styling.green_style == "light" then "lg"
+			else                                     "g"
 		) else input
 	}
-	
-	card_template := { green_template() + "card.jpg" }
-	land_template   := { green_template() + "lcard.jpg" }
+	template      := { green_template() + "{type}.jpg" }
+	land_template := { (if input == "a" then "c" else green_template()) + "l{type}.jpg" }
 	
 	# Use the normal tap symbol
 	mana_t := {
@@ -38,15 +34,9 @@ init script:
 	# Use guild mana symbols?
 	guild_mana := { styling.use_guild_mana_symbols }
 	
-	# Does the card have a color that requires a white font for copyright/artist?
-	black_font_colors := filter_rule(match:"^(hybrid 2 color [^/]*/ )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid 4 color [^/]*/[^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(hybrid 5 color horizontal  [^/]*/[^/]*/[^/]*/[^/]*/ )?(white)")
-	white_font_colors := filter_rule(match:"^(hybrid 2 color overlay green / white|hybrid 2 color overlay red / white)")
-	font_color := {
-		if white_font_colors(input: card.card_color) != "" then rgb(255,255,255)
-		else if black_font_colors(input: card.card_color) != "" then rgb(0,0,0)
-		else rgb(255,255,255)
-	}
-
+	# Only white cards use a black font
+	# TODO: also for some overlays involving white
+	font_colors_white := { input != "w" }
 
 
 ############################################################## Extra style options
@@ -127,7 +117,7 @@ card style:
 		z index: -2
 		render style: image
 		popup style: in place
-		include file: magic-blends.mse-include/card-backgrounds
+		image: { card_background() }
 
 	############################# Name line
 	name:
@@ -291,7 +281,7 @@ card style:
 		font:
 			name: MPlantin-Italic
 			size: 8
-			color: { font_color() }
+			color: { font_color(card.card_color) }
 		symbol font:
 			name: magic-paintbrush
 			size: 14
@@ -306,7 +296,7 @@ card style:
 		font:
 			name: MPlantin
 			size: 7
-			color: { font_color() }
+			color: { font_color(card.card_color) }
 
 ############################################################## Extra card fields