From b28e87e5fea82a0f2130325e307c02cc07773104 Mon Sep 17 00:00:00 2001 From: pichoro Date: Tue, 7 Oct 2008 03:12:03 +0000 Subject: [PATCH] =?UTF-8?q?Version=20bumping=20from=20past=20edits.=20Upda?= =?UTF-8?q?ting=20vs-standard-new=20to=20match=20vs-standard-official=20an?= =?UTF-8?q?d=20vs-standard-arrow.=20Changed=20insert=20symbol=20menus=20to?= =?UTF-8?q?=20use=20"=E2=80=A2"=20instead=20of=20"<>",=20so=20they=20actua?= =?UTF-8?q?lly=20work.=20New=20plan=20for=20preventing=20symbolization=20o?= =?UTF-8?q?f=20affiliations=20on=20old=20style=20cards.=20=20May=20need=20?= =?UTF-8?q?further=20tweaking.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1220 0fc631ac-6414-0410-93d0-97cfa31319b6 --- data/vs-extended-art.mse-style/style | 2 +- data/vs-extended-hellboy.mse-style/style | 2 +- data/vs-hellboy.mse-style/style | 2 +- data/vs-insanity.mse-style/style | 2 +- data/vs-new.mse-style/style | 56 ++++++++++++++++++- data/vs-oversize.mse-style/style | 56 ++++++++++++++++++- .../symbol-font | 4 +- .../symbol-font | 7 ++- .../symbol-font | 4 +- data/vs-standard.mse-style/style | 2 +- data/vs.mse-game/game | 38 +++++++------ 11 files changed, 145 insertions(+), 30 deletions(-) diff --git a/data/vs-extended-art.mse-style/style b/data/vs-extended-art.mse-style/style index 88f20799..101a469b 100644 --- a/data/vs-extended-art.mse-style/style +++ b/data/vs-extended-art.mse-style/style @@ -6,7 +6,7 @@ installer group: VS System/Standard style/Extended art icon: card-sample.png position hint: 005 -version: 2008-09-26 +version: 2008-09-29 depends on: package: vs.mse-game version: 2008-09-26 diff --git a/data/vs-extended-hellboy.mse-style/style b/data/vs-extended-hellboy.mse-style/style index 44222dce..ef7b9d73 100644 --- a/data/vs-extended-hellboy.mse-style/style +++ b/data/vs-extended-hellboy.mse-style/style @@ -6,7 +6,7 @@ installer group: VS System/Hellboy style/Extended Art icon: card-sample.png position hint: 006 -version: 2008-09-26 +version: 2008-09-29 depends on: package: vs.mse-game version: 2008-09-26 diff --git a/data/vs-hellboy.mse-style/style b/data/vs-hellboy.mse-style/style index 638824e5..692bb603 100644 --- a/data/vs-hellboy.mse-style/style +++ b/data/vs-hellboy.mse-style/style @@ -6,7 +6,7 @@ short name: Hellboy icon: card-sample.png position hint: 003 -version: 2008-09-26 +version: 2008-09-29 depends on: package: vs.mse-game version: 2008-09-26 diff --git a/data/vs-insanity.mse-style/style b/data/vs-insanity.mse-style/style index 5a6c0232..ec8d1b00 100644 --- a/data/vs-insanity.mse-style/style +++ b/data/vs-insanity.mse-style/style @@ -6,7 +6,7 @@ installer group: VS System/Insanity Style/Normal icon: card-sample.png position hint: 004 -version: 2008-09-26 +version: 2008-09-29 depends on: package: vs.mse-game version: 2008-09-26 diff --git a/data/vs-new.mse-style/style b/data/vs-new.mse-style/style index b4c04b40..4003ed32 100644 --- a/data/vs-new.mse-style/style +++ b/data/vs-new.mse-style/style @@ -6,7 +6,7 @@ installer group: VS System/New style/Normal icon: card-sample.png position hint: 001 -version: 2008-09-26 +version: 2008-10-09 depends on: package: vs.mse-game version: 2008-09-26 @@ -37,6 +37,60 @@ init script: else "ccoccard.png" } card_shape := { "new" } + + text_filter := + # step 1 : Remove all automatic tags + tag_remove_rule(tag: "") + + tag_remove_rule(tag: "") + + tag_remove_rule(tag: "") + + # step 2 : Reminder text for keywords + expand_keywords@( + condition: { + correct_case + } + default_expand: { + chosen(choice:if correct_case then mode else "lower case", set.automatic_reminder_text) + }, + combine: { "{keyword} ({process_english_hints(reminder)})" } + ) + + # step 3 : Expand shortcut words ~ and CARDNAME + replace_rule( + match: "~|~THIS~|CARDNAME", + in_context: "(^|[[:space:]])", + replace: "&" + ) + + # step 4 : Fill in atom fields + tag_contents_rule( + tag: "", + contents: { if card.name=="" then "CARDNAME" else card.name } + ) + + # step 5a: add arrow/diamond/dot symbols + replace_rule( + match: "->|>>>|@|<>", + 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", + replace: "&") + + # step 5c: SHIELD Variations + replace_rule( + match: "S.H.I.E.L.D.|SHIELD|Shield", + replace: "Shield") + + #X#if contains(card.shape, match:"old") then symbol_filter else new_symbols + # step 7a : Bold keywords without reminder text + replace_rule( + match: "]*>[^<]+", + replace: "&") + + # step 7b : Bold keywords with reminder text + replace_rule( + match: "]*>[^<]+", + replace: "&") + + # step 8 : Italic reminder text + replace_rule( + match: "[(][^)\n]*[)]?", + in_context: "(^|[[:space:]])|", + replace: "&") + ############################################################## Set info fields ############################################################## Extra style styling field: diff --git a/data/vs-oversize.mse-style/style b/data/vs-oversize.mse-style/style index f0b7bd3f..7bd21ad5 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: 2008-09-26 +version: 2008-10-06 depends on: package: vs.mse-game version: 2008-09-26 @@ -28,6 +28,60 @@ card dpi: 75 ############################################################## Extra scripts init script: card_shape := { if styling.style_sorting then "avatar" else "new" } + + text_filter := + # step 1 : Remove all automatic tags + tag_remove_rule(tag: "") + + tag_remove_rule(tag: "") + + tag_remove_rule(tag: "") + + # step 2 : Reminder text for keywords + expand_keywords@( + condition: { + correct_case + } + default_expand: { + chosen(choice:if correct_case then mode else "lower case", set.automatic_reminder_text) + }, + combine: { "{keyword} ({process_english_hints(reminder)})" } + ) + + # step 3 : Expand shortcut words ~ and CARDNAME + replace_rule( + match: "~|~THIS~|CARDNAME", + in_context: "(^|[[:space:]])", + replace: "&" + ) + + # step 4 : Fill in atom fields + tag_contents_rule( + tag: "", + contents: { if card.name=="" then "CARDNAME" else card.name } + ) + + # step 5a: add arrow/diamond/dot symbols + replace_rule( + match: "->|>>>|@|<>", + 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", + replace: "&") + + # step 5c: SHIELD Variations + replace_rule( + match: "S.H.I.E.L.D.|SHIELD|Shield", + replace: "Shield") + + #X#if contains(card.shape, match:"old") then symbol_filter else new_symbols + # step 7a : Bold keywords without reminder text + replace_rule( + match: "]*>[^<]+", + replace: "&") + + # step 7b : Bold keywords with reminder text + replace_rule( + match: "]*>[^<]+", + replace: "&") + + # step 8 : Italic reminder text + replace_rule( + match: "[(][^)\n]*[)]?", + in_context: "(^|[[:space:]])|", + replace: "&") + ############################################################## Set info fields ############################################################## Extra style styling field: diff --git a/data/vs-standard-arrow.mse-symbol-font/symbol-font b/data/vs-standard-arrow.mse-symbol-font/symbol-font index 375057dd..b84f8607 100644 --- a/data/vs-standard-arrow.mse-symbol-font/symbol-font +++ b/data/vs-standard-arrow.mse-symbol-font/symbol-font @@ -1,5 +1,5 @@ mse version: 0.3.7 -version: 2008-09-26 +version: 2008-10-06 short name: old position hint: 2 installer group: VS System/Symbol Fonts/Arrow @@ -27,4 +27,4 @@ symbol: # Insert-symbol menu insert symbol menu: item: -> - item: <> + item: • diff --git a/data/vs-standard-new.mse-symbol-font/symbol-font b/data/vs-standard-new.mse-symbol-font/symbol-font index 4be6c9cc..fe376ed9 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.7 -version: 2008-09-26 +version: 2008-10-06 short name: New (unofficial) position hint: 3 installer group: VS System/Symbol Fonts/New @@ -17,6 +17,9 @@ symbol: symbol: code: • image: diamond.png +symbol: + code: @ + image: diamond.png symbol: code: <> image: diamond.png @@ -256,7 +259,7 @@ symbol: # Insert-symbol menu insert symbol menu: item: -> - item: <> + item: • item: Activate item: Planet item: diff --git a/data/vs-standard-official.mse-symbol-font/symbol-font b/data/vs-standard-official.mse-symbol-font/symbol-font index 77c0c5f2..cd3d9258 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.7 -version: 2008-09-26 +version: 2008-10-06 short name: New (official) position hint: 1 installer group: VS System/Symbol Fonts/Official New @@ -165,7 +165,7 @@ symbol: # Insert-symbol menu insert symbol menu: item: -> - item: <> + item: • item: Activate item: Planet item: diff --git a/data/vs-standard.mse-style/style b/data/vs-standard.mse-style/style index afee4d65..e620ba76 100644 --- a/data/vs-standard.mse-style/style +++ b/data/vs-standard.mse-style/style @@ -6,7 +6,7 @@ installer group: VS System/Standard style/Normal icon: card-sample.png position hint: 002 -version: 2008-09-26 +version: 2008-09-29 depends on: package: vs.mse-game version: 2008-09-26 diff --git a/data/vs.mse-game/game b/data/vs.mse-game/game index 32a26215..41e9bcc1 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: 2008-09-26 +version: 2008-10-06 depends on: package: vs-common.mse-include version: 2008-09-23 @@ -50,21 +50,21 @@ init script: ############################################################## Text Filters ############### Symbol Filter - symbol_filter := - # step 5a : add arrow/diamond/dot symbols - replace_rule( - match: "->|>>>|@|<>", - replace: "&"); - new_symbols := - symbol_filter + - # step 5a: Majority of affiliation symbols - replace_rule( - match: "Activate|Avengers|B.P.R.D.|Brotherhood|Crime Lords|Defenders|Doom|Fantastic Four|Gotham Knights|Green Lantern|Hellfire Club|Heralds of Galactus|Horsemen of Apocalypse|Invaders|JLA|JSA|Kree|Marvel Knights|Masters of Evil|Negative Zone|Planet|Shadowpact|Shi'ar|Sinister Syndicate|Skrull|Speed Force|Spider-Friends|Team Superman|Thule Society|Thunderbolts|Teen Titans|Underworld|Warbound|X-Men", - replace: "&") + - # step 5b: SHIELD Variations - replace_rule( - match: "S.H.I.E.L.D.|SHIELD|Shield", - replace: "Shield"); + #X#symbol_filter := + #X# # step 5a : add arrow/diamond/dot symbols + #X# replace_rule( + #X# match: "->|>>>|@|<>", + #X# replace: "&"); + #X#new_symbols := + #X# symbol_filter + + #X# # step 5a: Majority of affiliation symbols + #X# replace_rule( + #X# 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", + #X# replace: "&") + + #X# # step 5b: SHIELD Variations + #X# replace_rule( + #X# match: "S.H.I.E.L.D.|SHIELD|Shield", + #X# replace: "Shield"); ############### Other Text Filters card_shape := { "new" } @@ -97,7 +97,11 @@ init script: tag: "", contents: { if card.name=="" then "CARDNAME" else card.name } ) + - if contains(card.shape, match:"old") then symbol_filter else new_symbols + # step 5a: add arrow/diamond/dot symbols + replace_rule( + match: "->|>>>|@|<>", + replace: "&") + + #X#if contains(card.shape, match:"old") then symbol_filter else new_symbols # step 7a : Bold keywords without reminder text replace_rule( match: "]*>[^<]+",