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

data/vs-alter.mse-style/style

@@ -116,15 +116,8 @@ card style:
 			DC-new:	/vs-common.mse-include/dcnew.png
 			DC-old:	/vs-common.mse-include/dcold.png
 			Hellboy: /vs-common.mse-include/hellboy.png
-			Other...: /vs-common.mse-include/blank.png
+			Other...: { set.custom_logo }
 		z index: 3
-	custom symbol:
-		left: 310
-		top: 31
-		height: 30
-		width: 30
-		visible: { card.card_symbol=="Other..." }
-		z index: 4
 	############################# Type Bar
 	############################# Version
 	############################# Card ID

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

@@ -129,15 +129,8 @@ card style:
 			DC-new:	/vs-common.mse-include/dcnew.png
 			DC-old:	/vs-common.mse-include/dcold.png
 			Hellboy: /vs-common.mse-include/hellboy.png
-			Other...: /vs-common.mse-include/blank.png
+			Other...: { set.custom_logo }
 		z index: 3
-	custom symbol:
-		left: 310
-		top: 31
-		height: 30
-		width: 30
-		visible: { card.card_symbol=="Other..." }
-		z index: 4
 	edition:
 		left: 335
 		top: 472

data/vs-extended-hellboy.mse-style/style

@@ -129,15 +129,8 @@ card style:
 			DC-new:	/vs-common.mse-include/dcnew.png
 			DC-old:	/vs-common.mse-include/dcold.png
 			Hellboy: /vs-common.mse-include/hellboy.png
-			Other...: /vs-common.mse-include/blank.png
+			Other...: { set.custom_logo }
 		z index: 3
-	custom symbol:
-		left: 310
-		top: 31
-		height: 30
-		width: 30
-		visible: { card.card_symbol=="Other..." }
-		z index: 4
 	edition:
 		left: 335
 		top: 472

data/vs-hellboy.mse-style/style

@@ -131,15 +131,8 @@ card style:
 			DC-new:	/vs-common.mse-include/dcnew.png
 			DC-old:	/vs-common.mse-include/dcold.png
 			Hellboy: /vs-common.mse-include/hellboy.png
-			Other...: /vs-common.mse-include/blank.png
+			Other...: { set.custom_logo }
 		z index: 3
-	custom symbol:
-		left: 310
-		top: 31
-		height: 30
-		width: 30
-		visible: { card.card_symbol=="Other..." }
-		z index: 4
 	edition:
 		left: 315
 		top: 447

data/vs-insanity.mse-style/style

@@ -131,15 +131,8 @@ card style:
 			DC-new:	/vs-common.mse-include/dcnew.png
 			DC-old:	/vs-common.mse-include/dcold.png
 			Hellboy: /vs-common.mse-include/hellboy.png
-			Other...: /vs-common.mse-include/blank.png
+			Other...: { set.custom_logo }
 		z index: 3
-	custom symbol:
-		left: 310
-		top: 31
-		height: 30
-		width: 30
-		visible: { card.card_symbol=="Other..." }
-		z index: 4
 	edition:
 		left: 315
 		top: 447

data/vs-oversize.mse-style/style

@@ -174,15 +174,8 @@ card style:
 			DC-new:	/vs-common.mse-include/dcnew.png
 			DC-old:	/vs-common.mse-include/dcold.png
 			Hellboy: /vs-common.mse-include/hellboy.png
-			Other...: /vs-common.mse-include/blank.png
+			Other...: { set.custom_logo }
 		z index: 3
-	custom symbol:
-		left: 310
-		top: 31
-		height: 30
-		width: 30
-		visible: { card.card_symbol=="Other..." }
-		z index: 4
 	############################# Type Bar
 	############################# Version
 	version full:

data/vs-standard.mse-style/style

@@ -131,15 +131,8 @@ card style:
 			DC-new:	/vs-common.mse-include/dcnew.png
 			DC-old:	/vs-common.mse-include/dcold.png
 			Hellboy: /vs-common.mse-include/hellboy.png
-			Other...: /vs-common.mse-include/blank.png
+			Other...: { set.custom_logo }
 		z index: 3
-	custom symbol:
-		left: 310
-		top: 31
-		height: 30
-		width: 30
-		visible: { card.card_symbol=="Other..." }
-		z index: 4
 	edition:
 		left: 315
 		top: 447

data/vs.mse-game/game

@@ -628,6 +628,7 @@ card field:
 		if card.flightrange=="flight" then "flight" 
 		else if card.flightrange=="range" then "range" 
 		else if card.flightrange=="both" then "flight, range"
+		else if card.flightrange=="none" then ""
 		else (value)
 	description: Symbols for this card (flight/range/ongoing), multiple symbols can be selected
 	show statistics: false
@@ -715,11 +716,6 @@ card field:
 	choice: range
 	choice: both
 	initial: none
-	script: 
-		if card.symbols=="flight" then "flight" 
-		else if card.symbols=="range" then "range" 
-		else if card.symbols=="flight, range" then "both" 
-		else (value)
 	show statistics: false
 	save value: true
 	description: Flight and range icons for the card.
@@ -1027,12 +1023,21 @@ word list:
 			script: all_affiliations()
 			line below: true
 ############################################################## Card pack items
-pack item:
-	name: common / uncommon
-	filter: card.rarity == "common" or card.rarity == "uncommon"
 pack item:
 	name: rare
 	filter: card.rarity == "rare"
+pack item:
+	name: uncommon
+	filter: card.rarity == "uncommon"
+pack item:
+	name: common
+	filter: card.rarity == "common"
+pack item:
+	name: promo
+	filter: card.rarity == "promo"
+pack item:
+	name: random non-rare foil
+	filter: card.rarity == "common" or card.rarity == "uncommon"
 ############################################################## Card packs
 pack type:
 	name: booster pack
@@ -1040,16 +1045,34 @@ pack type:
 		name: rare
 		amount: 1
 	item:
-		name: common / uncommon
+		name: uncommon
-		amount: 13
+		amount: 3
-pack type:
-	name: additional common / uncommon
 	item:
-		name: common / uncommon
+		name: common
+		amount: 9
+	item:
+		name: random non-rare foil
+		amount: 1
+pack type:
+	name: additional promo
+	item:
+		name: promo
 pack type:
 	name: additional rare
 	item:
 		name: rare
+pack type:
+	name: additional uncommon
+	item:
+		name: uncommon
+pack type:
+	name: additional common
+	item:
+		name: common
+pack type:
+	name: additional random non-rare foil
+	item:
+		name: random foil
 ############################################################## Keywords
 ############################# Keyword rules
 
@@ -1057,13 +1080,13 @@ has keywords: true
 
 keyword match script: text_filter(value)
 
-keyword mode:
-	name: real
-	description: Actual keywords.
 keyword mode:
 	is default: true
 	name: custom
 	description: Custom keywords.
+keyword mode:
+	name: real
+	description: Actual keywords.
 
 keyword parameter type:
 	name: number