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

Added explicit call for shuffling deck

Browse Source 
Fixes shuffling after taking revealing cards from the top/bottom of the draw deck
This commit is contained in:
Phallen Cassidy
2020-04-13 11:39:32 -04:00
parent b781fcd1ba
commit d4619a2fe1
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromDeckIntoHand.java
View File

@@ -23,10 +23,11 @@ import java.util.List;
public class PutCardsFromDeckIntoHand implements EffectAppenderProducer {
@Override
public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
FieldUtils.validateAllowedFields(effectObject, "count", "filter");
FieldUtils.validateAllowedFields(effectObject, "count", "filter", "shuffle");
final ValueSource valueSource = ValueResolver.resolveEvaluator(effectObject.get("count"), 1, environment);
final String filter = FieldUtils.getString(effectObject.get("filter"), "filter", "choose(any)");
final boolean shuffle = FieldUtils.getBoolean(effectObject.get("shuffle"), "shuffle", false);
MultiEffectAppender result = new MultiEffectAppender();
@@ -46,13 +47,14 @@ public class PutCardsFromDeckIntoHand implements EffectAppenderProducer {
return result;
}
});
result.addEffectAppender(
new DelayedAppender() {
@Override
protected Effect createEffect(boolean cost, CostToEffectAction action, ActionContext actionContext) {
return new ShuffleDeckEffect(actionContext.getPerformingPlayer());
}
});
if (shuffle)
result.addEffectAppender(
new DelayedAppender() {
@Override
protected Effect createEffect(boolean cost, CostToEffectAction action, ActionContext actionContext) {
return new ShuffleDeckEffect(actionContext.getPerformingPlayer());
}
});
return result;