From 104ed221da2f84efa9a3a31d2918936fed6622a1 Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Wed, 11 Mar 2020 08:50:23 -0400 Subject: [PATCH 1/4] Hobbit changes for casual games --- .../src/main/web/cards/set31/set31-fp.json | 38 ++++++++++++++++--- .../lotro/cards/set31/dwarven/Card31_007.java | 31 ++++++++------- .../src/main/resources/lotrFormats.json | 13 +++---- 3 files changed, 54 insertions(+), 28 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json index 0bb063b6b..bf0711829 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json @@ -28,6 +28,34 @@ "keyword": "fellowship", "effects": { "type": "event", + "cost": { + "type": "choice", + "texts": [ + "Sites 1-5", + "Sites 6-9" + ], + "effects": [ + { + "type": "conditional", + "condition": { + "type": "location", + "filter": "siteNumber(1-5),siteBlock(hobbit)" + }, + "effect": { + "type": "discard", + "filter": "choose(culture(dwarven),follower)", + "memorize": "discardedFollower" + } + }, + { + "type": "conditional", + "condition": { + "type": "location", + "filter": "not(siteNumber(1-5),siteBlock(hobbit))" + } + } + ] + }, "effect": [ { "type": "conditional", @@ -37,13 +65,13 @@ }, "effect": { "type": "duplicate", - "effect": { - "type": "playCardFromDrawDeck", - "filter": "choose(culture(dwarven),not(event))" - }, "amount": { "type": "twilightCostInMemory", "memory": "discardedFollower" + }, + "effect": { + "type": "playCardFromDrawDeck", + "filter": "choose(culture(dwarven),not(event))" } } }, @@ -51,7 +79,7 @@ "type": "conditional", "condition": { "type": "location", - "filter": "siteNumber(6-9),siteBlock(hobbit)" + "filter": "not(siteNumber(1-5),siteBlock(hobbit))" }, "effect": { "type": "heal", diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_007.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_007.java index f6a27f015..270067c06 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_007.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_007.java @@ -58,24 +58,23 @@ public class Card31_007 extends AbstractPermanent { return Collections.singletonList(action); } } - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self)) { + if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self) + && PlayConditions.checkPhaseLimit(game, self, 1)) { final ActivateCardAction action = new ActivateCardAction(self); - if (PlayConditions.checkPhaseLimit(game, self, 1)) { - action.appendCost( - new IncrementPhaseLimitEffect(self, 1)); - action.appendCost( - new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.DWARF)); - action.appendEffect( - new ChooseCardsFromDeckEffect(playerId, 1, 1, CardType.EVENT, Culture.DWARVEN) { - @Override - protected void cardsSelected(LotroGame game, Collection cards) { - for (PhysicalCard card : cards) { - game.getGameState().removeCardsFromZone(playerId, Collections.singleton(card)); - game.getGameState().stackCard(game, card, self); - } + action.appendCost( + new IncrementPhaseLimitEffect(self, 1)); + action.appendCost( + new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.DWARF)); + action.appendEffect( + new ChooseCardsFromDeckEffect(playerId, 1, 1, CardType.EVENT, Culture.DWARVEN) { + @Override + protected void cardsSelected(LotroGame game, Collection cards) { + for (PhysicalCard card : cards) { + game.getGameState().removeCardsFromZone(playerId, Collections.singleton(card)); + game.getGameState().stackCard(game, card, self); } - }); - } + } + }); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json index 5b089ac47..55455baea 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json @@ -300,8 +300,8 @@ "code":"hobbit_tsr", "sites":"HOBBIT", "cancelRingBearerSkirmish":true, - "restricted":["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_19", "30_25", "30_26", "30_27", "30_28", "30_29", "30_43", "30_44", "30_45", "30_46", "30_48", "30_58", "31_13", "31_14", "31_56"], - "limit2":["30_1", "31_1", "31_38"], + "restricted":["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_16", "30_17", "30_18", "30_19", "30_29", "30_47", "30_48", "30_58", "31_13", "31_14", "31_16", "31_23", "31_56"], + "limit2":["30_1", "30_24", "31_1", "31_38"], "limit3":[], "set":[30, 31], "restrictedName":["Gandalf", "Bilbo"], @@ -312,8 +312,8 @@ "code": "hobbit_tcb", "sites": "HOBBIT", "cancelRingBearerSkirmish": true, - "restricted": ["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_19", "30_25", "30_26", "30_27", "30_28", "30_29", "30_43", "30_44", "30_45", "30_46", "30_48", "30_58"], - "limit2": ["30_1"], + "restricted": ["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_16", "30_17", "30_18", "30_19", "30_29", "30_47", "30_48", "30_58"], + "limit2": ["30_24", "32_21", "32_22"], "limit3": [], "set": [30, 32], "restrictedName": ["Gandalf", "Bilbo"], @@ -324,9 +324,8 @@ "code": "hobbit_faw", "sites": "HOBBIT", "cancelRingBearerSkirmish": true, - "restricted": ["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_19", - "30_25", "30_26", "30_27", "30_28", "30_29", "30_43", "30_44", "30_45", "30_46", "30_48", "30_58"], - "limit2": ["30_1"], + "restricted": ["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_16", "30_17", "30_18", "30_19", "30_29", "30_47", "30_48", "30_58"], + "limit2": ["30_1", "30_24"], "limit3": [], "set": [30, 33], "restrictedName": ["Gandalf","Bilbo"], From e3932248a67bde70b5cdfcc8f43114b7c61b9883 Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Mon, 16 Mar 2020 10:14:38 -0400 Subject: [PATCH 2/4] Minor LotR fixes --- .../src/main/web/cards/set1/set1-wraith.json | 10 +++++++++- .../src/main/resources/set15-rarity.txt | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-wraith.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-wraith.json index 87ac2d09c..3301950aa 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-wraith.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-wraith.json @@ -140,6 +140,10 @@ { "type": "activated", "phase": "skirmish", + "condition": { + "type": "canSpot", + "filter": "self,zone(support)" + }, "effect": { "type": "transfer", "filter": "choose(self,zone(support))", @@ -217,6 +221,10 @@ "filter": "nazgul", "memorize": "winner" }, + "condition": { + "type": "canSpot", + "filter": "self,zone(support)" + }, "effect": { "type": "transfer", "filter": "choose(self,zone(support))", @@ -1074,4 +1082,4 @@ } } } -} \ No newline at end of file +} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set15-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/set15-rarity.txt index a5dcc01f2..ab03c4097 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set15-rarity.txt +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set15-rarity.txt @@ -184,7 +184,7 @@ 15R185 15R186 15U187 -15U188 +15S188 15S189 15U190 15U191 From e16e399ab4cbb00d11e94734807554c41d85b705 Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Fri, 20 Mar 2020 11:13:52 -0400 Subject: [PATCH 3/4] Temporarily removing Realm of Dwarrowdelf damage limit --- .../src/main/web/cards/set2/set2-dwarven.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-dwarven.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-dwarven.json index f1e2c89cc..a8f21d2b0 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-dwarven.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-dwarven.json @@ -346,12 +346,7 @@ "type": "addKeyword", "filter": "memory(chosenDwarf)", "keyword": "damage", - "amount": { - "type": "cardAffectedLimitPerPhase", - "prefix": "dmg-", - "source": 1, - "limit": 3 - } + "amount": "1" } } ] From c450046bdb77e239e948680294c01cf0846a4d0b Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Fri, 20 Mar 2020 11:38:37 -0400 Subject: [PATCH 4/4] Revert "Temporarily removing Realm of Dwarrowdelf damage limit" This reverts commit e16e399ab4cbb00d11e94734807554c41d85b705. --- .../src/main/web/cards/set2/set2-dwarven.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-dwarven.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-dwarven.json index a8f21d2b0..f1e2c89cc 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-dwarven.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-dwarven.json @@ -346,7 +346,12 @@ "type": "addKeyword", "filter": "memory(chosenDwarf)", "keyword": "damage", - "amount": "1" + "amount": { + "type": "cardAffectedLimitPerPhase", + "prefix": "dmg-", + "source": 1, + "limit": 3 + } } } ]