From 139c6dc7a818e2ce04338732083805ab47c34595 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sun, 11 Dec 2022 12:44:22 -0600 Subject: [PATCH] typo and fixing Southern Spies not compiling --- .../gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js | 2 +- .../field/effect/appender/resolver/ValueResolver.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js index d00857d39..43365f564 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js @@ -354,7 +354,7 @@ var PCCards = { '73_104': 'https://i.lotrtcgpc.net/errata/LOTR-EN03E104.1_card.jpg', '74_146': 'https://i.lotrtcgpc.net/errata/LOTR-EN04E146.1_card.jpg', '75_8': 'https://i.lotrtcgpc.net/errata/LOTR-EN05E008.1_card.jpg', - '75_057': 'https://i.lotrtcgpc.net/errata/LOTR-EN05E057.1_card.jpg', + '75_57': 'https://i.lotrtcgpc.net/errata/LOTR-EN05E057.1_card.jpg', '77_256': 'https://i.lotrtcgpc.net/errata/LOTR-EN07E256.1_card.jpg', '77_332': 'https://i.lotrtcgpc.net/errata/LOTR-EN07E332.1_card.jpg', '78_48': 'https://i.lotrtcgpc.net/errata/LOTR-EN08E048.1_card.jpg', 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 879895c2d..28027024b 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 @@ -259,11 +259,13 @@ public class ValueResolver { return new ConstantEvaluator(result); }; } else if (type.equalsIgnoreCase("forEachInHand")) { - FieldUtils.validateAllowedFields(object, "filter"); - final String filter = FieldUtils.getString(object.get("filter"), "filter"); + FieldUtils.validateAllowedFields(object, "filter", "hand"); + final String filter = FieldUtils.getString(object.get("filter"), "filter", "any"); + final String hand = FieldUtils.getString(object.get("hand"), "hand", "you"); + final PlayerSource player = PlayerResolver.resolvePlayer(hand, environment); final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter, environment); return actionContext -> - (Evaluator) (game, cardAffected) -> Filters.filter(game.getGameState().getHand(actionContext.getPerformingPlayer()), + (Evaluator) (game, cardAffected) -> Filters.filter(game.getGameState().getHand(player.getPlayer(actionContext)), game, filterableSource.getFilterable(actionContext)).size(); } else if (type.equalsIgnoreCase("forEachInDeadPile")) { FieldUtils.validateAllowedFields(object, "filter", "multiplier");