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

Added triggers correctly receive the parameters they need in context

Browse Source
This commit is contained in:
marcin.sciesinski
2019-09-02 09:40:11 -07:00
parent 52a95fb12b
commit e662a5fce8
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gemp-lotr/gemp-lotr-async/src/main/web/cards/set40/set40-dwarven.json
View File

@@ -412,6 +412,7 @@
"type": "startOfPhase",
"phase": "fellowship"
},
"optional": true,
"cost": {
"type": "stackCardsFromHand",
"where": "choose(culture(dwarven),support area,condition)",

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

@@ -1,9 +1,6 @@
package com.gempukku.lotro.cards.build.field.effect.appender;
import com.gempukku.lotro.cards.build.ActionContext;
import com.gempukku.lotro.cards.build.CardGenerationEnvironment;
import com.gempukku.lotro.cards.build.InvalidCardDefinitionException;
import com.gempukku.lotro.cards.build.Requirement;
import com.gempukku.lotro.cards.build.*;
import com.gempukku.lotro.cards.build.field.FieldUtils;
import com.gempukku.lotro.cards.build.field.effect.EffectAppender;
import com.gempukku.lotro.cards.build.field.effect.EffectAppenderProducer;
@@ -84,8 +81,10 @@ public class AddTrigger implements EffectAppenderProducer {
if (checkRequirements(actionContext))
return null;
DelegateActionContext delegate = new DelegateActionContext(actionContext, actionContext.getPerformingPlayer(),
lotroGame, actionContext.getSource(), null, effect);
RequiredTriggerAction result = new RequiredTriggerAction(actionContext.getSource());
customizeTriggerAction(result, actionContext);
customizeTriggerAction(result, delegate);
return Collections.singletonList(result);
}
@@ -98,8 +97,10 @@ public class AddTrigger implements EffectAppenderProducer {
if (checkRequirements(actionContext))
return null;
DelegateActionContext delegate = new DelegateActionContext(actionContext, actionContext.getPerformingPlayer(),
lotroGame, actionContext.getSource(), null, effect);
OptionalTriggerAction result = new OptionalTriggerAction(actionContext.getSource());
customizeTriggerAction(result, actionContext);
customizeTriggerAction(result, delegate);
return Collections.singletonList(result);
}
@@ -112,8 +113,10 @@ public class AddTrigger implements EffectAppenderProducer {
if (checkRequirements(actionContext))
return null;
DelegateActionContext delegate = new DelegateActionContext(actionContext, actionContext.getPerformingPlayer(),
lotroGame, actionContext.getSource(), effectResult, null);
RequiredTriggerAction result = new RequiredTriggerAction(actionContext.getSource());
customizeTriggerAction(result, actionContext);
customizeTriggerAction(result, delegate);
return Collections.singletonList(result);
}
@@ -126,8 +129,10 @@ public class AddTrigger implements EffectAppenderProducer {
if (checkRequirements(actionContext))
return null;
DelegateActionContext delegate = new DelegateActionContext(actionContext, actionContext.getPerformingPlayer(),
lotroGame, actionContext.getSource(), effectResult, null);
OptionalTriggerAction result = new OptionalTriggerAction(actionContext.getSource());
customizeTriggerAction(result, actionContext);
customizeTriggerAction(result, delegate);
return Collections.singletonList(result);
}