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

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

data/magic-firepenguinmaster-flip.mse-style/style

@@ -1,4 +1,4 @@
-mse version: 0.3.2
+mse version: 0.3.4
 game: magic
 full name: FPM's Flip Magic
 short name: FPM Flip
@@ -13,10 +13,10 @@ card dpi: 150
 
 init script:
 	# Load blend scripts for hybrids/multicolors
-	include file: magic-blends.mse-include/blend-scripts
+	include file: magic-default-image.mse-include/scripts
 	
 	# We have no land templates
-	land_template := { "ccard.jpg" }
+	land_template := { "c{type}.jpg" }
 	
 	# Use the normal tap symbol
 	mana_t := {
@@ -28,14 +28,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
@@ -102,7 +97,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:
@@ -180,8 +175,9 @@ card style:
 		height: 20
 		width: 14
 		render style: image
+		angle: 180
 		choice images:
-			tombstone: tombstone-2.png
+			tombstone: tombstone.png
 
 	############################# Image
 	image:
@@ -382,7 +378,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
@@ -396,7 +392,7 @@ card style:
 		font:
 			name: MPlantin
 			size: 7
-			color: { font_color() }
+			color: { font_color(card.card_color) }
 
 ############################################################## Extra card fields
 
@@ -430,5 +426,6 @@ extra card style:
 		z index: 1
 		visible: { card.power_2 != "" or card.toughness_2 != "" }
 		render style: image
+		angle: 180
 		choice images:
-			shieldsword: ptshieldsword-2.png
+			shieldsword: ptshieldsword.png

data/magic-firepenguinmasterpromo.mse-style/style

@@ -1,4 +1,4 @@
-mse version: 0.2.7
+mse version: 0.3.4
 game: magic
 full name: FPM's Promo Magic
 short name: FPM Promo
@@ -12,19 +12,14 @@ card dpi: 300
 ############################################################## Extra scripts
 
 init script:
-	# Load blend scripts for hybrids/multicolors
-	include file: magic-blends.mse-include/blend-scripts
-	
-	# Which green template should be used?
 	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 := {
@@ -35,15 +30,7 @@ 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)
-	}
+
 	
 ############################################################## Extra style
 styling field:
@@ -121,7 +108,7 @@ card style:
 		z index: -2
 		render style: image
 		popup style: in place
-		include file: magic-blends.mse-include/card-backgrounds
+		image: { card_background() }
 	font color:
 		left: 25
 		top: 508

data/magic-firepenguinmastersplit.mse-style/style

@@ -1,4 +1,4 @@
-mse version: 0.3.2
+mse version: 0.3.4
 game: magic
 full name: FPM's Split Magic
 short name: FPM Split
@@ -9,23 +9,23 @@ card width: 523
 card height: 375
 card dpi: 150
 
-#Made by the forum members of the MSE2 Forums.  Special thanks to Artfreakwiu who did the start and the bulk of the work, RoatheEternal for testing and graphics, BunnieRein (for finally making the casting cost work), FirePenguinMaster for making the frames to begin with, and Twanvl for making MSE2 to begin with.
+# Made by the forum members of the MSE2 Forums.
+# Special thanks to Artfreakwiu who did the start and the bulk of the work,
+# RoatheEternal for testing and graphics,
+# BunnieRein (for finally making the casting cost work),
+# FirePenguinMaster for making the frames to begin with,
+# and Twanvl for making MSE2 to begin with.
 ############################################################## Extra scripts
 
 init script:
-	# Load blend scripts for hybrids/multicolors
-	include file: magic-blends.mse-include/blend-scripts
-		
-	# Which green template should be used?
 	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 := {
@@ -37,19 +37,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)
-	}
-	font_color_2 := {
-		if white_font_colors(input: card.card_color_2) != "" then rgb(255,255,255)
-		else if black_font_colors(input: card.card_color_2) != "" 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
 styling field:
@@ -123,7 +113,7 @@ card style:
 		z index: -2
 		render style: image
 		popup style: in place
-		include file: magic-blends.mse-include/card-backgrounds
+		image: { card_background() }
 	card color 2:
 		left:	271.49
 		top:	18
@@ -132,7 +122,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:
@@ -428,7 +418,7 @@ card style:
 		font:
 			name: MPlantin-Italic
 			size: 5.54
-			color: { font_color() }
+			color: { font_color(card.card_color) }
 		symbol font:
 			name: magic-paintbrush
 			size: 9.7
@@ -442,7 +432,7 @@ card style:
 		font:
 			name: MPlantin-Italic
 			size: 5.54
-			color: { font_color_2() }
+			color: { font_color(card.card_color_2) }
 		symbol font:
 			name: magic-paintbrush
 			size: 9.7
@@ -456,7 +446,7 @@ card style:
 		font:
 			name: MPlantin
 			size: 4.85
-			color: { font_color() }
+			color: { font_color(card.card_color) }
 	copyright line 2:
 		left: 298.51
 		top : 348
@@ -467,7 +457,7 @@ card style:
 		font:
 			name: MPlantin
 			size: 4.85
-			color: { font_color_2() }
+			color: { font_color(card.card_color_2) }
 
 ############################################################## Extra card fields