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
+	base := base_hybrid[shape][color_count]()
-	[	if      chosen(choice:"horizontal") then "horizontal"
-		else if chosen(choice:"vertical")   then "vertical"
-		else if chosen(choice:"overlay")    then "overlay"
-		else                                     "radial"
-	][color_count]()
 	
 	# Put a frame around it?
 	if multi then 

data/magic-extended-art.mse-style/style

@@ -1,4 +1,4 @@
-mse version: 0.2.7
+mse version: 0.3.4
 game: magic
 full name: Extended Art
 short name: Extended Art
@@ -13,8 +13,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?
@@ -26,9 +25,8 @@ init script:
 		then	"oa"
 		else	input
 	}
-	
+	template      := { (if type == "pt" then "/magic-new.mse-style/" else "") + artifact_template() + "{type}.jpg" }
-	card_template := { artifact_template() + "card.jpg" }
+	land_template := { (if type == "pt" then "/magic-new.mse-style/" else "") +(if input == "a" then "c" else input) + "l{type}.jpg" }
-	pt_template   := { "/magic-new.mse-style/" + artifact_template() + "pt.jpg" }
 	
 	# Use the normal tap symbol
 	mana_t := {
@@ -38,15 +36,6 @@ 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|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 := {
-		if  white_font_colors(input:card.card_color) != "" then
-			rgb(255,255,255)
-		else
-			rgb(0,0,0)
-	}
 
 ############################################################## Extra style
 
@@ -111,7 +100,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:
@@ -246,7 +235,7 @@ card style:
 		font:
 			name: Matrix
 			size: 10
-			color: { font_color() }
+			color: { font_color(card.card_color) }
 
 	copyright line:
 		left: 26
@@ -257,7 +246,7 @@ card style:
 		font:
 			name: MPlantin
 			size: 6.5
-			color: { font_color() }
+			color: { font_color(card.card_color) }
 
 ############################################################## Extra card fields
 
@@ -277,4 +266,4 @@ extra card style:
 		visible: { card.pt != "" }
 		render style: image
 		mask: mask_pt.png
-		include file: magic-blends.mse-include/card-ptboxes
+		image: { card_ptbox() }

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

@@ -1,4 +1,4 @@
-mse version: 0.3.2
+mse version: 0.3.4
 game: magic
 short name: Flip Cards
 full name: Modern flip cards
@@ -16,31 +16,14 @@ 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?
 	# Should hybrids have a grey name?
 	mask_hybrid_with_land := { false }
 	
 	# We have no land templates
-	# Which artifact template should be used?
+	land_template := { "c{type}.jpg" }
-	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 := {
-		if input == "wl" or input == "ul" or input == "bl" or input == "rl" or input == "gl" or input == "ml" then "c"
-		 else input
-	}
-	
-	land_template   := { land_to_artifact() + "ccard.jpg" }
-	pt_template   := { land_to_artifact_pt() + "pt.jpg" }
-	pt2_template   := { land_to_artifact_pt() + "pt.jpg" }
-	land_hybrid_pt := { "cpt.jpg" }
-	land_hybrid_pt2 := { "cpt.jpg" }
 	
 	# Use the normal tap symbol
 	mana_t := {
@@ -50,14 +33,6 @@ 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|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 := {
-		if white_font_colors(input: card.card_color) != "" then rgb(255,255,255)
-		else rgb(0,0,0)
-	}
-
 
 ############################################################## Extra style options
 
@@ -123,7 +98,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:
@@ -363,7 +338,7 @@ card style:
 		font:
 			name: Matrix
 			size: 10
-			color: { font_color() }
+			color: { font_color(card.card_color) }
 
 	copyright line:
 		left: 26
@@ -374,7 +349,7 @@ card style:
 		font:
 			name: MPlantin
 			size: 6.5
-			color: { font_color() }
+			color: { font_color(card.card_color) }
 
 ############################################################## Extra card fields
 
@@ -398,7 +373,7 @@ extra card style:
 		z index: 1
 		visible: { card.pt != "" }
 		render style: image
-		include file: magic-blends.mse-include/flip-ptboxes
+		image: { flip_ptbox() }
 
 	pt box 2:
 		left:	17
@@ -408,4 +383,4 @@ extra card style:
 		z index: 2
 		visible: { card.pt_2 != "" }
 		render style: image
-		include file: magic-blends.mse-include/flip-ptboxes2
+		image: { flip_ptbox2() }

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

@@ -1,4 +1,4 @@
-mse version: 0.3.2
+mse version: 0.3.4
 game: magic
 short name: Promotional
 full name: Large image
@@ -12,8 +12,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?
@@ -25,7 +24,7 @@ init script:
 		then	"oa"
 		else	input
 	}
-	card_template := { artifact_template() + "card.jpg" }
+	template := { artifact_template() + "{type}.jpg" }
 	pt_template   := { "/magic-new.mse-style/" + artifact_template() + "pt.jpg" }
 	
 	# Use the normal tap symbol
@@ -36,14 +35,6 @@ 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|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 := {
-		if white_font_colors(input: card.card_color) != "" then rgb(255,255,255)
-		else rgb(0,0,0)
-	}
-
 
 ############################################################## Extra style options
 
@@ -116,7 +107,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:
@@ -250,8 +241,7 @@ card style:
 		font:
 			name: Matrix
 			size: 10
-			color:
+			color: { font_color(card.card_color) }
-				script: font_color()
 
 	copyright line:
 		left: 26
@@ -262,7 +252,7 @@ card style:
 		font:
 			name: MPlantin
 			size: 6.5
-			color: { font_color() }
+			color: { font_color(card.card_color) }
 
 ############################################################## Extra card fields
 
@@ -282,4 +272,4 @@ extra card style:
 		visible: { card.pt != "" }
 		render style: image
 		mask: mask_pt.png
-		include file: magic-blends.mse-include/card-ptboxes
+		image: { card_ptbox() }

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

@@ -1,4 +1,4 @@
-mse version: 0.3.2
+mse version: 0.3.4
 game: magic
 short name: Split Cards
 full name: Modern split cards
@@ -15,8 +15,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?
@@ -36,17 +35,6 @@ 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|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 := {
-		if white_font_colors(input: card.card_color) != "" then rgb(255,255,255)
-		else rgb(0,0,0)
-	}
-	font_color_2 := {
-		if white_font_colors(input: card.card_color_2) != "" then rgb(255,255,255)
-		else rgb(0,0,0)
-	}
-	
 ############################################################## Extra style options
 
 styling field:
@@ -114,7 +102,7 @@ card style:
 		z index: -1
 		render style: image
 		popup style: in place
-		include file: magic-blends.mse-include/card-backgrounds
+		image: { card_background() }
 	card color 2:
 		left:	269
 		top:	18
@@ -123,7 +111,7 @@ card style:
 		z index: -1
 		render style: image
 		popup style: in place
-		include file: magic-blends.mse-include/card-backgrounds
+		image: { card_background() }
 
 	############################# Name line
 	name:
@@ -369,7 +357,7 @@ card style:
 		font:
 			name: Matrix
 			size: 8
-			color: { font_color() }
+			color: { font_color(card.card_color) }
 	
 	illustrator 2:
 		left: 298
@@ -380,7 +368,7 @@ card style:
 		font:
 			name: Matrix
 			size: 8
-			color: { font_color_2() }
+			color: { font_color(card.card_color_2) }
 	
 	copyright line:
 		left: 26
@@ -391,7 +379,7 @@ card style:
 		font:
 			name: MPlantin
 			size: 6
-			color: { font_color() }
+			color: { font_color(card.card_color) }
 	
 	copyright line 2:
 		left: 278
@@ -402,7 +390,7 @@ card style:
 		font:
 			name: MPlantin
 			size: 6
-			color: { font_color_2() }
+			color: { font_color(card.card_color_2) }
 
 ############################################################## Extra card fields
 
@@ -426,7 +414,7 @@ extra card style:
 		z index: 1
 		visible: { card.pt != "" }
 		render style: image
-		include file: magic-blends.mse-include/card-ptboxes
+		image: { card_ptbox() }
 
 	pt box 2:
 		left:	445
@@ -436,4 +424,4 @@ extra card style:
 		z index: 1
 		visible: { card.pt_2 != "" }
 		render style: image
-		include file: magic-blends.mse-include/card-ptboxes
+		image: { card_ptbox() }

data/magic-new.mse-style/style

@@ -8,7 +8,7 @@ position hint: 001
 version: 2007-05-05
 depends on:
 	package: magic.mse-game
-	version: 2007-05-05
+	version: 2007-07-01
 depends on:
 	package: magic-watermarks.mse-include
 	version: 2006-08-03
@@ -36,6 +36,8 @@ init script:
 	}
 	template      := { artifact_template() + "{type}.jpg" }
 	land_template := { (if input == "a" then "c" else input) + "l{type}.jpg" }
+	# Use land templates for previews because they show more contrast
+	hybrid_previews := "land,hybrid"
 	
 	# Use the normal tap symbol
 	mana_t := {

data/magic-old-split.mse-style/style

@@ -1,4 +1,4 @@
-mse version: 0.3.2
+mse version: 0.3.4
 game: magic
 full name: Magic Old Split Cards
 short name: Old Splits
@@ -12,6 +12,21 @@ card dpi: 150
 # Author: Buttock1234
 # Lots of copy/paste from magic-new.mse-style
 
+############################################################## Extra scripts
+
+init script:
+	# Use the normal tap symbol
+	mana_t := {
+		if      styling.tap_symbol == "old"        then "old"
+		else if styling.tap_symbol == "diagonal T" then "older"
+		else                                            "new"
+	}
+	# Use guild mana symbols?
+	guild_mana := { styling.use_guild_mana_symbols }
+	
+	# Only white cards use a black font
+	font_colors_white := { input != "w" }
+
 ############################################################## Set info fields
 set info style:
 	symbol:
@@ -32,55 +47,12 @@ set info style:
 			border color 1: rgb(255,255,255)
 			border color 2: rgb(255,255,255)
 
-############################################################## Extra scripts
-
-init script:
-	# Load blend scripts for hybrids/multicolors
-	include file: magic-blends.mse-include/blend-scripts
-		
-	# Which artifact template should be used?
-	artifact_template := {
-		if input == "a" then (
-			if       styling.artifact_style == "light" then "oa"
-			else                                            "a"
-		) else	input
-	}
-	
-	# Use the normal tap symbol
-	mana_t := {
-		if      styling.tap_symbol == "old"        then "old"
-		else if styling.tap_symbol == "diagonal T" then "older"
-		else                                            "new"
-	}
-	# 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)?white")
-	font_color := {
-		if  black_font_colors(card.card_color) != "" then
-			rgb(0,0,0)
-		else
-			rgb(255,255,255)
-	}
-	
-	font_color_2 := {
-		if  black_font_colors(card.card_color_2) != "" then
-			rgb(0,0,0)
-		else
-			rgb(255,255,255)
-	}
-
 ############################################################## styling style
 
 styling field:
 	type: boolean
 	name: colored mana symbols
 	description: Use colored mana symbols, as used by Wizards since Fifth Dawn.
-styling field:
-	type: boolean
-	name: darker artifacts
-	description: Use darker artifacts, as used by Wizards since Fifth Dawn.
 styling field:
 	type: boolean
 	name: use guild mana symbols
@@ -134,7 +106,7 @@ card style:
 		z index: -1
 		render style: image
 		popup style: in place
-		include file: magic-blends.mse-include/card-backgrounds
+		image: { card_background() }
 	card color 2:
 		left:	269
 		top:	18
@@ -143,7 +115,7 @@ card style:
 		z index: -1
 		render style: image
 		popup style: in place
-		include file: magic-blends.mse-include/card-backgrounds
+		image: { card_background() }
 
 	############################# Name line
 	name:
@@ -434,7 +406,7 @@ card style:
 		font:
 			name: MPlantin
 			size: 6
-			color: { font_color() }
+			color: { font_color(card.card_color) }
 	
 	copyright line 2:
 		left: 302
@@ -446,4 +418,4 @@ card style:
 		font:
 			name: MPlantin
 			size: 6
-			color: { font_color_2() }
+			color: { font_color(card.card_color_2) }

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

@@ -4,7 +4,7 @@
 ############################################################## 
 ############################################################## 
 
-mse version: 0.3.2
+mse version: 0.3.4
 game: magic
 short name: Tokens
 full name: Old style
@@ -15,6 +15,25 @@ card width: 312
 card height: 444
 card dpi: 127.34225621414913957934990439771
 
+############################################################## Extra scripts
+## COPY/PASTE from magic-old.mse-style/style
+
+init script:
+	# There is no land template
+	land_template := { "c{type}.jpg" }
+	
+	# Use the normal tap symbol
+	mana_t := {
+		if      styling.tap_symbol == "old"        then "old"
+		else if styling.tap_symbol == "diagonal T" then "older"
+		else                                            "new"
+	}
+	# Use guild mana symbols?
+	guild_mana := { styling.use_guild_mana_symbols }
+	
+	# Only white cards use a black font
+	font_colors_white := { input != "w" }
+
 ############################################################## Set info fields
 set info style:
 	symbol:
@@ -35,37 +54,6 @@ set info style:
 			border color 1: rgb(255,255,255)
 			border color 2: rgb(255,255,255)
 
-############################################################## Extra scripts
-## COPY/PASTE from magic-old.mse-style/style
-
-init script:
-	# Load blend scripts for hybrids/multicolors
-	include file: magic-blends.mse-include/blend-scripts
-	
-	# There is no land template
-	land_template := { "acard.jpg" }
-	
-	# Horizontal 5 color blends are not supported
-	card_hybrid_5b := card_hybrid_5
-	
-	# Use the normal tap symbol
-	mana_t := {
-		if      styling.tap_symbol == "old"        then "old"
-		else if styling.tap_symbol == "diagonal T" then "older"
-		else                                            "new"
-	}
-	# Use guild mana symbols?
-	guild_mana := { styling.use_guild_mana_symbols }
-	
-	# Does the card have a color that requires a black font for copyright/artist?
-	black_font_colors := filter_rule(match:"^(hybrid 2 color)?white")
-	font_color := {
-		if  black_font_colors(input:card.card_color) != "" then
-			rgb(0,0,0)
-		else
-			rgb(255,255,255)
-	}
-
 ############################################################## Extra style options
 
 styling field:
@@ -125,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() }
 
 	############################# Name line
 	name:
@@ -260,4 +248,4 @@ card style:
 		font:
 			name: MPlantin
 			size: 6
-			color: script: font_color()
+			color: { font_color(card.card_color) }

data/magic-old.mse-style/style

@@ -4,7 +4,7 @@
 ############################################################## 
 ############################################################## 
 
-mse version: 0.3.2
+mse version: 0.3.4
 game: magic
 short name: Old style
 full name: Before 8th edition
@@ -15,6 +15,34 @@ card width: 337
 card height: 469
 card dpi: 134.98
 
+############################################################## Extra scripts
+## COPY/PASTE from magic-new.mse-style/style
+
+init script:
+	# Use the normal tap symbol
+	mana_t := {
+		if      styling.tap_symbol == "old"        then "old"
+		else if styling.tap_symbol == "diagonal T" then "older"
+		else                                            "new"
+	}
+	# Use guild mana symbols?
+	guild_mana := { styling.use_guild_mana_symbols }
+	
+	# Only white cards use a black font
+	font_colors_white := { input != "w" }
+	
+	# Alpha style lands?
+	color_combination_std := color_combination
+	color_combination := {
+		if type == "card" and land and color_count == 2 and shape != "overlay" and styling.alpha_style_blending then
+			masked_blend(
+				mask:  "alpha_blend.png",
+				dark:  land_template(colors[0]),
+				light: land_template(colors[1]),
+			)
+		else color_combination_std()
+	}
+
 ############################################################## Set info fields
 set info style:
 	symbol:
@@ -35,50 +63,6 @@ set info style:
 			border color 1: rgb(255,255,255)
 			border color 2: rgb(255,255,255)
 
-############################################################## Extra scripts
-## COPY/PASTE from magic-new.mse-style/style
-
-init script:
-	# Load blend scripts for hybrids/multicolors
-	include file: magic-blends.mse-include/blend-scripts
-	
-	# Horizontal 5 color blends are not supported
-	card_hybrid_5b := card_hybrid_5
-	
-	# Use the normal tap symbol
-	mana_t := {
-		if      styling.tap_symbol == "old"        then "old"
-		else if styling.tap_symbol == "diagonal T" then "older"
-		else                                            "new"
-	}
-	# Use guild mana symbols?
-	guild_mana := { styling.use_guild_mana_symbols }
-	
-	# Does the card have a color that requires a black font for copyright/artist?
-	black_font_colors := filter_rule(match:"^(hybrid 2 color)?white")
-	font_color := {
-		if  black_font_colors(input:card.card_color) != "" then
-			rgb(0,0,0)
-		else
-			rgb(255,255,255)
-	}
-	land_hybrid_2 := { if styling.alpha_style_blending then
-				masked_blend(
-					mask:  "alpha_blend.png",
-					dark:  land_template(input[0]),
-					light: land_template(input[1]),
-				)
-			else
-				card_hybrid_nt(
-					linear_blend(
-						image1: land_template(input[0])
-						image2: land_template(input[1])
-						x1: 0.4,  y1: 0
-						x2: 0.6,  y2: 0
-					)
-				)
-	}
-
 ############################################################## Extra style options
 
 styling field:
@@ -143,7 +127,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:
@@ -308,4 +292,4 @@ card style:
 		font:
 			name: MPlantin
 			size: 6
-			color: script: font_color()
+			color: { font_color(card.card_color) }

data/magic-planeshifted.mse-style/style

@@ -1,4 +1,4 @@
-mse version: 0.3.2
+mse version: 0.3.4
 game: magic
 short name: Planeshifted
 full name: Planar Chaos Timeshifts
@@ -11,15 +11,13 @@ card dpi: 150
 
 ############################################################## Extra scripts
 
-init script:
+init script:	
-	# Load blend scripts for hybrids/multicolors
-	include file: magic-blends.mse-include/blend-scripts
-	
 	# Should hybrids have a grey name?
 	mask_hybrid_with_land := { styling.grey_hybrid_name }
 	
-	card_template := { input + "card.jpg" }
+	suffix := [card: "card.jpg", pt: "pt.png"]
-	pt_template   := { input + "pt.png" }
+	template      := { input + suffix[type] }
+	land_template := { (if input == "a" then "c" else input) + "l" + suffix[type] }
 	
 	# Use the normal tap symbol
 	mana_t := {
@@ -31,13 +29,6 @@ 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|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 := {
-		if white_font_colors(input: card.card_color) != "" then rgb(255,255,255)
-		else rgb(0,0,0)
-	}
-	
 ############################################################## Extra style options
 
 styling field:
@@ -105,7 +96,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:
@@ -259,7 +250,7 @@ card style:
 			name: Matrix
 			size: 10
 			weight: bold
-			color: { font_color() }
+			color: { font_color(card.card_color) }
 
 	copyright line:
 		left: 30
@@ -270,7 +261,7 @@ card style:
 		font:
 			name: MPlantin
 			size: 6.5
-			color: { font_color() }
+			color: { font_color(card.card_color) }
 
 ############################################################## Extra card fields
 
@@ -289,4 +280,4 @@ extra card style:
 		z index: 1
 		visible: { card.pt != "" }
 		render style: image
-		include file: magic-blends.mse-include/card-ptboxes
+		image: { card_ptbox() }

data/magic-textless.mse-style/style

@@ -1,4 +1,4 @@
-mse version: 0.3.2
+mse version: 0.3.4
 game: magic
 short name: Textless
 full name: Modern style
@@ -14,20 +14,14 @@ card dpi: 150
 ############################################################## Extra scripts
 
 init script:
-	# Load blend scripts for hybrids/multicolors
-	include file: magic-blends.mse-include/blend-scripts
-	
 	# Should hybrids have a grey name?
 	mask_hybrid_with_land := { styling.grey_hybrid_name }
 	
 	# There is no land template
-	land_template := { "acard.jpg" }
+	land_template := { "a{type}.jpg" }
 	
 	# there is no multi template
-	multi_hybrid := { input }
+	template := { (if input == "m" then "a" else input) + "{type}.jpg" }
-	
-	card_template := { if input == "m" then "acard.jpg" else input + "card.jpg" }
-	pt_template   := { input + "pt.jpg" }
 	
 	# Use the normal tap symbol
 	mana_t := {
@@ -37,13 +31,6 @@ 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|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 := {
-		if white_font_colors(input: card.card_color) != "" then rgb(255,255,255)
-		else rgb(0,0,0)
-	}
 
 ############################################################## Extra style options
 
@@ -105,7 +92,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:
@@ -197,8 +184,7 @@ card style:
 		font:
 			name: Matrix
 			size: 10
-			color:
+			color: { font_color(card.card_color) }
-				script: font_color()
 
 	copyright line:
 		left: 26
@@ -209,8 +195,7 @@ card style:
 		font:
 			name: MPlantin
 			size: 6.5
-			color:
+			color: { font_color(card.card_color) }
-				script: font_color()
 
 ############################################################## Extra card fields
 
@@ -227,8 +212,7 @@ extra card style:
 		width:	81
 		height:	42
 		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() }

data/magic.mse-game/game

@@ -580,7 +580,41 @@ card field:
 card field:
 	type: multiple choice
 	name: card color
-	include file: magic-blends.mse-include/card-colors
+	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: horizontal
+		enabled: { card_color_color_count(card.card_color) >= 2 }
+		type: radio
+	choice:
+		name: vertical
+		enabled: { card_color_color_count(card.card_color) >= 2 }
+		type: radio
+	choice:
+		name: radial
+		enabled: { card_color_color_count(card.card_color) >= 2 }
+		type: radio
+	choice:
+		name: overlay
+		enabled: { card_color_color_count(card.card_color) == 2 and chosen(choice:"hybrid",card.card_color) }
+		type: radio
+	choice:
+		name: reversed
+		enabled: { card_color_color_count(card.card_color) >= 2 and not chosen(choice:"overlay",card.card_color) }
+	script: card_color_filter(value)
 	default: card_color(casting_cost: card.casting_cost)
 	show statistics: false
 #needed for FPM temps???
@@ -790,10 +824,44 @@ card field:
 
 
 card field:
-	type: choice
+	type: multiple choice
 	name: card color 2
 	icon: stats/card_color.png
-	include file: magic-blends.mse-include/card-colors
+	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) >= 2 }
+		line below: true
+	choice:
+		name: horizontal
+		enabled: { card_color_color_count(card.card_color_2) >= 2 }
+		type: radio
+	choice:
+		name: vertical
+		enabled: { card_color_color_count(card.card_color_2) >= 2 }
+		type: radio
+	choice:
+		name: radial
+		enabled: { card_color_color_count(card.card_color_2) >= 2 }
+		type: radio
+	choice:
+		name: overlay
+		enabled: { card_color_color_count(card.card_color_2) == 2 and chosen(choice:"hybrid",card.card_color_2) }
+		type: radio
+	choice:
+		name: reversed
+		enabled: { card_color_color_count(card.card_color) >= 2 and not chosen(choice:"overlay",card.card_color_2) }
+	script: card_color_filter(value)
 	default: card_color(casting_cost: card.casting_cost_2)
 	show statistics: false
 card field: