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

data/vs-standard-arrow.mse-symbol-font/symbol-font

@@ -14,6 +14,9 @@ symbol:
 symbol:
 	code: >>>
 	image: arrow.png
+symbol:
+	code: •
+	image: diamond.png
 symbol:
 	code: @
 	image: diamond.png

data/vs-standard-official.mse-symbol-font/symbol-font

@@ -17,6 +17,9 @@ symbol:
 symbol:
 	code: •
 	image: diamond.png
+symbol:
+	code: @
+	image: diamond.png
 symbol:
 	code: <>
 	image: diamond.png

data/vs-standard.mse-style/style

@@ -24,14 +24,9 @@ card dpi: 150
 
 ############################################################## Extra scripts
 init script:
-	card_shape := { if styling.style_sorting then "old standard" else "old" }
+	card_shape := { "old" }
 ############################################################## Set info fields
 ############################################################## Extra style
-styling field:
-	type: boolean
-	name: style sorting
-	description: Should this style of card sort as separate from cards of other styles?
-	initial: no
 styling field:
 	type: package choice
 	name: text box symbols
@@ -106,7 +101,7 @@ card style:
 		top : 30
 		width: 25
 		height: 41
-		alignment: bottom center
+		alignment: bottom center shrink-overflow
 		font:
 			name: BadhouseBoldNumbers
 			size: 40
@@ -158,7 +153,7 @@ card style:
 	############################# Type Bar
 	type text full:
 		left:	72
-		top:	299
+		top:	297
 		width:	{ if is_dual() then 235 else 268 }
 		height: 20
 		font:
@@ -170,7 +165,7 @@ card style:
 		z index: 3
 	type bar:
 		left:	72
-		top:	299
+		top:	297
 		width:	{ if is_dual() then 235 else 268 }
 		height: 20
 		visible: { card.type_text != "" }
@@ -258,14 +253,13 @@ card style:
 		angle: 90
 		font:
 			name: Percolator Expert
-			size: 19
+			size: 16
-			scale down to: 16
 			color: rgb(245,230,197)
 		symbol font:
 			name: vs-standard-arrow
-			size: 18
+			size: 16
 			alignment: middle center
-		alignment: middle center
+		alignment: middle center shrink-overflow
 		z index: 4
 		padding left:   2
 		padding top:    2
@@ -279,15 +273,15 @@ card style:
 		angle: 270
 		font:
 			name: Percolator Expert
-			size: 19
+			size: 16
 			scale down to: 18
 			color: rgb(245,230,197)
 		symbol font:
 			name: vs-standard-arrow
-			size: 18
+			size: 16
 			alignment: middle center
 		visible: is_dual()
-		alignment: middle center
+		alignment: middle center shrink-overflow
 		z index: 4
 		padding left:   2
 		padding top:    2
@@ -399,7 +393,7 @@ card style:
 		top : 322
 		width: 165
 		height: 16
-		alignment: center top
+		alignment: center top shrink-overflow
 		z index: 4
 		font:
 			name: Eurostile

data/vs.mse-game/game

@@ -14,13 +14,6 @@ depends on:
 # General functions
 init script:
 	############### Sorting
-	sort_index := {
-		card_type() +
-		(if contains(card.shape, match:"old") then "B" else "A") +
-		(if contains(card.shape, match:"avatar")   then "C" else "A") +
-		(if contains(card.shape, match:"alter ego") then "D" else "A") +
-		":"
-	}
 	sort_index := {
 		if	contains(card.team, match: "EQUIPMENT")		then "2"
 		else if	contains(card.team, match: "Equipment")		then "2"
@@ -64,11 +57,11 @@ init script:
 			replace: "<sym-auto>&</sym-auto>");
 	new_symbols :=
 		symbol_filter +
-		# step 5f: Majority of affiliation symbols
+		# step 5a: Majority of affiliation symbols
 		replace_rule(
 			match: "Activate|Avengers|B.P.R.D.|Brotherhood|Crime Lords|Defenders|Doom|Fantastic Four|Gotham Knights|Green Lantern|Hellfire Club|Heralds of Galactus|Horsemen of Apocalypse|Invaders|JLA|JSA|Kree|Marvel Knights|Masters of Evil|Negative Zone|Planet|Shadowpact|Shi'ar|Sinister Syndicate|Skrull|Speed Force|Spider-Friends|Team Superman|Thule Society|Thunderbolts|Teen Titans|Underworld|Warbound|X-Men",
 			replace: "<sym-auto>&</sym-auto>") +
-		# step 5g: SHIELD Variations
+		# step 5b: SHIELD Variations
 		replace_rule(
 			match: "S.H.I.E.L.D.|SHIELD|Shield",
 			replace: "<sym-auto>Shield</sym-auto>");
@@ -236,14 +229,11 @@ init script:
 	
 	separator_type := {
 		if contains(card.shape, match:"old") then (
-			if team2 != "<word-list-affiliation2></word-list-affiliation2>" then " <sym>@</sym> "
+			if team2 != "<word-list-affiliation2></word-list-affiliation2>" then " <sym>•</sym> "
 			else " "
 		)
 		else " • "
 	}
-	#separator_type := {
-	#	if contains(card.shape, match:"old") then " <sym>@</sym> " else " • "
-	#}
 	
 	only_first := replace@(match:"card.team", replace:"")
 	
@@ -385,7 +375,7 @@ card field:
 	type: text
 	name: sep
 	editable: false
-	script: if is_character() and card.identity=="" then "™" else if is_character() and card.identity!="" then "™ <sym>@</sym>" else ""
+	script: if is_character() and card.identity=="" then "™" else if is_character() and card.identity!="" then "™ <sym>@</sym> " else ""
 	show statistics: false
 card field:
 	type: text