ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

typo and fixing Southern Spies not compiling

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2022-12-11 12:44:22 -06:00
parent 46148e79c0
commit 139c6dc7a8
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
View File

@@ -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',

8
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/resolver/ValueResolver.java
View File

@@ -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");