Updated all magic and vanguard styles to use new styling choice for choosing text box mana font.

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

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

@@ -1,14 +1,14 @@
-mse version: 0.3.5
+mse version: 0.3.6
 game: magic
 full name: Extended Art
 short name: Extended Art
 icon: card-sample.png
 position hint: 006
 
-version: 2007-09-23
+version: 2007-12-29
 depends on:
 	package: magic.mse-game
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-default-image.mse-include
 	version: 2007-09-23
@@ -19,6 +19,7 @@ depends on:
 	package: magic-mana-small.mse-symbol-font
 	version: 2007-09-23
 
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
@@ -77,10 +78,10 @@ styling field:
 	description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana.
 	initial: no
 styling field:
-	type: boolean
-	name: popup mana symbols
-	description: Use the symbols of the casting cost line inside the text box as well
-	initial: no
+	type: package choice
+	name: text box mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small.mse-symbol-font
 styling field:
 	type: choice
 	name: tap symbol
@@ -104,10 +105,6 @@ styling field:
 	initial: no
 
 styling style:
-	popup mana symbols:
-		choice images:
-			yes: /magic-mana-large.mse-symbol-font/mana_w.png
-			no:  /magic-mana-small.mse-symbol-font/mana_w.png
 	tap symbol:
 		render style: both
 		choice images:
@@ -237,11 +234,7 @@ card style:
 			shadow displacement y: 1
 			color: rgb(255,255,255)
 		symbol font:
-			name:
-				script:
-					if styling.popup_mana_symbols
-					then "magic-mana-large"
-					else "magic-mana-small"
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment:
 			script:

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

@@ -7,7 +7,7 @@ position hint: 402
 version: 2007-12-29
 depends on:
 	package: magic.mse-game
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-future-common.mse-include
 	version: 2007-09-23
@@ -24,7 +24,7 @@ depends on:
 	package: magic-mana-small.mse-symbol-font
 	version: 2007-09-23
 
-
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
@@ -63,10 +63,10 @@ styling field:
 	choice: Matrix
 	choice: MatrixBoldSmallCaps
 styling field:
-	type: boolean
-	name: beveled mana symbols
-	description: Use the symbols of the casting cost line inside the text box as well?
-	initial: no
+	type: package choice
+	name: text box mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small.mse-symbol-font
 styling field:
 	type: boolean
 	name: use guild mana symbols
@@ -94,10 +94,6 @@ styling style:
 		choice images:
 			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
 			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
-	beveled mana symbols:
-		choice images:
-			yes: /magic-mana-beveled.mse-symbol-font/mana_w.png
-			no:  /magic-mana-small.mse-symbol-font/mana_w.png
 	tap symbol:
 		render style: both
 		choice images:
@@ -276,9 +272,7 @@ card style:
 			scale down to: 6
 			color: rgb(0,0,0)
 		symbol font:
-			name:
-				{ if styling.beveled_mana_symbols then "magic-mana-beveled"
-				else "magic-mana-small" }
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment:
 			script:
@@ -319,9 +313,7 @@ card style:
 			scale down to: 6
 			color: rgb(0,0,0)
 		symbol font:
-			name:
-				{ if styling.beveled_mana_symbols then "magic-mana-beveled"
-				else "magic-mana-small" }
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment:
 			script:

data/magic-firepenguinmaster.mse-style/style

@@ -1,14 +1,14 @@
-mse version: 0.3.5
+mse version: 0.3.6
 game: magic
 full name: FPM's Normal Magic
 short name: FPM Normal
 icon: card-sample.png
 position hint: 401
 
-version: 2007-09-23
+version: 2007-12-29
 depends on:
 	package: magic.mse-game
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-future-common.mse-include
 	version: 2007-09-23
@@ -22,6 +22,7 @@ depends on:
 	package: magic-mana-small.mse-symbol-font
 	version: 2007-09-23
 
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
@@ -71,10 +72,10 @@ styling field:
 	choice: Matrix
 	choice: MatrixBoldSmallCaps
 styling field:
-	type: boolean
-	name: beveled mana symbols
-	description: Use the symbols of the casting cost line inside the text box as well?
-	initial: no
+	type: package choice
+	name: text box mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small.mse-symbol-font
 styling field:
 	type: choice
 	name: green style
@@ -121,10 +122,6 @@ styling style:
 		choice images:
 			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
 			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
-	beveled mana symbols:
-		choice images:
-			yes: /magic-mana-beveled.mse-symbol-font/mana_w.png
-			no:  /magic-mana-small.mse-symbol-font/mana_w.png
 	tap symbol:
 		render style: both
 		choice images:
@@ -250,9 +247,7 @@ card style:
 			scale down to: 6
 			color: rgb(0,0,0)
 		symbol font:
-			name:
-				{ if styling.beveled_mana_symbols then "magic-mana-beveled"
-				else "magic-mana-small" }
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment:
 			script:

data/magic-firepenguinmasterpromo.mse-style/style

@@ -1,14 +1,14 @@
-mse version: 0.3.5
+mse version: 0.3.6
 game: magic
 full name: FPM's Promo Magic
 short name: FPM Promo
 icon: card-sample.png
 position hint: 404
 
-version: 2007-10-13
+version: 2007-12-29
 depends on:
 	package: magic.mse-game
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-future-common.mse-include
 	version: 2007-09-23
@@ -22,6 +22,7 @@ depends on:
 	package: magic-mana-small.mse-symbol-font
 	version: 2007-09-23
 
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
@@ -71,10 +72,10 @@ styling field:
 		name: white
 		color: rgb(255,255,255)
 styling field:
-	type: boolean
-	name: beveled mana symbols
-	description: Use the symbols of the casting cost line inside the text box as well
-	initial: no
+	type: package choice
+	name: text box mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small.mse-symbol-font
 styling field:
 	type: choice
 	name: green style
@@ -121,10 +122,6 @@ styling style:
 		choice images:
 			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
 			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
-	beveled mana symbols:
-		choice images:
-			yes: /magic-mana-beveled.mse-symbol-font/mana_w.png
-			no:  /magic-mana-small.mse-symbol-font/mana_w.png
 	tap symbol:
 		render style: both
 		choice images:
@@ -234,9 +231,7 @@ card style:
 			scale down to: 6
 			color: { styling.font_color }
 		symbol font:
-			name:
-				{ if styling.beveled_mana_symbols then "magic-mana-beveled"
-				else "magic-mana-small" }
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment:
 			script:

data/magic-firepenguinmastersplit.mse-style/style

@@ -1,14 +1,14 @@
-mse version: 0.3.5
+mse version: 0.3.6
 game: magic
 full name: FPM's Split Magic
 short name: FPM Split
 icon: card-sample.png
 position hint: 403
 
-version: 2007-09-23
+version: 2007-12-29
 depends on:
 	package: magic.mse-game
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-future-common.mse-include
 	version: 2007-09-23
@@ -22,6 +22,7 @@ depends on:
 	package: magic-mana-small.mse-symbol-font
 	version: 2007-09-23
 
+card background: white
 card width: 523
 card height: 375
 card dpi: 150
@@ -75,10 +76,10 @@ styling field:
 	choice: Matrix
 	choice: MatrixBoldSmallCaps
 styling field:
-	type: boolean
-	name: beveled mana symbols
-	description: Use the symbols of the casting cost line inside the text box as well?
-	initial: no
+	type: package choice
+	name: text box mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small.mse-symbol-font
 styling field:
 	type: choice
 	name: green style
@@ -125,10 +126,6 @@ styling style:
 		choice images:
 			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
 			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
-	beveled mana symbols:
-		choice images:
-			yes: /magic-mana-beveled.mse-symbol-font/mana_w.png
-			no:  /magic-mana-small.mse-symbol-font/mana_w.png
 	tap symbol:
 		render style: both
 		choice images:
@@ -332,9 +329,7 @@ card style:
 			scale down to: 4.16
 			color: rgb(0,0,0)
 		symbol font:
-			name:
-				{ if styling.beveled_mana_symbols then "magic-mana-beveled"
-				else "magic-mana-small" }
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment:
 			script:
@@ -365,9 +360,7 @@ card style:
 			scale down to: 4.16
 			color: rgb(0,0,0)
 		symbol font:
-			name:
-				{ if styling.beveled_mana_symbols then "magic-mana-beveled"
-				else "magic-mana-small" }
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment:
 			script:

data/magic-firepenguinmastertokens.mse-style/style

@@ -1,14 +1,14 @@
-mse version: 0.3.5
+mse version: 0.3.6
 game: magic
 full name: FPM's Token Magic
 short name: FPM Token
 icon: card-sample.png
 position hint: 407
 
-version: 2007-09-23
+version: 2007-12-29
 depends on:
 	package: magic.mse-game
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-future-common.mse-include
 	version: 2007-09-23
@@ -22,6 +22,7 @@ depends on:
 	package: magic-mana-small.mse-symbol-font
 	version: 2007-09-23
 
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
@@ -70,10 +71,10 @@ styling field:
 	choice: Matrix
 	choice: MatrixBoldSmallCaps
 styling field:
-	type: boolean
-	name: beveled mana symbols
-	description: Use the symbols of the casting cost line inside the text box as well
-	initial: no
+	type: package choice
+	name: text box mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small.mse-symbol-font
 styling field:
 	type: boolean
 	name: use guild mana symbols
@@ -120,10 +121,6 @@ styling style:
 		choice images:
 			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
 			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
-	beveled mana symbols:
-		choice images:
-			yes: /magic-mana-beveled.mse-symbol-font/mana_w.png
-			no:  /magic-mana-small.mse-symbol-font/mana_w.png
 	tap symbol:
 		render style: both
 		choice images:
@@ -249,9 +246,7 @@ card style:
 			scale down to: 6
 			color: rgb(0,0,0)
 		symbol font:
-			name:
-				{ if styling.beveled_mana_symbols then "magic-mana-beveled"
-				else "magic-mana-small" }
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment:
 			script:

data/magic-future.mse-style/style

@@ -1,14 +1,14 @@
-mse version: 0.3.5
+mse version: 0.3.6
 game: magic
 short name: Future
 full name: Futureshift
 icon: card-sample.png
 position hint: 050
 
-version: 2007-09-23
+version: 2007-12-29
 depends on:
 	package: magic.mse-game
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-watermarks.mse-include
 	version: 2007-09-23
@@ -25,6 +25,7 @@ depends on:
 	package: magic-mana-future.mse-symbol-font
 	version: 2007-09-23
 
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
@@ -178,13 +179,10 @@ styling field:
 	choice: old
 	choice: diagonal T
 styling field:
-	type: choice
-	name: mana symbols
-	choice: future
-	choice: popup
-	choice: normal
-	description: What style of mana symbols should be used?
-	initial: normal
+	type: package choice
+	name: text box mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small.mse-symbol-font
 styling field:
 	type: choice
 	name: center text
@@ -204,12 +202,6 @@ styling style:
 		choice images:
 			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
 			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
-	mana symbols:
-		render style: both
-		choice images:
-			future: /magic-mana-future.mse-symbol-font/mana_w.png
-			popup:  /magic-mana-large.mse-symbol-font/mana_w.png
-			normal:  /magic-mana-small.mse-symbol-font/mana_w.png
 	tap symbol:
 		render style: both
 		choice images:
@@ -389,9 +381,7 @@ card style:
 					if not contains(card.card_color, match:"land") then rgb(0,0,0)
 					else font_color(card.card_color)
 		symbol font:
-			name:
-				{ if styling.mana_symbols=="future" then "magic-mana-future" else
-				if styling.mana_symbols=="popup" then "magic-mana-large" else "magic-mana-small" }
+			name: { styling.text_box_mana_symbols }
 			size: 15
 		alignment:
 			script:

data/magic-mana-beveled.mse-symbol-font/symbol-font

@@ -1,6 +1,6 @@
 mse version: 0.3.5
 version: 2007-10-12
-short name: beveled style (Fire Penguin Master)
+short name: beveled style (firepenguinmaster)
 position hint: 101
 icon: mana_r.png
 # Symbol font in the beveled style used for casting costs on FPM cards

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

@@ -8,7 +8,7 @@ position hint: 002
 version: 2007-12-29
 depends on:
 	package: magic.mse-game
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-default-image.mse-include
 	version: 2007-09-23
@@ -22,6 +22,7 @@ depends on:
 	package: magic-mana-small.mse-symbol-font
 	version: 2007-09-23
 
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
@@ -74,10 +75,10 @@ styling field:
 	description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana.
 	initial: no
 styling field:
-	type: boolean
-	name: popup mana symbols
-	description: Use the symbols of the casting cost line inside the text box as well
-	initial: no
+	type: package choice
+	name: text box mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small.mse-symbol-font
 styling field:
 	type: choice
 	name: tap symbol
@@ -105,10 +106,6 @@ styling style:
 		choice images:
 			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
 			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
-	popup mana symbols:
-		choice images:
-			yes: /magic-mana-large.mse-symbol-font/mana_w.png
-			no:  /magic-mana-small.mse-symbol-font/mana_w.png
 	tap symbol:
 		render style: both
 		choice images:
@@ -280,11 +277,7 @@ card style:
 			scale down to: 8
 			color: rgb(0,0,0)
 		symbol font:
-			name:
-				script:
-					if styling.popup_mana_symbols
-					then "magic-mana-large"
-					else "magic-mana-small"
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment:
 			script:
@@ -317,11 +310,7 @@ card style:
 			scale down to: 8
 			color: rgb(0,0,0)
 		symbol font:
-			name:
-				script:
-					if styling.popup_mana_symbols
-					then "magic-mana-large"
-					else "magic-mana-small"
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment:
 			script:

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

@@ -1,14 +1,14 @@
-mse version: 0.3.5
+mse version: 0.3.6
 game: magic
 short name: Walkers
 full name: Modern Planeswalkers
 icon: card-sample.png
 position hint: 008
 
-version: 2007-09-23
+version: 2007-12-29
 depends on:
 	package: magic.mse-game
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-default-image.mse-include
 	version: 2007-09-23
@@ -25,6 +25,7 @@ depends on:
 	package: magic-mana-small.mse-symbol-font
 	version: 2007-09-23
 
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
@@ -91,10 +92,10 @@ styling field:
 	description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana.
 	initial: no
 styling field:
-	type: boolean
-	name: popup mana symbols
-	description: Use the symbols of the casting cost line inside the text box as well
-	initial: no
+	type: package choice
+	name: text box mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small.mse-symbol-font
 styling field:
 	type: choice
 	name: tap symbol
@@ -122,10 +123,6 @@ styling style:
 		choice images:
 			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
 			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
-	popup mana symbols:
-		choice images:
-			yes: /magic-mana-large.mse-symbol-font/mana_w.png
-			no:  /magic-mana-small.mse-symbol-font/mana_w.png
 	tap symbol:
 		render style: both
 		choice images:
@@ -254,11 +251,7 @@ card style:
 			scale down to: 6
 			color: rgb(0,0,0)
 		symbol font:
-			name:
-				script:
-					if styling.popup_mana_symbols
-					then "magic-mana-large"
-					else "magic-mana-small"
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		paragraph height: 48
 		alignment:

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

@@ -1,14 +1,14 @@
-mse version: 0.3.5
+mse version: 0.3.6
 game: magic
 short name: Promotional
 full name: Large image
 icon: card-sample.png
 position hint: 004
 
-version: 2007-09-29
+version: 2007-12-29
 depends on:
 	package: magic.mse-game
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-default-image.mse-include
 	version: 2007-09-23
@@ -22,6 +22,7 @@ depends on:
 	package: magic-mana-small.mse-symbol-font
 	version: 2007-09-23
 
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
@@ -73,10 +74,10 @@ styling field:
 	description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana.
 	initial: no
 styling field:
-	type: boolean
-	name: popup mana symbols
-	description: Use the symbols of the casting cost line inside the text box as well
-	initial: no
+	type: package choice
+	name: text box mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small.mse-symbol-font
 styling field:
 	type: choice
 	name: tap symbol
@@ -99,10 +100,6 @@ styling style:
 		choice images:
 			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
 			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
-	popup mana symbols:
-		choice images:
-			yes: /magic-mana-large.mse-symbol-font/mana_w.png
-			no:  /magic-mana-small.mse-symbol-font/mana_w.png
 	tap symbol:
 		render style: both
 		choice images:
@@ -213,11 +210,7 @@ card style:
 			shadow displacement y: 1
 			color: rgb(255,255,255)
 		symbol font:
-			name:
-				script:
-					if styling.popup_mana_symbols
-					then "magic-mana-large"
-					else "magic-mana-small"
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment:
 			script:

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

@@ -1,14 +1,14 @@
-mse version: 0.3.5
+mse version: 0.3.6
 game: magic
 short name: Split Cards
 full name: Modern split cards
 icon: card-sample.png
 position hint: 003
 
-version: 2007-09-23
+version: 2007-12-29
 depends on:
 	package: magic.mse-game
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-default-image.mse-include
 	version: 2007-09-23
@@ -22,6 +22,7 @@ depends on:
 	package: magic-mana-small.mse-symbol-font
 	version: 2007-09-23
 
+card background: white
 card width: 523
 card height: 375
 card dpi: 150
@@ -87,10 +88,10 @@ styling field:
 	description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana.
 	initial: no
 styling field:
-	type: boolean
-	name: popup mana symbols
-	description: Use the symbols of the casting cost line inside the text box as well
-	initial: no
+	type: package choice
+	name: text box mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small.mse-symbol-font
 styling field:
 	type: choice
 	name: tap symbol
@@ -117,10 +118,6 @@ styling style:
 		choice images:
 			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
 			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
-	popup mana symbols:
-		choice images:
-			yes: /magic-mana-large.mse-symbol-font/mana_w.png
-			no:  /magic-mana-small.mse-symbol-font/mana_w.png
 	tap symbol:
 		render style: both
 		choice images:
@@ -314,11 +311,7 @@ card style:
 			scale down to: 6
 			color: rgb(0,0,0)
 		symbol font:
-			name:
-				script:
-					if styling.popup_mana_symbols
-					then "magic-mana-large"
-					else "magic-mana-small"
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment:
 			script:
@@ -350,11 +343,7 @@ card style:
 			scale down to: 6
 			color: rgb(0,0,0)
 		symbol font:
-			name:
-				script:
-					if styling.popup_mana_symbols
-					then "magic-mana-large"
-					else "magic-mana-small"
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment:
 			script:

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

@@ -1,14 +1,14 @@
-mse version: 0.3.5
+mse version: 0.3.6
 game: magic
 short name: Tokens
 full name: Modern style
 icon: card-sample.png
 position hint: 007
 
-version: 2007-09-23
+version: 2007-12-30
 depends on:
 	package: magic.mse-game
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-default-image.mse-include
 	version: 2007-09-23
@@ -25,6 +25,7 @@ depends on:
 	package: magic-embossedletters.mse-symbol-font
 	version: 2007-09-23
 
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
@@ -86,10 +87,10 @@ styling field:
 	description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana.
 	initial: no
 styling field:
-	type: boolean
-	name: popup mana symbols
-	description: Use the symbols of the casting cost line inside the text box as well
-	initial: no
+	type: package choice
+	name: text box mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small.mse-symbol-font
 styling field:
 	type: boolean
 	name: one textline tokens
@@ -117,10 +118,6 @@ styling field:
 	description: Should the common rarity symbol be inverted, like in Coldsnap?
 	initial: no
 styling style:
-	popup mana symbols:
-		choice images:
-			yes: /magic-mana-large.mse-symbol-font/mana_w.png
-			no:  /magic-mana-small.mse-symbol-font/mana_w.png
 	use guild mana symbols:
 		choice images:
 			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
@@ -253,11 +250,7 @@ card style:
 			scale down to: 10
 			color: rgb(0,0,0)
 		symbol font:
-			name:
-				script:
-					if styling.popup_mana_symbols
-					then "magic-mana-large"
-					else "magic-mana-small"
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment:
 			script:

data/magic-new.mse-style/style

@@ -1,14 +1,14 @@
-mse version: 0.3.5
+mse version: 0.3.6
 game: magic
 short name: Modern style
 full name: After 8th edition
 icon: card-sample.png
 position hint: 001
 
-version: 2007-09-23
+version: 2007-12-29
 depends on:
 	package: magic.mse-game
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-default-image.mse-include
 	version: 2007-09-23
@@ -58,15 +58,7 @@ init script:
 	
 	# Use guild mana symbols?
 	guild_mana := { styling.use_guild_mana_symbols }
-	colorless_color := { "c" } # MOVE TO GAME FILE
-	
-	# 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)
-	#}
-	
+		
 	
 ############################################################## Set info fields
 set info style:
@@ -101,11 +93,6 @@ styling field:
 	name: use guild mana symbols
 	description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana.
 	initial: no
-styling field:
-	type: boolean
-	name: popup mana symbols
-	description: Use the symbols of the casting cost line inside the text box as well
-	initial: no
 styling field:
 	type: choice
 	name: tap symbol
@@ -150,10 +137,6 @@ styling style:
 		choice images:
 			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
 			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
-	popup mana symbols:
-		choice images:
-			yes: /magic-mana-large.mse-symbol-font/mana_w.png
-			no:  /magic-mana-small.mse-symbol-font/mana_w.png
 	tap symbol:
 		render style: both
 		choice images:

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

@@ -1,14 +1,14 @@
-mse version: 0.3.5
+mse version: 0.3.6
 game: magic
 full name: Magic Old Split Cards
 short name: Old Splits
 icon: card-sample.png
 position hint: 103
 
-version: 2007-12-29
+version: 2007-12-30
 depends on:
 	package: magic.mse-game
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-watermarks.mse-include
 	version: 2007-12-29
@@ -19,6 +19,7 @@ depends on:
 	package: magic-mana-small.mse-symbol-font
 	version: 2007-09-23
 
+card background: white
 card width: 523
 card height: 375
 card dpi: 150
@@ -117,10 +118,10 @@ styling field:
 	description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana.
 	initial: no
 styling field:
-	type: boolean
-	name: popup mana symbols
-	description: Use the symbols of the casting cost line inside the text box as well
-	initial: no
+	type: package choice
+	name: text box mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small.mse-symbol-font
 styling field:
 	type: choice
 	name: type of gradient multicolor
@@ -155,10 +156,6 @@ styling style:
 		choice images:
 			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
 			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
-	popup mana symbols:
-		choice images:
-			yes: /magic-mana-large.mse-symbol-font/mana_w.png
-			no:  /magic-mana-small.mse-symbol-font/mana_w.png
 	tap symbol:
 		render style: both
 		choice images:
@@ -372,11 +369,7 @@ card style:
 			scale down to: 6
 			color: rgb(0,0,0)
 		symbol font:
-			name:
-				script:
-					if styling.popup_mana_symbols
-					then "magic-mana-large"
-					else "magic-mana-small"
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment:
 			script:
@@ -408,11 +401,7 @@ card style:
 			scale down to: 6
 			color: rgb(0,0,0)
 		symbol font:
-			name:
-				script:
-					if styling.popup_mana_symbols
-					then "magic-mana-large"
-					else "magic-mana-small"
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment:
 			script:

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

@@ -4,17 +4,17 @@
 ############################################################## 
 ############################################################## 
 
-mse version: 0.3.5
+mse version: 0.3.6
 game: magic
 short name: Tokens
 full name: Old style
 icon: card-sample.png
 position hint: 107
 
-version: 2007-12-29
+version: 2007-12-30
 depends on:
 	package: magic.mse-game
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-mana-large.mse-symbol-font
 	version: 2007-09-23
@@ -22,6 +22,7 @@ depends on:
 	package: magic-mana-small.mse-symbol-font
 	version: 2007-09-23
 
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
@@ -109,10 +110,10 @@ styling field:
 	description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana.
 	initial: no
 styling field:
-	type: boolean
-	name: popup mana symbols
-	description: Use the symbols of the casting cost line inside the text box as well
-	initial: no
+	type: package choice
+	name: text box mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small.mse-symbol-font
 styling field:
 	type: choice
 	name: type of gradient multicolor
@@ -147,10 +148,6 @@ styling style:
 		choice images:
 			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
 			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
-	popup mana symbols:
-		choice images:
-			yes: /magic-mana-large.mse-symbol-font/mana_w.png
-			no:  /magic-mana-small.mse-symbol-font/mana_w.png
 	tap symbol:
 		render style: both
 		choice images:
@@ -266,11 +263,7 @@ card style:
 			scale down to: 6
 			color: rgb(0,0,0)
 		symbol font:
-			name:
-				script:
-					if styling.popup_mana_symbols
-					then "magic-mana-large"
-					else "magic-mana-small"
+			name: { styling.text_box_mana_symbols }
 			size: 13
 		alignment:
 			script:

data/magic-old.mse-style/style

@@ -4,17 +4,17 @@
 ############################################################## 
 ############################################################## 
 
-mse version: 0.3.5
+mse version: 0.3.6
 game: magic
 short name: Old style
 full name: Before 8th edition
 icon: card-sample.png
 position hint: 101
 
-version: 2007-12-29
+version: 2007-12-30
 depends on:
 	package: magic.mse-game
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-watermarks.mse-include
 	version: 2007-12-29
@@ -25,6 +25,7 @@ depends on:
 	package: magic-mana-small.mse-symbol-font
 	version: 2007-09-23
 
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
@@ -115,10 +116,10 @@ styling field:
 	description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana.
 	initial: no
 styling field:
-	type: boolean
-	name: popup mana symbols
-	description: Use the symbols of the casting cost line inside the text box as well
-	initial: no
+	type: package choice
+	name: text box mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small.mse-symbol-font
 styling field:
 	type: boolean
 	name: alpha style blending
@@ -157,10 +158,6 @@ styling style:
 		choice images:
 			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
 			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
-	popup mana symbols:
-		choice images:
-			yes: /magic-mana-large.mse-symbol-font/mana_w.png
-			no:  /magic-mana-small.mse-symbol-font/mana_w.png
 	tap symbol:
 		render style: both
 		choice images:
@@ -298,11 +295,7 @@ card style:
 			scale down to: 6
 			color: rgb(0,0,0)
 		symbol font:
-			name:
-				script:
-					if styling.popup_mana_symbols
-					then "magic-mana-large"
-					else "magic-mana-small"
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment:
 			script:

data/magic-planeshifted.mse-style/style

@@ -1,14 +1,14 @@
-mse version: 0.3.5
+mse version: 0.3.6
 game: magic
 short name: Planeshifted
 full name: Planar Chaos Timeshifts
 icon: card-sample.png
 position hint: 011
 
-version: 2007-09-29
+version: 2007-12-30
 depends on:
 	package: magic.mse-game
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-watermarks.mse-include
 	version: 2007-09-23
@@ -19,6 +19,7 @@ depends on:
 	package: magic-mana-small.mse-symbol-font
 	version: 2007-09-23
 
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
@@ -71,10 +72,10 @@ styling field:
 	description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana.
 	initial: no
 styling field:
-	type: boolean
-	name: popup mana symbols
-	description: Use the symbols of the casting cost line inside the text box as well
-	initial: no
+	type: package choice
+	name: text box mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small.mse-symbol-font
 styling field:
 	type: choice
 	name: tap symbol
@@ -108,10 +109,6 @@ styling style:
 		choice images:
 			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
 			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
-	popup mana symbols:
-		choice images:
-			yes: /magic-mana-large.mse-symbol-font/mana_w.png
-			no:  /magic-mana-small.mse-symbol-font/mana_w.png
 	tap symbol:
 		render style: both
 		choice images:
@@ -247,11 +244,7 @@ card style:
 			scale down to: 6
 			color: rgb(0,0,0)
 		symbol font:
-			name:
-				script:
-					if styling.popup_mana_symbols
-					then "magic-mana-large"
-					else "magic-mana-small"
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment:
 			script:

data/magic-textless.mse-style/style

@@ -1,14 +1,14 @@
-mse version: 0.3.5
+mse version: 0.3.6
 game: magic
 short name: Textless
 full name: Modern style
 icon: card-sample.png
 position hint: 005
 
-version: 2007-09-23
+version: 2007-12-30
 depends on:
 	package: magic.mse-game
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-future-common.mse-include
 	version: 2007-09-23
@@ -16,6 +16,7 @@ depends on:
 	package: magic-mana-large.mse-symbol-font
 	version: 2007-09-23
 
+card background: white
 card width: 375
 card height: 523
 card dpi: 150

data/magic.mse-game/game

@@ -1,4 +1,4 @@
-mse version: 0.3.5
+mse version: 0.3.6
 short name: Magic
 full name: Magic the Gathering
 icon: card-back.png
@@ -445,6 +445,9 @@ init script:
 		}
 	typesymbol_type := { typesymbol_for(card.super_type) }
 	
+	#Script to make magic-mana-future compatible w/ other templates
+	colorless_color := { "c" }
+	
 	############################################################## Statistics utilities
 	
 	# Converted mana cost

data/vanguard-standard.mse-style/style

@@ -1,13 +1,13 @@
-mse version: 0.3.5
+mse version: 0.3.6
 game: vanguard
 short name: Standard
 icon: card-sample.png
 position hint: 01
 
-version: 2007-10-05
+version: 2007-12-30
 depends on:
 	package: vanguard.mse-game
-	version: 2007-09-29
+	version: 2007-12-29
 depends on:
 	package: magic-mana-small.mse-symbol-font
 	version: 2007-09-23
@@ -15,6 +15,7 @@ depends on:
 	package: magic-mana-large.mse-symbol-font
 	version: 2007-09-23
 
+card background: white
 card width: 375
 card height: 523
 #card dpi: 150
@@ -44,10 +45,10 @@ styling field:
 	description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana.
 	initial: no
 styling field:
-	type: boolean
-	name: popup mana symbols
-	description: Use the symbols of the casting cost line inside the text box as well
-	initial: no
+	type: package choice
+	name: text box mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small.mse-symbol-font
 styling field:
 	type: choice
 	name: tap symbol
@@ -66,10 +67,6 @@ styling style:
 		choice images:
 			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
 			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
-	popup mana symbols:
-		choice images:
-			yes: /magic-mana-large.mse-symbol-font/mana_w.png
-			no:  /magic-mana-small.mse-symbol-font/mana_w.png
 	tap symbol:
 		render style: both
 		choice images:
@@ -160,11 +157,7 @@ card style:
 			scale down to: 6
 			color: rgb(0,0,0)
 		symbol font:
-			name:
-				script:
-					if styling.popup_mana_symbols
-					then "magic-mana-large"
-					else "magic-mana-small"
+			name: { styling.text_box_mana_symbols }
 			size: 14
 		alignment: middle center
 		z index: 2

data/vanguard.mse-game/game

@@ -166,6 +166,9 @@ init script:
 		# curly quotes
 		curly_quotes
 	
+	#Necessary to make magic-mana-future play nicely
+	colorless_color := { "c" }
+	
 ############################################################## Set fields
 
 set field: