From da01c308d6e1bd1ef89cb253868a0929d182e3ac Mon Sep 17 00:00:00 2001 From: pichoro Date: Fri, 13 Aug 2010 22:19:51 +0000 Subject: [PATCH] More VS changes: Moving "~ to CARDNAME" into auto replace file. Automatic symbolization of new official affiliations in new styles. Typeline symbols and watermarks for new official affiliations. Now showing statistics for frame type. (seems useful) In Alter and Oversize styles, calling background image more directly instead of having every frame choice point to it. Ditching an unused card-sample.jpg from oversize style. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1487 0fc631ac-6414-0410-93d0-97cfa31319b6 --- data/vs-alter.mse-style/style | 23 +++--------------- data/vs-common.mse-include/affiliations | 2 ++ data/vs-common.mse-include/dual-affiliation | 6 +++++ data/vs-common.mse-include/include | 6 ++--- data/vs-common.mse-include/watermark-names | 6 +++++ data/vs-common.mse-include/watermarks | 2 ++ data/vs-new.mse-style/style | 10 ++++---- data/vs-oversize.mse-style/card-sample.jpg | Bin 3676 -> 0 bytes data/vs-oversize.mse-style/style | 25 ++++---------------- data/vs.mse-game/auto_replace | 3 +++ data/vs.mse-game/card_fields | 1 - data/vs.mse-game/game | 4 ++-- 12 files changed, 35 insertions(+), 53 deletions(-) delete mode 100644 data/vs-oversize.mse-style/card-sample.jpg 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 39d03e873b901d2d440a739da5c3d82d238ae312..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3676 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", 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