diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveBurdenEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveBurdenEffect.java index 79104103c..db7c13938 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveBurdenEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveBurdenEffect.java @@ -9,9 +9,11 @@ import com.gempukku.lotro.logic.timing.results.RemoveBurdenResult; import java.util.Collections; public class RemoveBurdenEffect extends AbstractEffect { + private String _performingPlayerId; private PhysicalCard _source; - public RemoveBurdenEffect(PhysicalCard source) { + public RemoveBurdenEffect(String performingPlayerId, PhysicalCard source) { + _performingPlayerId = performingPlayerId; _source = source; } @@ -40,7 +42,7 @@ public class RemoveBurdenEffect extends AbstractEffect { if (isPlayableInFull(game)) { game.getGameState().sendMessage("Removed a burden"); game.getGameState().removeBurdens(1); - return new FullEffectResult(Collections.singleton(new RemoveBurdenResult(_source)), true, true); + return new FullEffectResult(Collections.singleton(new RemoveBurdenResult(_performingPlayerId, _source)), true, true); } return new FullEffectResult(null, false, false); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_039.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_039.java index 61f206b08..8d7fd892d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_039.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_039.java @@ -38,7 +38,7 @@ public class Card1_039 extends AbstractOldEvent { @Override public PlayEventAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) { PlayEventAction action = new PlayEventAction(self); - action.appendEffect(new RemoveBurdenEffect(self)); + action.appendEffect(new RemoveBurdenEffect(playerId, self)); return action; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_061.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_061.java index d60369a84..610df7310 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_061.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_061.java @@ -30,7 +30,7 @@ public class Card1_061 extends AbstractPermanent { public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (TriggerConditions.played(game, effectResult, Filters.and(Culture.ELVEN, Keyword.TALE))) { OptionalTriggerAction action = new OptionalTriggerAction(self); - action.appendEffect(new RemoveBurdenEffect(self)); + action.appendEffect(new RemoveBurdenEffect(playerId, self)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_074.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_074.java index 94d77484a..8f3c2ab65 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_074.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_074.java @@ -50,7 +50,7 @@ public class Card1_074 extends AbstractAttachableFPPossession { public void decisionMade(String result) throws DecisionResultInvalidException { int spotCount = getValidatedResult(result); for (int i = 0; i < spotCount; i++) - action.appendEffect(new RemoveBurdenEffect(self)); + action.appendEffect(new RemoveBurdenEffect(playerId, self)); } })); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_245.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_245.java index 3032fe126..9a37d6834 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_245.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_245.java @@ -36,7 +36,7 @@ public class Card1_245 extends AbstractOldEvent { @Override public PlayEventAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) { PlayEventAction action = new PlayEventAction(self); - action.appendCost(new RemoveBurdenEffect(self)); + action.appendCost(new RemoveBurdenEffect(playerId, self)); action.appendEffect( new DiscardTopCardFromDeckEffect(self, game.getGameState().getCurrentPlayerId(), true)); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_287.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_287.java index a82f6268a..dd826029d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_287.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_287.java @@ -43,7 +43,7 @@ public class Card1_287 extends AbstractResponseOldEvent { action.appendCost( new PreventCardEffect(healEffect, Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Keyword.RING_BEARER))); action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_307.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_307.java index 2d07ae351..eb88ed553 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_307.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_307.java @@ -43,7 +43,7 @@ public class Card1_307 extends AbstractCompanion { final RequiredTriggerAction action = new RequiredTriggerAction(self); List possibleEffects = new LinkedList(); - possibleEffects.add(new RemoveBurdenEffect(self) { + possibleEffects.add(new RemoveBurdenEffect(self.getOwner(), self) { @Override public String getText(LotroGame game) { return "Remove a burden"; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_311.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_311.java index 59d160734..69aa2179a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_311.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_311.java @@ -43,7 +43,7 @@ public class Card1_311 extends AbstractCompanion { && PlayConditions.canExert(self, game, self)) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost(new ExertCharactersEffect(self, self)); - action.appendEffect(new RemoveBurdenEffect(self)); + action.appendEffect(new RemoveBurdenEffect(playerId, self)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_312.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_312.java index c354c3578..bcbc7f6d8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_312.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_312.java @@ -38,7 +38,7 @@ public class Card1_312 extends AbstractOldEvent { final PlayEventAction action = new PlayEventAction(self); action.appendCost( new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.HOBBIT, CardType.COMPANION)); - action.appendEffect(new RemoveBurdenEffect(self)); + action.appendEffect(new RemoveBurdenEffect(playerId, self)); return action; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_108.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_108.java index e9012adb8..1bc15922a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_108.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_108.java @@ -35,7 +35,7 @@ public class Card10_108 extends AbstractPermanent { && PlayConditions.canSpot(game, 2, Culture.SHIRE, CardType.COMPANION)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_112.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_112.java index 8c6b35f99..e6222d519 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_112.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_112.java @@ -46,7 +46,7 @@ public class Card10_112 extends AbstractEvent { new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Culture.SHIRE, Filters.character)); List possibleEffects = new LinkedList(); possibleEffects.add( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); possibleEffects.add( new RemoveThreatsEffect(self, 2) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/site/Card10_118.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/site/Card10_118.java index 493d8bed7..6863954d7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/site/Card10_118.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/site/Card10_118.java @@ -41,7 +41,7 @@ public class Card10_118 extends AbstractSite { action.appendCost( new ChooseAndExertCharactersEffect(action, playerId, 1, 1, CardType.MINION)); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( new ChooseAndDiscardCardsFromPlayEffect(action, game.getGameState().getCurrentPlayerId(), 1, 1, CardType.CONDITION, Filters.owner(game.getGameState().getCurrentPlayerId()))); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_034.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_034.java index 77bf33f2f..e64f542de 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_034.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_034.java @@ -42,7 +42,7 @@ public class Card3_034 extends AbstractAttachableFPPossession { action.appendCost( new AddTwilightEffect(self, 3)); action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_113.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_113.java index 3a27aa8db..97865cd3e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_113.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_113.java @@ -38,7 +38,7 @@ public class Card3_113 extends AbstractPermanent { if (effectResult.getType() == EffectResult.Type.REMOVE_BURDEN) { RemoveBurdenResult removeBurdenResult = (RemoveBurdenResult) effectResult; PhysicalCard source = removeBurdenResult.getSource(); - if (source != null && source.getOwner().equals(playerId) && source.getBlueprint().getRace() != Race.HOBBIT) { + if (source != null && removeBurdenResult.getPerformingPlayerId().equals(playerId) && source.getBlueprint().getRace() != Race.HOBBIT) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new ChooseAndHealCharactersEffect(action, playerId, CardType.COMPANION)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/site/Card3_119.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/site/Card3_119.java index 559e6e663..0c9a02ec1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/site/Card3_119.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/site/Card3_119.java @@ -35,7 +35,7 @@ public class Card3_119 extends AbstractSite { && Filters.countSpottable(game.getGameState(), game.getModifiersQuerying(), Race.ELF) >= 2) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_298.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_298.java index a86af38c7..d02d0df89 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_298.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_298.java @@ -43,7 +43,7 @@ public class Card4_298 extends AbstractAttachableFPPossession { action.appendCost( new DiscardCardsFromPlayEffect(self, self)); action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_299.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_299.java index da24f7f57..7b06acdd9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_299.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_299.java @@ -47,7 +47,7 @@ public class Card4_299 extends AbstractPermanent { int count = getValidatedResult(result); for (int i = 0; i < count; i++) action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(self.getOwner(), self)); } })); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_302.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_302.java index 5fc0fc204..c5c97b08a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_302.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_302.java @@ -38,7 +38,7 @@ public class Card4_302 extends AbstractCompanion { action.appendCost( new ChooseAndPlayCardFromHandEffect(playerId, game, CardType.COMPANION, Keyword.RING_BOUND)); action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_303.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_303.java index 8f353ecbb..fa084ecce 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_303.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_303.java @@ -56,7 +56,7 @@ public class Card4_303 extends AbstractAttachableFPPossession { action.appendCost( new DiscardCardsFromPlayEffect(self, self)); action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( new HealCharactersEffect(self, self.getAttachedTo())); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_305.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_305.java index 383e942d5..170fc4066 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_305.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_305.java @@ -49,7 +49,7 @@ public class Card4_305 extends AbstractPermanent { ActivateCardAction action = new ActivateCardAction(self); for (int i = 0; i < tokenCount; i++) action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( new DiscardCardsFromPlayEffect(self, self)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_307.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_307.java index 5001fb6f8..2e1b76c4f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_307.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_307.java @@ -61,7 +61,7 @@ public class Card4_307 extends AbstractEvent { OptionalTriggerAction action = new OptionalTriggerAction(self); action.setVirtualCardAction(true); action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_363.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_363.java index c848285aa..d06cc9c57 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_363.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_363.java @@ -34,9 +34,9 @@ public class Card4_363 extends AbstractSite { && PlayConditions.canPlayFromDiscard(playerId, game, CardType.MINION)) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( new ChooseAndPlayCardFromDiscardEffect(playerId, game, CardType.MINION)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_112.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_112.java index ab28537d6..8fcf0076e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_112.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_112.java @@ -38,11 +38,11 @@ public class Card5_112 extends AbstractEvent { action.appendCost( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Filters.gollumOrSmeagol)); action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); return action; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/gollum/Card6_043.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/gollum/Card6_043.java index 2026a212d..dbf523ca5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/gollum/Card6_043.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/gollum/Card6_043.java @@ -36,9 +36,9 @@ public class Card6_043 extends AbstractResponseEvent { action.appendEffect( new ChooseAndHealCharactersEffect(action, playerId, Filters.smeagol)); action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/sauron/Card6_100.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/sauron/Card6_100.java index 5029480d4..cf922c0ea 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/sauron/Card6_100.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/sauron/Card6_100.java @@ -47,7 +47,7 @@ public class Card6_100 extends AbstractMinion { PlayPermanentAction action = super.getPlayCardAction(playerId, game, self, twilightModifier, ignoreRoamingPenalty); List possibleCosts = new LinkedList(); possibleCosts.add( - new RemoveBurdenEffect(self) { + new RemoveBurdenEffect(playerId, self) { @Override public String getText(LotroGame game) { return "Remove a burden"; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/site/Card6_115.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/site/Card6_115.java index 0ad52b0e6..31123f939 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/site/Card6_115.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/site/Card6_115.java @@ -35,7 +35,7 @@ public class Card6_115 extends AbstractSite { action.appendCost( new ChooseAndPlayCardFromHandEffect(playerId, game, CardType.COMPANION, Signet.FRODO)); action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_140.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_140.java index 21e7e0300..54b020836 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_140.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_140.java @@ -39,7 +39,7 @@ public class Card7_140 extends AbstractMinion { && game.getGameState().getBurdens() >= 1) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendCost( new ExertCharactersEffect(self, self)); boolean hasInitiative = PlayConditions.hasInitiative(game, Side.SHADOW); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_147.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_147.java index 6fecdd122..a99486f98 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_147.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_147.java @@ -40,9 +40,9 @@ public class Card7_147 extends AbstractMinion { && game.getGameState().getBurdens() >= 2) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( new ChooseAndHealCharactersEffect(action, playerId, 1, 1, Filters.not(self), Keyword.EASTERLING)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/sauron/Card7_262.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/sauron/Card7_262.java index 720457fc5..a8d7ba5ec 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/sauron/Card7_262.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/sauron/Card7_262.java @@ -71,7 +71,7 @@ public class Card7_262 extends AbstractEvent { @Override protected void doPlayEffect(LotroGame game) { action.insertCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( new ChooseAndPlayCardFromDiscardEffect(playerId, game, Culture.SAURON, Race.ORC)); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_326.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_326.java index c9d9e4512..8048de732 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_326.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_326.java @@ -44,7 +44,7 @@ public class Card7_326 extends AbstractCompanion { action.appendCost( new ChooseAndPlayCardFromHandEffect(playerId, game, CardType.COMPANION, Race.HOBBIT)); action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_328.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_328.java index 0e5bac058..e2f9693a6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_328.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_328.java @@ -67,9 +67,9 @@ public class Card7_328 extends AbstractAttachable { action.appendEffect( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.MINION)); action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_341.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_341.java index 6089146e6..6abc1eea7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_341.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_341.java @@ -37,7 +37,7 @@ public class Card7_341 extends AbstractSite { && PlayConditions.canRemoveBurdens(game, self, 1)) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( new ChooseAndAddUntilEOPStrengthBonusEffect(action, self, playerId, 2, Filters.owner(playerId), CardType.MINION)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_342.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_342.java index 4dfdee8f4..820cec65b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_342.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_342.java @@ -38,9 +38,9 @@ public class Card7_342 extends AbstractSite { && PlayConditions.canRemoveBurdens(game, self, 2)) { final ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( new ChooseActiveCardEffect(self, playerId, "Choose your minion", Filters.owner(playerId), CardType.MINION) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_343.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_343.java index b8de7d8bb..099076cea 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_343.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/site/Card7_343.java @@ -35,11 +35,11 @@ public class Card7_343 extends AbstractSite { && PlayConditions.canRemoveBurdens(game, self, 3)) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( new ArcheryTotalModifier(self, Side.SHADOW, 3), Phase.ARCHERY)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/wraith/Card7_188.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/wraith/Card7_188.java index b6bbd21a5..6494b1f41 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/wraith/Card7_188.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/wraith/Card7_188.java @@ -73,7 +73,7 @@ public class Card7_188 extends AbstractMinion { && PlayConditions.canRemoveBurdens(game, self, 1)) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( new StrengthModifier(self, self, 3), Phase.SKIRMISH)); 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 bcb355523..dd48a1bd2 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 @@ -52,7 +52,7 @@ public class Card8_028 extends AbstractPermanent { } }); possibleCosts.add( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendCost( new ChoiceEffect(action, playerId, possibleCosts)); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/sauron/Card8_093.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/sauron/Card8_093.java index 60c0ab60a..f63160975 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/sauron/Card8_093.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/sauron/Card8_093.java @@ -31,7 +31,7 @@ public class Card8_093 extends AbstractPermanent { } @Override - protected List getExtraPhaseActions(String playerId, LotroGame game, final PhysicalCard self) { + protected List getExtraPhaseActions(final String playerId, LotroGame game, final PhysicalCard self) { if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.REGROUP, self, 0) && PlayConditions.canDiscardFromPlay(self, game, Culture.SAURON, CardType.MINION) && PlayConditions.canSpot(game, CardType.COMPANION, Filters.not(Keyword.RING_BEARER), Filters.lessVitalityThan(game.getGameState().getBurdens() + 1))) { @@ -45,7 +45,7 @@ public class Card8_093 extends AbstractPermanent { int vitality = game.getModifiersQuerying().getVitality(game.getGameState(), card); for (int i = 0; i < vitality; i++) action.insertCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( new ReturnCardsToHandEffect(self, card)); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/sauron/Card8_098.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/sauron/Card8_098.java index 3a8a7bbc5..52ac427f4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/sauron/Card8_098.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/sauron/Card8_098.java @@ -42,7 +42,7 @@ public class Card8_098 extends AbstractMinion { && PlayConditions.canPlayFromStacked(playerId, game, Filters.siteControlled(playerId), Keyword.BESIEGER)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( new ChooseAndPlayCardFromStackedEffect(playerId, Filters.siteControlled(playerId), Keyword.BESIEGER)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/site/Card8_118.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/site/Card8_118.java index 5a6a17b8b..f1c2dbf9f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/site/Card8_118.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/site/Card8_118.java @@ -39,9 +39,9 @@ public class Card8_118 extends AbstractSite { && PlayConditions.canRemoveBurdens(game, self, 2)) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); List possibleEffects = new LinkedList(); possibleEffects.add( new ChooseAndPlayCardFromDeckEffect(playerId, CardType.MINION, Keyword.ENDURING) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/gollum/Card9_028.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/gollum/Card9_028.java index 52b9ea0d2..d5a812160 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/gollum/Card9_028.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/gollum/Card9_028.java @@ -55,7 +55,7 @@ public class Card9_028 extends AbstractMinion { ActivateCardAction action = new ActivateCardAction(self); action.setText("Add (1)"); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( new AddTwilightEffect(self, 1)); actions.add(action); @@ -66,7 +66,7 @@ public class Card9_028 extends AbstractMinion { && PlayConditions.canRemoveBurdens(game, self, 1)) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( new AddTwilightEffect(self, 2)); return Collections.singletonList(action); @@ -77,7 +77,7 @@ public class Card9_028 extends AbstractMinion { ActivateCardAction action = new ActivateCardAction(self); action.setText("Add (3)"); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( new AddTwilightEffect(self, 3)); actions.add(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/shire/Card9_052.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/shire/Card9_052.java index c993234ae..003088d01 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/shire/Card9_052.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/shire/Card9_052.java @@ -46,13 +46,13 @@ public class Card9_052 extends AbstractAlly { } @Override - public PlayPermanentAction getPlayCardAction(String playerId, LotroGame game, final PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) { + public PlayPermanentAction getPlayCardAction(final String playerId, LotroGame game, final PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) { final PlayPermanentAction action = super.getPlayCardAction(playerId, game, self, twilightModifier, ignoreRoamingPenalty); List possibleCosts = new LinkedList(); if (PlayConditions.canRemoveBurdens(game, self, 2)) { possibleCosts.add( - new RemoveBurdenEffect(self) { + new RemoveBurdenEffect(playerId, self) { @Override public String getText(LotroGame game) { return "Remove 2 burdens"; @@ -62,7 +62,7 @@ public class Card9_052 extends AbstractAlly { protected FullEffectResult playEffectReturningResult(LotroGame game) { FullEffectResult effectResult = super.playEffectReturningResult(game); action.insertCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); return effectResult; } }); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/wraith/Card9_044.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/wraith/Card9_044.java index a96d9fe88..8300c96b4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/wraith/Card9_044.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/wraith/Card9_044.java @@ -50,7 +50,7 @@ public class Card9_044 extends AbstractAttachable { && PlayConditions.canRemoveBurdens(game, self, 1)) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new RemoveBurdenEffect(self)); + new RemoveBurdenEffect(playerId, self)); action.appendEffect( new HealCharactersEffect(self, Race.NAZGUL)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/RemoveBurdenResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/RemoveBurdenResult.java index c57b9b059..c52b88b74 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/RemoveBurdenResult.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/RemoveBurdenResult.java @@ -4,13 +4,19 @@ import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.logic.timing.EffectResult; public class RemoveBurdenResult extends EffectResult { + private String _performingPlayerId; private PhysicalCard _source; - public RemoveBurdenResult(PhysicalCard source) { + public RemoveBurdenResult(String performingPlayerId, PhysicalCard source) { super(EffectResult.Type.REMOVE_BURDEN); + _performingPlayerId = performingPlayerId; _source = source; } + public String getPerformingPlayerId() { + return _performingPlayerId; + } + public PhysicalCard getSource() { return _source; } diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html index f29bdec06..d0b733113 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html @@ -7,6 +7,7 @@ at a time (because of the Rule of 4 rule). - "Ring of Asperity" can now wound an unwounded companion when played. - "What Are We Waiting For?" should now correctly skip Shadow phase, if such option is chosen. - If there is a choice of number involved of 0-1 range (i.e. one token on "Grond"), it will be now possible to choose 1. +- "Shire Countryside" should only trigger when it's the FP player that removes the token. 23 Nov. 2011 - "Jarnsmid" now modifies the twilight cost of the itmes by -1, rather than +1.