From 4c5180fb2683322f3adaedebc62553c094bfc59e Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Fri, 29 Jan 2021 16:42:28 -0500 Subject: [PATCH 01/10] Corrected rarity errors --- gemp-lotr/gemp-lotr-cards/src/main/resources/set15-rarity.txt | 4 ++-- gemp-lotr/gemp-lotr-cards/src/main/resources/set17-rarity.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 ab03c4097..a80bb6c47 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 @@ -186,8 +186,8 @@ 15U187 15S188 15S189 -15U190 -15U191 +15S190 +15S191 15U192 15R193 15S194 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set17-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/set17-rarity.txt index 6163e142e..52c7091c1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set17-rarity.txt +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set17-rarity.txt @@ -44,7 +44,7 @@ 17R44 17R45 17C46 -17U47 +17C47 17S48 17R49 17U50 @@ -154,4 +154,4 @@ 17A154 17A155 17A156 -17A157 \ No newline at end of file +17A157 From 0e79006201db73d3656d2c5d28a56fbc8fa8bc15 Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Sat, 6 Feb 2021 10:28:22 -0500 Subject: [PATCH 02/10] Nertea, Dark Horseman Should no longer prevent allies from being assigned --- gemp-lotr/gemp-lotr-async/src/main/web/cards/set19.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set19.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set19.json index e8edfca96..e3729a02a 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set19.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set19.json @@ -1438,7 +1438,7 @@ "modifier": { "type": "cantBeAssignedToSkirmishAgainst", "side": "free people", - "fpCharacter": "race(stored)", + "fpCharacter": "companion,race(stored)", "minion": "self" } } From 9c3a04819bd5127d43ce96a19c7774dd2cd4ab22 Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Sat, 6 Feb 2021 10:58:22 -0500 Subject: [PATCH 03/10] Narya, Ring of Fire Active abilty should properly remove culture tokens --- gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json index 8bfd9f6d1..5c84cf03b 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json @@ -715,7 +715,8 @@ "filter": "bearer" }, "effect": { - "type": "removeTokens" + "type": "removeTokens", + "filter": "any" } }, { From f6e22585a9534c346c758b6dd485a1b23cb26df6 Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Sat, 6 Feb 2021 11:26:04 -0500 Subject: [PATCH 04/10] Dead pile checks should always refer to the FP player --- .../build/field/effect/appender/resolver/ValueResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/resolver/ValueResolver.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/resolver/ValueResolver.java index 51463c02d..e23469223 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/resolver/ValueResolver.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/resolver/ValueResolver.java @@ -248,7 +248,7 @@ public class ValueResolver { final int multiplier = FieldUtils.getInteger(object.get("multiplier"), "multiplier", 1); final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter, environment); return actionContext -> - (Evaluator) (game, cardAffected) -> multiplier * Filters.filter(game.getGameState().getDeadPile(actionContext.getPerformingPlayer()), + (Evaluator) (game, cardAffected) -> multiplier * Filters.filter(game.getGameState().getDeadPile(game.getGameState().getCurrentPlayerId()), game, filterableSource.getFilterable(actionContext)).size(); } else if (type.equalsIgnoreCase("fromMemory")) { FieldUtils.validateAllowedFields(object, "memory", "multiplier", "limit"); From af51b2830a9b4c1f6fa189074605591e4155465d Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Mon, 8 Feb 2021 09:26:35 -0500 Subject: [PATCH 05/10] Corrected overwhelm multiplier text --- .../field/effect/appender/CantBeOverwhelmedMultiplier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantBeOverwhelmedMultiplier.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantBeOverwhelmedMultiplier.java index bb036124c..3c9ad4dde 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantBeOverwhelmedMultiplier.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantBeOverwhelmedMultiplier.java @@ -31,7 +31,7 @@ public class CantBeOverwhelmedMultiplier implements EffectAppenderProducer { MultiEffectAppender result = new MultiEffectAppender(); result.addEffectAppender( - CardResolver.resolveCards(filter, new ConstantEvaluator(1), "_temp", "you", "Choose characters that you want to make unable to be assigned to skirmish", environment)); + CardResolver.resolveCards(filter, new ConstantEvaluator(1), "_temp", "you", "Choose characters to apply overwhelm multiplier on", environment)); result.addEffectAppender( new DelayedAppender() { @Override From 910aef12160a75e3179ca58b970f32f599fca004 Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Fri, 19 Feb 2021 08:13:22 -0500 Subject: [PATCH 06/10] Jarnsmid, Merchant from Dale No longer discounts Shadow items --- .../gemp-lotr-async/src/main/web/cards/set2/set2-gandalf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-gandalf.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-gandalf.json index efc380d07..e0e5f5e09 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-gandalf.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-gandalf.json @@ -128,7 +128,7 @@ "modifier": { "type": "modifyCost", "amount": -1, - "filter": "or(shield,armor,helm,hand weapon)" + "filter": "side(free people),or(shield,armor,helm,hand weapon)" } } }, From 09ad118f5d6686a65dc8ca750dfe06bb16d418bd Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Fri, 19 Feb 2021 08:15:26 -0500 Subject: [PATCH 07/10] Narya, Ring of Fire --- gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json index 5c84cf03b..51cf32cfc 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json @@ -716,7 +716,7 @@ }, "effect": { "type": "removeTokens", - "filter": "any" + "filter": "choose(any)" } }, { From 4bc90765940487de4959dfcee32ad8c130427016 Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Fri, 19 Feb 2021 08:42:41 -0500 Subject: [PATCH 08/10] Mordor Assassin No longer crashes the game if the RB is overwhelmed --- .../java/com/gempukku/lotro/cards/set7/sauron/Card7_284.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/sauron/Card7_284.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/sauron/Card7_284.java index 4a4092219..d7bbbdd21 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/sauron/Card7_284.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/sauron/Card7_284.java @@ -45,7 +45,8 @@ public class Card7_284 extends AbstractMinion { KilledResult killResult = threatWoundsEffect.getKillResult(); if (killResult.getCause() == KillEffect.Cause.OVERWHELM && Filters.filter(killResult.getKilledCards(), game, CardType.COMPANION).size() > 0 - && Filters.canSpot(game, Filters.inSkirmish, Culture.SAURON, Race.ORC)) { + && Filters.canSpot(game, Filters.inSkirmish, Culture.SAURON, Race.ORC) + && Filters.canSpot(game, Filters.ringBearer)) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( new RemoveThreatsEffect(self, 1)); From e300b376304f0dd5bb37983dc88a87991d0a26b2 Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Fri, 19 Feb 2021 11:33:53 -0500 Subject: [PATCH 09/10] Discard from play checks performing player instead of only card owner --- .../lotro/logic/effects/DiscardCardsFromPlayEffect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardsFromPlayEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardsFromPlayEffect.java index c6837ea9e..cf89e9ce5 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardsFromPlayEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardsFromPlayEffect.java @@ -33,7 +33,7 @@ public class DiscardCardsFromPlayEffect extends AbstractPreventableCardEffect { protected Filter getExtraAffectableFilter() { if (_source == null) return Filters.any; - return Filters.canBeDiscarded(_source); + return Filters.canBeDiscarded(_performingPlayer, _source); } public String getPerformingPlayer() { From ea460a13e9f49bc4242f3a2ae6f1b1b3351dacd8 Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Fri, 19 Feb 2021 11:43:20 -0500 Subject: [PATCH 10/10] Performing player specified in chat log --- .../lotro/logic/effects/DiscardCardsFromPlayEffect.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardsFromPlayEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardsFromPlayEffect.java index cf89e9ce5..8d8b12d5a 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardsFromPlayEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardsFromPlayEffect.java @@ -69,17 +69,13 @@ public class DiscardCardsFromPlayEffect extends AbstractPreventableCardEffect { discardedCards.addAll(cards); toMoveFromZoneToDiscard.addAll(cards); - String sourcePlayer = null; - if (_source != null) - sourcePlayer = _source.getOwner(); - - gameState.removeCardsFromZone(sourcePlayer, toMoveFromZoneToDiscard); + gameState.removeCardsFromZone(_performingPlayer, toMoveFromZoneToDiscard); for (PhysicalCard card : toMoveFromZoneToDiscard) gameState.addCardToZone(game, card, Zone.DISCARD); if (_source != null && discardedCards.size() > 0) - game.getGameState().sendMessage(_source.getOwner() + " discards " + getAppendedNames(discardedCards) + " from play using " + GameUtils.getCardLink(_source)); + game.getGameState().sendMessage(_performingPlayer + " discards " + getAppendedNames(discardedCards) + " from play using " + GameUtils.getCardLink(_source)); for (PhysicalCard discardedCard : discardedCards) game.getActionsEnvironment().emitEffectResult(new DiscardCardsFromPlayResult(_source, getPerformingPlayer(), discardedCard));