New card color system, based on a multiple choice field. Renamed some image files to be more consistent.

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

data/magic-new.mse-style/style

@@ -1,4 +1,4 @@
-mse version: 0.3.2
+mse version: 0.3.4
 game: magic
 short name: Modern style
 full name: After 8th edition
@@ -20,8 +20,7 @@ card dpi: 150
 ############################################################## Extra scripts
 
 init script:
-	# Load blend scripts for hybrids/multicolors
+	# Load scripts for image box
-	include file: magic-blends.mse-include/blend-scripts
 	include file: magic-default-image.mse-include/scripts
 	
 	# Should hybrids have a grey name?
@@ -35,8 +34,8 @@ init script:
 			else                                            "a"
 		) else	input
 	}
-	card_template := { artifact_template() + "card.jpg" }
+	template      := { artifact_template() + "{type}.jpg" }
-	pt_template   := { artifact_template() + "pt.jpg" }
+	land_template := { (if input == "a" then "c" else input) + "l{type}.jpg" }
 	
 	# Use the normal tap symbol
 	mana_t := {
@@ -49,11 +48,11 @@ 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 )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(black|land|hybrid 4 color white / blue / black / red|hybrid 2 color overlay blue / black|hybrid 2 color overlay black / red|hybrid 2 color overlay black / green)")
+	#white_font_colors := filter_rule(match:"^(hybrid 2 color )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(black|land|hybrid 4 color white / blue / black / red|hybrid 2 color overlay blue / black|hybrid 2 color overlay black / red|hybrid 2 color overlay black / green)")
-	font_color := {
+	#font_color := {
-		if white_font_colors(input: card.card_color) != "" then rgb(255,255,255)
+	#	if white_font_colors(input: card.card_color) != "" then rgb(255,255,255)
-		else rgb(0,0,0)
+	#	else rgb(0,0,0)
-	}
+	#}
 	
 	
 ############################################################## Extra style options
@@ -143,13 +142,13 @@ 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:
 		left:   { if card.card_symbol=="none" then 32 else 51 }
 		top :   30
-		width:  { if card.card_symbol=="none" then 246 else 227 }
+		right:  278
 		height: 23
 		alignment: bottom shrink-overflow
 		padding bottom: 0
@@ -244,7 +243,8 @@ card style:
 			script:
 				if styling.center_short_text and
 				   not contains(match:"\n", card.rule_text) and
-				   card.flavor_text == "<i-flavor></i-flavor>"
+				   card.flavor_text == "<i-flavor></i-flavor>" and
+				   card_style.text.content_lines <= 2
 				then "middle center"
 				else "middle left"
 		z index: 2
@@ -294,7 +294,7 @@ card style:
 			name: Matrix
 			size: 10
 			weight: bold
-			color: { font_color() }
+			color: { font_color(card.card_color) }
 
 	copyright line:
 		left: 30
@@ -305,7 +305,7 @@ card style:
 		font:
 			name: MPlantin
 			size: 6.5
-			color: { font_color() }
+			color: { font_color(card.card_color) }
 
 ############################################################## Extra card fields
 
@@ -324,4 +324,4 @@ extra card style:
 		z index: 1
 		visible: { card.pt != "" }
 		render style: image
-		include file: magic-blends.mse-include/card-ptboxes
+		image: { card_ptbox() }