Conversion of new style tokens to new color system

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

data/magic-new-token.mse-style/style

@@ -1,4 +1,4 @@
-mse version: 0.3.3
+mse version: 0.3.4
 game: magic
 short name: Modern Token
 full name: Post 8th Tokens
@@ -21,65 +21,23 @@ card dpi: 150
 ##############################P############################### Extra scripts
 
 init script:
-	# Load blend scripts for hybrids/multicolors
+	# Load scripts for default images
-	include file: magic-blends.mse-include/blend-scripts
 	include file: magic-default-image.mse-include/scripts
-	
+		
-	# Should hybrids have a grey name?
+	# What should the textbox look like?
-	mask_hybrid_with_land := { false }
+	text_shape := {
-	
-	# We have no land templates
-	# Which artifact template should be used?
-	text_sensor := {
 		if styling.one_textline_tokens
-		and card_style.text.content_lines == 1
+		   and card_style.text.content_lines <= 2
-		and card.flavor_text == "<i-flavor></i-flavor>" then "1"
+		   and card.flavor_text == "<i-flavor></i-flavor>"  then "1" # small
-		else if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then "2"
+		else if card.rule_text != "" or
-		else "" }
+		     number_of_items(in:"" + card.flavor_text) > 21 then "2" # large
-	
+		else                                                     "0" # none
-	land_to_artifact := {
-		if input == "w" or input == "u" or input == "b" or input == "r" or input == "g" or input == "m" then ""
-		 else input
 	}
 	
-	land_to_artifact_pt := {
+	suffix := ""
-		if input == "l" or input == "wl" or input == "ul" or input == "bl" or input == "rl" or input == "gl" or input == "ml" then "c"
+	template      := { input + "{type}{suffix}.jpg" }
-		 else input
+	land_template := { "c{type}{suffix}.jpg" }
-	}
+		
-	
-	card_hybrid_nt := {
-		if mask_hybrid_with_land() then
-			masked_blend(
-				mask: (
-					if styling.one_textline_tokens
-					and card_style.text.content_lines == 1
-					and card.flavor_text == "<i-flavor></i-flavor>" then "1hybrid_blend_nt.png"
-					else if card.rule_text != "" then "2hybrid_blend_nt.png"
-					else "hybrid_blend_nt.png" ),
-				dark:  land_template(""),
-				light: input,
-			)
-		else input
-	}
-	multi_hybrid := {
-		masked_blend(
-			mask: (
-				if styling.one_textline_tokens
-				and card_style.text.content_lines == 1
-				and card.flavor_text == "<i-flavor></i-flavor>" then "1multicolor_dual_blend.png"
-				else if card.rule_text != "" then "2multicolor_dual_blend.png"
-				else "multicolor_dual_blend.png" ),
-			dark: (
-				if card.rule_text != "" then "2mcard.jpg"
-				else "mcard.jpg" ),
-			light: input,
-		)
-	}
-	card_template := { text_sensor() + input + "card.jpg" }
-	land_template   := { text_sensor() + land_to_artifact() + "ccard.jpg" }
-	pt_template   := { text_sensor() + land_to_artifact_pt() + "pt.jpg" }
-	land_hybrid_pt := { text_sensor() + "cpt.jpg" }
-	
 	# Use the normal tap symbol
 	mana_t := {
 		if      styling.tap_symbol == "old"        then "old"
@@ -89,13 +47,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?
-	white_font_colors := filter_rule(match:"^(hybrid 2 color )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(black|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 := {
-		if white_font_colors(input: card.card_color) != "" then rgb(255,255,255)
-		else rgb(0,0,0)
-	}
 	
 ############################################################## Set info fields
 
@@ -162,7 +114,7 @@ card style:
 		z index: -2
 		render style: image
 		popup style: in place
-		include file:  magic-blends.mse-include/card-backgrounds
+		image: { color_background(type:"card" + text_shape(), base_hybrid:card_hybrid) }
 
 	###################C######### Name line
 	name:
@@ -183,26 +135,13 @@ card style:
 	############################# Image
 	image:
 		left:	30
-		top:
+		top: { if text_shape() == 2 then 58 else 59 }
-			script: if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then
-				58
-			else
-				59
 		width:	315
 		height:
-			script: if styling.one_textline_tokens and card_style.text.content_lines == 1and card.flavor_text == "<i-flavor></i-flavor>" then
+			{ if      text_shape() == "1" then 349
-				349
+			  else if text_shape() == "2" then 288
-			else if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then
+			  else                             366 }
-				288
+		mask: { "imagemask{text_shape()}.png" }
-			else
-				366
-		mask:
-			script: if styling.one_textline_tokens and card_style.text.content_lines == 1and card.flavor_text == "<i-flavor></i-flavor>" then
-				"1imagemask.png"
-			else if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then
-				"2imagemask.png"
-			else
-				"imagemask.png"
 		z index: 1
 
 
@@ -211,12 +150,9 @@ card style:
 	type:
 		left: 35
 		top:
-			script: if styling.one_textline_tokens and card_style.text.content_lines == 1and card.flavor_text == "<i-flavor></i-flavor>" then
+			{ if      text_shape() == "1" then 414
-				414
+			  else if text_shape() == "2" then 350
-			else if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then
+			  else                             433 }
-				350
-			else
-				433
 		width: 286
 		height: 20
 		alignment: top shrink-overflow
@@ -233,12 +169,9 @@ card style:
 	rarity:
 		left: 320
 		top:
-			script: if styling.one_textline_tokens and card_style.text.content_lines == 1and card.flavor_text == "<i-flavor></i-flavor>" then
+			{ if      text_shape() == "1" then 415
-				415
+			  else if text_shape() == "2" then 351
-			else if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then
+			  else                             432 }
-				351
-			else
-				432
 		width: 22
 		height: 22
 		z index: 1
@@ -249,21 +182,19 @@ card style:
 			common:     script: symbol_variation(symbol: set.symbol, variation: "common")
 			uncommon:   script: symbol_variation(symbol: set.symbol, variation: "uncommon")
 			rare:       script: symbol_variation(symbol: set.symbol, variation: "rare")
-			special:	script: symbol_variation(symbol: set.symbol, variation: "special")
+			special:    script: symbol_variation(symbol: set.symbol, variation: "special")
 
 	############################# Text box
 	text:
 		left: 31
 		top:
-			script:
+			{ if      text_shape() == "1" then 444
-				if styling.one_textline_tokens and card_style.text.content_lines == 1and card.flavor_text == "<i-flavor></i-flavor>" then 444
+			  else if text_shape() == "2" then 388
-				else if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then 388
+			  else                             300 }
-				else 300
 		width: 311
 		height: 
-			script:
+			{ if   text_shape() == "1" then 22
-				if styling.one_textline_tokens and card_style.text.content_lines == 1and card.flavor_text == "<i-flavor></i-flavor>" then 22
+			  else                          80 }
-				else 80
 		font:
 			name: MPlantin
 			italic name: MPlantin-Italic
@@ -280,12 +211,12 @@ card style:
 		alignment:
 			script:
 				if not contains(match:",", card.rule_text) and
-				not contains(match: ".", card.rule_text) and
+				   not contains(match: ".", card.rule_text) and
-				not contains(match: ";", card.rule_text) and
+				   not contains(match: ";", card.rule_text) and
-				not contains(match: ":", card.rule_text) and
+				   not contains(match: ":", card.rule_text) and
-				not contains (match: "!", card.rule_text) and
+				   not contains (match: "!", card.rule_text) and
-				not contains (match: "?", card.rule_text) and
+				   not contains (match: "?", card.rule_text) and
-				card.flavor_text == "<i-flavor></i-flavor>"
+				   card.flavor_text == "<i-flavor></i-flavor>"
 				then "middle center"
 				else "middle left"
 		z index: 2
@@ -323,8 +254,7 @@ card style:
 			name: Matrix
 			size: 11
 			weight: bold
-			color:
+			color: { font_color(card.card_color) }
-				script: font_color()
 		symbol font:
 			name: magic-paintbrush
 			size: 10.5
@@ -338,8 +268,7 @@ card style:
 		font:
 			name: MPlantin
 			size: 7.5
-			color:
+			color: { font_color(card.card_color) }
-				script: font_color()
 
 ############################################################## Extra card fields
 
@@ -348,6 +277,8 @@ extra card field:
 	name: pt box
 	script: card.card_color
 	editable: false
+	save value: false
+	show statistics: false
 extra card field:
 	type: choice
 	name: name box
@@ -377,46 +308,38 @@ extra card style:
 		width:	90
 		height:	50
 		z index: 1
-		visible:
+		visible: { card.pt != "" }
-			script: card.pt != ""
 		render style: image
 		mask: mask_pt.png
-		include file: magic-blends.mse-include/card-ptboxes
+		image: { card_ptbox(suffix: text_shape()) }
-#	name box:
-#		left: script: card_style.name.content_width * -.5 + 172
-#		top: 25
-#		width: script: card_style.name.content_width + 1
-#		height: 35
-#		z index:	2
-#		visible:
-#			script: card.name != ""
-#		render style: image
-#		mask: name_mask.png
-#		choice images:
-#			black: name.jpg
 
-#	name box left:
+	name box:
-#		right: script: card_style.name.content_width * -.5 + 172
+		left: { card_style.name.content_width * -0.5 + 187.5 }
-#		top: 25
+		top: 25
-#		width: 15
+		width: { card_style.name.content_width + 1 }
-#		height: 35
+		height: 35
-#		z index:	2
+		z index: 2
-#		visible:
+		visible: { card.name != "" }
-#			script: card.name != ""
+		render style: image
-#		render style: image
+		choice images:
-#		mask: name_l_mask.png
+			black: name.jpg
-#		choice images:
+	name box left:
-#			black: name_l.jpg
+		right: { card_style.name.content_width * -0.5 + 187.5 }
-
+		top: 25
-#	name box right:
+		width: 15
-#		left: script: card_style.name.content_width * .5 + 173
+		height: 35
-#		top: 25
+		z index: 2
-#		width: 15
+		visible: { card.name != "" }
-#		height: 35
+		render style: image
-#		z index:	2
+		choice images:
-#		visible:
+			black: name_l.jpg
-#			script: card.name != ""
+	name box right:
-#		render style: image
+		left: { card_style.name.content_width * 0.5 + 188.5 }
-#		mask: name_r_mask.png
+		top: 25
-#		choice images:
+		width: 15
-#			black: name_r.jpg
+		height: 35
+		z index: 2
+		visible: { card.name != "" }
+		render style: image
+		choice images:
+			black: name_r.jpg