diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentAction.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentAction.java index e8c49e2b0..2245e4851 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentAction.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentAction.java @@ -55,7 +55,7 @@ public class AttachPermanentAction extends AbstractCostToEffectAction implements _target = target; if (_exertTarget) { appendCost( - new ExertCharactersEffect(target, target)); + new ExertCharactersEffect(AttachPermanentAction.this, target, target)); } int modifier = twilightModifier; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ExertCharactersEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ExertCharactersEffect.java index 9ba1004ea..dc2ddeb7c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ExertCharactersEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ExertCharactersEffect.java @@ -15,17 +15,12 @@ import com.gempukku.lotro.logic.timing.results.ExertResult; import java.util.Collection; public class ExertCharactersEffect extends AbstractPreventableCardEffect { - private String _playerId; private Action _action; private PhysicalCard _source; - public ExertCharactersEffect(PhysicalCard source, PhysicalCard... cards) { - super(cards); - _source = source; - } - - public ExertCharactersEffect(PhysicalCard source, Filterable... filter) { + public ExertCharactersEffect(Action action, PhysicalCard source, Filterable... filter) { super(filter); + _action = action; _source = source; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ExhaustCharacterEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ExhaustCharacterEffect.java index 5a80e739a..64bb1fd56 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ExhaustCharacterEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ExhaustCharacterEffect.java @@ -56,7 +56,7 @@ public class ExhaustCharacterEffect extends AbstractSubActionEffect { private SubAction _subAction; private InfiniteExertionEffect(PhysicalCard source, SubAction subAction, Filterable[] filters) { - super(source, filters); + super(_action, source, filters); _subAction = subAction; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_010.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_010.java index 39b2262f6..fe3fbf76c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_010.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_010.java @@ -41,7 +41,7 @@ public class Card1_010 extends AbstractAttachable { return Collections.singletonList(action); } else if (effectResult.getType() == EffectResult.Type.START_OF_TURN) { RequiredTriggerAction action = new RequiredTriggerAction(self); - action.appendEffect(new ExertCharactersEffect(self, self.getAttachedTo())); + action.appendEffect(new ExertCharactersEffect(action, self, self.getAttachedTo())); return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java index f4c75af15..7688af82f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java @@ -54,7 +54,7 @@ public class Card1_047 extends AbstractAttachableFPPossession { List possibleCosts = new LinkedList(); possibleCosts.add( - new ExertCharactersEffect(self, self.getAttachedTo()) { + new ExertCharactersEffect(action, self, self.getAttachedTo()) { @Override public String getText(LotroGame game) { return "Exert Arwen"; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java index 899a6a064..e5a441f7b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java @@ -44,7 +44,7 @@ public class Card1_055 extends AbstractPermanent { && opponentsHavingAtLeast7Cards(game, playerId).length > 0) { final ActivateCardAction action = new ActivateCardAction(self); PhysicalCard galadriel = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.galadriel); - action.appendCost(new ExertCharactersEffect(self, galadriel)); + action.appendCost(new ExertCharactersEffect(action, self, galadriel)); action.appendEffect( new PlayoutDecisionEffect(playerId, new MultipleChoiceAwaitingDecision(1, "Choose opponent with at least 7 cards in hand", opponentsHavingAtLeast7Cards(game, playerId)) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_062.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_062.java index 7d031a488..3cdf66706 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_062.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_062.java @@ -42,7 +42,7 @@ public class Card1_062 extends AbstractAttachable { && game.getModifiersQuerying().hasKeyword(game.getGameState(), self.getAttachedTo(), Keyword.ARCHER) && PlayConditions.canExert(self, game, self.getAttachedTo())) { ActivateCardAction action = new ActivateCardAction(self); - action.appendCost(new ExertCharactersEffect(self, self.getAttachedTo())); + action.appendCost(new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 1), Phase.ARCHERY)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_068.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_068.java index 1795181c7..f08558d92 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_068.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_068.java @@ -42,7 +42,7 @@ public class Card1_068 extends AbstractAttachable { && PlayConditions.canExert(self, game, self.getAttachedTo()) && game.getModifiersQuerying().hasKeyword(game.getGameState(), self.getAttachedTo(), Keyword.ARCHER)) { final ActivateCardAction action = new ActivateCardAction(self); - action.appendCost(new ExertCharactersEffect(self, self.getAttachedTo())); + action.appendCost(new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseOpponentEffect(playerId) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_075.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_075.java index 498ac8106..a92dcc543 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_075.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_075.java @@ -51,7 +51,7 @@ public class Card1_075 extends AbstractAttachableFPPossession { || PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self)) && PlayConditions.canExert(self, game, self.getAttachedTo())) { final ActivateCardAction action = new ActivateCardAction(self); - action.appendCost(new ExertCharactersEffect(self, self.getAttachedTo())); + action.appendCost(new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseOpponentEffect(playerId) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_084.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_084.java index a0872bfc0..d5d8eae43 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_084.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_084.java @@ -34,7 +34,7 @@ public class Card1_084 extends AbstractOldEvent { public PlayEventAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) { PlayEventAction action = new PlayEventAction(self); PhysicalCard gandalf = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.gandalf); - action.appendCost(new ExertCharactersEffect(self, gandalf)); + action.appendCost(new ExertCharactersEffect(action, self, gandalf)); action.appendEffect( new DiscardCardsFromPlayEffect(self, CardType.CONDITION)); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java index c03af9b27..6fa512c92 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java @@ -48,7 +48,7 @@ public class Card1_090 extends AbstractAttachableFPPossession { if (PlayConditions.canUseFPCardDuringPhase(game, Phase.ARCHERY, self) && PlayConditions.canExert(self, game, self.getAttachedTo())) { final ActivateCardAction action = new ActivateCardAction(self); - action.appendCost(new ExertCharactersEffect(self, self.getAttachedTo())); + action.appendCost(new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( new DoesNotAddToArcheryTotalModifier(self, Filters.sameCard(self.getAttachedTo())), Phase.ARCHERY)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_095.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_095.java index db142fec5..4392a30ec 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_095.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_095.java @@ -48,7 +48,7 @@ public class Card1_095 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, self.getAttachedTo())) { final ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, Filters.or(Race.ORC, Race.URUK_HAI), Filters.inSkirmishAgainst(Filters.hasAttached(self)))); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_098.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_098.java index 43d4fd700..7f2d2b6da 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_098.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_098.java @@ -39,7 +39,7 @@ public class Card1_098 extends AbstractAttachableFPPossession { if (PlayConditions.canUseFPCardDuringPhase(game, Phase.MANEUVER, self) && PlayConditions.canExert(self, game, self.getAttachedTo())) { final ActivateCardAction action = new ActivateCardAction(self); - action.appendCost(new ExertCharactersEffect(self, self.getAttachedTo())); + action.appendCost(new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseActiveCardEffect(self, playerId, "Choose a Weather condition", Keyword.WEATHER, CardType.CONDITION) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_124.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_124.java index 499cb1353..ee019ca74 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_124.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_124.java @@ -51,7 +51,7 @@ public class Card1_124 extends AbstractOldEvent { new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Culture.ISENGARD, CardType.MINION)); List possibleEffects = new LinkedList(); - possibleEffects.add(new ExertCharactersEffect(self, game.getGameState().getRingBearer(fpPlayer)) { + possibleEffects.add(new ExertCharactersEffect(action, self, game.getGameState().getRingBearer(fpPlayer)) { @Override public String getText(LotroGame game) { return "Exert Ring-bearer"; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_134.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_134.java index dd2cdf670..0019aef69 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_134.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_134.java @@ -57,7 +57,7 @@ public class Card1_134 extends AbstractAttachable { public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { if (TriggerConditions.movesFrom(game, effectResult, Filters.hasAttached(self))) { RequiredTriggerAction action = new RequiredTriggerAction(self); - action.appendEffect(new ExertCharactersEffect(self, Filters.and(CardType.COMPANION, Race.HOBBIT))); + action.appendEffect(new ExertCharactersEffect(action, self, Filters.and(CardType.COMPANION, Race.HOBBIT))); return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_162.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_162.java index f4665fe38..6a811f16e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_162.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_162.java @@ -55,7 +55,7 @@ public class Card1_162 extends AbstractPermanent { if (TriggerConditions.losesSkirmishInvolving(game, effectResult, Filters.or(CardType.COMPANION, CardType.ALLY), Race.URUK_HAI)) { RequiredTriggerAction action = new RequiredTriggerAction(self); List possibleEffects = new LinkedList(); - possibleEffects.add(new ExertCharactersEffect(self, gameState.getRingBearer(gameState.getCurrentPlayerId())) { + possibleEffects.add(new ExertCharactersEffect(action, self, gameState.getRingBearer(gameState.getCurrentPlayerId())) { @Override public String getText(LotroGame game) { return "Exert the Ring-bearer"; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java index 518faf6b0..2e3e22740 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java @@ -52,7 +52,7 @@ public class Card1_190 extends AbstractAttachable { && PlayConditions.canExert(self, game, self.getAttachedTo())) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( new StrengthModifier(self, Filters.sameCard(self.getAttachedTo()), 2), Phase.SKIRMISH)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_254.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_254.java index e2537fe3e..80b8e38d1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_254.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_254.java @@ -39,7 +39,7 @@ public class Card1_254 extends AbstractAttachable { && PlayConditions.canExert(self, game, self.getAttachedTo())) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); int archerCompanions = Filters.countActive(game.getGameState(), game.getModifiersQuerying(), CardType.COMPANION, Keyword.ARCHER); action.appendEffect( new AddTwilightEffect(self, archerCompanions)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_313.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_313.java index 8b83ec5e8..e87e85a93 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_313.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_313.java @@ -49,7 +49,7 @@ public class Card1_313 extends AbstractAttachableFPPossession { || PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self)) && PlayConditions.canExert(self, game, self.getAttachedTo())) { final ActivateCardAction action = new ActivateCardAction(self); - action.appendCost(new ExertCharactersEffect(self, self.getAttachedTo())); + action.appendCost(new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseOpponentEffect(playerId) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_332.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_332.java index b1f65be8a..24fede00e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_332.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_332.java @@ -34,7 +34,7 @@ public class Card1_332 extends AbstractSite { if (TriggerConditions.movesTo(game, effectResult, self)) { if (Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Race.HOBBIT, CardType.COMPANION)) { RequiredTriggerAction action = new RequiredTriggerAction(self); - action.appendEffect(new ExertCharactersEffect(self, Filters.and(Race.HOBBIT, CardType.COMPANION))); + action.appendEffect(new ExertCharactersEffect(action, self, Filters.and(Race.HOBBIT, CardType.COMPANION))); return Collections.singletonList(action); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_344.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_344.java index 84d9deb2a..a06bca557 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_344.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_344.java @@ -44,7 +44,7 @@ public class Card1_344 extends AbstractSite { PhysicalCard gimli = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.gimli); List possibleEffects = new LinkedList(); - possibleEffects.add(new ExertCharactersEffect(self, gimli) { + possibleEffects.add(new ExertCharactersEffect(action, self, gimli) { @Override public String getText(LotroGame game) { return "Exert Gimli"; @@ -64,7 +64,7 @@ public class Card1_344 extends AbstractSite { if (gimliCanExert) { RequiredTriggerAction action = new RequiredTriggerAction(self); PhysicalCard gimli = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.gimli); - action.appendEffect(new ExertCharactersEffect(self, gimli)); + action.appendEffect(new ExertCharactersEffect(action, self, gimli)); return Collections.singletonList(action); } if (twoOtherCanExert) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_346.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_346.java index 8e36b58ff..bfc610678 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_346.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_346.java @@ -44,7 +44,7 @@ public class Card1_346 extends AbstractSite { PhysicalCard frodo = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.frodo); List possibleEffects = new LinkedList(); - possibleEffects.add(new ExertCharactersEffect(self, frodo) { + possibleEffects.add(new ExertCharactersEffect(action, self, frodo) { @Override public String getText(LotroGame game) { return "Exert Frodo"; @@ -64,7 +64,7 @@ public class Card1_346 extends AbstractSite { if (frodoCanExert) { RequiredTriggerAction action = new RequiredTriggerAction(self); PhysicalCard frodo = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.frodo); - action.appendEffect(new ExertCharactersEffect(self, frodo)); + action.appendEffect(new ExertCharactersEffect(action, self, frodo)); return Collections.singletonList(action); } if (twoOtherCanExert) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_355.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_355.java index a477e98b6..bd7e9b8f6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_355.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_355.java @@ -34,7 +34,7 @@ public class Card1_355 extends AbstractSite { && !Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Keyword.RANGER)) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, CardType.COMPANION)); + new ExertCharactersEffect(action, self, CardType.COMPANION)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_214.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_214.java index a68b56b5a..665e7f4f4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_214.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_214.java @@ -44,7 +44,7 @@ public class Card1_214 extends AbstractResponseOldEvent { PlayEventAction action = new PlayEventAction(self); List possibleEffects = new LinkedList(); possibleEffects.add( - new ExertCharactersEffect(self, game.getGameState().getRingBearer(game.getGameState().getCurrentPlayerId())) { + new ExertCharactersEffect(action, self, game.getGameState().getRingBearer(game.getGameState().getCurrentPlayerId())) { @Override public String getText(LotroGame game) { return "Exert the Ring-bearer"; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_221.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_221.java index b539fa334..0f6d6ab64 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_221.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_221.java @@ -57,7 +57,7 @@ public class Card1_221 extends AbstractAttachable { && PlayConditions.canExert(self, game, self.getAttachedTo())) { final ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseActiveCardEffect(self, playerId, "Choose a Free Peoples condition", Side.FREE_PEOPLE, CardType.CONDITION) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_225.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_225.java index 0328df8a3..dcd5d14cd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_225.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_225.java @@ -52,7 +52,7 @@ public class Card1_225 extends AbstractAttachable { if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.SKIRMISH, self, 0) && PlayConditions.canExert(self, game, self.getAttachedTo())) { final ActivateCardAction action = new ActivateCardAction(self); - action.appendCost(new ExertCharactersEffect(self, self.getAttachedTo())); + action.appendCost(new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.POSSESSION, Filters.attachedTo(Filters.character, Filters.inSkirmishAgainst(self)))); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/dwarven/Card10_001.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/dwarven/Card10_001.java index fd2d06348..bc77cd2e8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/dwarven/Card10_001.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/dwarven/Card10_001.java @@ -47,7 +47,7 @@ public class Card10_001 extends AbstractResponseEvent { int damageCount = game.getModifiersQuerying().getKeywordCount(game.getGameState(), character, Keyword.DAMAGE); for (int i = 0; i < damageCount; i++) action.appendEffect( - new ExertCharactersEffect(self, playedMinion)); + new ExertCharactersEffect(action, self, playedMinion)); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/sauron/Card10_079.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/sauron/Card10_079.java index f18bd66ed..5a9612e09 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/sauron/Card10_079.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/sauron/Card10_079.java @@ -43,7 +43,7 @@ public class Card10_079 extends AbstractPermanent { if (TriggerConditions.movesTo(game, effectResult, Filters.or(Filters.siteNumber(8), Filters.siteNumber(9)))) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, CardType.COMPANION, Keyword.RING_BOUND)); + new ExertCharactersEffect(action, self, CardType.COMPANION, Keyword.RING_BOUND)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_114.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_114.java index b015e480a..9cd752127 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_114.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_114.java @@ -48,7 +48,7 @@ public class Card10_114 extends AbstractPermanent { new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.HOBBIT, CardType.COMPANION)); action.appendEffect( new CheckTurnLimitEffect(action, self, 1, - new ExertCharactersEffect(self, playedCard))); + new ExertCharactersEffect(action, self, playedCard))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/gondor/Card11_058.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/gondor/Card11_058.java index 60c49bcd9..eb9cb9dd6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/gondor/Card11_058.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/gondor/Card11_058.java @@ -43,7 +43,7 @@ public class Card11_058 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, Filters.hasAttached(self))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 1), Phase.ARCHERY)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/gondor/Card11_060.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/gondor/Card11_060.java index c58047a15..70ebddfc2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/gondor/Card11_060.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/gondor/Card11_060.java @@ -53,7 +53,7 @@ public class Card11_060 extends AbstractEvent { throw new DecisionResultInvalidException("These characters have only " + resistanceTotal + " resistance total"); action.insertCost( - new ExertCharactersEffect(self, characters.toArray(new PhysicalCard[characters.size()]))); + new ExertCharactersEffect(action, self, characters.toArray(new PhysicalCard[characters.size()]))); action.appendEffect( new ChooseAndAddUntilEOPStrengthBonusEffect(action, self, playerId, -3 * characters.size(), CardType.MINION, Filters.inSkirmishAgainst(Culture.GONDOR, CardType.COMPANION))); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/orc/Card11_109.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/orc/Card11_109.java index f26088920..f1fe5ec95 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/orc/Card11_109.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/orc/Card11_109.java @@ -46,7 +46,7 @@ public class Card11_109 extends AbstractAttachable { && PlayConditions.canExert(self, game, self.getAttachedTo())) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseAndAddUntilEOPStrengthBonusEffect(action, self, playerId, 2, Culture.ORC, CardType.MINION)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/orc/Card11_124.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/orc/Card11_124.java index 80d047dbc..f375c6da1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/orc/Card11_124.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/orc/Card11_124.java @@ -36,7 +36,7 @@ public class Card11_124 extends AbstractMinion { if (TriggerConditions.winsSkirmish(game, effectResult, self)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, CardType.COMPANION, Filters.maxResistance(4))); + new ExertCharactersEffect(action, self, CardType.COMPANION, Filters.maxResistance(4))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/orc/Card11_128.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/orc/Card11_128.java index 93538d67a..802e7412d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/orc/Card11_128.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/orc/Card11_128.java @@ -45,7 +45,7 @@ public class Card11_128 extends AbstractAttachable { if (TriggerConditions.assignedAgainst(game, effectResult, null, CardType.COMPANION, Filters.hasAttached(self))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.assignedAgainst(Filters.hasAttached(self)))); + new ExertCharactersEffect(action, self, Filters.assignedAgainst(Filters.hasAttached(self)))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/orc/Card11_129.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/orc/Card11_129.java index c8c5ab2e7..1fb2bec22 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/orc/Card11_129.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/orc/Card11_129.java @@ -37,7 +37,7 @@ public class Card11_129 extends AbstractMinion { if (TriggerConditions.assignedAgainst(game, effectResult, null, Filters.and(CardType.COMPANION, Filters.maxResistance(5)), self)) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.assignedAgainst(self))); + new ExertCharactersEffect(action, self, Filters.assignedAgainst(self))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/rohan/Card11_144.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/rohan/Card11_144.java index 929e3befa..9092f23c8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/rohan/Card11_144.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/rohan/Card11_144.java @@ -68,7 +68,7 @@ public class Card11_144 extends AbstractPermanent { action.appendCost( new ChoiceEffect(action, playerId, possibleCosts)); action.appendEffect( - new ExertCharactersEffect(self, ((PlayCardResult) effectResult).getPlayedCard())); + new ExertCharactersEffect(action, self, ((PlayCardResult) effectResult).getPlayedCard())); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/rohan/Card11_156.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/rohan/Card11_156.java index 1ab3898da..114ce5944 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/rohan/Card11_156.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/rohan/Card11_156.java @@ -41,7 +41,7 @@ public class Card11_156 extends AbstractAttachableFPPossession { && Filters.inSkirmish.accepts(game.getGameState(), game.getModifiersQuerying(), self.getAttachedTo())) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); + new ExertCharactersEffect(action, self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/shire/Card11_173.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/shire/Card11_173.java index b1c2e892a..b55f8df5a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/shire/Card11_173.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/shire/Card11_173.java @@ -48,7 +48,7 @@ public class Card11_173 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, self.getAttachedTo())) { final ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseActiveCardEffect(self, playerId, "Choose a companion", CardType.COMPANION, Filters.not(self.getAttachedTo())) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/site/Card11_249.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/site/Card11_249.java index 275e54a0b..8fd49def5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/site/Card11_249.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/site/Card11_249.java @@ -35,7 +35,7 @@ public class Card11_249 extends AbstractNewSite { action.appendEffect( new HealCharactersEffect(self, Filters.or(CardType.COMPANION, CardType.ALLY), Filters.minResistance(5))); action.appendEffect( - new ExertCharactersEffect(self, Filters.or(CardType.COMPANION, CardType.ALLY), Filters.maxResistance(4))); + new ExertCharactersEffect(action, self, Filters.or(CardType.COMPANION, CardType.ALLY), Filters.maxResistance(4))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/wraith/Card11_214.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/wraith/Card11_214.java index 98e963c5c..60b9a6cad 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/wraith/Card11_214.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/wraith/Card11_214.java @@ -48,7 +48,7 @@ public class Card11_214 extends AbstractAttachable { && PlayConditions.canExert(self, game, Filters.hasAttached(self))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new AddBurdenEffect(self, 1)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/elven/Card12_018.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/elven/Card12_018.java index eaf46a59a..b2e4d83c8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/elven/Card12_018.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/elven/Card12_018.java @@ -44,7 +44,7 @@ public class Card12_018 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, self.getAttachedTo())) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.CONDITION)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/rohan/Card12_111.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/rohan/Card12_111.java index d79d86a9f..e1641d94e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/rohan/Card12_111.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/rohan/Card12_111.java @@ -45,7 +45,7 @@ public class Card12_111 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, self.getAttachedTo())) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new PreventEffect((AddTwilightEffect) effect)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gandalf/Card13_037.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gandalf/Card13_037.java index ad1f48597..27c8785a7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gandalf/Card13_037.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gandalf/Card13_037.java @@ -50,9 +50,9 @@ public class Card13_037 extends AbstractFollower { if (TriggerConditions.transferredCard(game, effectResult, self, null, Filters.and(CardType.COMPANION, Filters.not(Culture.GANDALF)))) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/men/Card13_092.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/men/Card13_092.java index 820670658..31bd6655e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/men/Card13_092.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/men/Card13_092.java @@ -38,7 +38,7 @@ public class Card13_092 extends AbstractMinion { && PlayConditions.canSpot(game, Filters.not(self), Culture.MEN, CardType.MINION)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, CardType.COMPANION)); + new ExertCharactersEffect(action, self, CardType.COMPANION)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/rohan/Card13_138.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/rohan/Card13_138.java index 9d5cbd4d1..b9c71c796 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/rohan/Card13_138.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/rohan/Card13_138.java @@ -48,7 +48,7 @@ public class Card13_138 extends AbstractCompanion { && Filters.inSkirmish.accepts(game.getGameState(), game.getModifiersQuerying(), self)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, CardType.MINION, Filters.inSkirmishAgainst(self))); + new ExertCharactersEffect(action, self, CardType.MINION, Filters.inSkirmishAgainst(self))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/uruk_hai/Card13_167.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/uruk_hai/Card13_167.java index d39f45009..91da54cca 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/uruk_hai/Card13_167.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/uruk_hai/Card13_167.java @@ -35,7 +35,7 @@ public class Card13_167 extends AbstractPermanent { && PlayConditions.canSpot(game, 3, Culture.URUK_HAI, CardType.MINION, Keyword.LURKER)) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, CardType.COMPANION, Filters.inSkirmish)); + new ExertCharactersEffect(action, self, CardType.COMPANION, Filters.inSkirmish)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/wraith/Card13_182.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/wraith/Card13_182.java index d18671e1f..a2bd9c0d2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/wraith/Card13_182.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/wraith/Card13_182.java @@ -40,7 +40,7 @@ public class Card13_182 extends AbstractMinion { OptionalTriggerAction action = new OptionalTriggerAction(self); if (PlayConditions.canSpot(game, 6, CardType.COMPANION)) { action.appendEffect( - new ExertCharactersEffect(self, CardType.COMPANION)); + new ExertCharactersEffect(action, self, CardType.COMPANION)); } else { action.appendEffect( new ChooseAndExertCharactersEffect(action, playerId, 2, 2, Filters.unboundCompanion)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_012.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_012.java index d8b172751..ed2ed1da8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_012.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_012.java @@ -56,7 +56,7 @@ public class Card15_012 extends AbstractFollower { if (TriggerConditions.transferredCard(game, effectResult, self, null, Filters.and(CardType.COMPANION, Filters.not(Culture.ELVEN)))) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_025.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_025.java index f5463016f..7559cfcdb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_025.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_025.java @@ -57,7 +57,7 @@ public class Card15_025 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, self.getAttachedTo())) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseAndExertCharactersEffect(action, playerId, 1, 1, CardType.MINION, Filters.inSkirmishAgainst(self.getAttachedTo()))); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gondor/Card15_062.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gondor/Card15_062.java index 20119a2ad..93d82e7b9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gondor/Card15_062.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gondor/Card15_062.java @@ -49,9 +49,9 @@ public class Card15_062 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, 2, self.getAttachedTo())) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.MINION, Keyword.ROAMING)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gondor/Card15_068.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gondor/Card15_068.java index 31e1daa74..de9b142f8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gondor/Card15_068.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gondor/Card15_068.java @@ -70,7 +70,7 @@ public class Card15_068 extends AbstractAttachableFPPossession { possibleCosts.add( new AddThreatsEffect(playerId, self, 1)); possibleCosts.add( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendCost( new ChoiceEffect(action, playerId, possibleCosts)); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_129.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_129.java index 653149d4e..00ffd581b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_129.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_129.java @@ -42,7 +42,7 @@ public class Card15_129 extends AbstractAttachableFPPossession { && Filters.inSkirmish.accepts(game.getGameState(), game.getModifiersQuerying(), self.getAttachedTo())) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); + new ExertCharactersEffect(action, self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); return Collections.singletonList(action); } return null; @@ -54,7 +54,7 @@ public class Card15_129 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, Filters.hasAttached(self))) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseAndAddUntilEOPStrengthBonusEffect( action, self, playerId, 1, Culture.ROHAN, Race.MAN)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_135.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_135.java index 46c2e124e..6b7544b78 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_135.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_135.java @@ -49,9 +49,9 @@ public class Card15_135 extends AbstractFollower { if (TriggerConditions.transferredCard(game, effectResult, self, null, Filters.and(CardType.COMPANION, Filters.not(Culture.ROHAN)))) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.hasAttached(self))); + new ExertCharactersEffect(action, self, Filters.hasAttached(self))); action.appendEffect( - new ExertCharactersEffect(self, Filters.hasAttached(self))); + new ExertCharactersEffect(action, self, Filters.hasAttached(self))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/uruk_hai/Card15_172.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/uruk_hai/Card15_172.java index 6478cecfe..c454dd574 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/uruk_hai/Card15_172.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/uruk_hai/Card15_172.java @@ -42,7 +42,7 @@ public class Card15_172 extends AbstractMinion { && PlayConditions.canSpot(game, self, Filters.inSkirmish)) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.character, Filters.not(Keyword.HUNTER), Filters.inSkirmishAgainst(self))); + new ExertCharactersEffect(action, self, Filters.character, Filters.not(Keyword.HUNTER), Filters.inSkirmishAgainst(self))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gandalf/Card17_020.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gandalf/Card17_020.java index c2c513d8b..630407da9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gandalf/Card17_020.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gandalf/Card17_020.java @@ -66,7 +66,7 @@ public class Card17_020 extends AbstractFollower { new WoundCharactersEffect(self, card)); else action.appendEffect( - new ExertCharactersEffect(self, card)); + new ExertCharactersEffect(action, self, card)); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gondor/Card17_027.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gondor/Card17_027.java index d5065af54..a27f9c5e1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gondor/Card17_027.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gondor/Card17_027.java @@ -54,7 +54,7 @@ public class Card17_027 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, self.getAttachedTo())) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); List possibleEffects = new LinkedList(); possibleEffects.add( new LiberateASiteEffect(self)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gondor/Card17_029.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gondor/Card17_029.java index 2df2a242f..fcc543110 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gondor/Card17_029.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gondor/Card17_029.java @@ -53,9 +53,9 @@ public class Card17_029 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, 2, Filters.hasAttached(self))) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseAndExhaustCharactersEffect(action, playerId, 1, 1, CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self)))); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gondor/Card17_031.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gondor/Card17_031.java index df6c12094..f1e4ca681 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gondor/Card17_031.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gondor/Card17_031.java @@ -49,7 +49,7 @@ public class Card17_031 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, self.getAttachedTo())) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Side.SHADOW, CardType.POSSESSION)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/orc/Card17_067.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/orc/Card17_067.java index 16f908a66..d9bbb52a0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/orc/Card17_067.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/orc/Card17_067.java @@ -59,7 +59,7 @@ public class Card17_067 extends AbstractPermanent { action.setText("Assigned " + GameUtils.getCardLink(assignResult.getAssignedCard()) + " to " + GameUtils.getCardLink(companion)); List possibleEffects = new LinkedList(); possibleEffects.add( - new ExertCharactersEffect(self, companion)); + new ExertCharactersEffect(action, self, companion)); possibleEffects.add( new AddTwilightEffect(self, 2)); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/elven/Card18_005.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/elven/Card18_005.java index 453f0290e..2dffb8aa4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/elven/Card18_005.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/elven/Card18_005.java @@ -45,7 +45,7 @@ public class Card18_005 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, Filters.hasAttached(self), Filters.arwen)) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new DrawCardsEffect(action, playerId, 2)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gandalf/Card18_026.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gandalf/Card18_026.java index 83e146c13..0986d4d6b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gandalf/Card18_026.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gandalf/Card18_026.java @@ -50,7 +50,7 @@ public class Card18_026 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, Filters.hasAttached(self))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.MINION)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_053.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_053.java index ee925965a..fd88e731a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_053.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_053.java @@ -54,7 +54,7 @@ public class Card18_053 extends AbstractAttachableFPPossession { && PlayConditions.canDiscardFromPlay(self, game, CardType.FOLLOWER)) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendCost( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.FOLLOWER)); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_055.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_055.java index d3c57de8d..1f1462ad0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_055.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_055.java @@ -43,7 +43,7 @@ public class Card18_055 extends AbstractAttachable { && PlayConditions.canExert(self, game, self.getAttachedTo())) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new AddUntilStartOfPhaseModifierEffect( new KeywordModifier(self, self.getAttachedTo(), Keyword.DEFENDER, 1), Phase.REGROUP)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_095.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_095.java index 25a2695e5..a8506b128 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_095.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_095.java @@ -48,7 +48,7 @@ public class Card18_095 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, self.getAttachedTo(), Filters.name(Names.eomer))) { final ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseOpponentEffect(playerId) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_096.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_096.java index d4f63fb13..a9399e397 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_096.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_096.java @@ -44,7 +44,7 @@ public class Card18_096 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, self.getAttachedTo())) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseAndPlayCardFromDeckEffect(playerId, Side.FREE_PEOPLE, CardType.FOLLOWER)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_097.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_097.java index 351546b49..b7d2eafbb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_097.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_097.java @@ -69,7 +69,7 @@ public class Card18_097 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, self.getAttachedTo())) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseAndPreventCardEffect(self, (WoundCharactersEffect) effect, playerId, "Choose a ROHAN Man to prevent wound to", Culture.ROHAN, Race.MAN)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/shire/Card18_113.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/shire/Card18_113.java index 1548f7e46..1f89fe3e3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/shire/Card18_113.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/shire/Card18_113.java @@ -52,7 +52,7 @@ public class Card18_113 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, self.getAttachedTo())) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new RemoveThreatsEffect(self, 1)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/uruk_hai/Card18_118.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/uruk_hai/Card18_118.java index 9eec90af9..c21b9a220 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/uruk_hai/Card18_118.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/uruk_hai/Card18_118.java @@ -68,7 +68,7 @@ public class Card18_118 extends AbstractMinion { public Effect createPreventionCostForPlayer(SubAction subAction, String playerId) { List possibleCosts = new LinkedList(); possibleCosts.add( - new ExertCharactersEffect(self, companion)); + new ExertCharactersEffect(action, self, companion)); possibleCosts.add( new AddBurdenEffect(self, 1)); return new ChoiceEffect(subAction, playerId, possibleCosts) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/uruk_hai/Card18_123.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/uruk_hai/Card18_123.java index 25cffde39..c58ea946f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/uruk_hai/Card18_123.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/uruk_hai/Card18_123.java @@ -35,7 +35,7 @@ public class Card18_123 extends AbstractPermanent { && PlayConditions.canSpot(game, Culture.URUK_HAI, Keyword.HUNTER, Filters.inSkirmish)) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, CardType.COMPANION, Filters.inSkirmish)); + new ExertCharactersEffect(action, self, CardType.COMPANION, Filters.inSkirmish)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/elven/Card19_005.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/elven/Card19_005.java index 2424aff21..a6400def9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/elven/Card19_005.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/elven/Card19_005.java @@ -64,7 +64,7 @@ public class Card19_005 extends AbstractAttachable { RequiredTriggerAction action = new RequiredTriggerAction(self); List possibleEffects = new LinkedList(); possibleEffects.add( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); possibleEffects.add( new ReturnCardsToHandEffect(self, self)); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/isengard/Card19_016.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/isengard/Card19_016.java index 244658525..9cda8f62f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/isengard/Card19_016.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/isengard/Card19_016.java @@ -82,7 +82,7 @@ public class Card19_016 extends AbstractMinion { new PreventableEffect.PreventionCost() { @Override public Effect createPreventionCostForPlayer(SubAction subAction, String playerId) { - return new ExertCharactersEffect(self, companion); + return new ExertCharactersEffect(action, self, companion); } })); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/orc/Card19_022.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/orc/Card19_022.java index 95f92c500..797381a95 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/orc/Card19_022.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/orc/Card19_022.java @@ -48,7 +48,7 @@ public class Card19_022 extends AbstractMinion { @Override public List getRequiredAfterTriggers(final LotroGame game, EffectResult effectResult, final PhysicalCard self) { if (TriggerConditions.played(game, effectResult, self)) { - RequiredTriggerAction action = new RequiredTriggerAction(self); + final RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( new PreventableEffect(action, new AddThreatsEffect(self.getOwner(), self, 2), game.getGameState().getCurrentPlayerId(), @@ -56,7 +56,7 @@ public class Card19_022 extends AbstractMinion { @Override public Effect createPreventionCostForPlayer(SubAction subAction, String playerId) { final PhysicalCard ringBearer = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.ringBearer); - return new ExertCharactersEffect(self, ringBearer); + return new ExertCharactersEffect(action, self, ringBearer); } })); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gandalf/Card2_022.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gandalf/Card2_022.java index 747ca7f31..3a3049969 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gandalf/Card2_022.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gandalf/Card2_022.java @@ -52,9 +52,9 @@ public class Card2_022 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, 2, Filters.sameCard(self.getAttachedTo()))) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); if (Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.sameCard(self.getAttachedTo()), Filters.inSkirmish)) action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gandalf/Card2_029.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gandalf/Card2_029.java index dcbecedc9..94584c025 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gandalf/Card2_029.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gandalf/Card2_029.java @@ -41,9 +41,9 @@ public class Card2_029 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, 2, Filters.sameCard(self.getAttachedTo()))) { final ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseActiveCardEffect(self, playerId, "Choose minion", CardType.MINION) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_048.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_048.java index d3b052e1c..cf2c89452 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_048.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_048.java @@ -58,7 +58,7 @@ public class Card2_048 extends AbstractAttachable { if (TriggerConditions.movesFrom(game, effectResult, self.getAttachedTo())) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, CardType.COMPANION)); + new ExertCharactersEffect(action, self, CardType.COMPANION)); return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_054.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_054.java index eea07267b..08ba0fe7d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_054.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_054.java @@ -53,7 +53,7 @@ public class Card2_054 extends AbstractAttachable { if (effectResult.getType() == EffectResult.Type.WHEN_FELLOWSHIP_MOVES) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_074.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_074.java index 5bd0090d5..8f7d23560 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_074.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_074.java @@ -49,7 +49,7 @@ public class Card2_074 extends AbstractAttachable { && PlayConditions.canExert(self, game, self.getAttachedTo())) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Filters.or( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_097.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_097.java index 717c9b831..d6a2add66 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_097.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_097.java @@ -56,7 +56,7 @@ public class Card2_097 extends AbstractAttachable { ActivateCardAction action = new ActivateCardAction(self); List possibleCosts = new LinkedList(); possibleCosts.add( - new ExertCharactersEffect(self, self.getAttachedTo()) { + new ExertCharactersEffect(action, self, self.getAttachedTo()) { @Override public String getText(LotroGame game) { return "Exert Bilbo"; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_109.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_109.java index 30f6a707a..755a028c6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_109.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_109.java @@ -55,7 +55,7 @@ public class Card2_109 extends AbstractOldEvent { final int exertionCount = getValidatedResult(result); for (int i = 0; i < exertionCount; i++) { action.insertCost( - new ExertCharactersEffect(self, bearer)); + new ExertCharactersEffect(action, self, bearer)); } action.appendEffect( new PlayoutDecisionEffect(playerId, diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/wraith/Card2_079.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/wraith/Card2_079.java index 70de1f6ae..d6b6e329f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/wraith/Card2_079.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/wraith/Card2_079.java @@ -51,7 +51,7 @@ public class Card2_079 extends AbstractOldEvent { action.appendCost( new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.NAZGUL, Keyword.TWILIGHT)); action.appendEffect( - new ExertCharactersEffect(self, Filters.ringBearer)); + new ExertCharactersEffect(action, self, Filters.ringBearer)); action.appendEffect( new UnrespondableEffect() { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_002.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_002.java index 012fbf73b..b74d92df7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_002.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_002.java @@ -40,7 +40,7 @@ public class Card3_002 extends AbstractAttachable { && PlayConditions.canExert(self, game, self.getAttachedTo())) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( new PossessionClassSpotModifier(self, PossessionClass.PIPE), Phase.FELLOWSHIP)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_027.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_027.java index fa577c27f..1f726e460 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_027.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_027.java @@ -42,9 +42,9 @@ public class Card3_027 extends AbstractAttachableFPPossession { && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Side.SHADOW, CardType.CONDITION)) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseAndReturnCardsToHandEffect(action, playerId, 1, 1, Side.SHADOW, CardType.CONDITION)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_061.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_061.java index c9a145d31..cec11105d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_061.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_061.java @@ -52,7 +52,7 @@ public class Card3_061 extends AbstractMinion { action.appendCost( new SelfExertEffect(action, self)); action.appendEffect( - new ExertCharactersEffect(self, CardType.COMPANION)); + new ExertCharactersEffect(action, self, CardType.COMPANION)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_069.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_069.java index d591930c4..2f4199da2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_069.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_069.java @@ -95,7 +95,7 @@ public class Card3_069 extends AbstractMinion { new PreventableEffect.PreventionCost() { @Override public Effect createPreventionCostForPlayer(SubAction subAction, String playerId) { - return new ExertCharactersEffect(self, companion); + return new ExertCharactersEffect(action, self, companion); } } )); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_084.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_084.java index 7e7575f32..2e1838e11 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_084.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_084.java @@ -54,7 +54,7 @@ public class Card3_084 extends AbstractOldEvent { protected void cardSelected(LotroGame game, PhysicalCard card) { for (int i = 0; i < twilightCost; i++) action.appendEffect( - new ExertCharactersEffect(self, card)); + new ExertCharactersEffect(action, self, card)); } }); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/elven/Card4_064.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/elven/Card4_064.java index e7499a0ff..3e5d450b1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/elven/Card4_064.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/elven/Card4_064.java @@ -49,7 +49,7 @@ public class Card4_064 extends AbstractAttachableFPPossession { List possibleCosts = new LinkedList(); possibleCosts.add( - new ExertCharactersEffect(self, self.getAttachedTo()) { + new ExertCharactersEffect(action, self, self.getAttachedTo()) { @Override public String getText(LotroGame game) { return "Exert bearer"; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/elven/Card4_079.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/elven/Card4_079.java index 079790022..620b00506 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/elven/Card4_079.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/elven/Card4_079.java @@ -47,7 +47,7 @@ public class Card4_079 extends AbstractResponseOldEvent { if (PlayConditions.canExert(self, game, winner)) { PlayEventAction action = new PlayEventAction(self); action.appendCost( - new ExertCharactersEffect(self, winner)); + new ExertCharactersEffect(action, self, winner)); List possibleEffects = new LinkedList(); possibleEffects.add( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_100.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_100.java index 14db12dcf..a1633c030 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_100.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_100.java @@ -59,7 +59,7 @@ public class Card4_100 extends AbstractAttachableFPPossession { if (skirmish != null && skirmish.getFellowshipCharacter() != null && skirmish.getFellowshipCharacter().getBlueprint().getName().equals("Gandalf")) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.inSkirmishAgainst(Filters.gandalf))); + new ExertCharactersEffect(action, self, Filters.inSkirmishAgainst(Filters.gandalf))); return Collections.singletonList(action); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_112.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_112.java index 144a9276c..e92f9cf7e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_112.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_112.java @@ -48,7 +48,7 @@ public class Card4_112 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, self.getAttachedTo())) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new PreventableEffect(action, new CancelSkirmishEffect(Filters.hasAttached(self)), diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_118.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_118.java index ddf4ba2ab..9e842bf4f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_118.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_118.java @@ -49,7 +49,7 @@ public class Card4_118 extends AbstractAttachableFPPossession { && Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Filters.inSkirmishAgainst(Filters.hasAttached(self)), Filters.or(Race.MAN, Keyword.ROAMING)) > 0) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, Filters.inSkirmishAgainst(Filters.hasAttached(self)), Filters.or(Race.MAN, Keyword.ROAMING))); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_139.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_139.java index 53ef82314..cb7af79d1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_139.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_139.java @@ -58,7 +58,7 @@ public class Card4_139 extends AbstractAttachable { Filters.or(CardType.ALLY, CardType.COMPANION)))) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.hasAttached(self))); + new ExertCharactersEffect(action, self, Filters.hasAttached(self))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_143.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_143.java index 4515df39c..c665a8883 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_143.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_143.java @@ -64,7 +64,7 @@ public class Card4_143 extends AbstractOldEvent { new PreventableEffect.PreventionCost() { @Override public Effect createPreventionCostForPlayer(SubAction subAction, String playerId) { - return new ExertCharactersEffect(self, companion); + return new ExertCharactersEffect(action, self, companion); } } )); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_159.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_159.java index 4f2c1bdec..f9765254a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_159.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_159.java @@ -81,7 +81,7 @@ public class Card4_159 extends AbstractAttachable { new PreventableEffect.PreventionCost() { @Override public Effect createPreventionCostForPlayer(SubAction subAction, String playerId) { - return new ExertCharactersEffect(self, self.getAttachedTo()); + return new ExertCharactersEffect(action, self, self.getAttachedTo()); } } )); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_164.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_164.java index c221f155e..45158cd1b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_164.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_164.java @@ -55,7 +55,7 @@ public class Card4_164 extends AbstractMinion { new PreventableEffect.PreventionCost() { @Override public Effect createPreventionCostForPlayer(SubAction subAction, String playerId) { - return new ExertCharactersEffect(self, companion); + return new ExertCharactersEffect(action, self, companion); } } )); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_172.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_172.java index 86f368dfb..4dffe9fb7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_172.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_172.java @@ -48,7 +48,7 @@ public class Card4_172 extends AbstractAttachable { if (TriggerConditions.assignedAgainst(game, effectResult, Side.FREE_PEOPLE, Filters.any, Filters.hasAttached(self))) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, CardType.ALLY)); + new ExertCharactersEffect(action, self, CardType.ALLY)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_178.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_178.java index 73321ea57..89cd5c0ac 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_178.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_178.java @@ -42,7 +42,7 @@ public class Card4_178 extends AbstractMinion { RequiredTriggerAction action = new RequiredTriggerAction(self); action.setText("Exert " + GameUtils.getCardLink(assignmentResult.getAssignedCard())); action.appendEffect( - new ExertCharactersEffect(self, assignmentResult.getAssignedCard())); + new ExertCharactersEffect(action, self, assignmentResult.getAssignedCard())); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_212.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_212.java index 1fedfc482..d478a6b5b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_212.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_212.java @@ -42,7 +42,7 @@ public class Card4_212 extends AbstractAttachable { if (TriggerConditions.assignedAgainst(game, effectResult, Side.FREE_PEOPLE, Filters.and(Culture.ISENGARD, Keyword.TRACKER), Filters.hasAttached(self))) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_215.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_215.java index d3008ffcc..1f81504ad 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_215.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_215.java @@ -57,7 +57,7 @@ public class Card4_215 extends AbstractAttachable { if (TriggerConditions.played(game, effectResult, self)) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_231.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_231.java index e7ad87818..7bc87080e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_231.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_231.java @@ -37,9 +37,9 @@ public class Card4_231 extends AbstractPermanent { if (TriggerConditions.movesFrom(game, effectResult, Filters.siteBlock(Block.TWO_TOWERS), Filters.siteNumber(2))) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.and(CardType.COMPANION, Keyword.RING_BOUND))); + new ExertCharactersEffect(action, self, Filters.and(CardType.COMPANION, Keyword.RING_BOUND))); action.appendEffect( - new ExertCharactersEffect(self, Filters.and(CardType.COMPANION, Keyword.RING_BOUND))); + new ExertCharactersEffect(action, self, Filters.and(CardType.COMPANION, Keyword.RING_BOUND))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_255.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_255.java index 18a2dde91..da49a30e4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_255.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_255.java @@ -51,7 +51,7 @@ public class Card4_255 extends AbstractAttachable { action.appendCost( new RemoveTwilightEffect(4)); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, Filters.inSkirmishAgainst(Filters.hasAttached(self)))); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_263.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_263.java index c7cd88973..92bb4ab92 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_263.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_263.java @@ -59,7 +59,7 @@ public class Card4_263 extends AbstractAttachableFPPossession { && Filters.inSkirmish.accepts(game.getGameState(), game.getModifiersQuerying(), self.getAttachedTo())) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); + new ExertCharactersEffect(action, self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_269.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_269.java index e21602d90..4641bd2e2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_269.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_269.java @@ -36,7 +36,7 @@ public class Card4_269 extends AbstractCompanion { && game.getModifiersQuerying().hasKeyword(game.getGameState(), game.getGameState().getCurrentSite(), Keyword.PLAINS)) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, CardType.MINION)); + new ExertCharactersEffect(action, self, CardType.MINION)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_274.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_274.java index df5d29afe..b03f6ea0c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_274.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_274.java @@ -47,7 +47,7 @@ public class Card4_274 extends AbstractAttachableFPPossession { && Filters.inSkirmish.accepts(game.getGameState(), game.getModifiersQuerying(), self.getAttachedTo())) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); + new ExertCharactersEffect(action, self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_283.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_283.java index b72845b35..a0efd06d4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_283.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_283.java @@ -46,7 +46,7 @@ public class Card4_283 extends AbstractAttachableFPPossession { && Filters.inSkirmish.accepts(game.getGameState(), game.getModifiersQuerying(), self.getAttachedTo())) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); + new ExertCharactersEffect(action, self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_287.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_287.java index b71393362..c845b6e30 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_287.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_287.java @@ -39,7 +39,7 @@ public class Card4_287 extends AbstractAttachableFPPossession { && Filters.inSkirmish.accepts(game.getGameState(), game.getModifiersQuerying(), self.getAttachedTo())) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); + new ExertCharactersEffect(action, self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_293.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_293.java index 1b5d04bb6..9265bf0d0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_293.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_293.java @@ -36,7 +36,7 @@ public class Card4_293 extends AbstractPermanent { PlayCardResult result = (PlayCardResult) effectResult; OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, result.getPlayedCard())); + new ExertCharactersEffect(action, self, result.getPlayedCard())); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_300.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_300.java index 4ccd55c48..3fe41428b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_300.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_300.java @@ -55,9 +55,9 @@ public class Card4_300 extends AbstractAttachable { && PlayConditions.canExert(self, game, 2, Filters.hasAttached(self))) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new PreventableEffect(action, new CancelSkirmishEffect(Filters.hasAttached(self)), diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_329.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_329.java index 37712f73d..54ee021da 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_329.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_329.java @@ -30,7 +30,7 @@ public class Card4_329 extends AbstractSite { if (TriggerConditions.movesFrom(game, effectResult, self)) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, CardType.COMPANION, Keyword.RING_BOUND)); + new ExertCharactersEffect(action, self, CardType.COMPANION, Keyword.RING_BOUND)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_335.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_335.java index 36281842f..737a7c2a8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_335.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_335.java @@ -35,7 +35,7 @@ public class Card4_335 extends AbstractSite { PlayCardResult playCardResult = (PlayCardResult) effectResult; RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, playCardResult.getPlayedCard())); + new ExertCharactersEffect(action, self, playCardResult.getPlayedCard())); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_357.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_357.java index 1a2ddcdf5..13c758f46 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_357.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_357.java @@ -33,7 +33,7 @@ public class Card4_357 extends AbstractSite { && Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Culture.ROHAN, CardType.COMPANION) == 0) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.unboundCompanion)); + new ExertCharactersEffect(action, self, Filters.unboundCompanion)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_049.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_049.java index 4bee52da5..163a3eb08 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_049.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_049.java @@ -46,7 +46,7 @@ public class Card5_049 extends AbstractPermanent { && game.getGameState().getTokenCount(self, Token.ISENGARD) >= 8) { ActivateCardAction action = new ActivateCardAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.or(CardType.COMPANION, CardType.ALLY, CardType.MINION))); + new ExertCharactersEffect(action, self, Filters.or(CardType.COMPANION, CardType.ALLY, CardType.MINION))); action.appendEffect( new SelfDiscardEffect(self)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/raider/Card5_072.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/raider/Card5_072.java index e5ecdf8cc..25a6444f6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/raider/Card5_072.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/raider/Card5_072.java @@ -46,7 +46,7 @@ public class Card5_072 extends AbstractMinion { action.appendCost( new SelfExertEffect(action, self)); action.appendEffect( - new ExertCharactersEffect(self, CardType.COMPANION)); + new ExertCharactersEffect(action, self, CardType.COMPANION)); return Collections.singletonList(action); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_088.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_088.java index 82f3fc16c..6751192b1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_088.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_088.java @@ -40,7 +40,7 @@ public class Card5_088 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, self.getAttachedTo())) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendCost( new SelfDiscardEffect(self)); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/elven/Card6_021.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/elven/Card6_021.java index 3d91ad48c..682495824 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/elven/Card6_021.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/elven/Card6_021.java @@ -42,7 +42,7 @@ public class Card6_021 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, self.getAttachedTo())) { final ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new DiscardTopCardFromDeckEffect(self, playerId, false) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/dwarven/Card7_011.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/dwarven/Card7_011.java index 91fe8ece3..d68b169d6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/dwarven/Card7_011.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/dwarven/Card7_011.java @@ -48,7 +48,7 @@ public class Card7_011 extends AbstractEvent { if (index == 0) { SubCostToEffectAction subAction = new SubCostToEffectAction(action); subAction.appendCost( - new ExertCharactersEffect(self, card)); + new ExertCharactersEffect(action, self, card)); subAction.appendEffect( new DrawCardsEffect(action, playerId, 2)); game.getActionsEnvironment().addActionToStack(subAction); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/elven/Card7_017.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/elven/Card7_017.java index fab9f5ad3..f7bc04d7d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/elven/Card7_017.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/elven/Card7_017.java @@ -41,7 +41,7 @@ public class Card7_017 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, Filters.arwen, Filters.hasAttached(self))) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( new StrengthModifier(self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))), -2), Phase.SKIRMISH)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_094.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_094.java index 7406f5830..8d8f070d8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_094.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_094.java @@ -47,7 +47,7 @@ public class Card7_094 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, Filters.hasAttached(self))) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self)), Filters.hasAttached(Keyword.FORTIFICATION))); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_156.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_156.java index 84121a737..8718e4a41 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_156.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_156.java @@ -47,7 +47,7 @@ public class Card7_156 extends AbstractAttachable { && PlayConditions.canExert(self, game, Filters.hasAttached(self))) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new AddTwilightEffect(self, 2)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/rohan/Card7_232.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/rohan/Card7_232.java index 343a275da..7410a7a9d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/rohan/Card7_232.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/rohan/Card7_232.java @@ -49,7 +49,7 @@ public class Card7_232 extends AbstractAttachableFPPossession { && Filters.inSkirmish.accepts(game.getGameState(), game.getModifiersQuerying(), self.getAttachedTo())) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); + new ExertCharactersEffect(action, self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/rohan/Card7_250.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/rohan/Card7_250.java index 29ddaefb3..a29ca3ceb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/rohan/Card7_250.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/rohan/Card7_250.java @@ -49,7 +49,7 @@ public class Card7_250 extends AbstractAttachableFPPossession { && Filters.inSkirmish.accepts(game.getGameState(), game.getModifiersQuerying(), self.getAttachedTo())) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); + new ExertCharactersEffect(action, self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/rohan/Card7_253.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/rohan/Card7_253.java index c3c92d8a5..1c0384862 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/rohan/Card7_253.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/rohan/Card7_253.java @@ -47,7 +47,7 @@ public class Card7_253 extends AbstractAttachableFPPossession { && Filters.inSkirmish.accepts(game.getGameState(), game.getModifiersQuerying(), self.getAttachedTo())) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); + new ExertCharactersEffect(action, self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/rohan/Card7_260.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/rohan/Card7_260.java index f2a7aec53..94fce92bb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/rohan/Card7_260.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/rohan/Card7_260.java @@ -43,7 +43,7 @@ public class Card7_260 extends AbstractAttachableFPPossession { && Filters.inSkirmish.accepts(game.getGameState(), game.getModifiersQuerying(), self.getAttachedTo())) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); + new ExertCharactersEffect(action, self, Filters.and(CardType.MINION, Filters.inSkirmishAgainst(Filters.hasAttached(self))))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/wraith/Card7_212.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/wraith/Card7_212.java index fdfb4300d..9de602bda 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/wraith/Card7_212.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/wraith/Card7_212.java @@ -50,7 +50,7 @@ public class Card7_212 extends AbstractMinion { action.appendCost( new SelfExertEffect(action, self)); action.appendEffect( - new ExertCharactersEffect(self, Filters.ringBearer)); + new ExertCharactersEffect(action, self, Filters.ringBearer)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/wraith/Card7_216.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/wraith/Card7_216.java index ba96d0a0a..036c3816c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/wraith/Card7_216.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/wraith/Card7_216.java @@ -39,7 +39,7 @@ public class Card7_216 extends AbstractMinion { action.appendCost( new SelfDiscardEffect(self)); action.appendEffect( - new ExertCharactersEffect(self, Keyword.RING_BOUND, CardType.COMPANION)); + new ExertCharactersEffect(action, self, Keyword.RING_BOUND, CardType.COMPANION)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/gandalf/Card8_021.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/gandalf/Card8_021.java index bbaaba5d7..bb92ca12d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/gandalf/Card8_021.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/gandalf/Card8_021.java @@ -50,7 +50,7 @@ public class Card8_021 extends AbstractAttachableFPPossession { if (skirmish != null && skirmish.getFellowshipCharacter() != null && skirmish.getFellowshipCharacter().getBlueprint().getName().equals("Gandalf")) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.inSkirmishAgainst(Filters.gandalf))); + new ExertCharactersEffect(action, self, Filters.inSkirmishAgainst(Filters.gandalf))); return Collections.singletonList(action); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/gollum/Card8_028.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/gollum/Card8_028.java index 985e689fd..e0ee9e7eb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/gollum/Card8_028.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/gollum/Card8_028.java @@ -73,7 +73,7 @@ public class Card8_028 extends AbstractPermanent { if (TriggerConditions.assignedAgainst(game, effectResult, null, Filters.any, Filters.hasAttached(self))) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new ExertCharactersEffect(self, Filters.hasAttached(self))); + new ExertCharactersEffect(action, self, Filters.hasAttached(self))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_070.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_070.java index 0d16a2df3..00a1d28af 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_070.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_070.java @@ -49,7 +49,7 @@ public class Card8_070 extends AbstractAttachable { && PlayConditions.canSpot(game, CardType.POSSESSION, Filters.attachedTo(Filters.inSkirmishAgainst(Filters.hasAttached(self))))) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.POSSESSION, Filters.attachedTo(Filters.inSkirmishAgainst(Filters.hasAttached(self))))); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/dwarven/Card9_009.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/dwarven/Card9_009.java index 486aa2a9f..56ee7fbcf 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/dwarven/Card9_009.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/dwarven/Card9_009.java @@ -44,7 +44,7 @@ public class Card9_009 extends AbstractAttachableFPPossession { action.appendCost( new SelfDiscardEffect(self)); action.appendEffect( - new ExertCharactersEffect(self, Race.ORC)); + new ExertCharactersEffect(action, self, Race.ORC)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/gandalf/Card9_024.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/gandalf/Card9_024.java index 9402c420a..92984808c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/gandalf/Card9_024.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/gandalf/Card9_024.java @@ -56,7 +56,7 @@ public class Card9_024 extends AbstractAttachable { && PlayConditions.canExert(self, game, Filters.hasAttached(self))) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( new KeywordModifier(self, self.getAttachedTo(), Keyword.DAMAGE, 1), Phase.SKIRMISH)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/rohan/Card9_045.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/rohan/Card9_045.java index 586027f17..b7053a882 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/rohan/Card9_045.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/rohan/Card9_045.java @@ -53,7 +53,7 @@ public class Card9_045 extends AbstractAttachableFPPossession { && PlayConditions.canExert(self, game, self.getAttachedTo())) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ExertCharactersEffect(self, self.getAttachedTo())); + new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new DiscardCardsFromPlayEffect(self, CardType.MINION, Filters.inSkirmish)); return Collections.singletonList(action);