diff --git a/data/vs-alter.mse-style/style b/data/vs-alter.mse-style/style index 1ca3f4ed..c28fa646 100644 --- a/data/vs-alter.mse-style/style +++ b/data/vs-alter.mse-style/style @@ -1,4 +1,4 @@ -mse version: 0.3.7 +mse version: 0.3.8 game: vs full name: VS Alter Ego installer group: VS System/Alter Ego @@ -6,7 +6,7 @@ short name: Alter Ego icon: card-sample.png position hint: 008 -version: 2008-10-26 +version: 2010-08-13 depends on: package: vs.mse-game version: 2008-10-26 @@ -17,11 +17,9 @@ depends on: package: vs-standard-arrow.mse-symbol-font version: 2008-01-03 -card background: white card width: 375 card height: 523 card dpi: 150 - ############################################################## Extra scripts init script: card_shape := { if styling.style_sorting then "alter ego" else "new" } @@ -53,22 +51,7 @@ card style: z index: -2 render style: image popup style: in place - choice images: - characters visible character: card.jpg - characters visible character dual: card.jpg - characters visible character dual (new): card.jpg - characters hidden concealed: card.jpg - characters hidden concealed dual: card.jpg - characters hidden concealed dual (new): card.jpg - characters concealed-optional concealed-optional character: card.jpg - characters concealed-optional concealed-optional dual: card.jpg - characters concealed-optional concealed-optional dual (new): card.jpg - equipment visible equipment: card.jpg - equipment concealed equipment: card.jpg - equipment concealed-optional equipment: card.jpg - location: card.jpg - plot twist: card.jpg - planet: card.jpg + image: card.jpg ############################# Name line full name: left: 80 diff --git a/data/vs-common.mse-include/affiliations b/data/vs-common.mse-include/affiliations index 3b2291fb..b08f0ee8 100644 --- a/data/vs-common.mse-include/affiliations +++ b/data/vs-common.mse-include/affiliations @@ -1,6 +1,7 @@ # Affiliation images choice images: + Marvel A-C Alpha Flight: /vs-standard-official.mse-symbol-font/alphaflight.png 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 @@ -16,6 +17,7 @@ choice images: 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 Sinister Syndicate: /vs-standard-official.mse-symbol-font/sinistersyndicate.png + Marvel N-S Skrull: /vs-standard-official.mse-symbol-font/skrull.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 diff --git a/data/vs-common.mse-include/dual-affiliation b/data/vs-common.mse-include/dual-affiliation index 7de97f4f..e76f92d5 100644 --- a/data/vs-common.mse-include/dual-affiliation +++ b/data/vs-common.mse-include/dual-affiliation @@ -8,6 +8,7 @@ choice: name: Marvel choice: name: A-C + choice: Alpha Flight choice: Avengers choice: Brotherhood choice: Crime Lords @@ -29,6 +30,7 @@ choice: choice: Shi'ar choice: Shield choice: Sinister Syndicate + choice: Skrull choice: Spider-Friends choice: name: T-Z @@ -62,6 +64,8 @@ choice: choice: B.P.R.D. choice: Thule Society script: + if contains(card.team_2_of_2, match: "Alpha Flight") then "Marvel A-C Alpha Flight" else + if contains(card.team_2_of_2, match: "ALPHA FLIGHT") then "Marvel A-C Alpha Flight" else if contains(card.team_2_of_2, match: "Avengers") then "Marvel A-C Avengers" else if contains(card.team_2_of_2, match: "AVENGERS") then "Marvel A-C Avengers" else if contains(card.team_2_of_2, match: "Brood") then "Marvel A-C Brood" else @@ -96,6 +100,8 @@ script: if contains(card.team_2_of_2, match: "SHIELD") then "Marvel N-S Shield" else if contains(card.team_2_of_2, match: "Sinister Syndicate") then "Marvel N-S Sinister Syndicate" else if contains(card.team_2_of_2, match: "SINISTER SYNDICATE") then "Marvel N-S Sinister Syndicate" else + if contains(card.team_2_of_2, match: "Skrull") then "Marvel N-S Skrull" else + if contains(card.team_2_of_2, match: "SKRULL") then "Marvel N-S Skrull" else if contains(card.team_2_of_2, match: "Spider-Friends") then "Marvel N-S Spider-Friends" else if contains(card.team_2_of_2, match: "SPIDER-FRIENDS") then "Marvel N-S Spider-Friends" else if contains(card.team_2_of_2, match: "Thunderbolts") then "Marvel T-Z Thunderbolts" else diff --git a/data/vs-common.mse-include/include b/data/vs-common.mse-include/include index c0fe59b2..066190af 100644 --- a/data/vs-common.mse-include/include +++ b/data/vs-common.mse-include/include @@ -1,11 +1,11 @@ mse version: 0.3.8 full name: VS System, textbox watermarks -version: 2009-02-04 +version: 2010-03-25 depends on: package: vs-standard-official.mse-symbol-font - version: 2009-02-04 + version: 2010-03-25 # This file doesn't do anything, other files in this directory can be included # in game/style files: -# watermarks Includes references to the watermark images, to be used in a style file \ No newline at end of file +# watermarks Includes references to the watermark images, to be used in a style file diff --git a/data/vs-common.mse-include/watermark-names b/data/vs-common.mse-include/watermark-names index 424a5c8a..d11e9fe8 100644 --- a/data/vs-common.mse-include/watermark-names +++ b/data/vs-common.mse-include/watermark-names @@ -8,6 +8,7 @@ choice: name: Marvel choice: name: A-C + choice: Alpha Flight choice: Avengers choice: Brotherhood choice: Crime Lords @@ -28,6 +29,7 @@ choice: choice: Shi'ar choice: Shield choice: Sinister Syndicate + choice: Skrull choice: Spider-Friends choice: name: T-Z @@ -61,6 +63,8 @@ choice: choice: B.P.R.D. choice: Thule Society script: + if contains(card.team, match:"Alpha Flight") then "Marvel A-C Alpha Flight" else + if contains(card.team, match:"ALPHA FLIGHT") then "Marvel A-C Alpha Flight" else if contains(card.team, match:"Avengers") then "Marvel A-C Avengers" else if contains(card.team, match:"AVENGERS") then "Marvel A-C Avengers" else if contains(card.team, match:"Brood") then "Marvel A-C Brood" else @@ -95,6 +99,8 @@ script: if contains(card.team, match:"SHIELD") then "Marvel N-S Shield" else if contains(card.team, match:"Sinister Syndicate") then "Marvel N-S Sinister Syndicate" else if contains(card.team, match:"SINISTER SYNDICATE") then "Marvel N-S Sinister Syndicate" else + if contains(card.team, match:"Skrull") then "Marvel N-S Skrull" else + if contains(card.team, match:"SKRULL") then "Marvel N-S Skrull" else if contains(card.team, match:"Spider-Friends") then "Marvel N-S Spider-Friends" else if contains(card.team, match:"SPIDER-FRIENDS") then "Marvel N-S Spider-Friends" else if contains(card.team, match:"Thunderbolts") then "Marvel T-Z Thunderbolts" else diff --git a/data/vs-common.mse-include/watermarks b/data/vs-common.mse-include/watermarks index a0d29197..9f931cfa 100644 --- a/data/vs-common.mse-include/watermarks +++ b/data/vs-common.mse-include/watermarks @@ -1,6 +1,7 @@ # Watermark images choice images: + Marvel A-C Alpha Flight: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/alphaflight.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 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")) @@ -16,6 +17,7 @@ choice images: 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 Sinister Syndicate: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/sinistersyndicate.png")) + Marvel N-S Skrull: script: set_combine(combine:"shadow", set_alpha(alpha: 0.2, input:"/vs-standard-official.mse-symbol-font/skrull.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")) diff --git a/data/vs-new.mse-style/style b/data/vs-new.mse-style/style index 55924d30..19037b1b 100644 --- a/data/vs-new.mse-style/style +++ b/data/vs-new.mse-style/style @@ -6,22 +6,20 @@ installer group: VS System/New style/Normal icon: card-sample.png position hint: 001 -version: 2009-01-18 +version: 2010-07-30 depends on: package: vs.mse-game version: 2008-10-26 depends on: package: vs-common.mse-include - version: 2007-09-06 + 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 init script: con_opt_template_1 := { @@ -63,7 +61,7 @@ init script: }) + # step 3 : Expand shortcut words ~ and CARDNAME replace_rule( - match: "~|~THIS~|CARDNAME", + match: "CARDNAME", in_context: "(^|[[:space:]])", replace: "&" ) + @@ -78,7 +76,7 @@ init script: replace: "&") + # step 5b: Majority of affiliation symbols replace_rule( - match: "Activate|Avengers|B.P.R.D.|Brotherhood|Crime Lords|Defenders|Doom|Fantastic Four|Gotham Knights|Green Lantern|Hellfire Club|Heralds of Galactus|Horsemen of Apocalypse|Invaders|JLA|JSA|Kree|Marvel Knights|Masters of Evil|Negative Zone|Planet|Shadowpact|Shi'ar|Sinister Syndicate|Skrull|Speed Force|Spider-Friends|Team Superman|Thule Society|Thunderbolts|Teen Titans|Underworld|Warbound|X-Men", + match: "Activate|Alpha Flight|Avengers|B.P.R.D.|Brotherhood|Crime Lords|Defenders|Doom|Fantastic Four|Gotham Knights|Green Lantern|Hellfire Club|Heralds of Galactus|Horsemen of Apocalypse|Invaders|JLA|JSA|Kree|Marvel Knights|Masters of Evil|Negative Zone|Planet|Shadowpact|Shi'ar|Sinister Syndicate|Skrull|Speed Force|Spider-Friends|Team Superman|Thule Society|Thunderbolts|Teen Titans|Underworld|Warbound|X-Men", replace: "&") + # step 5c: SHIELD Variations replace_rule( diff --git a/data/vs-oversize.mse-style/card-sample.jpg b/data/vs-oversize.mse-style/card-sample.jpg deleted file mode 100644 index 39d03e87..00000000 Binary files a/data/vs-oversize.mse-style/card-sample.jpg and /dev/null differ diff --git a/data/vs-oversize.mse-style/style b/data/vs-oversize.mse-style/style index eaacf0f2..bc42d820 100644 --- a/data/vs-oversize.mse-style/style +++ b/data/vs-oversize.mse-style/style @@ -6,7 +6,7 @@ installer group: VS System/Oversize Avatar icon: card-sample.png position hint: 007 -version: 2009-01-18 +version: 2010-08-13 depends on: package: vs.mse-game version: 2008-10-26 @@ -20,11 +20,9 @@ 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 init script: card_shape := { if styling.style_sorting then "avatar" else "new" } @@ -54,7 +52,7 @@ init script: }) + # step 3 : Expand shortcut words ~ and CARDNAME replace_rule( - match: "~|~THIS~|CARDNAME", + match: "CARDNAME", in_context: "(^|[[:space:]])", replace: "&" ) + @@ -69,7 +67,7 @@ init script: replace: "&") + # step 5b: Majority of affiliation symbols replace_rule( - match: "Activate|Avengers|B.P.R.D.|Brotherhood|Crime Lords|Defenders|Doom|Fantastic Four|Gotham Knights|Green Lantern|Hellfire Club|Heralds of Galactus|Horsemen of Apocalypse|Invaders|JLA|JSA|Kree|Marvel Knights|Masters of Evil|Negative Zone|Planet|Shadowpact|Shi'ar|Sinister Syndicate|Skrull|Speed Force|Spider-Friends|Team Superman|Thule Society|Thunderbolts|Teen Titans|Underworld|Warbound|X-Men", + match: "Activate|Alpha Flight|Avengers|B.P.R.D.|Brotherhood|Crime Lords|Defenders|Doom|Fantastic Four|Gotham Knights|Green Lantern|Hellfire Club|Heralds of Galactus|Horsemen of Apocalypse|Invaders|JLA|JSA|Kree|Marvel Knights|Masters of Evil|Negative Zone|Planet|Shadowpact|Shi'ar|Sinister Syndicate|Skrull|Speed Force|Spider-Friends|Team Superman|Thule Society|Thunderbolts|Teen Titans|Underworld|Warbound|X-Men", replace: "&") + # step 5c: SHIELD Variations replace_rule( @@ -118,22 +116,7 @@ card style: 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 + image: card.png ############################# Name line full name: left: 80 diff --git a/data/vs.mse-game/auto_replace b/data/vs.mse-game/auto_replace index f1f5754a..ac94ffdd 100644 --- a/data/vs.mse-game/auto_replace +++ b/data/vs.mse-game/auto_replace @@ -36,3 +36,6 @@ auto replace: auto replace: match: @ replace: @ +auto replace: + match: ~ + replace: CARDNAME diff --git a/data/vs.mse-game/card_fields b/data/vs.mse-game/card_fields index 76243e4e..bdc2754f 100644 --- a/data/vs.mse-game/card_fields +++ b/data/vs.mse-game/card_fields @@ -42,7 +42,6 @@ card field: choice: plot twist choice: planet default: card_type() - show statistics: false description: The frame of the card. ############################# Name line card field: diff --git a/data/vs.mse-game/game b/data/vs.mse-game/game index 8de7c02f..2598430a 100644 --- a/data/vs.mse-game/game +++ b/data/vs.mse-game/game @@ -5,7 +5,7 @@ installer group: VS System/game files icon: card-back.png position hint: 3 -version: 2009-07-25 +version: 2010-08-13 depends on: package: vs-common.mse-include version: 2009-02-04 @@ -24,4 +24,4 @@ include file: keywords include file: word_lists include file: auto_replace -############################################################## Other stuff \ No newline at end of file +############################################################## Other stuff