From 8bd97a689404680534e61a2b7c219a50d6f4951d Mon Sep 17 00:00:00 2001
From: twanvl <twanvl@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Mon, 2 Jul 2007 00:45:29 +0000
Subject: [PATCH] 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
---
 .../{lcard.jpg => clcard.jpg}                 | Bin
 .../magic-new.mse-style/{lpt.jpg => clpt.jpg} | Bin
 ...rid_blend_nt.png => hybrid_blend_card.png} | Bin
 data/magic-new.mse-style/hybrid_blend_pt.png  | Bin 260 -> 300 bytes
 ...al_blend.png => multicolor_blend_card.png} | Bin
 ...l_blend_pt.png => multicolor_blend_pt.png} | Bin
 data/magic-new.mse-style/style                |  32 +++++++++---------
 7 files changed, 16 insertions(+), 16 deletions(-)
 rename data/magic-new.mse-style/{lcard.jpg => clcard.jpg} (100%)
 rename data/magic-new.mse-style/{lpt.jpg => clpt.jpg} (100%)
 rename data/magic-new.mse-style/{hybrid_blend_nt.png => hybrid_blend_card.png} (100%)
 rename data/magic-new.mse-style/{multicolor_dual_blend.png => multicolor_blend_card.png} (100%)
 rename data/magic-new.mse-style/{multicolor_dual_blend_pt.png => multicolor_blend_pt.png} (100%)

diff --git a/data/magic-new.mse-style/lcard.jpg b/data/magic-new.mse-style/clcard.jpg
similarity index 100%
rename from data/magic-new.mse-style/lcard.jpg
rename to data/magic-new.mse-style/clcard.jpg
diff --git a/data/magic-new.mse-style/lpt.jpg b/data/magic-new.mse-style/clpt.jpg
similarity index 100%
rename from data/magic-new.mse-style/lpt.jpg
rename to data/magic-new.mse-style/clpt.jpg
diff --git a/data/magic-new.mse-style/hybrid_blend_nt.png b/data/magic-new.mse-style/hybrid_blend_card.png
similarity index 100%
rename from data/magic-new.mse-style/hybrid_blend_nt.png
rename to data/magic-new.mse-style/hybrid_blend_card.png
diff --git a/data/magic-new.mse-style/hybrid_blend_pt.png b/data/magic-new.mse-style/hybrid_blend_pt.png
index 489c036c2e4046b149828b20c307a05aa04fc269..b06f45bf9374ca14eb828400251ed9d734c51176 100644
GIT binary patch
delta 273
zcmV+s0q*{U0;~d%B!BZsL_t(|+GF@nZNM<ZOkB=D0ciY(Y2pG(3}n!I{SV#58w`{I
zn|Ej?Zf2kq%tABqjT@yV2K_-b@gv11s$BesVqy`+zUFB8i((?h1~M>vJV!Cng<=!A
zbazwPM1HxARQ9!?<T5Io$S+216S=5vB7@*kYMaPFbvH5$1%Ed#r@DzNscz!JAz<PT
zs+)L;+9v9LrM8JaZ>ek|>x}<YHc@0ZwN2D~g=%633xx)X-bHVvWKw1zQzb@AYAHpI
zbZPp7*)}`1tRO!>FBb@MKp+>y%*o3E5@4ZRs0>6pI|s@Gv9fdRpAXqK?x=}_$wUC%
XVhXuOuayq~015yANkvXXu0mjf!})ge

delta 232
zcmV<E02lwP0)zsPB!A0EL_t(|+GF@nZNM<ZOkB=D0cgTv;sQzxWbplmVd4!2%0S~k
zG!r*7PzqL}nfS(yQWLkJnfQ@n6VITTSVXa}&!U+~v4ITd(M)uq*u>{lH}NIaef^y3
zCQ?6U`lxOq>j`R`$iPZ<6B$NL95r$9n8?~lZ4=w5ov&FBP+{A|mj5(2F@uFN137PC
zv{EuD3&rc0EvcoHIFfY>w$|RMWd-^9dAUH40|L1qW=>uXkN^wiLS-P***Q=ih?SkY
idg!)sM@<||CISFhr6&cmeM_YP0000<MNUMnLSTZxTWFd9

diff --git a/data/magic-new.mse-style/multicolor_dual_blend.png b/data/magic-new.mse-style/multicolor_blend_card.png
similarity index 100%
rename from data/magic-new.mse-style/multicolor_dual_blend.png
rename to data/magic-new.mse-style/multicolor_blend_card.png
diff --git a/data/magic-new.mse-style/multicolor_dual_blend_pt.png b/data/magic-new.mse-style/multicolor_blend_pt.png
similarity index 100%
rename from data/magic-new.mse-style/multicolor_dual_blend_pt.png
rename to data/magic-new.mse-style/multicolor_blend_pt.png
diff --git a/data/magic-new.mse-style/style b/data/magic-new.mse-style/style
index 0da73ab1..cae3af25 100644
--- a/data/magic-new.mse-style/style
+++ b/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
-	include file: magic-blends.mse-include/blend-scripts
+	# Load scripts for image box
 	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" }
-	pt_template   := { artifact_template() + "pt.jpg" }
+	template      := { artifact_template() + "{type}.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)")
-	font_color := {
-		if white_font_colors(input: card.card_color) != "" then rgb(255,255,255)
-		else rgb(0,0,0)
-	}
+	#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
@@ -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() }