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

Fixed Add Trigger

Browse Source
This commit is contained in:
marcin.sciesinski
2019-09-03 09:56:40 -07:00
parent dd40d65aa7
commit 2843c44942
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,13 +80,13 @@ public class AddTrigger implements EffectAppenderProducer {
@Override
public List<? extends RequiredTriggerAction> getRequiredBeforeTriggers(LotroGame lotroGame, Effect effect) {
if (trigger.isBefore() && !optional && trigger.accepts(actionContext)) {
if (checkRequirements(actionContext))
DelegateActionContext delegate = new DelegateActionContext(actionContext, actionContext.getPerformingPlayer(),
lotroGame, actionContext.getSource(), null, effect);
if (trigger.isBefore() && !optional && trigger.accepts(delegate)) {
if (checkRequirements(delegate))
return null;
DelegateActionContext delegate = new DelegateActionContext(actionContext, actionContext.getPerformingPlayer(),
lotroGame, actionContext.getSource(), null, effect);
RequiredTriggerAction result = new RequiredTriggerAction(actionContext.getSource());
RequiredTriggerAction result = new RequiredTriggerAction(delegate.getSource());
customizeTriggerAction(result, delegate);
return Collections.singletonList(result);
@@ -96,13 +96,13 @@ public class AddTrigger implements EffectAppenderProducer {
@Override
public List<? extends OptionalTriggerAction> getOptionalBeforeTriggers(String playerId, LotroGame lotroGame, Effect effect) {
if (trigger.isBefore() && optional && trigger.accepts(actionContext)) {
if (checkRequirements(actionContext))
DelegateActionContext delegate = new DelegateActionContext(actionContext, actionContext.getPerformingPlayer(),
lotroGame, actionContext.getSource(), null, effect);
if (trigger.isBefore() && optional && trigger.accepts(delegate)) {
if (checkRequirements(delegate))
return null;
DelegateActionContext delegate = new DelegateActionContext(actionContext, actionContext.getPerformingPlayer(),
lotroGame, actionContext.getSource(), null, effect);
OptionalTriggerAction result = new OptionalTriggerAction(actionContext.getSource());
OptionalTriggerAction result = new OptionalTriggerAction(delegate.getSource());
customizeTriggerAction(result, delegate);
return Collections.singletonList(result);
@@ -112,13 +112,13 @@ public class AddTrigger implements EffectAppenderProducer {
@Override
public List<? extends RequiredTriggerAction> getRequiredAfterTriggers(LotroGame lotroGame, EffectResult effectResult) {
if (!trigger.isBefore() && !optional && trigger.accepts(actionContext)) {
if (checkRequirements(actionContext))
DelegateActionContext delegate = new DelegateActionContext(actionContext, actionContext.getPerformingPlayer(),
lotroGame, actionContext.getSource(), effectResult, null);
if (!trigger.isBefore() && !optional && trigger.accepts(delegate)) {
if (checkRequirements(delegate))
return null;
DelegateActionContext delegate = new DelegateActionContext(actionContext, actionContext.getPerformingPlayer(),
lotroGame, actionContext.getSource(), effectResult, null);
RequiredTriggerAction result = new RequiredTriggerAction(actionContext.getSource());
RequiredTriggerAction result = new RequiredTriggerAction(delegate.getSource());
customizeTriggerAction(result, delegate);
return Collections.singletonList(result);
@@ -128,13 +128,13 @@ public class AddTrigger implements EffectAppenderProducer {
@Override
public List<? extends OptionalTriggerAction> getOptionalAfterTriggers(String playerId, LotroGame lotroGame, EffectResult effectResult) {
if (!trigger.isBefore() && optional && trigger.accepts(actionContext)) {
if (checkRequirements(actionContext))
DelegateActionContext delegate = new DelegateActionContext(actionContext, actionContext.getPerformingPlayer(),
lotroGame, actionContext.getSource(), effectResult, null);
if (!trigger.isBefore() && optional && trigger.accepts(delegate)) {
if (checkRequirements(delegate))
return null;
DelegateActionContext delegate = new DelegateActionContext(actionContext, actionContext.getPerformingPlayer(),
lotroGame, actionContext.getSource(), effectResult, null);
OptionalTriggerAction result = new OptionalTriggerAction(actionContext.getSource());
OptionalTriggerAction result = new OptionalTriggerAction(delegate.getSource());
customizeTriggerAction(result, delegate);
return Collections.singletonList(result);