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

Fixng triggers vs actions.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-09-01 20:43:57 +00:00
parent f05bc6362e
commit e460d97b97
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_023.java
View File

@@ -41,7 +41,7 @@ public class Card1_023 extends AbstractLotroCardBlueprint {
} }
@Override @Override
public List<? extends Action> getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { public List<? extends Action> getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) {
if (PlayConditions.winsSkirmish(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.keyword(Keyword.DWARF))) { if (PlayConditions.winsSkirmish(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.keyword(Keyword.DWARF))) {
final PlayEventAction action = new PlayEventAction(self); final PlayEventAction action = new PlayEventAction(self);
action.addEffect(new PlayoutDecisionEffect( action.addEffect(new PlayoutDecisionEffect(

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_025.java
View File

@@ -35,7 +35,7 @@ public class Card1_025 extends AbstractLotroCardBlueprint {
} }
@Override @Override
public List<? extends Action> getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { public List<? extends Action> getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) {
if (self.getZone() == Zone.HAND && PlayConditions.winsSkirmish(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.keyword(Keyword.DWARF))) { if (self.getZone() == Zone.HAND && PlayConditions.winsSkirmish(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.keyword(Keyword.DWARF))) {
SkirmishResult skirmishResult = (SkirmishResult) effectResult; SkirmishResult skirmishResult = (SkirmishResult) effectResult;
PlayEventAction action = new PlayEventAction(self); PlayEventAction action = new PlayEventAction(self);

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_122.java
View File

@@ -39,7 +39,7 @@ public class Card1_122 extends AbstractLotroCardBlueprint {
} }
@Override @Override
public List<? extends Action> getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { public List<? extends Action> getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) {
if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Filters.keyword(Keyword.URUK_HAI), Filters.owner(playerId))) if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Filters.keyword(Keyword.URUK_HAI), Filters.owner(playerId)))
&& PlayConditions.canPlayShadowCardDuringPhase(game, null, self)) { && PlayConditions.canPlayShadowCardDuringPhase(game, null, self)) {
final PlayEventAction action = new PlayEventAction(self); final PlayEventAction action = new PlayEventAction(self);

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_144.java
View File

@@ -47,7 +47,7 @@ public class Card1_144 extends AbstractLotroCardBlueprint {
} }
@Override @Override
public List<? extends Action> getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { public List<? extends Action> getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) {
if (PlayConditions.winsSkirmish(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Filters.keyword(Keyword.URUK_HAI), Filters.owner(playerId))) if (PlayConditions.winsSkirmish(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Filters.keyword(Keyword.URUK_HAI), Filters.owner(playerId)))
&& game.getGameState().getTwilightPool() >= 1) { && game.getGameState().getTwilightPool() >= 1) {
SkirmishResult skirmishResult = ((SkirmishResult) effectResult); SkirmishResult skirmishResult = ((SkirmishResult) effectResult);

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_154.java
View File

@@ -43,7 +43,7 @@ public class Card1_154 extends AbstractMinion {
} }
@Override @Override
public List<? extends Action> getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { public List<? extends Action> getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) {
if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) {
CostToEffectAction action = new CostToEffectAction(self, null, "The Free Peoples player discard the top card of his draw deck."); CostToEffectAction action = new CostToEffectAction(self, null, "The Free Peoples player discard the top card of his draw deck.");
action.addEffect(new DiscardTopCardFromDeckEffect(game.getGameState().getCurrentPlayerId())); action.addEffect(new DiscardTopCardFromDeckEffect(game.getGameState().getCurrentPlayerId()));

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_155.java
View File

@@ -47,7 +47,7 @@ public class Card1_155 extends AbstractMinion {
} }
@Override @Override
public List<? extends Action> getOptionalAfterTriggers(final String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { public List<? extends Action> getOptionalAfterActions(final String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) {
if (effectResult.getType() == EffectResult.Type.PUT_ON_THE_ONE_RING if (effectResult.getType() == EffectResult.Type.PUT_ON_THE_ONE_RING
&& PlayConditions.canExert(game.getGameState(), game.getModifiersQuerying(), self)) { && PlayConditions.canExert(game.getGameState(), game.getModifiersQuerying(), self)) {
final CostToEffectAction action = new CostToEffectAction(self, Keyword.RESPONSE, "Exert this minion. Discard a card from the top of your draw deck for each ISENGARD minion you spot. Add a burden for each Shadow card discarded in this way."); final CostToEffectAction action = new CostToEffectAction(self, Keyword.RESPONSE, "Exert this minion. Discard a card from the top of your draw deck for each ISENGARD minion you spot. Add a burden for each Shadow card discarded in this way.");

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_159.java
View File

@@ -49,7 +49,7 @@ public class Card1_159 extends AbstractLotroCardBlueprint {
} }
@Override @Override
public List<? extends Action> getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { public List<? extends Action> getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) {
if (PlayConditions.winsSkirmish(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Filters.owner(playerId), Filters.keyword(Keyword.URUK_HAI))) if (PlayConditions.winsSkirmish(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Filters.owner(playerId), Filters.keyword(Keyword.URUK_HAI)))
&& game.getGameState().getTwilightPool() >= 3) { && game.getGameState().getTwilightPool() >= 3) {
SkirmishResult skirmishResult = ((SkirmishResult) effectResult); SkirmishResult skirmishResult = ((SkirmishResult) effectResult);

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_362.java
View File

@@ -27,7 +27,7 @@ public class Card1_362 extends AbstractSite {
} }
@Override @Override
public List<? extends Action> getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { public List<? extends Action> getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) {
if (effectResult.getType() == EffectResult.Type.WHEN_MOVE_TO if (effectResult.getType() == EffectResult.Type.WHEN_MOVE_TO
&& game.getGameState().getCurrentSite() == self) { && game.getGameState().getCurrentSite() == self) {
List<Action> actions = new LinkedList<Action>(); List<Action> actions = new LinkedList<Action>();