From 76c73f5420d58885159c9e863c8902e575b05764 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Fri, 17 Dec 2021 12:42:39 -0600 Subject: [PATCH] Cleaned up site 3 and Would Have Gone to use existing json functions. Site 4 is going to require some elbow grease down the line. --- .../cards/set101/set101_gondor_playtest.json | 25 ++++++++++++++----- .../cards/set101/set101_sites_playtest.json | 6 ++++- 2 files changed, 24 insertions(+), 7 deletions(-) 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 6b5d31e03..227df4ad1 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 @@ -163,17 +163,30 @@ "type": "played", "filter": "your,skirmish,event" }, - "condition": { - "type": "canSpot", - "filter": "companion,inSkirmish,signet(aragorn)" - }, + "condition": [ + { + "type": "canSpot", + "filter": "companion,inSkirmish,signet(aragorn)" + }, + { + "type": "canSpot", + "filter": "name(Aragorn)" + } + ], "effect": { - "type": "splaceholder for function to stack the played event here" + "type": "stackPlayedEvent", + "where": "self" } - }, + }, { "type": "activated", "phase": "skirmish", + "condition": [ + { + "type": "canSpot", + "filter": "name(Aragorn)" + } + ], "cost": [ { "type": "chooseANumber", 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 b5698733d..11d78a92c 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 @@ -51,7 +51,11 @@ "trigger": { "type": "condition", "condition": { - "type": "can spot 4 FP cultures (workaround is for each culture over 3; limit 1)" + "type": "not", + "condition": { + "type": "cantspotfpcultures", + "amount": 4 + } } }, "condition": {