diff --git a/data/vs-common.mse-include/affiliations b/data/vs-common.mse-include/affiliations index 9aa04e99..0e1bc56a 100644 --- a/data/vs-common.mse-include/affiliations +++ b/data/vs-common.mse-include/affiliations @@ -3,18 +3,25 @@ choice images: Marvel A-C Avengers: /vs-standard-official.mse-symbol-font/avengers.png Marvel A-C Brotherhood: /vs-standard-official.mse-symbol-font/brotherhood.png + Marvel A-C Crime Lords: /vs-standard-official.mse-symbol-font/crimelords.png Marvel D-H Doom: /vs-standard-official.mse-symbol-font/doom.png Marvel D-H Fantastic Four: /vs-standard-official.mse-symbol-font/F4.png Marvel D-H Horsemen of Apocalypse: /vs-standard-official.mse-symbol-font/apocalypse.png Marvel I-M Marvel Knights: /vs-standard-official.mse-symbol-font/marvelknights.png + Marvel N-S Negative Zone: /vs-standard-official.mse-symbol-font/negativezone.png Marvel N-S Shi'ar: /vs-standard-official.mse-symbol-font/shiar.png + Marvel N-S Shield: /vs-standard-official.mse-symbol-font/shield.png Marvel N-S Spider-Friends: /vs-standard-official.mse-symbol-font/spiderman.png + Marvel T-Z Thunderbolts: /vs-standard-official.mse-symbol-font/thunderbolts.png + Marvel T-Z Underworld: /vs-standard-official.mse-symbol-font/underworld.png + Marvel T-Z Warbound: /vs-standard-official.mse-symbol-font/warbound.png Marvel T-Z X-Men: /vs-standard-official.mse-symbol-font/xmen.png DC D-H Gotham Knights: /vs-standard-official.mse-symbol-font/gothamknights.png DC D-H Green Lantern: /vs-standard-official.mse-symbol-font/greenlantern.png DC I-M JLA: /vs-standard-official.mse-symbol-font/jla.png DC I-M JSA: /vs-standard-official.mse-symbol-font/jsa.png + DC N-S Speed Force: /vs-standard-official.mse-symbol-font/speedforce.png DC T-Z Team Superman: /vs-standard-official.mse-symbol-font/superman.png DC T-Z Teen Titans: /vs-standard-official.mse-symbol-font/titans.png diff --git a/data/vs-common.mse-include/dual-affiliation b/data/vs-common.mse-include/dual-affiliation index 18aa3d97..a2c254a0 100644 --- a/data/vs-common.mse-include/dual-affiliation +++ b/data/vs-common.mse-include/dual-affiliation @@ -21,10 +21,15 @@ choice: choice: Marvel Knights choice: name: N-S + choice: Negative Zone choice: Shi'ar + choice: Shield choice: Spider-Friends choice: name: T-Z + choice: Thunderbolts + choice: Underworld + choice: Warbound choice: X-Men choice: name: DC @@ -36,6 +41,9 @@ choice: name: I-M choice: JLA choice: JSA + choice: + name: N-S + choice: Speed Force choice: name: T-Z choice: Team Superman @@ -51,6 +59,8 @@ script: 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=="Crime Lords" then "Marvel A-C Crime Lords" else + if card.team_2_of_2=="CRIME LORDS" then "Marvel A-C Crime Lords" 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 @@ -59,10 +69,20 @@ script: 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=="Negative Zone" then "Marvel N-S Negative Zone" else + if card.team_2_of_2=="NEGATIVE ZONE" then "Marvel N-S Negative Zone" 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=="Shield" then "Marvel N-S Shield" else + if card.team_2_of_2=="SHIELD" then "Marvel N-S Shield" 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=="Thunderbolts" then "Marvel T-Z Thunderbolts" else + if card.team_2_of_2=="THUNDERBOLTS" then "Marvel T-Z Thunderbolts" else + if card.team_2_of_2=="Underworld" then "Marvel T-Z Underworld" else + if card.team_2_of_2=="UNDERWORLD" then "Marvel T-Z Underworld" else + if card.team_2_of_2=="Warbound" then "Marvel T-Z Warbound" else + if card.team_2_of_2=="WARBOUND" then "Marvel T-Z Warbound" 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 @@ -71,6 +91,8 @@ script: 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=="Speed Force" then "DC N-S Speed Force" else + if card.team_2_of_2=="SPEED FORCE" then "DC N-S Speed Force" 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 diff --git a/data/vs-common.mse-include/include b/data/vs-common.mse-include/include index a4209322..053db284 100644 --- a/data/vs-common.mse-include/include +++ b/data/vs-common.mse-include/include @@ -1,6 +1,6 @@ mse version: 0.3.6 full name: VS System, textbox watermarks -version: 2008-01-03 +version: 2008-06-23 # This file doesn't do anything, other files in this directory can be included # in game/style files: diff --git a/data/vs-common.mse-include/watermark-names b/data/vs-common.mse-include/watermark-names index 1850bccc..8c161857 100644 --- a/data/vs-common.mse-include/watermark-names +++ b/data/vs-common.mse-include/watermark-names @@ -21,10 +21,15 @@ choice: choice: Marvel Knights choice: name: N-S + choice: Negative Zone choice: Shi'ar + choice: Shield choice: Spider-Friends choice: name: T-Z + choice: Thunderbolts + choice: Underworld + choice: Warbound choice: X-Men choice: name: DC @@ -36,6 +41,9 @@ choice: name: I-M choice: JLA choice: JSA + choice: + name: N-S + choice: Speed Force choice: name: T-Z choice: Team Superman @@ -51,6 +59,8 @@ script: if card.team=="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=="Crime Lords" then "Marvel A-C Crime Lords" else + if card.team=="CRIME LORDS" then "Marvel A-C Crime Lords" else if card.team=="Doom" then "Marvel D-H Doom" else if card.team=="DOOM" then "Marvel D-H Doom" else if card.team=="Fantastic Four" then "Marvel D-H Fantastic Four" else @@ -59,10 +69,20 @@ script: if card.team=="HORSEMEN OF APOCALYPSE" then "Marvel D-H Horsemen of Apocalypse" 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=="Negative Zone" then "Marvel N-S Negative Zone" else + if card.team=="NEGATIVE ZONE" then "Marvel N-S Negative Zone" 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=="Shield" then "Marvel N-S Shield" else + if card.team=="SHIELD" then "Marvel N-S Shield" 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=="Thunderbolts" then "Marvel T-Z Thunderbolts" else + if card.team=="THUNDERBOLTS" then "Marvel T-Z Thunderbolts" else + if card.team=="Underworld" then "Marvel T-Z Underworld" else + if card.team=="UNDERWORLD" then "Marvel T-Z Underworld" else + if card.team=="Warbound" then "Marvel T-Z Warbound" else + if card.team=="WARBOUND" then "Marvel T-Z Warbound" 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=="Gotham Knights" then "DC D-H Gotham Knights" else @@ -71,6 +91,8 @@ script: if card.team=="GREEN LANTERN" then "DC D-H Green Lantern" else if card.team=="JLA" then "DC I-M JLA" else if card.team=="JSA" then "DC I-M JSA" else + if card.team=="Speed Force" then "DC N-S Speed Force" else + if card.team=="SPEED FORCE" then "DC N-S Speed Force" 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=="Teen Titans" then "DC T-Z Teen Titans" else diff --git a/data/vs-common.mse-include/watermarks b/data/vs-common.mse-include/watermarks index d57d2bd2..27eb51f4 100644 --- a/data/vs-common.mse-include/watermarks +++ b/data/vs-common.mse-include/watermarks @@ -3,19 +3,25 @@ choice images: 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 Brotherhood: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/brotherhood.png")) + Marvel A-C Crime Lords: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/crimelords.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 D-H Fantastic Four: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/F4.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 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 Masters of Evil: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/mastersofevil.png")) + Marvel N-S Negative Zone: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/negativezone.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 N-S Shield: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/shield.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 T-Z Thunderbolts: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/thunderbolts.png")) + Marvel T-Z Underworld: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/underworld.png")) + Marvel T-Z Warbound: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/warbound.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")) DC D-H Gotham Knights: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/gothamknights.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")) DC I-M JLA: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/jla.png")) DC I-M JSA: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/jsa.png")) + DC N-S Speed Force: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/speedforce.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")) diff --git a/data/vs-standard-new.mse-symbol-font/avengers.png b/data/vs-standard-new.mse-symbol-font/avengers.png index 2b85d5a0..d651d641 100644 Binary files a/data/vs-standard-new.mse-symbol-font/avengers.png and b/data/vs-standard-new.mse-symbol-font/avengers.png differ diff --git a/data/vs-standard-new.mse-symbol-font/crimelords.png b/data/vs-standard-new.mse-symbol-font/crimelords.png new file mode 100644 index 00000000..ff2f0736 Binary files /dev/null and b/data/vs-standard-new.mse-symbol-font/crimelords.png differ diff --git a/data/vs-standard-new.mse-symbol-font/negativezone.png b/data/vs-standard-new.mse-symbol-font/negativezone.png new file mode 100644 index 00000000..7954667c Binary files /dev/null and b/data/vs-standard-new.mse-symbol-font/negativezone.png differ diff --git a/data/vs-standard-new.mse-symbol-font/shield.png b/data/vs-standard-new.mse-symbol-font/shield.png index b1af3b59..1da8f251 100644 Binary files a/data/vs-standard-new.mse-symbol-font/shield.png and b/data/vs-standard-new.mse-symbol-font/shield.png differ diff --git a/data/vs-standard-new.mse-symbol-font/speedforce.png b/data/vs-standard-new.mse-symbol-font/speedforce.png new file mode 100644 index 00000000..589ba76d Binary files /dev/null and b/data/vs-standard-new.mse-symbol-font/speedforce.png differ diff --git a/data/vs-standard-new.mse-symbol-font/symbol-font b/data/vs-standard-new.mse-symbol-font/symbol-font index 29102fe6..6a74bfaf 100644 --- a/data/vs-standard-new.mse-symbol-font/symbol-font +++ b/data/vs-standard-new.mse-symbol-font/symbol-font @@ -1,5 +1,5 @@ mse version: 0.3.6 -version: 2008-05-19 +version: 2008-06-23 short name: New (unofficial) position hint: 3 installer group: VS System/Symbol Fonts/New @@ -65,6 +65,9 @@ symbol: symbol: code: Captain America image: captainamerica.png +symbol: + code: Crime Lords + image: crimelords.png symbol: code: Marvel Defenders image: defenders.png @@ -119,6 +122,9 @@ symbol: symbol: code: Masters of Evil image: mastersofevil.png +symbol: + code: Negative Zone + image: negativezone.png symbol: code: Outsiders image: outsiders.png @@ -141,7 +147,7 @@ symbol: code: Shi'ar image: shiar.png symbol: - code: SHIELD + code: Shield image: shield.png symbol: code: Sinister Syndicate @@ -149,6 +155,9 @@ symbol: symbol: code: Skeleton Crew image: skeletoncrew.png +symbol: + code: Speed Force + image: speedforce.png symbol: code: Spider-Friends image: spiderman.png @@ -176,6 +185,12 @@ symbol: symbol: code: The Ultimates image: ultimates.png +symbol: + code: Underworld + image: underworld.png +symbol: + code: Warbound + image: warbound.png symbol: code: X-Men image: xmen.png @@ -243,9 +258,11 @@ insert symbol menu: item: Brood item: Brotherhood item: Captain America + item: Crimelords item: Doom item: Excalibur item: Fantastic Four + item: Femizons item: The Hand item: Hellfire Club item: Heralds of Galactus @@ -256,35 +273,38 @@ insert symbol menu: item: Marvel Defenders item: Marvel Knights item: Masters of Evil + item: Negative Zone item: New Warriors item: Omega Flight + item: The Order item: Outsiders item: Serpent Society item: Shi'ar - item: SHIELD + item: Shield item: Sinister Syndicate + item: Skeleton Crew item: Spider-Friends item: Starjammers item: Thor item: Thunderbolts item: The Ultimates + item: Underworld + item: Warbound item: X-Men item: name: DC Teams item: Anti-Matter item: Arkham Inmates item: Birds of Prey - item: Femizons item: Gotham Knights item: Green Lantern item: JLA item: JSA item: Legionnaires - item: The Order item: Outsiders item: Secret Six item: Shadowpact - item: Skeleton Crew + item: Speed Force item: Team Superman item: Teen Titans item: diff --git a/data/vs-standard-new.mse-symbol-font/thunderbolts.png b/data/vs-standard-new.mse-symbol-font/thunderbolts.png index 2e3f0efd..16451336 100644 Binary files a/data/vs-standard-new.mse-symbol-font/thunderbolts.png and b/data/vs-standard-new.mse-symbol-font/thunderbolts.png differ diff --git a/data/vs-standard-new.mse-symbol-font/underworld.png b/data/vs-standard-new.mse-symbol-font/underworld.png new file mode 100644 index 00000000..c91c0f6b Binary files /dev/null and b/data/vs-standard-new.mse-symbol-font/underworld.png differ diff --git a/data/vs-standard-new.mse-symbol-font/warbound.png b/data/vs-standard-new.mse-symbol-font/warbound.png new file mode 100644 index 00000000..f6baa279 Binary files /dev/null and b/data/vs-standard-new.mse-symbol-font/warbound.png differ diff --git a/data/vs-standard-official.mse-symbol-font/avengers.png b/data/vs-standard-official.mse-symbol-font/avengers.png index 2b85d5a0..d651d641 100644 Binary files a/data/vs-standard-official.mse-symbol-font/avengers.png and b/data/vs-standard-official.mse-symbol-font/avengers.png differ diff --git a/data/vs-standard-official.mse-symbol-font/crimelords.png b/data/vs-standard-official.mse-symbol-font/crimelords.png new file mode 100644 index 00000000..ff2f0736 Binary files /dev/null and b/data/vs-standard-official.mse-symbol-font/crimelords.png differ diff --git a/data/vs-standard-official.mse-symbol-font/negativezone.png b/data/vs-standard-official.mse-symbol-font/negativezone.png new file mode 100644 index 00000000..7954667c Binary files /dev/null and b/data/vs-standard-official.mse-symbol-font/negativezone.png differ diff --git a/data/vs-standard-official.mse-symbol-font/shield.png b/data/vs-standard-official.mse-symbol-font/shield.png new file mode 100644 index 00000000..1da8f251 Binary files /dev/null and b/data/vs-standard-official.mse-symbol-font/shield.png differ diff --git a/data/vs-standard-official.mse-symbol-font/speedforce.png b/data/vs-standard-official.mse-symbol-font/speedforce.png new file mode 100644 index 00000000..589ba76d Binary files /dev/null and b/data/vs-standard-official.mse-symbol-font/speedforce.png differ diff --git a/data/vs-standard-official.mse-symbol-font/symbol-font b/data/vs-standard-official.mse-symbol-font/symbol-font index 5e0c35a6..226ec087 100644 --- a/data/vs-standard-official.mse-symbol-font/symbol-font +++ b/data/vs-standard-official.mse-symbol-font/symbol-font @@ -1,5 +1,5 @@ mse version: 0.3.6 -version: 2008-05-25 +version: 2008-06-23 short name: New (official) position hint: 1 installer group: VS System/Symbol Fonts/Official New @@ -41,6 +41,9 @@ symbol: symbol: code: Captain America image: captainamerica.png +symbol: + code: Crime Lords + image: crimelords.png symbol: code: Marvel Defenders image: defenders.png @@ -77,6 +80,9 @@ symbol: symbol: code: Masters of Evil image: mastersofevil.png +symbol: + code: Negative Zone + image: negativezone.png symbol: code: Planet image: planet.png @@ -86,9 +92,15 @@ symbol: symbol: code: Shi'ar image: shiar.png +symbol: + code: Shield + image: shield.png symbol: code: Sinister Syndicate image: sinistersyndicate.png +symbol: + code: Speed Force + image: speedforce.png symbol: code: Spider-Friends image: spiderman.png @@ -98,12 +110,18 @@ symbol: symbol: code: Thule Society image: thule.png +symbol: + code: Thunderbolts + image: thunderbolts.png symbol: code: Teen Titans image: titans.png symbol: - code: The Ultimates - image: ultimates.png + code: Underworld + image: underworld.png +symbol: + code: Warbound + image: warbound.png symbol: code: X-Men image: xmen.png @@ -166,6 +184,7 @@ insert symbol menu: item: Brood item: Brotherhood item: Captain America + item: Crime Lords item: Doom item: Excalibur item: Fantastic Four @@ -175,9 +194,14 @@ insert symbol menu: item: Marvel Defenders item: Marvel Knights item: Masters of Evil + item: Negative Zone + item: Shi'ar + item: Shield item: Sinister Syndicate item: Spider-Friends - item: The Ultimates + item: Thunderbolts + item: Underworld + item: Warbound item: X-Men item: name: DC Teams @@ -186,6 +210,7 @@ insert symbol menu: item: JLA item: JSA item: Shadowpact + item: Speed Force item: Team Superman item: Teen Titans item: diff --git a/data/vs-standard-official.mse-symbol-font/thunderbolts.png b/data/vs-standard-official.mse-symbol-font/thunderbolts.png new file mode 100644 index 00000000..16451336 Binary files /dev/null and b/data/vs-standard-official.mse-symbol-font/thunderbolts.png differ diff --git a/data/vs-standard-official.mse-symbol-font/ultimates.png b/data/vs-standard-official.mse-symbol-font/ultimates.png deleted file mode 100644 index d669cef1..00000000 Binary files a/data/vs-standard-official.mse-symbol-font/ultimates.png and /dev/null differ diff --git a/data/vs-standard-official.mse-symbol-font/underworld.png b/data/vs-standard-official.mse-symbol-font/underworld.png new file mode 100644 index 00000000..c91c0f6b Binary files /dev/null and b/data/vs-standard-official.mse-symbol-font/underworld.png differ diff --git a/data/vs-standard-official.mse-symbol-font/warbound.png b/data/vs-standard-official.mse-symbol-font/warbound.png new file mode 100644 index 00000000..f6baa279 Binary files /dev/null and b/data/vs-standard-official.mse-symbol-font/warbound.png differ