From dcbef7b7c7778e6603b1848d0f57ac6a9032ab02 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sun, 7 Nov 2021 03:21:36 -0600 Subject: [PATCH] Improved automatic json data to not have parsing errors by default. Improved standard formatting. --- .../cards/set101/set101_elven_playtest.json | 18 +++++----- .../cards/set101/set101_gandalf_playtest.json | 23 ++++++------ .../cards/set101/set101_gondor_playtest.json | 13 ++++--- .../set101/set101_isengard_playtest.json | 14 ++++---- .../set101/set101_ringwraith_playtest.json | 19 +++++----- .../cards/set101/set101_sauron_playtest.json | 16 ++++----- .../cards/set101/set101_shire_playtest.json | 22 ++++++------ .../cards/set101/set101_sites_playtest.json | 36 +++++++++++++------ 8 files changed, 89 insertions(+), 72 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_elven_playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_elven_playtest.json index 8f8d412b8..fe8f934c3 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_elven_playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_elven_playtest.json @@ -5,8 +5,8 @@ "culture": "elven", "cost": 0, "type": "event", - "keyword": "fellowship", -"effects": { + "keyword": ["fellowship"], + "effects": { "type": "event", "cost": { "type": "exert", @@ -29,8 +29,8 @@ "culture": "elven", "cost": 1, "type": "event", - "keyword": "skirmish", -"effects": { + "keyword": ["skirmish"], + "effects": { "type": "event", "cost": { "type": "exert", @@ -55,7 +55,7 @@ "cost": 2, "type": "companion", "race": "elf", - "keyword": "damage+1", + "keyword": ["damage+1"], "strength": 6, "vitality": 3, "signet": "aragorn", @@ -86,11 +86,11 @@ "151_10": { - "title": "*Let Fly the Darts of Lindon", + "title": "*Let Fly the\Darts of Lindon", "culture": "elven", "cost": 1, "type": "condition", - "keyword": "support area", + "keyword": ["support area"], "effects": [ { "type": "modifier", @@ -122,7 +122,7 @@ "cost": 2, "type": "artifact", "target": "name(Gimli)", - "keyword": "support area", + "keyword": ["support area"], "effects": [ { "type": "modifier", @@ -153,7 +153,7 @@ "culture": "elven", "cost": 1, "type": "condition", - "keyword": "support area", + "keyword": ["support area"], "effects": [ { "type": "modifier", diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_gandalf_playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_gandalf_playtest.json index 4c8d16878..14d669c89 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_gandalf_playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_gandalf_playtest.json @@ -7,7 +7,7 @@ "cost": 4, "type": "companion", "race": "wizard", - "keyword": "damage+1", + "keyword": ["damage+1"], "strength": 6, "vitality": 4, "signet": "gandalf", @@ -43,9 +43,9 @@ "culture": "gandalf", "cost": 4, "type": "ally", - "allyHome": 4, + "allyHome": "fellowship,4", "race": "eagle", - "keyword": "damage+1", + "keyword": ["damage+1"], "strength": 8, "vitality": 4, "effects": [ @@ -78,7 +78,7 @@ "culture": "gandalf", "cost": 1, "type": "condition", - "keyword": "support area", + "keyword": ["support area"], "effects": [ { "type": "modifier", @@ -109,9 +109,12 @@ "culture": "gandalf", "cost": 1, "type": "event", - "keyword": "response", -"effects": { - "type": "event", + "keyword": ["response"], + "effects": { + "type": "responseEvent", + "trigger": { + "type": "moves", + }, "cost": { "type": "exert", "filter": "choose(elf)", @@ -133,8 +136,8 @@ "culture": "gandalf", "cost": 3, "type": "event", - "keyword": "fellowship", -"effects": { + "keyword": ["fellowship"], + "effects": { "type": "event", "cost": { "type": "exert", @@ -157,7 +160,7 @@ "culture": "gandalf", "cost": 1, "type": "condition", - "keyword": "support area", + "keyword": ["support area"], "effects": [ { "type": "modifier", diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_gondor_playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_gondor_playtest.json index b4a756dcd..b83242511 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_gondor_playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_gondor_playtest.json @@ -7,7 +7,7 @@ "cost": 4, "type": "companion", "race": "man", - "keyword": "damage+1", + "keyword": ["damage+1"], "strength": 8, "vitality": 4, "signet": "gandalf", @@ -44,7 +44,7 @@ "cost": 3, "type": "companion", "race": "man", - "keyword": "damage+1", + "keyword": ["damage+1"], "strength": 7, "vitality": 3, "signet": "aragorn", @@ -79,7 +79,7 @@ "culture": "gondor", "cost": 2, "type": "condition", - "keyword": "support area", + "keyword": ["support area"], "effects": [ { "type": "modifier", @@ -110,9 +110,8 @@ "culture": "gondor", "cost": 1, "type": "artifact", - "possession": "Support Area", "target": "name(Gimli)", - "keyword": "support area", + "keyword": ["support area"], "effects": [ { "type": "modifier", @@ -143,7 +142,7 @@ "culture": "gondor", "cost": 2, "type": "condition", - "keyword": "support area", + "keyword": ["support area"], "effects": [ { "type": "modifier", @@ -174,7 +173,7 @@ "culture": "gondor", "cost": 1, "type": "condition", - "keyword": "support area", + "keyword": ["support area"], "strength": 2, "effects": [ { diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_isengard_playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_isengard_playtest.json index 1dd40e8f7..4657651f6 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_isengard_playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_isengard_playtest.json @@ -6,7 +6,7 @@ "cost": 2, "type": "minion", "race": "crow", - "keyword": "damage+1", + "keyword": ["damage+1"], "strength": 4, "vitality": 2, "site": 4, @@ -41,7 +41,7 @@ "cost": 3, "type": "minion", "race": "crow", - "keyword": "damage+1", + "keyword": ["damage+1"], "strength": 5, "vitality": 3, "site": 4, @@ -75,7 +75,7 @@ "culture": "isengard", "cost": 1, "type": "condition", - "keyword": "support area", + "keyword": ["support area"], "effects": [ { "type": "modifier", @@ -106,8 +106,8 @@ "culture": "isengard", "cost": 0, "type": "event", - "keyword": "regroup", -"effects": { + "keyword": ["regroup"], + "effects": { "type": "event", "cost": { "type": "exert", @@ -131,7 +131,7 @@ "cost": 5, "type": "minion", "race": "crow", - "keyword": "damage+1", + "keyword": ["damage+1"], "strength": 7, "vitality": 4, "site": 4, @@ -167,7 +167,7 @@ "cost": 4, "type": "minion", "race": "wizard", - "keyword": "damage+1", + "keyword": ["damage+1"], "strength": 8, "vitality": 4, "site": 4, diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_ringwraith_playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_ringwraith_playtest.json index dce4de5e3..eb0be92b6 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_ringwraith_playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_ringwraith_playtest.json @@ -5,8 +5,8 @@ "culture": "wraith", "cost": 0, "type": "event", - "keyword": "shadow", -"effects": { + "keyword": ["shadow"], + "effects": { "type": "event", "cost": { "type": "exert", @@ -31,7 +31,7 @@ "cost": 1, "type": "minion", "race": "man", - "keyword": "damage+1", + "keyword": ["damage+1"], "strength": 3, "vitality": 1, "site": 2, @@ -65,9 +65,8 @@ "culture": "wraith", "cost": 1, "type": "artifact", - "possession": "", "target": "name(Gimli)", - "keyword": "support area", + "keyword": ["support area"], "vitality": 1, "effects": [ { @@ -100,7 +99,7 @@ "cost": 4, "type": "minion", "race": "nazgul", - "keyword": "damage+1", + "keyword": ["damage+1"], "strength": 9, "vitality": 3, "site": 3, @@ -134,7 +133,7 @@ "culture": "wraith", "cost": 1, "type": "condition", - "keyword": "support area", + "keyword": ["support area"], "effects": [ { "type": "modifier", @@ -165,7 +164,7 @@ "culture": "wraith", "cost": 2, "type": "condition", - "keyword": "support area", + "keyword": ["support area"], "effects": [ { "type": "modifier", @@ -196,8 +195,8 @@ "culture": "wraith", "cost": 1, "type": "event", - "keyword": "skirmish", -"effects": { + "keyword": ["skirmish"], + "effects": { "type": "event", "cost": { "type": "exert", diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_sauron_playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_sauron_playtest.json index c1f343b29..b76678e8d 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_sauron_playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_sauron_playtest.json @@ -5,8 +5,8 @@ "culture": "sauron", "cost": 1, "type": "event", - "keyword": "regroup", -"effects": { + "keyword": ["regroup"], + "effects": { "type": "event", "cost": { "type": "exert", @@ -29,7 +29,7 @@ "culture": "sauron", "cost": 1, "type": "condition", - "keyword": "support area", + "keyword": ["support area"], "effects": [ { "type": "modifier", @@ -60,7 +60,7 @@ "culture": "sauron", "cost": 0, "type": "condition", - "keyword": "support area", + "keyword": ["support area"], "effects": [ { "type": "modifier", @@ -91,8 +91,8 @@ "culture": "sauron", "cost": 1, "type": "event", - "keyword": "regroup", -"effects": { + "keyword": ["regroup"], + "effects": { "type": "event", "cost": { "type": "exert", @@ -116,7 +116,7 @@ "cost": 3, "type": "minion", "race": "orc", - "keyword": "damage+1", + "keyword": ["damage+1"], "strength": 8, "vitality": 2, "site": 6, @@ -150,7 +150,7 @@ "culture": "sauron", "cost": 1, "type": "condition", - "keyword": "support area", + "keyword": ["support area"], "effects": [ { "type": "modifier", diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_shire_playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_shire_playtest.json index 9c69cc3c3..72882c72c 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_shire_playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_shire_playtest.json @@ -7,7 +7,7 @@ "cost": 1, "type": "companion", "race": "hobbit", - "keyword": "damage+1", + "keyword": ["damage+1"], "strength": 3, "vitality": 4, "signet": "frodo", @@ -43,9 +43,9 @@ "culture": "shire", "cost": 2, "type": "ally", - "allyHome": 3, + "allyHome": "fellowship,3", "race": "hobbit", - "keyword": "damage+1", + "keyword": ["damage+1"], "strength": 2, "vitality": 3, "effects": [ @@ -80,7 +80,7 @@ "cost": 1, "type": "companion", "race": "hobbit", - "keyword": "damage+1", + "keyword": ["damage+1"], "strength": 3, "vitality": 4, "signet": "frodo", @@ -117,7 +117,7 @@ "cost": 2, "type": "companion", "race": "hobbit", - "keyword": "damage+1", + "keyword": ["damage+1"], "strength": 3, "vitality": 4, "signet": "frodo", @@ -152,8 +152,8 @@ "culture": "shire", "cost": 1, "type": "event", - "keyword": "skirmish", -"effects": { + "keyword": ["skirmish"], + "effects": { "type": "event", "cost": { "type": "exert", @@ -176,8 +176,8 @@ "culture": "shire", "cost": 2, "type": "event", - "keyword": "fellowship", -"effects": { + "keyword": ["fellowship"], + "effects": { "type": "event", "cost": { "type": "exert", @@ -201,9 +201,9 @@ "culture": "shire", "cost": 1, "type": "ally", - "allyHome": 1, + "allyHome": "fellowship,1", "race": "hobbit", - "keyword": "damage+1", + "keyword": ["damage+1"], "strength": 3, "vitality": 2, "effects": [ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_sites_playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_sites_playtest.json index 46cafd244..5f1c66100 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_sites_playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_sites_playtest.json @@ -2,9 +2,11 @@ "151_57": { "title": "Bag End Study", - "culture": "", "cost": 0, "type": "site", + "site": 1, + "block": "fellowship", + "direction": "left", "effects": [ { "type": "modifier", @@ -32,9 +34,11 @@ "151_58": { "title": "Bree Overlook", - "culture": "", "cost": 2, "type": "site", + "site": 2, + "block": "fellowship", + "direction": "left", "effects": [ { "type": "modifier", @@ -62,9 +66,11 @@ "151_59": { "title": "Rivendell Gateway", - "culture": "", "cost": 0, - "type": "sanctuary", + "type": "site", + "site": 3, + "block": "fellowship", + "direction": "left", "effects": [ { "type": "modifier", @@ -92,9 +98,11 @@ "151_60": { "title": "Moria Crossroads", - "culture": "", "cost": 3, "type": "site", + "site": 4, + "block": "fellowship", + "direction": "left", "effects": [ { "type": "modifier", @@ -122,9 +130,11 @@ "151_61": { "title": "Lorien Throne Room", - "culture": "", "cost": 3, - "type": "sanctuary", + "type": "site", + "site": 6, + "block": "fellowship", + "direction": "left", "effects": [ { "type": "modifier", @@ -152,9 +162,11 @@ "151_62": { "title": "Valley of the Anduin", - "culture": "", "cost": 6, "type": "site", + "site": 7, + "block": "fellowship", + "direction": "left", "effects": [ { "type": "modifier", @@ -182,9 +194,11 @@ "151_63": { "title": "Nen Hithoel", - "culture": "", "cost": 7, "type": "site", + "site": 8, + "block": "fellowship", + "direction": "left", "effects": [ { "type": "modifier", @@ -212,9 +226,11 @@ "151_64": { "title": "Henneth Anun Glade", - "culture": "", "cost": 9, "type": "site", + "site": 9, + "block": "fellowship", + "direction": "left", "effects": [ { "type": "modifier",