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

Fixing Wolf Pit unit tests. Fixing player resolver refactor in V2-specific triggers

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2024-09-24 17:34:05 -05:00
parent 79703118ee
commit cb383ebb4e
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/AddsCultureToken.java
View File

@@ -17,7 +17,7 @@ public class AddsCultureToken implements TriggerCheckerProducer {
final FilterableSource sourceFilter = environment.getFilterFactory().generateFilter(filter, environment); final FilterableSource sourceFilter = environment.getFilterFactory().generateFilter(filter, environment);
final FilterableSource onSourceFilter = environment.getFilterFactory().generateFilter(onFilter, environment); final FilterableSource onSourceFilter = environment.getFilterFactory().generateFilter(onFilter, environment);
PlayerSource playerSource = player != null ? PlayerResolver.resolvePlayer(player, environment) : null; PlayerSource playerSource = player != null ? PlayerResolver.resolvePlayer(player) : null;
return new TriggerChecker() { return new TriggerChecker() {
@Override @Override

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/RemovesCultureToken.java
View File

@@ -15,7 +15,7 @@ public class RemovesCultureToken implements TriggerCheckerProducer {
String onFilter = FieldUtils.getString(value.get("on"), "on", "any"); String onFilter = FieldUtils.getString(value.get("on"), "on", "any");
String filter = FieldUtils.getString(value.get("filter"), "filter", "any"); String filter = FieldUtils.getString(value.get("filter"), "filter", "any");
PlayerSource playerSource = (player != null) ? PlayerResolver.resolvePlayer(player, environment) : null; PlayerSource playerSource = (player != null) ? PlayerResolver.resolvePlayer(player) : null;
final FilterableSource sourceFilter = environment.getFilterFactory().generateFilter(filter, environment); final FilterableSource sourceFilter = environment.getFilterFactory().generateFilter(filter, environment);
final FilterableSource onSourceFilter = environment.getFilterFactory().generateFilter(onFilter, environment); final FilterableSource onSourceFilter = environment.getFilterFactory().generateFilter(onFilter, environment);

9
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_024_Tests.java
View File

@@ -81,6 +81,9 @@ public class Card_V2_024_Tests
assertTrue(scn.ShadowPlayAvailable(pit)); assertTrue(scn.ShadowPlayAvailable(pit));
scn.ShadowPlayCard(pit); scn.ShadowPlayCard(pit);
assertTrue(scn.ShadowHasOptionalTriggerAvailable());
scn.ShadowAcceptOptionalTrigger();
assertTrue(scn.ShadowDecisionAvailable("Choose action to perform")); assertTrue(scn.ShadowDecisionAvailable("Choose action to perform"));
scn.ShadowChooseMultipleChoiceOption("discard"); scn.ShadowChooseMultipleChoiceOption("discard");
@@ -121,6 +124,9 @@ public class Card_V2_024_Tests
assertTrue(scn.ShadowPlayAvailable(pit)); assertTrue(scn.ShadowPlayAvailable(pit));
scn.ShadowPlayCard(pit); scn.ShadowPlayCard(pit);
assertTrue(scn.ShadowHasOptionalTriggerAvailable());
scn.ShadowAcceptOptionalTrigger();
assertTrue(scn.ShadowDecisionAvailable("Choose action to perform")); assertTrue(scn.ShadowDecisionAvailable("Choose action to perform"));
scn.ShadowChooseMultipleChoiceOption("deck"); scn.ShadowChooseMultipleChoiceOption("deck");
@@ -162,6 +168,9 @@ public class Card_V2_024_Tests
assertTrue(scn.ShadowPlayAvailable(pit)); assertTrue(scn.ShadowPlayAvailable(pit));
scn.ShadowPlayCard(pit); scn.ShadowPlayCard(pit);
assertTrue(scn.ShadowHasOptionalTriggerAvailable());
scn.ShadowAcceptOptionalTrigger();
assertTrue(scn.ShadowDecisionAvailable("Choose action to perform")); assertTrue(scn.ShadowDecisionAvailable("Choose action to perform"));
scn.ShadowChooseMultipleChoiceOption("deck"); scn.ShadowChooseMultipleChoiceOption("deck");