Massive VS Update (Courtesy of Artfreakwiu)

e5ae0b88 · pichoro · 2a99ef92 · e5ae0b88 · e5ae0b88 · e5ae0b88
Commit e5ae0b88 authored Jan 04, 2008 by pichoro
87 changed files
--- a/data/vs-alter.mse-style/style
+++ b/data/vs-alter.mse-style/style
-mse version: 0.3.5
+mse version: 0.3.6
 game: vs
 full name: VS Alter Ego
 short name: Alter Ego
 icon: card-sample.png
-position hint: 005
+position hint: 008
-version: 2007-10-05
+version: 2008-01-03
 depends on:
 	package: vs.mse-game
-	version: 2007-09-23
+	version: 2008-01-03
 depends on:
 	package: vs-common.mse-include
-	version: 2007-09-23
+	version: 2008-01-03
 depends on:
 	package: vs-standard-arrow.mse-symbol-font
-	version: 2007-09-23
+	version: 2008-01-03
+depends on:
+	package: vs-standard-official.mse-symbol-font
+	version: 2008-01-03
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
 ############################################################## Extra scripts
 ############################################################## Set info fields
 ############################################################## Extra style
 styling field:
 	type: boolean
 	name: foils
 	description: Use foil backgrounds?
 	initial: no
-styling field:
-	type: boolean
-	name: watermarkings
-	description: Use watermarks?
-	initial: no
 ############################################################## Card fields
 card style:
 	############################# Background stuff
@@ -63,7 +58,7 @@ card style:
 			equipment concealed-optional equipment:				card.jpg
 			location:							card.jpg
 			plot twist:							card.jpg
+			planet:								card.jpg
 	############################# Name line
 	full name:
 		left: 80
@@ -93,7 +88,6 @@ card style:
 			color: rgb(255,213,128)
 		z index: 4
 		padding top: 0
 	############################# Image
 	image:
 		left:	19
@@ -119,19 +113,13 @@ card style:
 		top: 31
 		height: 30
 		width: 30
-		visible: script: card.card_symbol=="Other..."
+		visible: { card.card_symbol=="Other..." }
 		z index: 4
 	############################# Type Bar
 	############################# Version
 	############################# Card ID
 	############################# Affiliation
 	############################# FlightRange
 	############################# Text box
 	rule text:
 		left: 20
@@ -155,27 +143,9 @@ card style:
 		padding right:  2
 		padding bottom: 2
 		line height hard: 1.4
-	watermark:
-		left: 
-			script: if watermark_narrow() then 182 else
-				if watermark_wide() then 155 else 173
-		top:  423
-		width: 
-			script: if watermark_narrow() then 30 else
-				if watermark_wide() then 75 else 40
-		height: 40
-		visible:
-			script: styling.watermarkings
-		render style: image
-		include file: /vs-common.mse-include/watermarks
-		z index: 4
 	############################# Attack/defence
 	############################# Card sorting / numbering
 	############################# Copyright stuff
 	illustrator:
 		left: 20
 		top : 475
@@ -187,7 +157,6 @@ card style:
 			name: Eurostile
 			size: 9
 			color: rgb(255,255,255)
 	copyright:
 		left: 20
 		top : 490
@@ -199,9 +168,7 @@ card style:
 			name: Eurostile
 			size: 8
 			color: rgb(255,255,255)
 ############################################################## Extra card fields
 extra card field:
 	type: choice
 	name: overlay
@@ -212,7 +179,6 @@ extra card field:
 	name: foil layer
 	choice: foil
 	editable: false
 extra card style:
 	overlay:
 		left:	20
@@ -226,13 +192,10 @@ extra card style:
 	foil layer:
 		left: 0
 		top : 0
-		width:  
+		width:  { if styling.foils=="no" then 0 else 375 }
-			script: if styling.foils=="no" then 0 else 375
+		height: { if styling.foils=="no" then 0 else 523 }
-		height:
-			script: if styling.foils=="no" then 0 else 523
 		z index: 8
 		render style: image
 		choice images:
 			foil: /vs-common.mse-include/foil.png
-		visible:
+		visible: { styling.foils }
-			script: styling.foils
--- a/data/vs-common.mse-include/affiliations
+++ b/data/vs-common.mse-include/affiliations
 # Affiliation images
 choice images:
-	Marvel A-C AIM: /vs-standard-new.mse-symbol-font/aim.png
+	Marvel A-C Avengers: /vs-standard-official.mse-symbol-font/avengers.png
-	Marvel A-C Alpha Flight: /vs-standard-new.mse-symbol-font/alphaflight.png
+	Marvel A-C Brotherhood: /vs-standard-official.mse-symbol-font/brotherhood.png
-	Marvel A-C Avengers: /vs-standard-new.mse-symbol-font/avengers.png
+	Marvel D-H Doom: /vs-standard-official.mse-symbol-font/doom.png
-	Marvel A-C Brood: /vs-standard-new.mse-symbol-font/brood.png
+	Marvel D-H Fantastic Four: /vs-standard-official.mse-symbol-font/F4.png
-	Marvel A-C Brotherhood: /vs-standard-new.mse-symbol-font/brotherhood.png
+	Marvel D-H Horsemen of Apocalypse: /vs-standard-official.mse-symbol-font/apocalypse.png
-	Marvel A-C Captain America: /vs-standard-new.mse-symbol-font/captainamerica.png
+	Marvel I-M Marvel Knights: /vs-standard-official.mse-symbol-font/marvelknights.png
-	Marvel D-H Doom: /vs-standard-new.mse-symbol-font/doom.png
+	Marvel N-S Shi'ar: /vs-standard-official.mse-symbol-font/shiar.png
-	Marvel D-H Excalibur: /vs-standard-new.mse-symbol-font/excalibur.png
+	Marvel N-S Spider-Friends: /vs-standard-official.mse-symbol-font/spiderman.png
-	Marvel D-H Fantastic Four: /vs-standard-new.mse-symbol-font/F4.png
+	Marvel T-Z X-Men: /vs-standard-official.mse-symbol-font/xmen.png
-	Marvel D-H The Hand: /vs-standard-new.mse-symbol-font/hand.png
-	Marvel D-H Hellfire Club: /vs-standard-new.mse-symbol-font/hellfire.png
-	Marvel D-H Heralds of Galactus: /vs-standard-new.mse-symbol-font/heralds.png
-	Marvel D-H Heroes for Hire: /vs-standard-new.mse-symbol-font/heroesforhire.png
-	Marvel D-H Horsemen of Apocalypse: /vs-standard-new.mse-symbol-font/apocalypse.png
-	Marvel D-H Hydra: /vs-standard-new.mse-symbol-font/hydra.png
-	Marvel I-M Kree: /vs-standard-new.mse-symbol-font/kree.png
-	Marvel I-M Marvel Defenders: /vs-standard-new.mse-symbol-font/defenders.png
-	Marvel I-M Marvel Knights: /vs-standard-new.mse-symbol-font/marvelknights.png
-	Marvel I-M Masters of Evil: /vs-standard-new.mse-symbol-font/mastersofevil.png
-	Marvel N-S New Warriors: /vs-standard-new.mse-symbol-font/newwarriors.png
-	Marvel N-S Omega Flight: /vs-standard-new.mse-symbol-font/omegaflight.png
-	Marvel N-S Outsiders: /vs-standard-new.mse-symbol-font/outsiders.png
-	Marvel N-S Serpent Society: /vs-standard-new.mse-symbol-font/serpentsociety.png
-	Marvel N-S Shi'ar: /vs-standard-new.mse-symbol-font/shiar.png
-	Marvel N-S SHIELD: /vs-standard-new.mse-symbol-font/shield.png
-	Marvel N-S Sinister Syndicate: /vs-standard-new.mse-symbol-font/sinistersyndicate.png
-	Marvel N-S Spider-Friends: /vs-standard-new.mse-symbol-font/spiderman.png
-	Marvel N-S Starjammers: /vs-standard-new.mse-symbol-font/starjammers.png
-	Marvel T-Z Thor: /vs-standard-new.mse-symbol-font/thor.png
-	Marvel T-Z Thunderbolts: /vs-standard-new.mse-symbol-font/thunderbolts.png
-	Marvel T-Z The Ultimates: /vs-standard-new.mse-symbol-font/ultimates.png
-	Marvel T-Z X-Men: /vs-standard-new.mse-symbol-font/xmen.png
-	DC A-C Anti-Matter: /vs-standard-new.mse-symbol-font/antimatter.png
+	DC D-H Gotham Knights: /vs-standard-official.mse-symbol-font/gothamknights.png
-	DC A-C Arkham Inmates: /vs-standard-new.mse-symbol-font/arkhaminmates.png
+	DC D-H Green Lantern: /vs-standard-official.mse-symbol-font/greenlantern.png
-	DC A-C Birds of Prey: /vs-standard-new.mse-symbol-font/birdsofprey.png
+	DC I-M JLA: /vs-standard-official.mse-symbol-font/jla.png
-	DC D-H Femizons: /vs-standard-new.mse-symbol-font/femizons.png
+	DC I-M JSA: /vs-standard-official.mse-symbol-font/jsa.png
-	DC D-H Gotham Knights: /vs-standard-new.mse-symbol-font/gothamknights.png
+	DC T-Z Team Superman: /vs-standard-official.mse-symbol-font/superman.png
-	DC D-H Green Lantern: /vs-standard-new.mse-symbol-font/greenlantern.png
+	DC T-Z Teen Titans: /vs-standard-official.mse-symbol-font/titans.png
-	DC I-M JLA: /vs-standard-new.mse-symbol-font/jla.png
-	DC I-M JSA: /vs-standard-new.mse-symbol-font/jsa.png
-	DC I-M Legionnaires: /vs-standard-new.mse-symbol-font/legion.png
-	DC N-S The Order: /vs-standard-new.mse-symbol-font/theorder.png
-	DC N-S Outsiders: /vs-standard-new.mse-symbol-font/outsiders.png
-	DC N-S Secret Six: /vs-standard-new.mse-symbol-font/secretsix.png
-	DC N-S Shadowpact: /vs-standard-new.mse-symbol-font/shadowpact.png
-	DC N-S Skeleton Crew: /vs-standard-new.mse-symbol-font/skeletoncrew.png
-	DC T-Z Team Superman: /vs-standard-new.mse-symbol-font/superman.png
-	DC T-Z Teen Titans: /vs-standard-new.mse-symbol-font/titans.png
-	Other B.P.R.D.: /vs-standard-new.mse-symbol-font/bprd.png
+	Other B.P.R.D.: /vs-standard-official.mse-symbol-font/bprd.png
-	Other Thule Society: /vs-standard-new.mse-symbol-font/thule.png
+	Other Thule Society: /vs-standard-official.mse-symbol-font/thule.png
-	Other Autobot: /vs-standard-new.mse-symbol-font/autobots.png
-	Other Decepticon: /vs-standard-new.mse-symbol-font/decepticons.png
-	Other Quintesson: /vs-standard-new.mse-symbol-font/quintessons.png
--- a/data/vs-common.mse-include/dual-affiliation
+++ b/data/vs-common.mse-include/dual-affiliation
+# The second affiliation choices
+# Included by a game file
+choice:
+	name: none
+	line below: true
+choice:
+	name: Marvel
+	choice:
+		name: A-C
+		choice: Avengers
+		choice: Brotherhood
+		choice: Crime Lords
+	choice:
+		name: D-H
+		choice: Doom
+		choice: Fantastic Four
+		choice: Horsemen of Apocalypse
+	choice:
+		name: I-M
+		choice: Marvel Knights
+	choice:
+		name: N-S
+		choice: Shi'ar
+		choice: Spider-Friends
+	choice:
+		name: T-Z
+		choice: X-Men
+choice:
+	name: DC
+	choice:
+		name: D-H
+		choice: Gotham Knights
+		choice: Green Lantern
+	choice:
+		name: I-M
+		choice: JLA
+		choice: JSA
+	choice:
+		name: T-Z
+		choice: Team Superman
+		choice: Teen Titans
+choice:
+	name: Other
+	choice: B.P.R.D.
+	choice: Thule Society
+script:
+	if card.team_2_of_2=="Avengers" then "Marvel A-C Avengers" else
+	if card.team_2_of_2=="AVENGERS" then "Marvel A-C Avengers" else
+	if card.team_2_of_2=="Brood" then "Marvel A-C Brood" else
+	if card.team_2_of_2=="BROOD" then "Marvel A-C Brood" else
+	if card.team_2_of_2=="Brotherhood" then "Marvel A-C Brotherhood" else
+	if card.team_2_of_2=="BROTHERHOOD" then "Marvel A-C Brotherhood" else
+	if card.team_2_of_2=="Doom" then "Marvel D-H Doom" else
+	if card.team_2_of_2=="DOOM" then "Marvel D-H Doom" else
+	if card.team_2_of_2=="Fantastic Four" then "Marvel D-H Fantastic Four" else
+	if card.team_2_of_2=="FANTASTIC FOUR" then "Marvel D-H Fantastic Four" else
+	if card.team_2_of_2=="Horsemen of Apocalypse" then "Marvel D-H Horsemen of Apocalypse" else
+	if card.team_2_of_2=="HORSEMEN OF APOCALYPSE" then "Marvel D-H Horsemen of Apocalypse" else
+	if card.team_2_of_2=="Marvel Knights" then "Marvel I-M Marvel Knights" else
+	if card.team_2_of_2=="MARVEL KNIGHTS" then "Marvel I-M Marvel Knights" else
+	if card.team_2_of_2=="Shi'ar" then "Marvel N-S Shi'ar" else
+	if card.team_2_of_2=="SHI'AR" then "Marvel N-S Shi'ar" else
+	if card.team_2_of_2=="Spider-Friends" then "Marvel N-S Spider-Friends" else
+	if card.team_2_of_2=="SPIDER-FRIENDS" then "Marvel N-S Spider-Friends" else
+	if card.team_2_of_2=="X-Men" then "Marvel T-Z X-Men" else
+	if card.team_2_of_2=="X-MEN" then "Marvel T-Z X-Men" else
+	if card.team_2_of_2=="Gotham Knights" then "DC D-H Gotham Knights" else
+	if card.team_2_of_2=="GOTHAM KNIGHTS" then "DC D-H Gotham Knights" else
+	if card.team_2_of_2=="Green Lantern" then "DC D-H Green Lantern" else
+	if card.team_2_of_2=="GREEN LANTERN" then "DC D-H Green Lantern" else
+	if card.team_2_of_2=="JLA" then "DC I-M JLA" else
+	if card.team_2_of_2=="JSA" then "DC I-M JSA" else
+	if card.team_2_of_2=="Team Superman" then "DC T-Z Team Superman" else
+	if card.team_2_of_2=="TEAM SUPERMAN" then "DC T-Z Team Superman" else
+	if card.team_2_of_2=="Teen Titans" then "DC T-Z Teen Titans" else
+	if card.team_2_of_2=="TEEN TITANS" then "DC T-Z Teen Titans" else
+	if card.team_2_of_2=="B.P.R.D." then "Other B.P.R.D" else
+	if card.team_2_of_2=="Thule Society" then "Other Thule Society" else
+	if card.team_2_of_2=="THULE SOCIETY" then "Other Thule Society"
--- a/data/vs-common.mse-include/include
+++ b/data/vs-common.mse-include/include
-mse version: 0.3.5
+mse version: 0.3.6
 full name: VS System, textbox watermarks
-version: 2007-09-23
+version: 2008-01-03
 # This file doesn't do anything, other files in this directory can be included
 # in game/style files:

--- a/data/vs-common.mse-include/watermark-names
+++ b/data/vs-common.mse-include/watermark-names
-# The watermark choices
+# The second affiliation choices
 # Included by a game file
 choice:
@@ -8,69 +8,34 @@ choice:
 	name: Marvel
 	choice:
 		name: A-C
-		choice: AIM
-		choice: Alpha Flight
 		choice: Avengers
-		choice: Brood
 		choice: Brotherhood
-		choice: Captain America
+		choice: Crime Lords
 	choice:
 		name: D-H
 		choice: Doom
-		choice: Excalibur
 		choice: Fantastic Four
-		choice: The Hand
-		choice: Hellfire Club
-		choice: Heralds of Galactus
-		choice: Heroes for Hire
 		choice: Horsemen of Apocalypse
-		choice: Hydra
 	choice:
 		name: I-M
-		choice: Kree
-		choice: Marvel Defenders
 		choice: Marvel Knights
-		choice: Masters of Evil
 	choice:
 		name: N-S
-		choice: New Warriors
-		choice: Omega Flight
-		choice: Serpent Society
 		choice: Shi'ar
-		choice: SHIELD
-		choice: Sinister Syndicate
 		choice: Spider-Friends
-		choice: Starjammers
 	choice:
 		name: T-Z
-		choice: Thor
-		choice: Thunderbolts
-		choice: The Ultimates
 		choice: X-Men
 choice:
 	name: DC
-	choice:
-		name: A-C
-		choice: Anti-Matter
-		choice: Arkham Inmates
-		choice: Birds of Prey
 	choice:
 		name: D-H
-		choice: Femizons
 		choice: Gotham Knights
 		choice: Green Lantern
 	choice:
 		name: I-M
 		choice: JLA
 		choice: JSA
-		choice: Legionnaires
-	choice:
-		name: N-S
-		choice: The Order
-		choice: Outsiders
-		choice: Secret Six
-		choice: Shadowpact
-		choice: Skeleton Crew
 	choice:
 		name: T-Z
 		choice: Team Superman
@@ -79,158 +44,37 @@ choice:
 	name: Other
 	choice: B.P.R.D.
 	choice: Thule Society
-	choice: Autobot
-	choice: Decepticon
-	choice: Quintesson
 script:
-	if card.team=="A.I.M." then "Marvel A-C AIM" else
-	if card.team=="AIM" then "Marvel A-C AIM" else
-	if card.team_affiliation=="aim" then "Marvel A-C AIM" else
-	if card.team=="Alpha Flight" then "Marvel A-C Alpha Flight" else
-	if card.team=="ALPHA FLIGHT" then "Marvel A-C Alpha Flight" else
-	if card.team_affiliation=="alpha flight" then "Marvel A-C Alpha Flight" else
 	if card.team=="Avengers" then "Marvel A-C Avengers" else
 	if card.team=="AVENGERS" then "Marvel A-C Avengers" else
-	if card.team_affiliation=="avengers" then "Marvel A-C Avengers" else
 	if card.team=="Brood" then "Marvel A-C Brood" else
 	if card.team=="BROOD" then "Marvel A-C Brood" else
-	if card.team_affiliation=="brood" then "Marvel A-C Brood" else
 	if card.team=="Brotherhood" then "Marvel A-C Brotherhood" else
 	if card.team=="BROTHERHOOD" then "Marvel A-C Brotherhood" else
-	if card.team_affiliation=="brotherhood" then "Marvel A-C Brotherhood" else
-	if card.team=="Captain America" then "Marvel A-C Captain America" else
-	if card.team=="CAPTAIN AMERICA" then "Marvel A-C Captain America" else
-	if card.team_affiliation=="captain america" then "Marvel A-C Captain America" else
 	if card.team=="Doom" then "Marvel D-H Doom" else
 	if card.team=="DOOM" then "Marvel D-H Doom" else
-	if card.team_affiliation=="doom" then "Marvel D-H Doom" else
-	if card.team=="Excalibur" then "Marvel D-H Excalibur" else
-	if card.team=="EXCALIBUR" then "Marvel D-H Excalibur" else
-	if card.team_affiliation=="excalibur" then "Marvel D-H Excalibur" else
 	if card.team=="Fantastic Four" then "Marvel D-H Fantastic Four" else
 	if card.team=="FANTASTIC FOUR" then "Marvel D-H Fantastic Four" else
-	if card.team_affiliation=="fantastic four" then "Marvel D-H Fantastic Four" else
-	if card.team=="The Hand" then "Marvel D-H The Hand" else
-	if card.team=="THE HAND" then "Marvel D-H The Hand" else
-	if card.team_affiliation=="the hand" then "Marvel D-H The Hand" else
-	if card.team=="Hellfire Club" then "Marvel D-H Hellfire Club" else
-	if card.team=="HELLFIRE CLUB" then "Marvel D-H Hellfire Club" else
-	if card.team_affiliation=="hellfire club" then "Marvel D-H Hellfire Club" else
-	if card.team=="Heralds of Galactus" then "Marvel D-H Heralds of Galactus" else
-	if card.team=="HERALDS OF GALACTUS" then "Marvel D-H Heralds of Galactus" else
-	if card.team_affiliation=="heralds of galactus" then "Marvel D-H Heralds of Galactus" else
-	if card.team=="Heroes for Hire" then "Marvel D-H Heroes for Hire" else
-	if card.team=="HEROES FOR HIRE" then "Marvel D-H Heroes for Hire" else
-	if card.team_affiliation=="heroes for hire" then "Marvel D-H Heroes for Hire" else
 	if card.team=="Horsemen of Apocalypse" then "Marvel D-H Horsemen of Apocalypse" else
 	if card.team=="HORSEMEN OF APOCALYPSE" then "Marvel D-H Horsemen of Apocalypse" else
-	if card.team_affiliation=="horsemen of apocalypse" then "Marvel D-H Horsemen of Apocalypse" else
-	if card.team=="Hydra" then "Marvel D-H Hydra" else
-	if card.team=="H.Y.D.R.A." then "Marvel D-H Hydra" else
-	if card.team=="HYDRA" then "Marvel D-H Hydra" else
-	if card.team_affiliation=="hydra" then "Marvel D-H Hydra" else
-	if card.team=="Kree" then "Marvel I-M Kree" else
-	if card.team=="KREE" then "Marvel I-M Kree" else
-	if card.team_affiliation=="kree" then "Marvel I-M Kree" else
-	if card.team=="Marvel Defenders" then "Marvel I-M Marvel Defenders" else
-	if card.team=="MARVEL DEFENDERS" then "Marvel I-M Marvel Defenders" else
-	if card.team_affiliation=="marvel defenders" then "Marvel I-M Marvel Defenders" else
 	if card.team=="Marvel Knights" then "Marvel I-M Marvel Knights" else
 	if card.team=="MARVEL KNIGHTS" then "Marvel I-M Marvel Knights" else
-	if card.team_affiliation=="marvel knights" then "Marvel I-M Marvel Knights" else
-	if card.team=="Masters of Evil" then "Marvel I-M Masters of Evil" else
-	if card.team=="MASTERS OF EVIL" then "Marvel I-M Masters of Evil" else
-	if card.team_affiliation=="Masters of Evil" then "Marvel I-M Masters of Evil" else
-	if card.team=="New Warriors" then "Marvel N-S The New Warriors" else
-	if card.team=="NEW WARRIORS" then "Marvel N-S The New Warriors" else
-	if card.team_affiliation=="new warriors" then "Marvel N-S New Warriors" else
-	if card.team=="Omega Flight" then "Marvel N-S Omega Flight" else
-	if card.team=="OMEGA FLIGHT" then "Marvel N-S Omega Flight" else
-	if card.team_affiliation=="omega flight" then "Marvel N-S Omega Flight" else
-	if card.team=="Serpent Society" then "Marvel N-S Serpent Society" else
-	if card.team=="SERPENT SOCIETY" then "Marvel N-S Serpent Society" else
-	if card.team_affiliation=="serpent society" then "Marvel N-S Serpent Society" else
 	if card.team=="Shi'ar" then "Marvel N-S Shi'ar" else
 	if card.team=="SHI'AR" then "Marvel N-S Shi'ar" else
-	if card.team_affiliation=="shi'ar" then "Marvel N-S Shi'ar" else
-	if card.team=="S.H.I.E.L.D." then "Marvel N-S SHIELD" else
-	if card.team=="SHIELD" then "Marvel N-S SHIELD" else
-	if card.team_affiliation=="s.h.i.e.l.d." then "Marvel N-S SHIELD" else
-	if card.team=="Sinister Syndicate" then "Marvel N-S Sinister Syndicate" else
-	if card.team=="SINISTER SYNDICATE" then "Marvel N-S Sinister Syndicate" else
-	if card.team_affiliation=="sinister syndicate" then "Marvel N-S Sinister Syndicate" else
 	if card.team=="Spider-Friends" then "Marvel N-S Spider-Friends" else
 	if card.team=="SPIDER-FRIENDS" then "Marvel N-S Spider-Friends" else
-	if card.team_affiliation=="spider-friends" then "Marvel N-S Spider-Friends" else
-	if card.team=="Starjammers" then "Marvel N-S Starjammers" else
-	if card.team=="STARJAMMERS" then "Marvel N-S Starjammers" else
-	if card.team_affiliation=="starjammers" then "Marvel N-S Starjammers" else
-	if card.team=="Thunderbolts" then "Marvel T-Z Thunderbolts" else
-	if card.team=="THUNDERBOLTS" then "Marvel T-Z Thunderbolts" else
-	if card.team_affiliation=="thunderbolts" then "Marvel T-Z Thunderbolts" else
-	if card.team=="The Ultimates" then "Marvel T-Z The Ultimates" else
-	if card.team=="THE ULTIMATES" then "Marvel T-Z The Ultimates" else
-	if card.team_affiliation=="the ultimates" then "Marvel T-Z The Ultimates" else
 	if card.team=="X-Men" then "Marvel T-Z X-Men" else
 	if card.team=="X-MEN" then "Marvel T-Z X-Men" else
-	if card.team_affiliation=="x-men" then "Marvel T-Z X-Men" else
-	if card.team=="Anti-Matter" then "DC A-C Anti-Matter" else
-	if card.team=="ANTI-MATTER" then "DC A-C Anti-Matter" else
-	if card.team_affiliation=="anti-matter" then "DC A-C Anti-Matter" else
-	if card.team=="Arkham Inmates" then "DC A-C Arkham Inmates" else
-	if card.team=="ARKHAM INMATES" then "DC A-C Arkham Inmates" else
-	if card.team_affiliation=="arkham inmates" then "DC A-C Arkham Inmates" else
-	if card.team=="Birds of Prey" then "DC A-C Birds of Prey" else
-	if card.team=="BIRDS OF PREY" then "DC A-C Birds of Prey" else
-	if card.team_affiliation=="birds of prey" then "DC A-C Birds of Prey" else
-	if card.team=="Femizons" then "DC D-H Femizons" else
-	if card.team=="FEMIZONS" then "DC D-H Femizons" else
-	if card.team_affiliation=="femizons" then "DC D-H Femizons" else
 	if card.team=="Gotham Knights" then "DC D-H Gotham Knights" else
 	if card.team=="GOTHAM KNIGHTS" then "DC D-H Gotham Knights" else
-	if card.team_affiliation=="gotham knights" then "DC D-H Gotham Knights" else
 	if card.team=="Green Lantern" then "DC D-H Green Lantern" else
 	if card.team=="GREEN LANTERN" then "DC D-H Green Lantern" else
-	if card.team_affiliation=="green lantern" then "DC D-H Green Lantern" else
 	if card.team=="JLA" then "DC I-M JLA" else
-	if card.team_affiliation=="jla" then "DC I-M JLA" else
 	if card.team=="JSA" then "DC I-M JSA" else
-	if card.team_affiliation=="jsa" then "DC I-M JSA" else
-	if card.team=="Legionnaires" then "DC I-M Legionnaires" else
-	if card.team=="LEGIONNAIRES" then "DC I-M Legionnaires" else
-	if card.team_affiliation=="legionnaires" then "DC I-M Legionnaires" else
-	if card.team=="The Order" then "DC N-S The Order" else
-	if card.team=="THE ORDER" then "DC N-S The Order" else
-	if card.team_affiliation=="the order" then "DC N-S The Order" else
-	if card.team=="Outsiders" then "DC N-S Outsiders" else
-	if card.team=="OUTSIDERS" then "DC N-S Outsiders" else
-	if card.team_affiliation=="outsiders" then "DC N-S Outsiders" else
-	if card.team=="Secret Six" then "DC N-S Secret Six" else
-	if card.team=="SECRET SIX" then "DC N-S Secret Six" else
-	if card.team_affiliation=="secret six" then "DC N-S Secret Six" else
-	if card.team=="Shadowpact" then "DC N-S Shadowpact" else
-	if card.team=="SHADOWPACT" then "DC N-S Shadowpact" else
-	if card.team_affiliation=="shadowpact" then "DC N-S Shadowpact" else
-	if card.team=="Skeleton Crew" then "DC N-S Skeleton Crew" else
-	if card.team=="SKELETON CREW" then "DC N-S Skeleton Crew" else
-	if card.team_affiliation=="skeleton crew" then "DC N-S Skeleton Crew" else
 	if card.team=="Team Superman" then "DC T-Z Team Superman" else
 	if card.team=="TEAM SUPERMAN" then "DC T-Z Team Superman" else
-	if card.team_affiliation=="team superman" then "DC T-Z Team Superman" else
 	if card.team=="Teen Titans" then "DC T-Z Teen Titans" else
 	if card.team=="TEEN TITANS" then "DC T-Z Teen Titans" else
-	if card.team_affiliation=="teen titans" then "DC T-Z Teen Titans" else
 	if card.team=="B.P.R.D." then "Other B.P.R.D" else
-	if card.team_affiliation=="b.p.r.d." then "Other B.P.R.D" else
 	if card.team=="Thule Society" then "Other Thule Society" else
-	if card.team=="THULE SOCIETY" then "Other Thule Society" else
+	if card.team=="THULE SOCIETY" then "Other Thule Society"
-	if card.team_affiliation=="thule society" then "Other Thule Society" else
-	if card.team=="Autobot" then "Other Autobot" else
-	if card.team=="AUTOBOT" then "Other Autobot" else
-	if card.team_affiliation=="autobot" then "Other Autobot" else
-	if card.team=="Decepticon" then "Other Decepticon" else
-	if card.team=="DECEPTICON" then "Other Decepticon" else
-	if card.team_affiliation=="decepticon" then "Other Decepticon" else
-	if card.team=="Quintesson" then "Other Quintesson" else
-	if card.team=="QUINTESSON" then "Other Quintesson" else
-	if card.team_affiliation=="quintesson" then "Other Quintesson" else "none"
--- a/data/vs-common.mse-include/watermarks
+++ b/data/vs-common.mse-include/watermarks
 # Watermark images
 choice images:
-	Marvel A-C AIM: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/aim.png"))
+	Marvel A-C Avengers: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/avengers.png"))
-	Marvel A-C Alpha Flight: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/alphaflight.png"))
+	Marvel A-C Brotherhood: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/brotherhood.png"))
-	Marvel A-C Avengers: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/avengers.png"))
+	Marvel D-H Doom: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/doom.png"))
-	Marvel A-C Brood: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/brood.png"))
+	Marvel D-H Fantastic Four: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/F4.png"))
-	Marvel A-C Brotherhood: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/brotherhood.png"))
+	Marvel D-H Horsemen of Apocalypse: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/apocalypse.png"))
-	Marvel A-C Captain America: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/captainamerica.png"))
+	Marvel I-M Marvel Knights: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/marvelknights.png"))
-	Marvel I-M Marvel Defenders: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/defenders.png"))
+	Marvel I-M Masters of Evil: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/mastersofevil.png"))
-	Marvel D-H Doom: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/doom.png"))
+	Marvel N-S Shi'ar: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/shiar.png"))
-	Marvel D-H Excalibur: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/excalibur.png"))
+	Marvel N-S Spider-Friends: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/spiderman.png"))
-	Marvel D-H Fantastic Four: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/F4.png"))
+	Marvel T-Z X-Men: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/xmen.png"))
-	Marvel D-H The Hand: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/hand.png"))
-	Marvel D-H Hellfire Club: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/hellfire.png"))
-	Marvel D-H Heralds of Galactus: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/heralds.png"))
-	Marvel D-H Heroes for Hire: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/heroesforhire.png"))
-	Marvel D-H Horsemen of Apocalypse: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/apocalypse.png"))
-	Marvel D-H Hydra: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/hydra.png"))
-	Marvel I-M Kree: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/kree.png"))
-	Marvel I-M Marvel Knights: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/marvelknights.png"))
-	Marvel I-M Masters of Evil: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/mastersofevil.png"))
-	Marvel N-S New Warriors: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/newwarriors.png"))
-	Marvel N-S Omega Flight: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/omegaflight.png"))
-	Marvel N-S Outsiders: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/outsiders.png"))
-	Marvel N-S Serpent Society: script: set_combine(combine: "shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/serpentsociety.png"))
-	Marvel N-S Shi'ar: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/shiar.png"))
-	Marvel N-S SHIELD: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/shield.png"))
-	Marvel N-S Sinister Syndicate: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/sinistersyndicate.png"))
-	Marvel N-S Spider-Friends: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/spiderman.png"))
-	Marvel N-S Starjammers: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/starjammers.png"))
-	Marvel T-Z Thor: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/thor.png"))
-	Marvel T-Z Thunderbolts: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/thunderbolts.png"))
-	Marvel T-Z The Ultimates: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/ultimates.png"))
-	Marvel T-Z X-Men: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/xmen.png"))
-	DC A-C Anti-Matter: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/antimatter.png"))
-	DC A-C Arkham Inmates: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/arkhaminmates.png"))
-	DC A-C Birds of Prey: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/birdsofprey.png"))
-	DC D-H Femizons: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/femizons.png"))
-	DC D-H Gotham Knights: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/gothamknights.png"))
-	DC D-H Green Lantern: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/greenlantern.png"))
-	DC I-M JLA: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/jla.png"))
-	DC I-M JSA: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/jsa.png"))
-	DC I-M Legionnaires: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/legion.png"))
-	DC N-S The Order: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/theorder.png"))
-	DC N-S Outsiders: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/outsiders.png"))
-	DC N-S Secret Six: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/secretsix.png"))
-	DC N-S Shadowpact: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/shadowpact.png"))
-	DC N-S Skeleton Crew: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/skeletoncrew.png"))
-	DC T-Z Team Superman: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/superman.png"))
-	DC T-Z Teen Titans: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/titans.png"))
-	Other B.P.R.D.: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/bprd.png"))
+	DC D-H Gotham Knights: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/gothamknights.png"))
-	Other Thule Society: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/thule.png"))
+	DC D-H Green Lantern: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/greenlantern.png"))
-	Other Autobot: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/autobots.png"))
+	DC I-M JLA: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/jla.png"))
-	Other Decepticon: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/decepticons.png"))
+	DC I-M JSA: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/jsa.png"))
-	Other Quintesson: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-new.mse-symbol-font/quintessons.png"))
+	DC T-Z Team Superman: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/superman.png"))
+	DC T-Z Teen Titans: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/titans.png"))
+	Other B.P.R.D.: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/bprd.png"))
+	Other Thule Society: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/thule.png"))
--- a/data/vs-extended-art.mse-style/style
+++ b/data/vs-extended-art.mse-style/style
-mse version: 0.3.5
+mse version: 0.3.6
 game: vs
 full name: VS Extended Art
 short name: Extended Art
 icon: card-sample.png
-position hint: 002
+position hint: 005
-version: 2007-10-05
+version: 2008-01-03
 depends on:
 	package: vs.mse-game
-	version: 2007-09-23
+	version: 2008-01-03
 depends on:
 	package: vs-common.mse-include
-	version: 2007-09-23
+	version: 2008-01-03
 depends on:
 	package: vs-standard-arrow.mse-symbol-font
-	version: 2007-09-23
+	version: 2008-01-03
+depends on:
+	package: vs-standard-official.mse-symbol-font
+	version: 2008-01-03
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
 ############################################################## Extra scripts
 ############################################################## Set info fields
 ############################################################## Extra style
 styling field:
 	type: boolean
 	name: foils
@@ -41,7 +42,6 @@ styling field:
 	name: edition
 	description: Is the set a 1st Edition?
 	initial: no
 ############################################################## Card fields
 card style:
 	############################# Background stuff
@@ -68,7 +68,7 @@ card style:
 			equipment concealed-optional equipment:				eveqcard.jpg
 			location:							locard.jpg
 			plot twist:							ptcard.jpg
+			planet:								locard.jpg
 	############################# Name line
 	full name:
 		left: 85
@@ -105,17 +105,13 @@ card style:
 				else    if is_plot_twist() then rgb(161,174,238)
 				else                            rgb(255,236,130)
 		z index: 4
 	############################# Image
 	image:
-		left:	
+		left:	{ if is_new_dual() then 60 else 42 }
-			script: if is_new_dual() then 60 else 42
 		top:	73
-		width:	
+		width:	{ if is_new_dual() then 283 else 301 }
-			script:	if is_new_dual() then 283 else 301
 		height: 342
-		mask:
+		mask: { if is_new_dual() then "image-mask-dual.png" else "image-mask.png" }
-			script: if is_new_dual() then "image-mask-dual.png" else "image-mask.png"
 		z index: 1
 	card symbol:
 		left: 310
@@ -135,7 +131,7 @@ card style:
 		top: 31
 		height: 30
 		width: 30
-		visible: script: card.card_symbol=="Other..."
+		visible: { card.card_symbol=="Other..." }
 		z index: 4
 	edition:
 		left: 335
@@ -146,36 +142,31 @@ card style:
 		choice images:
 			first edition: /vs-common.mse-include/first-edition.png
 		z index: 3
-		visible:
+		visible: { styling.edition }
-			script: styling.edition
 	############################# Type Bar
 	type text full:
-		left:	script: if is_new_dual() then 87 else 72
+		left:	{ if is_new_dual() then 87 else 72 }
 		top:	395
-		width:	script: if is_new_dual() then 243 else 256
+		width:	{ if is_new_dual() then 243 else 256 }
 		height: 20
 		font:
 			name: Eurostile
 			size: 11
 			color: rgb(0,0,0)
-		visible: script: is_character()
+		visible: { is_character() }
 		alignment: middle center
 		z index: 3
 	type bar:
-		left:	script: if is_new_dual() then 87 else 72
+		left:	{ if is_new_dual() then 87 else 72 }
 		top:	395
-		width:	script: if is_new_dual() then 243 else 256
+		width:	{ if is_new_dual() then 243 else 256 }
 		height: 20
-		visible:
+		visible: { card.type_text != "" }
-			script: card.type_text != ""
 		render style: image
 		choice images:
 			type bar: type-bar.png
 		z index: 2
 	############################# Version
 	version full:
 		left: 85
 		top : 44
@@ -193,7 +184,6 @@ card style:
 				else    if is_plot_twist()	then rgb(28,47,87)
 				else                                 rgb(22,10,10)
 			separator color: rgb(128,128,128)
 	############################# Card ID
 	number line:
 		left: 136
@@ -216,7 +206,7 @@ card style:
 		top : 494
 		width: 30
 		height: 18
-		visible: script: card.rarity=="promo"
+		visible: { card.rarity=="promo" }
 		z index: 3
 		font:
 			name: Eurostile
@@ -228,7 +218,7 @@ card style:
 		top : 496
 		width: 30
 		height: 18
-		visible: script: card.rarity=="promo"
+		visible: { card.rarity=="promo" }
 		z index: 3
 		font:
 			name: Eurostile
@@ -247,13 +237,12 @@ card style:
 			uncommon: /vs-common.mse-include/rarity-uncommon.png
 			rare:	  /vs-common.mse-include/rarity-rare.png
 			promo:    /vs-common.mse-include/rarity-promo.png
 	############################# Affiliation
 	team 2 full:
 		left: 18
-		top : 100
+		top : 340
-		height: 245
+		height: 28
-		width: 28
+		width: 245
 		angle: 90
 		font:
 			name: Percolator Expert
@@ -267,35 +256,25 @@ card style:
 		padding top:    2
 		padding right:  2
 		padding bottom: 2
 	############################# FlightRange
 	symbols:
 		left: 20
-		top : 
+		top : { if is_new_dual() then 365 else 320 }
-			script: if is_new_dual() then 365 else 320
+		height: { if is_new_dual() then 34 else 17 }
-		height: 
+		width: { if is_new_dual() then 38 else 19 }
-			script: if is_new_dual() then 34 else 17
-		width: 
-			script: if is_new_dual() then 38 else 19
 		z index: 4
 		render style: image list
 		choice images:
-			flight:
+			flight: { if is_new_dual() then "/vs-common.mse-include/flight.png" else "/vs-common.mse-include/flight2.png" }
-				script: if is_new_dual() then "/vs-common.mse-include/flight.png" else "/vs-common.mse-include/flight2.png"
+			ongoing: { if is_new_dual() then "/vs-common.mse-include/ongoing.png" else "/vs-common.mse-include/ongoing2.png" }
-			ongoing:
+			range: { if is_new_dual() then "/vs-common.mse-include/range.png" else "/vs-common.mse-include/range2.png" }
-				script: if is_new_dual() then "/vs-common.mse-include/ongoing.png" else "/vs-common.mse-include/ongoing2.png"
-			range:
-				script: if is_new_dual() then "/vs-common.mse-include/range.png" else "/vs-common.mse-include/range2.png"
 		direction: vertical
-		spacing: 0
+		spacing: { if is_new_dual() then 35 else 20 }
 	############################# Text box
 	rule text:
-		left: 
+		left: { if is_new_dual() then 105 else 90 }
-			script: if is_new_dual() then 105 else 90
 		top : 430
-		width: 
+		width: { if is_new_dual() then 250 else 265 }
-			script: if is_new_dual() then 250 else 265
 		height: 50
 		mask: text-mask.png
 		font:
@@ -315,10 +294,8 @@ card style:
 		padding right:  2
 		padding bottom: 2
 		line height hard: 1.4
 	flavor text:
-		left: 
+		left: { if is_new_dual() then 95 else 90 }
-			script: if is_new_dual() then 95 else 90
 		top : 440
 		width: 265
 		height: 50
@@ -335,23 +312,15 @@ card style:
 		padding right:  2
 		padding bottom: 2
 		line height hard: 1.2
 	watermark:
-		left: 
+		left: { if watermark_narrow() then 190 else if watermark_wide() then 180 else if is_new_dual() then 217 else 200 }
-			script: if watermark_narrow() then 190 else
-				if watermark_wide() then 180 else
-				if is_new_dual() then 217 else 200
 		top:  435
-		width: 
+		width: { if watermark_narrow() then 35 else if watermark_wide() then 90 else 50 }
-			script: if watermark_narrow() then 35 else
-				if watermark_wide() then 90 else 50
 		height: 50
-		visible:
+		visible: { styling.watermarkings }
-			script: styling.watermarkings
 		render style: image
 		include file: /vs-common.mse-include/watermarks
 		z index: 4
 	############################# Atack/defence
 	attack:
 		z index: 4
@@ -359,7 +328,7 @@ card style:
 		top:	430
 		width:	30
 		height:	47
-		visible: script: is_character()
+		visible: { is_character() }
 		z index: 4
 		alignment: bottom left shrink-overflow
 		font:
@@ -369,14 +338,13 @@ card style:
 			shadow color: rgb(0,0,0)
 			shadow displacement x: 3
 			shadow displacement y: 0
 	defence:
 		z index: 4
 		left:	47
 		top:	465
 		width:	30
 		height:	47
-		visible: script: is_character()
+		visible: { is_character() }
 		z index: 4
 		alignment: bottom left shrink-overflow
 		padding bottom: -4
@@ -387,10 +355,8 @@ card style:
 			shadow color: rgb(0,0,0)
 			shadow displacement x: -3
 			shadow displacement y: 0
 	############################# Card sorting / numbering
 	############################# Copyright stuff
 	illustrator:
 		left: 122
 		top : 417
@@ -402,7 +368,6 @@ card style:
 			name: Eurostile
 			size: 6
 			color: rgb(255,255,255)
 	copyright:
 		left: 195
 		top : 492
@@ -415,24 +380,19 @@ card style:
 			size: 4
 			color: rgb(255,255,255)
 ############################################################## Extra card fields
 extra card field:
 	type: choice
 	name: foil layer
 	choice: foil
 	editable: false
 extra card style:
 	foil layer:
 		left: 0
 		top : 0
-		width:  
+		width:  { if styling.foils=="no" then 0 else 375 }
-			script: if styling.foils=="no" then 0 else 375
+		height: { if styling.foils=="no" then 0 else 523 }
-		height:
-			script: if styling.foils=="no" then 0 else 523
 		z index: 8
 		render style: image
 		choice images:
 			foil: /vs-common.mse-include/foil.png
-		visible:
+		visible: { styling.foils }
-			script: styling.foils
--- a/data/vs-extended-hellboy.mse-style/style
+++ b/data/vs-extended-hellboy.mse-style/style
-mse version: 0.3.5
+mse version: 0.3.6
 game: vs
 full name: Hellboy Extended Art
 short name: Extended Art
 icon: card-sample.png
-position hint: 004
+position hint: 006
-version: 2007-10-05
+version: 2008-01-03
 depends on:
 	package: vs.mse-game
-	version: 2007-09-23
+	version: 2008-01-03
 depends on:
 	package: vs-common.mse-include
-	version: 2007-09-23
+	version: 2008-01-03
 depends on:
 	package: vs-standard-arrow.mse-symbol-font
-	version: 2007-09-23
+	version: 2008-01-03
+depends on:
+	package: vs-standard-official.mse-symbol-font
+	version: 2008-01-03
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
 ############################################################## Extra scripts
 ############################################################## Set info fields
 ############################################################## Extra style
 styling field:
 	type: boolean
 	name: foils
@@ -41,7 +42,6 @@ styling field:
 	name: edition
 	description: Is the set a 1st Edition?
 	initial: no
 ############################################################## Card fields
 card style:
 	############################# Background stuff
@@ -68,7 +68,7 @@ card style:
 			equipment concealed-optional equipment:				eveqcard.jpg
 			location:							locard.jpg
 			plot twist:							ptcard.jpg
+			planet:								locard.jpg
 	############################# Name line
 	full name:
 		left: 85
@@ -105,17 +105,13 @@ card style:
 				else    if is_plot_twist() then rgb(161,174,238)
 				else                            rgb(255,236,130)
 		z index: 4
 	############################# Image
 	image:
-		left:	
+		left:	{ if is_new_dual() then 60 else 42 }
-			script: if is_new_dual() then 60 else 42
 		top:	73
-		width:	
+		width:	{ if is_new_dual() then 283 else 301 }
-			script:	if is_new_dual() then 283 else 301
 		height: 342
-		mask:
+		mask: { if is_new_dual() then "image-mask-dual.png" else "image-mask.png" }
-			script: if is_new_dual() then "image-mask-dual.png" else "image-mask.png"
 		z index: 1
 	card symbol:
 		left: 310
@@ -135,7 +131,7 @@ card style:
 		top: 31
 		height: 30
 		width: 30
-		visible: script: card.card_symbol=="Other..."
+		visible: { card.card_symbol=="Other..." }
 		z index: 4
 	edition:
 		left: 335
@@ -146,36 +142,31 @@ card style:
 		choice images:
 			first edition: /vs-common.mse-include/first-edition.png
 		z index: 3
-		visible:
+		visible: { styling.edition }
-			script: styling.edition
 	############################# Type Bar
 	type text full:
-		left:	script: if is_new_dual() then 87 else 72
+		left:	{ if is_new_dual() then 87 else 72 }
 		top:	395
-		width:	script: if is_new_dual() then 243 else 256
+		width:	{ if is_new_dual() then 243 else 256 }
 		height: 20
 		font:
 			name: Eurostile
 			size: 11
 			color: rgb(0,0,0)
-		visible: script: is_character()
+		visible: { is_character() }
 		alignment: middle center
 		z index: 3
 	type bar:
-		left:	script: if is_new_dual() then 87 else 72
+		left:	{ if is_new_dual() then 87 else 72 }
 		top:	395
-		width:	script: if is_new_dual() then 243 else 256
+		width:	{ if is_new_dual() then 243 else 256 }
 		height: 20
-		visible:
+		visible: { card.type_text != "" }
-			script: card.type_text != ""
 		render style: image
 		choice images:
 			type bar: type-bar.png
 		z index: 2
 	############################# Version
 	version full:
 		left: 85
 		top : 44
@@ -193,7 +184,6 @@ card style:
 				else    if is_plot_twist()	then rgb(28,47,87)
 				else                                 rgb(22,10,10)
 			separator color: rgb(128,128,128)
 	############################# Card ID
 	number line:
 		left: 136
@@ -216,7 +206,7 @@ card style:
 		top : 494
 		width: 30
 		height: 18
-		visible: script: card.rarity=="promo"
+		visible: { card.rarity=="promo" }
 		z index: 3
 		font:
 			name: Eurostile
@@ -228,7 +218,7 @@ card style:
 		top : 496
 		width: 30
 		height: 18
-		visible: script: card.rarity=="promo"
+		visible: { card.rarity=="promo" }
 		z index: 3
 		font:
 			name: Eurostile
@@ -247,13 +237,12 @@ card style:
 			uncommon: /vs-common.mse-include/rarity-uncommon.png
 			rare:	  /vs-common.mse-include/rarity-rare.png
 			promo:    /vs-common.mse-include/rarity-promo.png
 	############################# Affiliation
 	team 2 full:
 		left: 18
-		top : 100
+		top : 340
-		height: 245
+		height: 28
-		width: 28
+		width: 245
 		angle: 90
 		font:
 			name: Percolator Expert
@@ -267,35 +256,25 @@ card style:
 		padding top:    2
 		padding right:  2
 		padding bottom: 2
 	############################# FlightRange
 	symbols:
 		left: 20
-		top : 
+		top : { if is_new_dual() then 365 else 320 }
-			script: if is_new_dual() then 365 else 320
+		height: { if is_new_dual() then 34 else 17 }
-		height: 
+		width: { if is_new_dual() then 38 else 19 }
-			script: if is_new_dual() then 34 else 17
-		width: 
-			script: if is_new_dual() then 38 else 19
 		z index: 4
 		render style: image list
 		choice images:
-			flight:
+			flight: { if is_new_dual() then "/vs-common.mse-include/flight.png" else "/vs-common.mse-include/flight2.png" }
-				script: if is_new_dual() then "/vs-common.mse-include/flight.png" else "/vs-common.mse-include/flight2.png"
+			ongoing: { if is_new_dual() then "/vs-common.mse-include/ongoing.png" else "/vs-common.mse-include/ongoing2.png" }
-			ongoing:
+			range: { if is_new_dual() then "/vs-common.mse-include/range.png" else "/vs-common.mse-include/range2.png" }
-				script: if is_new_dual() then "/vs-common.mse-include/ongoing.png" else "/vs-common.mse-include/ongoing2.png"
-			range:
-				script: if is_new_dual() then "/vs-common.mse-include/range.png" else "/vs-common.mse-include/range2.png"
 		direction: vertical
-		spacing: 0
+		spacing: { if is_new_dual() then 35 else 20 }
 	############################# Text box
 	rule text:
-		left: 
+		left: { if is_new_dual() then 105 else 90 }
-			script: if is_new_dual() then 105 else 90
 		top : 430
-		width: 
+		width: { if is_new_dual() then 250 else 265 }
-			script: if is_new_dual() then 250 else 265
 		height: 50
 		mask: text-mask.png
 		font:
@@ -315,10 +294,8 @@ card style:
 		padding right:  2
 		padding bottom: 2
 		line height hard: 1.4
 	flavor text:
-		left: 
+		left: { if is_new_dual() then 95 else 90 }
-			script: if is_new_dual() then 95 else 90
 		top : 440
 		width: 265
 		height: 50
@@ -335,23 +312,15 @@ card style:
 		padding right:  2
 		padding bottom: 2
 		line height hard: 1.2
 	watermark:
-		left: 
+		left: { if watermark_narrow() then 190 else if watermark_wide() then 180 else if is_new_dual() then 217 else 200 }
-			script: if watermark_narrow() then 190 else
-				if watermark_wide() then 180 else
-				if is_new_dual() then 217 else 200
 		top:  435
-		width: 
+		width: { if watermark_narrow() then 35 else if watermark_wide() then 90 else 50 }
-			script: if watermark_narrow() then 35 else
-				if watermark_wide() then 90 else 50
 		height: 50
-		visible:
+		visible: { styling.watermarkings }
-			script: styling.watermarkings
 		render style: image
 		include file: /vs-common.mse-include/watermarks
 		z index: 4
 	############################# Atack/defence
 	attack:
 		z index: 4
@@ -359,7 +328,7 @@ card style:
 		top:	430
 		width:	30
 		height:	47
-		visible: script: is_character()
+		visible: { is_character() }
 		z index: 4
 		alignment: bottom left shrink-overflow
 		font:
@@ -369,14 +338,13 @@ card style:
 			shadow color: rgb(0,0,0)
 			shadow displacement x: 3
 			shadow displacement y: 0
 	defence:
 		z index: 4
 		left:	47
 		top:	465
 		width:	30
 		height:	47
-		visible: script: is_character()
+		visible: { is_character() }
 		z index: 4
 		alignment: bottom left shrink-overflow
 		padding bottom: -4
@@ -387,10 +355,8 @@ card style:
 			shadow color: rgb(0,0,0)
 			shadow displacement x: -3
 			shadow displacement y: 0
 	############################# Card sorting / numbering
 	############################# Copyright stuff
 	illustrator:
 		left: 122
 		top : 417
@@ -402,7 +368,6 @@ card style:
 			name: Eurostile
 			size: 6
 			color: rgb(255,255,255)
 	copyright:
 		left: 195
 		top : 492
@@ -415,24 +380,19 @@ card style:
 			size: 4
 			color: rgb(255,255,255)
 ############################################################## Extra card fields
 extra card field:
 	type: choice
 	name: foil layer
 	choice: foil
 	editable: false
 extra card style:
 	foil layer:
 		left: 0
 		top : 0
-		width:  
+		width:  { if styling.foils=="no" then 0 else 375 }
-			script: if styling.foils=="no" then 0 else 375
+		height: { if styling.foils=="no" then 0 else 523 }
-		height:
-			script: if styling.foils=="no" then 0 else 523
 		z index: 8
 		render style: image
 		choice images:
 			foil: /vs-common.mse-include/foil.png
-		visible:
+		visible: { styling.foils }
-			script: styling.foils
--- a/data/vs-hellboy.mse-style/style
+++ b/data/vs-hellboy.mse-style/style
-mse version: 0.3.5
+mse version: 0.3.6
 game: vs
 full name: Hellboy Normal
 short name: Hellboy
 icon: card-sample.png
 position hint: 003
-version: 2007-10-05
+version: 2008-01-03
 depends on:
 	package: vs.mse-game
-	version: 2007-09-23
+	version: 2008-01-03
 depends on:
 	package: vs-common.mse-include
-	version: 2007-09-23
+	version: 2008-01-03
 depends on:
 	package: vs-standard-arrow.mse-symbol-font
-	version: 2007-09-23
+	version: 2008-01-03
+depends on:
+	package: vs-standard-official.mse-symbol-font
+	version: 2008-01-03
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
 ############################################################## Extra scripts
 ############################################################## Set info fields
 ############################################################## Extra style
 styling field:
 	type: boolean
 	name: foils
@@ -41,7 +42,6 @@ styling field:
 	name: edition
 	description: Is the set a 1st Edition?
 	initial: no
 ############################################################## Card fields
 card style:
 	############################# Background stuff
@@ -68,8 +68,7 @@ card style:
 			equipment concealed-optional equipment:				eveqcard.jpg
 			location:							locard.jpg
 			plot twist:							ptcard.jpg
+			planet:								locard.jpg
 	############################# Name line
 	full name:
 		left: 90
@@ -82,7 +81,7 @@ card style:
 		font:
 			name: Percolator Expert
 			size: 22
-			color:
+			color: 
 				script:	if is_concealed()	then rgb(23,4,6)
 				else	if is_equipment()	then rgb(18,21,26)
 				else    if is_location()	then rgb(31,53,30)
@@ -108,16 +107,13 @@ card style:
 				else                            rgb(255,236,130)
 		z index: 4
 		padding top: 0
 	############################# Image
 	image:
 		left:	65
 		top:	78
-		width:	
+		width:	{ if is_dual() then 249 else 282 }
-			script:	if is_dual() then 249 else 282
 		height: 241
-		mask:
+		mask: { if is_dual() then "image-mask-dual.png" else "image-mask.png" }
-			script: if is_dual() then "image-mask-dual.png" else "image-mask.png"
 		z index: 1
 	card symbol:
 		left: 310
@@ -137,7 +133,7 @@ card style:
 		top: 31
 		height: 30
 		width: 30
-		visible: script: card.card_symbol=="Other..."
+		visible: { card.card_symbol=="Other..." }
 		z index: 4
 	edition:
 		left: 315
@@ -148,37 +144,31 @@ card style:
 		choice images:
 			first edition: /vs-common.mse-include/first-edition.png
 		z index: 3
-		visible:
+		visible: { styling.edition }
-			script: styling.edition
 	############################# Type Bar
 	type text full:
 		left:	72
 		top:	299
-		width:	
+		width:	{ if is_dual() then 235 else 268 }
-			script: if is_dual() then 235 else 268
 		height: 20
 		font:
 			name: Eurostile
 			size: 11
 			color: rgb(0,0,0)
-		visible: script: is_character()
+		visible: { is_character() }
 		alignment: middle center
 		z index: 3
 	type bar:
 		left:	72
 		top:	299
-		width:	script: if is_dual() then 235 else 268
+		width:	{ if is_dual() then 235 else 268 }
 		height: 20
-		visible:
+		visible: { card.type_text != "" }
-			script: card.type_text != ""
 		render style: image
 		choice images:
 			type bar: type-bar.png
 		z index: 2
 	############################# Version
 	version full:
 		left: 90
 		top : 46
@@ -196,7 +186,6 @@ card style:
 				else    if is_plot_twist()	then rgb(28,47,87)
 				else                                 rgb(22,10,10)
 			separator color: rgb(128,128,128)
 	############################# Card ID
 	number line:
 		left: 136
@@ -219,10 +208,10 @@ card style:
 		top : 484
 		width: 30
 		height: 18
-		visible: script: card.rarity=="promo"
+		visible: { card.rarity=="promo" }
 		z index: 3
 		font:
-			name: Eurostile-Black-DTC
+			name: Eurostile
 			size: 8
 			color: rgb(255,255,255)
 			weight: bold
@@ -231,7 +220,7 @@ card style:
 		top : 486
 		width: 30
 		height: 18
-		visible: script: card.rarity=="promo"
+		visible: { card.rarity=="promo" }
 		z index: 3
 		font:
 			name: Eurostile
@@ -250,14 +239,12 @@ card style:
 			uncommon: /vs-common.mse-include/rarity-uncommon.png
 			rare:	  /vs-common.mse-include/rarity-rare.png
 			promo:    /vs-common.mse-include/rarity-promo.png
 	############################# Affiliation
 	team full:
 		left: 23
-		top : 100
+		top : { if is_new_dual() then 340 else 300 }
-		height: 
+		height: 28
-			script: if is_new_dual() then 240 else 200
+		width: { if is_new_dual() then 240 else 200 }
-		width: 28
 		angle: 90
 		font:
 			name: Percolator Expert
@@ -268,18 +255,17 @@ card style:
 			name: vs-standard-arrow
 			size: 18
 			alignment: middle center
-		alignment: middle center shrink-overflow
+		alignment: middle center
 		z index: 4
 		padding left:   2
 		padding top:    2
 		padding right:  2
 		padding bottom: 2
 	team 2 full:
 		left: 325
 		top : 100
-		height: 200
+		height: 28
-		width: 28
+		width: 200
 		angle: 270
 		font:
 			name: Percolator Expert
@@ -289,7 +275,7 @@ card style:
 		symbol font:
 			name: vs-standard-arrow
 			size: 18
-			alignment: middle center shrink-overflow
+			alignment: middle center
 		visible: is_dual()
 		alignment: middle center
 		z index: 4
@@ -297,12 +283,10 @@ card style:
 		padding top:    2
 		padding right:  2
 		padding bottom: 2
 	############################# FlightRange
 	symbols:
 		left: 25
-		top : 
+		top : { if is_new_dual() then 366 else 322 }
-			script: if is_new_dual() then 366 else 322
 		height: 67
 		width: 38
 		z index: 4
@@ -312,9 +296,7 @@ card style:
 			ongoing: /vs-common.mse-include/ongoing.png
 			range: /vs-common.mse-include/range.png
 		direction: vertical
-		spacing: 0
+		spacing: 33
 	############################# Text box
 	rule text:
 		left: 84
@@ -339,7 +321,6 @@ card style:
 		padding right:  2
 		padding bottom: 2
 		line height hard: 1.4
 	flavor text:
 		left: 84
 		top : 356
@@ -358,30 +339,23 @@ card style:
 		padding right:  2
 		padding bottom: 2
 		line height hard: 1
 	watermark:
-		left: 
+		left: { if watermark_narrow() then 197 else if watermark_wide() then 132 else 166 }
-			script: if watermark_narrow() then 197 else
-				if watermark_wide() then 132 else 166
 		top:  365
-		width: 
+		width: { if watermark_narrow() then 60 else if watermark_wide() then 165 else 106 }
-			script: if watermark_narrow() then 60 else
-				if watermark_wide() then 165 else 106
 		height: 80
-		visible:
+		visible: { styling.watermarkings }
-			script: styling.watermarkings
 		render style: image
 		include file: /vs-common.mse-include/watermarks
 		z index: 4
+	############################# Attack/defence
-	############################# Atack/defence
 	attack:
 		z index: 4
 		left:	50
 		top:	427
 		width:	30
 		height:	47
-		visible: script: is_character()
+		visible: { is_character() }
 		z index: 4
 		alignment: bottom left shrink-overflow
 		font:
@@ -391,14 +365,13 @@ card style:
 			shadow color: rgb(0,0,0)
 			shadow displacement x: 3
 			shadow displacement y: 0
 	defence:
 		z index: 4
 		left:	50
 		top:	462
 		width:	30
 		height:	47
-		visible: script: is_character()
+		visible: { is_character() }
 		z index: 4
 		alignment: bottom left shrink-overflow
 		padding bottom: -4
@@ -409,23 +382,20 @@ card style:
 			shadow color: rgb(0,0,0)
 			shadow displacement x: -3
 			shadow displacement y: 0
 	############################# Card sorting / numbering
 	############################# Copyright stuff
 	illustrator:
 		left: 130
 		top : 322
 		width: 165
 		height: 16
-		alignment: center top shrink-overflow
+		alignment: center top
 		z index: 4
 		font:
 			name: Eurostile
 			size: 9
 			weight: bold
 			color: rgb(255,255,255)
 	copyright:
 		left: 195
 		top : 480
@@ -438,24 +408,19 @@ card style:
 			size: 6
 			color: rgb(255,255,255)
 ############################################################## Extra card fields
 extra card field:
 	type: choice
 	name: foil layer
 	choice: foil
 	editable: false
 extra card style:
 	foil layer:
 		left: 0
 		top : 0
-		width:  
+		width:  { if styling.foils=="no" then 0 else 375 }
-			script: if styling.foils=="no" then 0 else 375
+		height: { if styling.foils=="no" then 0 else 523 }
-		height:
-			script: if styling.foils=="no" then 0 else 523
 		z index: 8
 		render style: image
 		choice images:
 			foil: /vs-common.mse-include/foil.png
-		visible:
+		visible: { styling.foils }
-			script: styling.foils
--- a/data/vs-insanity.mse-style/card-sample.png
+++ b/data/vs-insanity.mse-style/card-sample.png
--- a/data/vs-insanity.mse-style/chcocard.jpg
+++ b/data/vs-insanity.mse-style/chcocard.jpg
--- a/data/vs-insanity.mse-style/chodcard.jpg
+++ b/data/vs-insanity.mse-style/chodcard.jpg
--- a/data/vs-insanity.mse-style/choncard.jpg
+++ b/data/vs-insanity.mse-style/choncard.jpg
--- a/data/vs-insanity.mse-style/cvcdcard.jpg
+++ b/data/vs-insanity.mse-style/cvcdcard.jpg
--- a/data/vs-insanity.mse-style/cvchcard.jpg
+++ b/data/vs-insanity.mse-style/cvchcard.jpg
--- a/data/vs-insanity.mse-style/cvcncard.jpg
+++ b/data/vs-insanity.mse-style/cvcncard.jpg
--- a/data/vs-insanity.mse-style/eveqcard.jpg
+++ b/data/vs-insanity.mse-style/eveqcard.jpg
--- a/data/vs-insanity.mse-style/flavor-text-mask.png
+++ b/data/vs-insanity.mse-style/flavor-text-mask.png
--- a/data/vs-insanity.mse-style/image-mask-dual.png
+++ b/data/vs-insanity.mse-style/image-mask-dual.png
--- a/data/vs-insanity.mse-style/image-mask.png
+++ b/data/vs-insanity.mse-style/image-mask.png
--- a/data/vs-insanity.mse-style/locard.jpg
+++ b/data/vs-insanity.mse-style/locard.jpg
--- a/data/vs-insanity.mse-style/ptcard.jpg
+++ b/data/vs-insanity.mse-style/ptcard.jpg
--- a/data/vs-insanity.mse-style/style
+++ b/data/vs-insanity.mse-style/style
+mse version: 0.3.6
+game: vs
+full name: VS Insanity
+short name: Insanity
+icon: card-sample.png
+position hint: 004
+version: 2008-01-03
+depends on:
+	package: vs.mse-game
+	version: 2008-01-03
+depends on:
+	package: vs-common.mse-include
+	version: 2008-01-03
+depends on:
+	package: vs-standard-arrow.mse-symbol-font
+	version: 2008-01-03
+depends on:
+	package: vs-standard-official.mse-symbol-font
+	version: 2008-01-03
+card background: white
+card width: 375
+card height: 523
+card dpi: 150
+############################################################## Extra scripts
+############################################################## Set info fields
+############################################################## Extra style
+styling field:
+	type: boolean
+	name: foils
+	description: Use foil backgrounds?
+	initial: no
+styling field:
+	type: boolean
+	name: watermarkings
+	description: Use watermarks?
+	initial: no
+styling field:
+	type: boolean
+	name: edition
+	description: Is the set a 1st Edition?
+	initial: no
+############################################################## Card fields
+card style:
+	############################# Background stuff
+	card type:
+		left:	0
+		top:	0
+		width:	375
+		height:	523
+		z index: -2
+		render style: image
+		popup style: in place
+		choice images:
+			characters visible character:					cvchcard.jpg
+			characters visible character dual:				cvcdcard.jpg
+			characters visible character dual (new):			cvcncard.jpg
+			characters hidden concealed:					chcocard.jpg
+			characters hidden concealed dual:				chodcard.jpg
+			characters hidden concealed dual (new):				choncard.jpg
+			characters concealed-optional concealed-optional character:	chcocard.jpg
+			characters concealed-optional concealed-optional dual:		chodcard.jpg
+			characters concealed-optional concealed-optional dual (new):	choncard.jpg
+			equipment visible equipment:					eveqcard.jpg
+			equipment concealed equipment:					eveqcard.jpg
+			equipment concealed-optional equipment:				eveqcard.jpg
+			location:							locard.jpg
+			plot twist:							ptcard.jpg
+			planet:								locard.jpg
+	############################# Name line
+	full name:
+		left: 90
+		top : 25
+		width: 219
+		height: 24
+		alignment: bottom shrink-overflow
+		padding bottom: 0
+		z index: 4
+		font:
+			name: Percolator Expert
+			size: 22
+			color: 
+				script:	if is_concealed()	then rgb(23,4,6)
+				else	if is_equipment()	then rgb(18,21,26)
+				else    if is_location()	then rgb(31,53,30)
+				else    if is_plot_twist()	then rgb(28,47,87)
+				else                                 rgb(22,10,10)
+		symbol font:
+			name: vs-standard-arrow
+			size: 15
+			alignment: middle center
+	cost:
+		left: 33
+		top : 30
+		width: 25
+		height: 41
+		alignment: bottom center
+		font:
+			name: BadhouseBoldNumbers
+			size: 40
+			color: 
+				script:	if is_equipment()  then rgb(240,221,146)
+				else    if is_location()   then rgb(193,240,250)
+				else    if is_plot_twist() then rgb(161,174,238)
+				else                            rgb(255,236,130)
+		z index: 4
+		padding top: 0
+	############################# Image
+	image:
+		left:	65
+		top:	78
+		width:	{ if is_dual() then 249 else 282 }
+		height: 241
+		mask: { if is_dual() then "image-mask-dual.png" else "image-mask.png" }
+		z index: 1
+	card symbol:
+		left: 310
+		top : 31
+		height: 30
+		width: 45
+		render style: image
+		choice images:
+			Marvel:	/vs-common.mse-include/marvel.png
+			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
+		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
+		height: 26
+		width: 34
+		render style: image
+		choice images:
+			first edition: /vs-common.mse-include/first-edition.png
+		z index: 3
+		visible: { styling.edition }
+	############################# Type Bar
+	type text full:
+		left:	72
+		top:	299
+		width:	{ if is_dual() then 235 else 268 }
+		height: 20
+		font:
+			name: Eurostile
+			size: 11
+			color: rgb(0,0,0)
+		visible: { is_character() }
+		alignment: middle center
+		z index: 3
+	type bar:
+		left:	72
+		top:	299
+		width:	{ if is_dual() then 235 else 268 }
+		height: 20
+		visible: { card.type_text != "" }
+		render style: image
+		choice images:
+			type bar: type-bar.png
+		z index: 2
+	############################# Version
+	version full:
+		left: 90
+		top : 46
+		width: 219
+		height: 18
+		alignment: top shrink-overflow
+		z index: 4
+		font:
+			name: Percolator Expert
+			size: 14
+			color: 
+				script:	if is_concealed()	then rgb(23,4,6)
+				else	if is_equipment()	then rgb(18,21,26)
+				else    if is_location()	then rgb(31,53,30)
+				else    if is_plot_twist()	then rgb(28,47,87)
+				else                                 rgb(22,10,10)
+			separator color: rgb(128,128,128)
+	############################# Card ID
+	number line:
+		left: 136
+		top : 485
+		width: 30
+		height: 18
+		z index: 4
+		font:
+			name: Eurostile
+			size: 8
+			color:
+				script: if card.rarity=="common"   then rgb(255,255,255)
+				else    if card.rarity=="uncommon" then rgb(80,174,255)
+				else    if card.rarity=="rare"     then rgb(255,236,130)
+				else 	if card.rarity=="promo"    then rgb(255,20,20)
+				else rgb(255,255,255)
+			weight: bold
+	promo outliner:
+		left: 135
+		top : 484
+		width: 30
+		height: 18
+		visible: { card.rarity=="promo" }
+		z index: 3
+		font:
+			name: Eurostile
+			size: 8
+			color: rgb(255,255,255)
+			weight: bold
+	promo outliner 2:
+		left: 137
+		top : 486
+		width: 30
+		height: 18
+		visible: { card.rarity=="promo" }
+		z index: 3
+		font:
+			name: Eurostile
+			size: 8
+			color: rgb(255,255,255)
+			weight: bold
+	rarity:
+		left: 135
+		top: 484
+		width: 50
+		height: 30
+		z index: 3
+		render style: image hidden
+		choice images:
+			common:	  /vs-common.mse-include/rarity-common.png
+			uncommon: /vs-common.mse-include/rarity-uncommon.png
+			rare:	  /vs-common.mse-include/rarity-rare.png
+			promo:    /vs-common.mse-include/rarity-promo.png
+	############################# Affiliation
+	team full:
+		left: 23
+		top : { if is_new_dual() then 340 else 300 }
+		height: 28
+		width: { if is_new_dual() then 240 else 200 }
+		angle: 90
+		font:
+			name: Percolator Expert
+			size: 19
+			scale down to: 16
+			color: rgb(245,230,197)
+		symbol font:
+			name: vs-standard-arrow
+			size: 18
+			alignment: middle center
+		alignment: middle center
+		z index: 4
+		padding left:   2
+		padding top:    2
+		padding right:  2
+		padding bottom: 2
+	team 2 full:
+		left: 325
+		top : 100
+		height: 28
+		width: 200
+		angle: 270
+		font:
+			name: Percolator Expert
+			size: 19
+			scale down to: 18
+			color: rgb(245,230,197)
+		symbol font:
+			name: vs-standard-arrow
+			size: 18
+			alignment: middle center
+		visible: is_dual()
+		alignment: middle center
+		z index: 4
+		padding left:   2
+		padding top:    2
+		padding right:  2
+		padding bottom: 2
+	############################# FlightRange
+	symbols:
+		left: 25
+		top : { if is_new_dual() then 366 else 322 }
+		height: 67
+		width: 38
+		z index: 4
+		render style: image list
+		choice images:
+			flight: /vs-common.mse-include/flight.png
+			ongoing: /vs-common.mse-include/ongoing.png
+			range: /vs-common.mse-include/range.png
+		direction: vertical
+		spacing: 33
+	############################# Text box
+	rule text:
+		left: 84
+		top : 336
+		width: 272
+		height: 120
+		mask: text-mask.png
+		font:
+			name: Eurostile
+			italic name: EurostileObl-Normal
+			size: 11
+			scale down to: 6
+			color: rgb(0,0,0)
+		symbol font:
+			name: vs-standard-arrow
+			size: 11
+			alignment: middle center
+		alignment: top left
+		z index: 4
+		padding left:   2
+		padding top:    5
+		padding right:  2
+		padding bottom: 2
+		line height hard: 1.4
+	flavor text:
+		left: 84
+		top : 356
+		width: 272
+		height: 118
+		mask: flavor-text-mask.png
+		font:
+			name: EurostileObl-Normal
+			size: 10
+			scale down to: 6
+			color: rgb(0,0,0)
+		alignment: bottom left
+		z index: 3
+		padding left:   2
+		padding top:    2
+		padding right:  2
+		padding bottom: 2
+		line height hard: 1
+	watermark:
+		left: { if watermark_narrow() then 197 else if watermark_wide() then 132 else 166 }
+		top:  365
+		width: { if watermark_narrow() then 60 else if watermark_wide() then 165 else 106 }
+		height: 80
+		visible: { styling.watermarkings }
+		render style: image
+		include file: /vs-common.mse-include/watermarks
+		z index: 4
+	############################# Attack/defence
+	attack:
+		z index: 4
+		left:	50
+		top:	427
+		width:	30
+		height:	47
+		visible: { is_character() }
+		z index: 4
+		alignment: bottom left shrink-overflow
+		font:
+			name: BadhouseBoldNumbers
+			size: 50
+			color: rgb(255,236,130)
+			shadow color: rgb(0,0,0)
+			shadow displacement x: 3
+			shadow displacement y: 0
+	defence:
+		z index: 4
+		left:	50
+		top:	462
+		width:	30
+		height:	47
+		visible: { is_character() }
+		z index: 4
+		alignment: bottom left shrink-overflow
+		padding bottom: -4
+		font:
+			name: BadhouseBoldNumbers
+			size: 50
+			color: rgb(200,213,225)
+			shadow color: rgb(0,0,0)
+			shadow displacement x: -3
+			shadow displacement y: 0
+	############################# Card sorting / numbering
+	############################# Copyright stuff
+	illustrator:
+		left: 130
+		top : 322
+		width: 165
+		height: 16
+		alignment: center top
+		z index: 4
+		font:
+			name: Eurostile
+			size: 9
+			weight: bold
+			color: rgb(255,255,255)
+	copyright:
+		left: 195
+		top : 480
+		width: 130
+		height: 22
+		z index: 4
+		alignment: middle left
+		font: 
+			name: Eurostile
+			size: 6
+			color: rgb(255,255,255)
+############################################################## Extra card fields
+extra card field:
+	type: choice
+	name: foil layer
+	choice: foil
+	editable: false
+extra card style:
+	foil layer:
+		left: 0
+		top : 0
+		width:  { if styling.foils=="no" then 0 else 375 }
+		height: { if styling.foils=="no" then 0 else 523 }
+		z index: 8
+		render style: image
+		choice images:
+			foil: /vs-common.mse-include/foil.png
+		visible: { styling.foils }
--- a/data/vs-insanity.mse-style/text-mask.png
+++ b/data/vs-insanity.mse-style/text-mask.png
--- a/data/vs-insanity.mse-style/type-bar.png
+++ b/data/vs-insanity.mse-style/type-bar.png
--- a/data/vs-new.mse-style/image-mask.png
+++ b/data/vs-new.mse-style/image-mask.png
--- a/data/vs-new.mse-style/plcard.png
+++ b/data/vs-new.mse-style/plcard.png
--- a/data/vs-new.mse-style/style
+++ b/data/vs-new.mse-style/style
-mse version: 0.3.5
+mse version: 0.3.6
 game: vs
 full name: New Style EM
 short name: New Style
 icon: card-sample.png
-position hint: 006
+position hint: 001
-version: 2007-10-05
+version: 2008-01-03
 depends on:
 	package: vs.mse-game
-	version: 2007-09-23
+	version: 2007-09-06
 depends on:
 	package: vs-common.mse-include
-	version: 2007-09-23
+	version: 2007-09-06
 depends on:
-	package: vs-standard-new.mse-symbol-font
+	package: vs-standard-official.mse-symbol-font
-	version: 2007-09-23
+	version: 2008-01-03
-depends on:
-	package: vs-standard-arrow.mse-symbol-font
-	version: 2007-09-23
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
 ############################################################## Extra scripts
 init script:
 	con_opt_template_1 := {
 			if   styling.con_optional == "c-left" then "ccoccard2.png"
@@ -40,9 +37,7 @@ init script:
 	}
 ############################################################## Set info fields
 ############################################################## Extra style
 styling field:
 	type: boolean
 	name: foils
@@ -60,21 +55,12 @@ styling field:
 	initial: c-left
 	choice: c-left
 	choice: c-right
-styling field:
-	type: choice
-	name: symbol font
-	description: Use which symbol font?
-	initial: new
-	choice: new
-	choice: old
 styling style:
 	con optional:
 		render style: both
 		choice images:
 			c-left: ccoccard2.png
 			c-right: ccoccard.png
 ############################################################## Card fields
 card style:
 	############################# Background stuff
@@ -101,15 +87,14 @@ card style:
 			equipment concealed-optional equipment:				eoeqcard.png
 			location:							locard.png
 			plot twist:							ptcard.png
+			planet:								plcard.png
 	############################# Name line
 	full name:
 		left: 82
 		top : 20
 		width: 230
 		height: 30
-		alignment: middle center shrink-overflow
+		alignment: middle center
 		padding bottom: 0
 		z index: 4
 		font:
@@ -119,11 +104,7 @@ card style:
 			color: rgb(247,239,231)
 			separator color: rgb(247,239,231)
 		symbol font:
-			name:
+			name: vs-standard-official
-				script:
-					if styling.symbol_font == "new"
-					then "vs-standard-new"
-					else "vs-standard-arrow"
 			size: 15
 			alignment: middle center
 	cost:
@@ -140,15 +121,16 @@ card style:
 			shadow displacement x: 2
 			shadow displacement y: 2
 		z index: 4
+		visible: { card.card_type!="planet" }
 		padding top: 0
 	############################# Image
 	image:
-		left:	19
+		left:	18
 		top:	73
-		width:	339
+		width:	{ if card.card_type=="planet" then 0 else 339 }
-		height: 255
+		height: { if card.card_type=="planet" then 0 else 255 }
 		mask:	image-mask.png
+		visible: { card.card_type!="planet" }
 		z index: 1
 	card symbol:
 		left: 315
@@ -168,42 +150,38 @@ card style:
 		top: 31
 		height: 30
 		width: 30
-		visible: script: card.card_symbol=="Other..."
+		visible: { card.card_symbol=="Other..." }
 		z index: 4
 	############################# Type Bar
 	type text full:
 		left:	19
 		top:	317
-		width:	339
+		width:	{ if card.card_type=="planet" then 0 else 339 }
-		height: 12
+		height: { if card.card_type=="planet" then 0 else 12 }
 		font:
 			name: BankGothic Md BT
 			size: 8
 			color: rgb(0,0,0)
-		visible: script: is_character()
+		visible: { is_character() }
 		alignment: middle center
 		z index: 3
 	type bar:
 		left:	19
 		top:	317
-		width:	339
+		width:	{ if card.card_type=="planet" then 0 else 339 }
-		height: 13
+		height: { if card.card_type=="planet" then 0 else 13 }
-		visible:
+		visible: { card.type_text != "" }
-			script: card.type_text != ""
 		render style: image
 		choice images:
 			type bar: type-bar.png
 		z index: 2
 	############################# Version
 	version full:
 		left: 80
 		top : 51
 		width: 230
 		height: 18
-		alignment: middle center shrink-overflow
+		alignment: middle center
 		z index: 4
 		font:
 			name: Percolator Expert
@@ -211,11 +189,10 @@ card style:
 			scale down to: 8
 			color: rgb(247,239,231)
 			separator color: rgb(247,239,231)
 	############################# Card ID
 	number line:
-		left: 106
+		left: { if card.card_type=="planet" then 165 else 106 }
-		top : 481
+		top : { if card.card_type=="planet" then 468 else 481 }
 		width: 45
 		height: 15
 		z index: 4
@@ -229,11 +206,11 @@ card style:
 				else 	if card.rarity=="promo"    then rgb(255,20,20)
 				else rgb(255,255,255)
 	promo outliner:
-		left: 105
+		left: { if card.card_type=="planet" then 164 else 105 }
-		top : 480
+		top : { if card.card_type=="planet" then 467 else 480 }
 		width: 45
 		height: 15
-		visible: script: card.rarity=="promo"
+		visible: { card.rarity=="promo" }
 		z index: 3
 		font:
 			name: Eurostile
@@ -241,11 +218,11 @@ card style:
 			color: rgb(255,255,255)
 			weight: bold
 	promo outliner 2:
-		left: 107
+		left: { if card.card_type=="planet" then 166 else 107 }
-		top : 482
+		top : { if card.card_type=="planet" then 469 else 482 }
 		width: 45
 		height: 15
-		visible: script: card.rarity=="promo"
+		visible: { card.rarity=="promo" }
 		z index: 3
 		font:
 			name: Eurostile
@@ -253,8 +230,8 @@ card style:
 			color: rgb(255,255,255)
 			weight: bold
 	rarity:
-		left: 120
+		left: { if card.card_type=="planet" then 180 else 120 }
-		top: 470
+		top: { if card.card_type=="planet" then 458 else 470 }
 		width: 23
 		height: 25
 		z index: 5
@@ -264,11 +241,10 @@ card style:
 			uncommon: /vs-common.mse-include/rarity-uncommon.png
 			rare:	  /vs-common.mse-include/rarity-rare.png
 			promo:    /vs-common.mse-include/rarity-promo.png
 	############################# Affiliation
 	team full:
-		left: 30
+		left: { if card.card_type=="planet" then 20 else 19 }
-		top : 329
+		top : { if card.card_type=="planet" then 441 else 329 }
 		height: 28
 		width: 338
 		font:
@@ -280,23 +256,21 @@ card style:
 				else	if is_equipment()	then rgb(82,82,82)
 				else    if is_location()	then rgb(0,48,33)
 				else    if is_plot_twist()	then rgb(28,47,87)
+				else if card.card_type=="planet" then rgb(243,217,105)
 				else                                  rgb(41,0,0)
-		alignment: middle center shrink-overflow
+		alignment: middle center
 		z index: 4
 		padding left:   4
 		padding top:    4
 		padding right:  4
 		padding bottom: 4
 	############################# FlightRange
 	############################# Text box
 	rule text:
-		left: 20
+		left: { if card.card_type=="planet" then 72 else 20 }
-		top : 353
+		top : { if card.card_type=="planet" then 123 else 353 }
-		width: 338
+		width: { if card.card_type=="planet" then 236 else 335 }
-		height: 100
+		height: { if card.card_type=="planet" then 305 else if card.flavor_text!="" then 80 else 100 }
 		font:
 			name: Eurostile
 			italic name: EurostileObl-Normal
@@ -304,63 +278,51 @@ card style:
 			scale down to: 6
 			color: rgb(0,0,0)
 		symbol font:
-			name:
+			name: vs-standard-official
-				script:
-					if styling.symbol_font == "new"
-					then "vs-standard-new"
-					else "vs-standard-arrow"
 			size: 14
 			alignment: middle center
-		alignment: top left shrink-overflow
+		alignment: middle left
 		z index: 3
-		padding left:   2
+		padding left:   3
 		padding top:    5
 		padding right:  2
 		padding bottom: 2
 		line height hard: 1.4
 	flavor text:
 		left: 90
 		top : 435
-		width: 225
+		width: { if card.card_type=="planet" then 0 else 225 }
-		height: 40
+		height: { if card.card_type=="planet" then 0 else 40 }
 		font:
 			name: EurostileObl-Normal
 			size: 10
 			scale down to: 6
 			color: rgb(0,0,0)
-		alignment: bottom center shrink-overflow
+		alignment: bottom center
 		z index: 3
+		visible: { card.card_type!="planet" }
 		padding left:   2
 		padding top:    2
 		padding right:  2
 		padding bottom: 2
 		line height hard: 1
 	watermark:
-		left: 
+		left: { if watermark_narrow() then 150 else if watermark_wide() then 112 else 147 }
-			script: if watermark_narrow() then 150 else
-				if watermark_wide() then 112 else 147
 		top:  367
-		width: 
+		width: { if watermark_narrow() then 75 else if watermark_wide() then 165 else 90 }
-			script: if watermark_narrow() then 75 else
-				if watermark_wide() then 165 else 90
 		height: 90
-		visible: 
+		visible: { styling.watermarkings }
-			script: styling.watermarkings
 		render style: image
 		include file: /vs-common.mse-include/watermarks
 		z index: 4
 	############################# Attack/defence
 	attack:
 		z index: 4
 		left:	24
 		top:	448
-		width:	30
+		width:	{ if card.card_type=="planet" then 0 else 30 }
-		height:	47
+		height:	{ if card.card_type=="planet" then 0 else 47 }
-		visible: script: is_character()
+		visible: { is_character() }
 		z index: 4
 		alignment: bottom center shrink-overflow
 		font:
@@ -370,14 +332,13 @@ card style:
 			shadow color: rgb(0,0,0)
 			shadow displacement x: 3
 			shadow displacement y: 0
 	defence:
 		z index: 4
 		left:	323
 		top:	448
-		width:	30
+		width:	{ if card.card_type=="planet" then 0 else 30 }
-		height:	47
+		height:	{ if card.card_type=="planet" then 0 else 47 }
-		visible: script: is_character()
+		visible: { is_character() }
 		z index: 4
 		alignment: bottom center shrink-overflow
 		font:
@@ -387,13 +348,11 @@ card style:
 			shadow color: rgb(0,0,0)
 			shadow displacement x: -3
 			shadow displacement y: 0
 	############################# Card sorting / numbering
 	############################# Copyright stuff
 	illustrator:
 		left: 169
-		top : 480
+		top : 476
 		width: 133
 		height: 15
 		alignment: middle left shrink-overflow
@@ -402,19 +361,18 @@ card style:
 			name: BankGothic Md BT
 			size: 6
 			color: rgb(255,255,255)
+		visible: { card.card_type!="planet" }
 	copyright:
-		left: 103
+		left: { if card.card_type=="planet" then 139 else 103 }
-		top : 493
+		top : { if card.card_type=="planet" then 479 else 493 }
-		width: 200
+		width: { if card.card_type=="planet" then 100 else 200 }
-		height: 10
+		height: { if card.card_type=="planet" then 20 else 10 }
 		z index: 4
 		alignment: middle center
 		font: 
 			name: Eurostile
 			size: 6
 			color: rgb(255,255,255)
 ############################################################## Extra card fields
 extra card field:
 	type: choice
@@ -453,9 +411,14 @@ extra card field:
 	type: choice
 	name: affiliation
 	editable: false
-	initial: none
+	initial: nones
 	include file: /vs-common.mse-include/watermark-names
+extra card field:
+	type: choice
+	name: affiliation2
+	editable: false
+	initial: none
+	include file: /vs-common.mse-include/dual-affiliation
 extra card style:
 	playarea:
 		left: 320
@@ -463,7 +426,6 @@ extra card style:
 		height: 15
 		width: 29
 		z index: 4
-		visible: { is_character() or is_equipment() }
 		render style: image list
 		choice images:
 			visible: visible.png
@@ -494,18 +456,15 @@ extra card style:
 	foil layer:
 		left: 0
 		top : 0
-		width:  
+		width: { if styling.foils=="no" then 0 else 375 }
-			script: if styling.foils=="no" then 0 else 375
+		height: { if styling.foils=="no" then 0 else 523 }
-		height:
-			script: if styling.foils=="no" then 0 else 523
 		z index: 8
 		render style: image
 		choice images:
 			foil: /vs-common.mse-include/foil.png
-		visible:
+		visible: { styling.foils }
-			script: styling.foils
 	affiliation:
-		right: { 194 + card_style.team_full.content_width * -0.5 }
+		right: { 184 + card_style.team_full.content_width * -0.5 }
 		top : 330
 		height: 17
 		width: 28
@@ -513,3 +472,12 @@ extra card style:
 		alignment: middle right
 		render style: image
 		include file: /vs-common.mse-include/affiliations
+	affiliation2:
+		right: { card_style.team_full.content_width * 0.5 + 217 }
+		top : 330
+		height: 17
+		width: 28
+		z index: 5
+		alignment: middle left
+		render style: image
+		include file: /vs-common.mse-include/affiliations
--- a/data/vs-oversize.mse-style/card-sample.PNG
+++ b/data/vs-oversize.mse-style/card-sample.PNG
--- a/data/vs-oversize.mse-style/card-sample.jpg
+++ b/data/vs-oversize.mse-style/card-sample.jpg
--- a/data/vs-oversize.mse-style/card.png
+++ b/data/vs-oversize.mse-style/card.png
--- a/data/vs-oversize.mse-style/image-mask.png
+++ b/data/vs-oversize.mse-style/image-mask.png
--- a/data/vs-oversize.mse-style/style
+++ b/data/vs-oversize.mse-style/style
+mse version: 0.3.6
+game: vs
+full name: VS Oversize Avatar
+short name: Oversize Avatar
+icon: card-sample.png
+position hint: 007
+version: 2008-01-03
+depends on:
+	package: vs.mse-game
+	version: 2008-01-03
+depends on:
+	package: vs-common.mse-include
+	version: 2008-01-03
+depends on:
+	package: vs-standard-arrow.mse-symbol-font
+	version: 2008-01-03
+depends on:
+	package: vs-standard-official.mse-symbol-font
+	version: 2008-01-03
+card background: white
+card width: 375
+card height: 523
+card dpi: 75
+############################################################## Extra scripts
+############################################################## Set info fields
+############################################################## Extra style
+styling field:
+	type: boolean
+	name: foils
+	description: Use foil backgrounds?
+	initial: no
+############################################################## Card fields
+card style:
+	############################# Background stuff
+	card type:
+		left:	0
+		top:	0
+		width:	375
+		height:	523
+		z index: -2
+		render style: image
+		popup style: in place
+		choice images:
+			characters visible character:					card.png
+			characters visible character dual:				card.png
+			characters visible character dual (new):			card.png
+			characters hidden concealed:					card.png
+			characters hidden concealed dual:				card.png
+			characters hidden concealed dual (new):				card.png
+			characters concealed-optional concealed-optional character:	card.png
+			characters concealed-optional concealed-optional dual:		card.png
+			characters concealed-optional concealed-optional dual (new):	card.png
+			equipment visible equipment:					card.png
+			equipment concealed equipment:					card.png
+			equipment concealed-optional equipment:				card.png
+			location:							card.png
+			plot twist:							card.png
+			planet:								card.png
+	############################# Name line
+	full name:
+		left: 80
+		top : 24
+		width: 230
+		height: 24
+		alignment: bottom center shrink-overflow
+		padding bottom: 0
+		z index: 4
+		font:
+			name: Percolator Expert
+			size: 22
+			color: rgb(230,230,230)
+		symbol font:
+			name: vs-standard-official
+			size: 15
+			alignment: middle center
+	cost:
+		left: 22
+		top : 30
+		width: 25
+		height: 41
+		alignment: bottom center
+		font:
+			name: BadhouseBoldNumbers
+			size: 40
+			color: rgb(230,230,230)
+		z index: 4
+		padding top: 0
+	############################# Image
+	image:
+		left:	19
+		top:	73
+		width:	339
+		height: 330
+		z index: 1
+		mask: image-mask.png
+	card symbol:
+		left: 310
+		top : 33
+		height: 30
+		width: 45
+		render style: image
+		choice images:
+			Marvel:	/vs-common.mse-include/marvel.png
+			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
+		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:
+		left: 80
+		top : 49
+		width: 230
+		height: 18
+		alignment: middle center shrink-overflow
+		padding bottom: 0
+		z index: 4
+		font:
+			name: Percolator Expert
+			size: 14
+			color: rgb(230,230,230)
+		symbol font:
+			name: vs-standard-arrow
+			size: 15
+			alignment: middle center
+	############################# Card ID
+	number line:
+		left: 24
+		top : 489
+		width: 30
+		height: 16
+		z index: 5
+		alignment: left middle
+		font:
+			name: Eurostile-Black-DTC
+			size: 8
+			color:
+				script: if card.rarity=="common"   then rgb(255,255,255)
+				else    if card.rarity=="uncommon" then rgb(151,183,201)
+				else    if card.rarity=="rare"     then rgb(253,215,125)
+				else 	if card.rarity=="promo"    then rgb(255,20,20)
+				else rgb(255,255,255)
+	promo outliner:
+		left: 23
+		top : 488
+		width: 45
+		height: 15
+		visible: { card.rarity=="promo" }
+		z index: 4
+		alignment: left middle
+		font:
+			name: Eurostile
+			size: 8
+			color: rgb(255,255,255)
+			weight: bold
+	promo outliner 2:
+		left: 25
+		top : 490
+		width: 45
+		height: 15
+		visible: { card.rarity=="promo" }
+		z index: 4
+		alignment: left middle
+		font:
+			name: Eurostile
+			size: 8
+			color: rgb(255,255,255)
+			weight: bold
+	rarity:
+		left: 35
+		top: 488
+		width: 20
+		height: 18
+		z index: 6
+		render style: image hidden
+		choice images:
+			common:	  /vs-common.mse-include/rarity-common.png
+			uncommon: /vs-common.mse-include/rarity-uncommon.png
+			rare:	  /vs-common.mse-include/rarity-rare.png
+			promo:    /vs-common.mse-include/rarity-promo.png
+	############################# Affiliation
+	team full:
+		left: 20
+		top:  406
+		width: 338
+		height: 20
+		font:
+			name: BankGothic Md BT
+			italic name: BankGothic Md BT
+			weight: bold
+			size: 12
+			scale down to: 12
+			color: rgb(230,230,230)
+		alignment: middle center
+	############################# FlightRange
+	############################# Text box
+	rule text:
+		left: 20
+		top : 430
+		width: 338
+		height: 38
+		font:
+			name: Eurostile
+			italic name: EurostileObl-Normal
+			size: 12
+			scale down to: 2
+			color: rgb(0,0,0)
+		symbol font:
+			name: vs-standard-official
+			size: 14
+			alignment: middle center
+		alignment: top left
+		z index: 3
+		padding left:   2
+		padding top:    0
+		padding right:  2
+		padding bottom: 2
+		line height hard: 1.0
+	flavor text:
+		left: 20
+		top : 468
+		width: 338
+		height: 17
+		font:
+			name: EurostileObl-Normal
+			italic name: EurostileObl-Normal
+			size: 10
+			scale down to: 2
+			color: rgb(0,0,0)
+		alignment: bottom center
+		z index: 3
+		padding left:   2
+		padding top:    2
+		padding right:  2
+		padding bottom: 2
+		line height hard: 1.0
+	############################# Attack/defence
+	############################# Card sorting / numbering
+	############################# Copyright stuff
+	illustrator:
+		left: 20
+		top : 489
+		width: 338
+		height: 7
+		alignment: middle center
+		z index: 4
+		font:
+			name: Eurostile
+			size: 6
+			color: rgb(255,255,255)
+	copyright:
+		left: 20
+		top : 497
+		width: 338
+		height: 7
+		z index: 4
+		alignment: bottom center
+		font: 
+			name: Eurostile
+			weight: bold
+			size: 6
+			color: rgb(255,255,255)
+############################################################## Extra card fields
+extra card field:
+	type: choice
+	name: foil layer
+	choice: foil
+	editable: false
+extra card style:
+	foil layer:
+		left: 0
+		top : 0
+		width:  { if styling.foils=="no" then 0 else 375 }
+		height: { if styling.foils=="no" then 0 else 523 }
+		z index: 8
+		render style: image
+		choice images:
+			foil: /vs-common.mse-include/foil.png
+		visible: { styling.foils }
--- a/data/vs-spoiler.mse-export-template/export-template
+++ b/data/vs-spoiler.mse-export-template/export-template
 # Simple exporter for HTML files
-mse version: 0.3.5
+mse version: 0.3.6
 game:        vs
 short name:  Spoiler
 full name:   List of cards
 icon: preview.png
 create directory: true
-version: 2007-09-23
 option field:
 	type: choice

--- a/data/vs-standard-arrow.mse-symbol-font/symbol-font
+++ b/data/vs-standard-arrow.mse-symbol-font/symbol-font
-mse version: 0.3.5
+mse version: 0.3.6
-version: 2007-10-13
+version: 2008-01-03
+short name: old
+position hint: 2
+icon: arrow.png
 # Symbol font for arrow symbol
 image font size: 135
@@ -16,9 +19,8 @@ symbol:
 symbol:
 	code: <>
 	image: diamonda.png
 ##############################################################
 # Insert-symbol menu
 insert symbol menu:
 	item: ->
-	item: @
+	item: <>
--- a/data/vs-standard-new.mse-symbol-font/X.png
+++ b/data/vs-standard-new.mse-symbol-font/X.png
--- a/data/vs-standard-new.mse-symbol-font/gothamknights.png
+++ b/data/vs-standard-new.mse-symbol-font/gothamknights.png
--- a/data/vs-standard-new.mse-symbol-font/planet.png
+++ b/data/vs-standard-new.mse-symbol-font/planet.png
--- a/data/vs-standard-new.mse-symbol-font/symbol-font
+++ b/data/vs-standard-new.mse-symbol-font/symbol-font
-mse version: 0.3.5
+mse version: 0.3.6
-version: 2007-10-13
+version: 2008-01-03
-# Symbol font for the new template
+short name: New (unofficial)
+position hint: 3
+icon: thunderbolts.png
+# Unofficial symbol font for the new template
 image font size: 135
 horizontal space: 0
@@ -205,13 +208,19 @@ symbol:
 symbol:
 	code: 9
 	image: 9.png
+symbol:
+	code: X
+	image: X.png
+symbol:
+	code: Planet
+	image: planet.png
 ##############################################################
 # Insert-symbol menu
 insert symbol menu:
 	item: ->
 	item: <>
 	item: Activate
+	item: Planet
 	item:
 		name: numbers
 		item: 0
@@ -224,6 +233,7 @@ insert symbol menu:
 		item: 7
 		item: 8
 		item: 9
+		item: X
 	item:
 		name: Marvel Teams
 		item: AIM

--- a/data/vs-standard-new.mse-symbol-font/titans.png
+++ b/data/vs-standard-new.mse-symbol-font/titans.png
--- a/data/vs-standard-official.mse-symbol-font/0.png
+++ b/data/vs-standard-official.mse-symbol-font/0.png
--- a/data/vs-standard-official.mse-symbol-font/1.png
+++ b/data/vs-standard-official.mse-symbol-font/1.png
--- a/data/vs-standard-official.mse-symbol-font/2.png
+++ b/data/vs-standard-official.mse-symbol-font/2.png
--- a/data/vs-standard-official.mse-symbol-font/3.png
+++ b/data/vs-standard-official.mse-symbol-font/3.png
--- a/data/vs-standard-official.mse-symbol-font/4.png
+++ b/data/vs-standard-official.mse-symbol-font/4.png
--- a/data/vs-standard-official.mse-symbol-font/5.png
+++ b/data/vs-standard-official.mse-symbol-font/5.png
--- a/data/vs-standard-official.mse-symbol-font/6.png
+++ b/data/vs-standard-official.mse-symbol-font/6.png
--- a/data/vs-standard-official.mse-symbol-font/7.png
+++ b/data/vs-standard-official.mse-symbol-font/7.png
--- a/data/vs-standard-official.mse-symbol-font/8.png
+++ b/data/vs-standard-official.mse-symbol-font/8.png
--- a/data/vs-standard-official.mse-symbol-font/9.png
+++ b/data/vs-standard-official.mse-symbol-font/9.png
--- a/data/vs-standard-official.mse-symbol-font/F4.png
+++ b/data/vs-standard-official.mse-symbol-font/F4.png
--- a/data/vs-standard-official.mse-symbol-font/X.png
+++ b/data/vs-standard-official.mse-symbol-font/X.png
--- a/data/vs-standard-official.mse-symbol-font/activate.png
+++ b/data/vs-standard-official.mse-symbol-font/activate.png
--- a/data/vs-standard-official.mse-symbol-font/apocalypse.png
+++ b/data/vs-standard-official.mse-symbol-font/apocalypse.png
--- a/data/vs-standard-official.mse-symbol-font/arrow.png
+++ b/data/vs-standard-official.mse-symbol-font/arrow.png
--- a/data/vs-standard-official.mse-symbol-font/avengers.png
+++ b/data/vs-standard-official.mse-symbol-font/avengers.png
--- a/data/vs-standard-official.mse-symbol-font/blank.png
+++ b/data/vs-standard-official.mse-symbol-font/blank.png
--- a/data/vs-standard-official.mse-symbol-font/bprd.png
+++ b/data/vs-standard-official.mse-symbol-font/bprd.png
--- a/data/vs-standard-official.mse-symbol-font/brood.png
+++ b/data/vs-standard-official.mse-symbol-font/brood.png
--- a/data/vs-standard-official.mse-symbol-font/brotherhood.png
+++ b/data/vs-standard-official.mse-symbol-font/brotherhood.png
--- a/data/vs-standard-official.mse-symbol-font/captainamerica.png
+++ b/data/vs-standard-official.mse-symbol-font/captainamerica.png
--- a/data/vs-standard-official.mse-symbol-font/defenders.png
+++ b/data/vs-standard-official.mse-symbol-font/defenders.png
--- a/data/vs-standard-official.mse-symbol-font/diamond.png
+++ b/data/vs-standard-official.mse-symbol-font/diamond.png
--- a/data/vs-standard-official.mse-symbol-font/doom.png
+++ b/data/vs-standard-official.mse-symbol-font/doom.png
--- a/data/vs-standard-official.mse-symbol-font/excalibur.png
+++ b/data/vs-standard-official.mse-symbol-font/excalibur.png
--- a/data/vs-standard-official.mse-symbol-font/gothamknights.png
+++ b/data/vs-standard-official.mse-symbol-font/gothamknights.png
--- a/data/vs-standard-official.mse-symbol-font/greenlantern.png
+++ b/data/vs-standard-official.mse-symbol-font/greenlantern.png
--- a/data/vs-standard-official.mse-symbol-font/hellfire.png
+++ b/data/vs-standard-official.mse-symbol-font/hellfire.png
--- a/data/vs-standard-official.mse-symbol-font/heralds.png
+++ b/data/vs-standard-official.mse-symbol-font/heralds.png
--- a/data/vs-standard-official.mse-symbol-font/jla.png
+++ b/data/vs-standard-official.mse-symbol-font/jla.png
--- a/data/vs-standard-official.mse-symbol-font/jsa.png
+++ b/data/vs-standard-official.mse-symbol-font/jsa.png
--- a/data/vs-standard-official.mse-symbol-font/marvelknights.png
+++ b/data/vs-standard-official.mse-symbol-font/marvelknights.png
--- a/data/vs-standard-official.mse-symbol-font/mastersofevil.png
+++ b/data/vs-standard-official.mse-symbol-font/mastersofevil.png
--- a/data/vs-standard-official.mse-symbol-font/planet.png
+++ b/data/vs-standard-official.mse-symbol-font/planet.png
--- a/data/vs-standard-official.mse-symbol-font/shadowpact.png
+++ b/data/vs-standard-official.mse-symbol-font/shadowpact.png
--- a/data/vs-standard-official.mse-symbol-font/shiar.png
+++ b/data/vs-standard-official.mse-symbol-font/shiar.png
--- a/data/vs-standard-official.mse-symbol-font/sinistersyndicate.png
+++ b/data/vs-standard-official.mse-symbol-font/sinistersyndicate.png
--- a/data/vs-standard-official.mse-symbol-font/spiderman.png
+++ b/data/vs-standard-official.mse-symbol-font/spiderman.png
--- a/data/vs-standard-official.mse-symbol-font/superman.png
+++ b/data/vs-standard-official.mse-symbol-font/superman.png
--- a/data/vs-standard-official.mse-symbol-font/symbol-font
+++ b/data/vs-standard-official.mse-symbol-font/symbol-font
+mse version: 0.3.6
+version: 2008-01-03
+short name: New (official)
+position hint: 1
+icon: activate.png
+# Official symbol font for the new template
+image font size: 135
+horizontal space: 0
+symbol:
+	code: ->
+	image: arrow.png
+symbol:
+	code: >>>
+	image: arrow.png
+symbol:
+	code: @
+	image: diamond.png
+symbol:
+	code: <>
+	image: diamond.png
+symbol:
+	code: Activate
+	image: activate.png
+symbol:
+	code: Horsemen of Apocalypse
+	image: apocalypse.png
+symbol:
+	code: Avengers
+	image: avengers.png
+symbol:
+	code: B.P.R.D.
+	image: bprd.png
+symbol:
+	code: Brood
+	image: brood.png
+symbol:
+	code: Brotherhood
+	image: brotherhood.png
+symbol:
+	code: Marvel Defenders
+	image: defenders.png
+symbol:
+	code: Doom
+	image: doom.png
+symbol:
+	code: Fantastic Four
+	image: f4.png
+symbol:
+	code: Gotham Knights
+	image: gothamknights.png
+symbol:
+	code: Green Lantern
+	image: greenlantern.png
+symbol:
+	code: Hellfire Club
+	image: hellfire.png
+symbol:
+	code: Heralds of Galactus
+	image: heralds.png
+symbol:
+	code: JLA
+	image: jla.png
+symbol:
+	code: JSA
+	image: jsa.png
+symbol:
+	code: Marvel Knights
+	image: marvelknights.png
+symbol:
+	code: Masters of Evil
+	image: mastersofevil.png
+symbol:
+	code: Planet
+	image: planet.png
+symbol:
+	code: Shadowpact
+	image: shadowpact.png
+symbol:
+	code: Shi'ar
+	image: shiar.png
+symbol:
+	code: Sinister Syndicate
+	image: sinistersyndicate.png
+symbol:
+	code: Spider-Friends
+	image: spiderman.png
+symbol:
+	code: Team Superman
+	image: superman.png
+symbol:
+	code: Thule Society
+	image: thule.png
+symbol:
+	code: Teen Titans
+	image: titans.png
+symbol:
+	code: X-Men
+	image: xmen.png			
+symbol:
+	code: 0
+	image: 0.png
+symbol:
+	code: 1
+	image: 1.png
+symbol:
+	code: 2
+	image: 2.png
+symbol:
+	code: 3
+	image: 3.png
+symbol:
+	code: 4
+	image: 4.png
+symbol:
+	code: 5
+	image: 5.png
+symbol:
+	code: 6
+	image: 6.png
+symbol:
+	code: 7
+	image: 7.png
+symbol:
+	code: 8
+	image: 8.png
+symbol:
+	code: 9
+	image: 9.png
+symbol:
+	code: X
+	image: X.png
+##############################################################
+# Insert-symbol menu
+insert symbol menu:
+	item: ->
+	item: <>
+	item: Activate
+	item: Planet
+	item:
+		name: numbers
+		item: 0
+		item: 1
+		item: 2
+		item: 3
+		item: 4
+		item: 5
+		item: 6
+		item: 7
+		item: 8
+		item: 9
+		item: X
+	item:
+		name: Marvel Teams
+		item: Avengers
+		item: Brood
+		item: Brotherhood
+		item: Captain America
+		item: Doom
+		item: Excalibur
+		item: Fantastic Four
+		item: Hellfire Club
+		item: Heralds of Galactus
+		item: Horsemen of Apocalypse
+		item: Marvel Defenders
+		item: Marvel Knights
+		item: Masters of Evil
+		item: Sinister Syndicate
+		item: Spider-Friends
+		item: The Ultimates
+		item: X-Men
+	item:
+		name: DC Teams
+		item: Gotham Knights
+		item: Green Lantern
+		item: JLA
+		item: JSA
+		item: Shadowpact
+		item: Team Superman
+		item: Teen Titans
+	item:
+		name: Other Teams
+		item: B.P.R.D.
+		item: Thule Society
--- a/data/vs-standard-official.mse-symbol-font/thule.png
+++ b/data/vs-standard-official.mse-symbol-font/thule.png
--- a/data/vs-standard-official.mse-symbol-font/titans.png
+++ b/data/vs-standard-official.mse-symbol-font/titans.png
--- a/data/vs-standard-official.mse-symbol-font/ultimates.png
+++ b/data/vs-standard-official.mse-symbol-font/ultimates.png
--- a/data/vs-standard-official.mse-symbol-font/xmen.png
+++ b/data/vs-standard-official.mse-symbol-font/xmen.png
--- a/data/vs-standard.mse-style/style
+++ b/data/vs-standard.mse-style/style
-mse version: 0.3.5
+mse version: 0.3.6
 game: vs
 full name: VS Standard
 short name: Standard
 icon: card-sample.png
-position hint: 001
+position hint: 002
-version: 2007-10-05
+version: 2008-01-03
 depends on:
 	package: vs.mse-game
-	version: 2007-09-23
+	version: 2008-01-03
 depends on:
 	package: vs-common.mse-include
-	version: 2007-09-23
+	version: 2008-01-03
 depends on:
 	package: vs-standard-arrow.mse-symbol-font
-	version: 2007-09-23
+	version: 2008-01-03
+depends on:
+	package: vs-standard-official.mse-symbol-font
+	version: 2008-01-03
+card background: white
 card width: 375
 card height: 523
 card dpi: 150
 ############################################################## Extra scripts
 ############################################################## Set info fields
 ############################################################## Extra style
 styling field:
 	type: boolean
 	name: foils
@@ -41,7 +42,6 @@ styling field:
 	name: edition
 	description: Is the set a 1st Edition?
 	initial: no
 ############################################################## Card fields
 card style:
 	############################# Background stuff
@@ -68,8 +68,7 @@ card style:
 			equipment concealed-optional equipment:				eveqcard.jpg
 			location:							locard.jpg
 			plot twist:							ptcard.jpg
+			planet:								locard.jpg
 	############################# Name line
 	full name:
 		left: 90
@@ -82,7 +81,7 @@ card style:
 		font:
 			name: Percolator Expert
 			size: 22
-			color:
+			color: 
 				script:	if is_concealed()	then rgb(23,4,6)
 				else	if is_equipment()	then rgb(18,21,26)
 				else    if is_location()	then rgb(31,53,30)
@@ -108,16 +107,13 @@ card style:
 				else                            rgb(255,236,130)
 		z index: 4
 		padding top: 0
 	############################# Image
 	image:
 		left:	65
 		top:	78
-		width:	
+		width:	{ if is_dual() then 249 else 282 }
-			script:	if is_dual() then 249 else 282
 		height: 241
-		mask:
+		mask: { if is_dual() then "image-mask-dual.png" else "image-mask.png" }
-			script: if is_dual() then "image-mask-dual.png" else "image-mask.png"
 		z index: 1
 	card symbol:
 		left: 310
@@ -137,7 +133,7 @@ card style:
 		top: 31
 		height: 30
 		width: 30
-		visible: script: card.card_symbol=="Other..."
+		visible: { card.card_symbol=="Other..." }
 		z index: 4
 	edition:
 		left: 315
@@ -148,37 +144,31 @@ card style:
 		choice images:
 			first edition: /vs-common.mse-include/first-edition.png
 		z index: 3
-		visible:
+		visible: { styling.edition }
-			script: styling.edition
 	############################# Type Bar
 	type text full:
 		left:	72
 		top:	299
-		width:	
+		width:	{ if is_dual() then 235 else 268 }
-			script: if is_dual() then 235 else 268
 		height: 20
 		font:
 			name: Eurostile
 			size: 11
 			color: rgb(0,0,0)
-		visible: script: is_character()
+		visible: { is_character() }
 		alignment: middle center
 		z index: 3
 	type bar:
 		left:	72
 		top:	299
-		width:	script: if is_dual() then 235 else 268
+		width:	{ if is_dual() then 235 else 268 }
 		height: 20
-		visible:
+		visible: { card.type_text != "" }
-			script: card.type_text != ""
 		render style: image
 		choice images:
 			type bar: type-bar.png
 		z index: 2
 	############################# Version
 	version full:
 		left: 90
 		top : 46
@@ -196,7 +186,6 @@ card style:
 				else    if is_plot_twist()	then rgb(28,47,87)
 				else                                 rgb(22,10,10)
 			separator color: rgb(128,128,128)
 	############################# Card ID
 	number line:
 		left: 136
@@ -219,7 +208,7 @@ card style:
 		top : 484
 		width: 30
 		height: 18
-		visible: script: card.rarity=="promo"
+		visible: { card.rarity=="promo" }
 		z index: 3
 		font:
 			name: Eurostile
@@ -231,7 +220,7 @@ card style:
 		top : 486
 		width: 30
 		height: 18
-		visible: script: card.rarity=="promo"
+		visible: { card.rarity=="promo" }
 		z index: 3
 		font:
 			name: Eurostile
@@ -250,14 +239,12 @@ card style:
 			uncommon: /vs-common.mse-include/rarity-uncommon.png
 			rare:	  /vs-common.mse-include/rarity-rare.png
 			promo:    /vs-common.mse-include/rarity-promo.png
 	############################# Affiliation
 	team full:
 		left: 23
-		top : 100
+		top : { if is_new_dual() then 340 else 300 }
-		height: 
+		height: 28
-			script: if is_new_dual() then 240 else 200
+		width: { if is_new_dual() then 240 else 200 }
-		width: 28
 		angle: 90
 		font:
 			name: Percolator Expert
@@ -267,19 +254,18 @@ card style:
 		symbol font:
 			name: vs-standard-arrow
 			size: 18
-			alignment: middle center shrink-overflow
+			alignment: middle center
 		alignment: middle center
 		z index: 4
 		padding left:   2
 		padding top:    2
 		padding right:  2
 		padding bottom: 2
 	team 2 full:
 		left: 325
 		top : 100
-		height: 200
+		height: 28
-		width: 28
+		width: 200
 		angle: 270
 		font:
 			name: Percolator Expert
@@ -289,7 +275,7 @@ card style:
 		symbol font:
 			name: vs-standard-arrow
 			size: 18
-			alignment: middle center shrink-overflow
+			alignment: middle center
 		visible: is_dual()
 		alignment: middle center
 		z index: 4
@@ -297,12 +283,10 @@ card style:
 		padding top:    2
 		padding right:  2
 		padding bottom: 2
 	############################# FlightRange
 	symbols:
 		left: 25
-		top : 
+		top : { if is_new_dual() then 366 else 322 }
-			script: if is_new_dual() then 366 else 322
 		height: 67
 		width: 38
 		z index: 4
@@ -312,9 +296,7 @@ card style:
 			ongoing: /vs-common.mse-include/ongoing.png
 			range: /vs-common.mse-include/range.png
 		direction: vertical
-		spacing: 0
+		spacing: 33
 	############################# Text box
 	rule text:
 		left: 84
@@ -332,14 +314,13 @@ card style:
 			name: vs-standard-arrow
 			size: 11
 			alignment: middle center
-		alignment: top left shrink-overflow
+		alignment: top left
 		z index: 4
 		padding left:   2
 		padding top:    5
 		padding right:  2
 		padding bottom: 2
 		line height hard: 1.4
 	flavor text:
 		left: 84
 		top : 356
@@ -351,30 +332,22 @@ card style:
 			size: 10
 			scale down to: 6
 			color: rgb(0,0,0)
-		alignment: bottom left shrink-overflow
+		alignment: bottom left
 		z index: 3
 		padding left:   2
 		padding top:    2
 		padding right:  2
 		padding bottom: 2
 		line height hard: 1
 	watermark:
-		left: 
+		left: { if watermark_narrow() then 197 else if watermark_wide() then 132 else 166 }
-			script: if watermark_narrow() then 197 else
-				if watermark_wide() then 132 else 166
 		top:  365
-		width: 
+		width: { if watermark_narrow() then 60 else if watermark_wide() then 165 else 106 }
-			script: if watermark_narrow() then 60 else
-				if watermark_wide() then 165 else 106
 		height: 80
-		visible:
+		visible: { styling.watermarkings }
-			script: styling.watermarkings
 		render style: image
 		include file: /vs-common.mse-include/watermarks
 		z index: 4
 	############################# Attack/defence
 	attack:
 		z index: 4
@@ -382,7 +355,7 @@ card style:
 		top:	427
 		width:	30
 		height:	47
-		visible: script: is_character()
+		visible: { is_character() }
 		z index: 4
 		alignment: bottom left shrink-overflow
 		font:
@@ -392,14 +365,13 @@ card style:
 			shadow color: rgb(0,0,0)
 			shadow displacement x: 3
 			shadow displacement y: 0
 	defence:
 		z index: 4
 		left:	50
 		top:	462
 		width:	30
 		height:	47
-		visible: script: is_character()
+		visible: { is_character() }
 		z index: 4
 		alignment: bottom left shrink-overflow
 		padding bottom: -4
@@ -410,23 +382,20 @@ card style:
 			shadow color: rgb(0,0,0)
 			shadow displacement x: -3
 			shadow displacement y: 0
 	############################# Card sorting / numbering
 	############################# Copyright stuff
 	illustrator:
 		left: 130
 		top : 322
 		width: 165
 		height: 16
-		alignment: center top shrink-overflow
+		alignment: center top
 		z index: 4
 		font:
 			name: Eurostile
 			size: 9
 			weight: bold
 			color: rgb(255,255,255)
 	copyright:
 		left: 195
 		top : 480
@@ -439,24 +408,19 @@ card style:
 			size: 6
 			color: rgb(255,255,255)
 ############################################################## Extra card fields
 extra card field:
 	type: choice
 	name: foil layer
 	choice: foil
 	editable: false
 extra card style:
 	foil layer:
 		left: 0
 		top : 0
-		width:  
+		width:  { if styling.foils=="no" then 0 else 375 }
-			script: if styling.foils=="no" then 0 else 375
+		height: { if styling.foils=="no" then 0 else 523 }
-		height:
-			script: if styling.foils=="no" then 0 else 523
 		z index: 8
 		render style: image
 		choice images:
 			foil: /vs-common.mse-include/foil.png
-		visible:
+		visible: { styling.foils }
-			script: styling.foils
--- a/data/vs.mse-game/card-back.png
+++ b/data/vs.mse-game/card-back.png
--- a/data/vs.mse-game/game
+++ b/data/vs.mse-game/game
-mse version: 0.3.5
+mse version: 0.3.6
 full name: VS System
 short name: VS
 icon: card-back.png
-version: 2007-09-23
 position hint: 3
+version: 2008-01-03
 depends on:
 	package: vs-common.mse-include
-	version: 2007-09-23
+	version: 2008-01-03
 ############################################################## Functions & filters
 # General functions
 init script:
 	# Index for sorting, character/concealed, equipment, location then plot twist
 	sort_index := {
-		if	card.team==""			then "2"
+		if	card.team=="Planet"		then "1"
-		else if	card.team=="EQUIPMENT"		then "3"
+		else if card.team=="PLANET"		then "1"
-		else if	card.team=="Equipment"		then "3"
+		else if card.team==""			then "3"
-		else if card.team=="LOCATION"		then "4"
+		else if	card.team=="EQUIPMENT"		then "4"
-		else if card.team=="Location"		then "4"
+		else if	card.team=="Equipment"		then "4"
-		else if card.team=="PLOT TWIST"		then "5"
+		else if card.team=="LOCATION"		then "5"
-		else if card.team=="Plot Twist"		then "5"
+		else if card.team=="Location"		then "5"
-		else 					     "1"
+		else if card.team=="PLOT TWIST"		then "6"
+		else if card.team=="Plot Twist"		then "6"
+		else 					     "2"
 	};
 	############################################################## Text Filters
@@ -38,9 +41,9 @@ init script:
 		replace_rule(
 			match: "`|::",
 			replace: "•")+
-		# step 5d : trademark symbol
+		# step 5e : trademark symbol
 		replace_rule(
-			match: " TM ",
+			match: "TM",
 			replace: "™")+
 		# step 5e : copyright symbol
 		replace_rule(
@@ -99,6 +102,8 @@ init script:
 		if      card.team == "Location"    				then "location"
 		else if card.team == "LOCATION"					then "location"
 		else if keyword_sort_location(card.rule_text) != ""     	then "location"
+		else if card.team == "Planet"					then "planet"
+		else if card.team == "PLANET"					then "planet"
 		else if card.team == "Equipment"   				then "equipment visible equipment"
 		else if card.team == "EQUIPMENT"				then "equipment visible equipment"
 		else if keyword_sort_equipment(card.rule_text) != ""    	then "equipment visible equipment"
@@ -114,8 +119,8 @@ init script:
 	}
 	# Default Concealed Optional Card Type
 	c_optional_script := {
-		if 	card.team_2 != ""        			then "characters concealed-optional concealed-optional dual"
+		if	card.team_2 != ""        			then "characters concealed-optional concealed-optional dual"
-		else if card.team_2_of_2 != "" 	   			then "characters concealed-optional concealed-optional dual (new)"
+		else if	card.team_2_of_2 != "" 	   			then "characters concealed-optional concealed-optional dual (new)"
 		else                                    		     "characters concealed-optional concealed-optional character"
 	}
 	# Default Concealed Card Type
@@ -163,16 +168,16 @@ init script:
 		card.card_type == "characters concealed-optional concealed-optional character" or
 	        card.card_type == "characters concealed-optional concealed-optional dual"
 	}
-	is_character := {
+	is_character := { contains(card.card_type, match: "characters")
-		card.card_type == "characters visible character" or
+	#	card.card_type == "characters visible character" or
-	        card.card_type == "characters visible character dual" or
+	#        card.card_type == "characters visible character dual" or
-	        card.card_type == "characters visible character dual (new)" or
+	#        card.card_type == "characters visible character dual (new)" or
-	        card.card_type == "characters hidden concealed" or
+	#        card.card_type == "characters hidden concealed" or
-	        card.card_type == "characters hidden concealed dual" or
+	#        card.card_type == "characters hidden concealed dual" or
-	        card.card_type == "characters hidden concealed dual (new)" or
+	#        card.card_type == "characters hidden concealed dual (new)" or
-	        card.card_type == "characters concealed-optional concealed-optional character" or
+	#        card.card_type == "characters concealed-optional concealed-optional character" or
-	        card.card_type == "characters concealed-optional concealed-optional character dual" or
+	#        card.card_type == "characters concealed-optional concealed-optional character dual" or
-	        card.card_type == "characters concealed-optional concealed-optional character dual (new)"
+	#        card.card_type == "characters concealed-optional concealed-optional character dual (new)"
 	}
 	is_concealed := {
 	        card.card_type == "characters hidden concealed" or
@@ -195,6 +200,9 @@ init script:
 	is_plot_twist := {
 		card.card_type == "plot twist"
 	}
+	is_ch_or_eq := {
+		is_character() or is_equipment()
+	}
 	is_ch_or_pt := {
 		is_character() or is_plot_twist()
 	}
@@ -222,6 +230,7 @@ init script:
 				sort_index() + card.team + card.team_2_of_2 + card.team_2 + card.team_2_of_2_2 + card.name + card.version + " • " + card.team_affiliation
 			}) + 1
 	}
 ############################################################## Set fields
 set field:
@@ -333,6 +342,7 @@ card field:
 		choice: concealed-optional equipment
 	choice: location
 	choice: plot twist
+	choice: planet
 	default: card_type()
 	show statistics: false
@@ -346,7 +356,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 ""
 card field:
 	type: text
 	name: identity
@@ -832,3 +842,8 @@ keyword:
 	match: Substitute
 	mode: real
 	reminder: Reveal this card -> You may remove from the game a ready character you control with cost greater than or equal to the cost of this card. If you do, put this card into play. Use only if this card is in your hand and only during your recruit step." 
+keyword:
+	keyword: Insanity:
+	match: Insanity: <atom-param>action</atom-param>
+	mode: real
+	reminder: You may not have more than one copy of this card in your deck.