From ab1f553161f90bb901e500e1a02c8cba81f7658c Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 24 Oct 2011 14:21:17 +0000 Subject: [PATCH] Fixing the healing to contain source of the heal. --- .../java/com/gempukku/lotro/cards/AbstractAlly.java | 2 +- .../com/gempukku/lotro/cards/AbstractCompanion.java | 2 +- .../lotro/cards/set1/dwarven/Card1_010.java | 4 ++-- .../lotro/cards/set1/dwarven/Card1_025.java | 2 +- .../gempukku/lotro/cards/set1/elven/Card1_040.java | 2 +- .../gempukku/lotro/cards/set1/elven/Card1_045.java | 2 +- .../gempukku/lotro/cards/set1/shire/Card1_290.java | 2 +- .../gempukku/lotro/cards/set1/shire/Card1_297.java | 2 +- .../gempukku/lotro/cards/set1/shire/Card1_309.java | 2 +- .../lotro/cards/set2/dwarven/Card2_014.java | 2 +- .../gempukku/lotro/cards/set2/site/Card2_120.java | 2 +- .../gempukku/lotro/cards/set3/gondor/Card3_122.java | 2 +- .../gempukku/lotro/cards/set4/rohan/Card4_263.java | 2 +- .../gempukku/lotro/cards/set4/rohan/Card4_365.java | 2 +- .../gempukku/lotro/cards/set4/shire/Card4_303.java | 2 +- .../gempukku/lotro/cards/set4/site/Card4_344.java | 2 +- .../gempukku/lotro/cards/set5/elven/Card5_012.java | 2 +- .../gempukku/lotro/cards/set5/gondor/Card5_031.java | 2 +- .../gempukku/lotro/cards/set5/gondor/Card5_036.java | 2 +- .../lotro/cards/set5/isengard/Card5_068.java | 2 +- .../gempukku/lotro/cards/set5/rohan/Card5_084.java | 2 +- .../gempukku/lotro/cards/set5/rohan/Card5_091.java | 2 +- .../gempukku/lotro/cards/set5/rohan/Card5_094.java | 2 +- .../gempukku/lotro/cards/set5/rohan/Card5_122.java | 2 +- .../gempukku/lotro/cards/set5/shire/Card5_117.java | 4 ++-- .../gempukku/lotro/cards/set6/elven/Card6_015.java | 2 +- .../gempukku/lotro/cards/set6/elven/Card6_018.java | 2 +- .../effects/ChooseAndHealCharactersEffect.java | 2 +- .../lotro/logic/effects/HealCharactersEffect.java | 13 +++++++------ 29 files changed, 37 insertions(+), 36 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java index 4121774a1..dd9632064 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java @@ -51,7 +51,7 @@ public class AbstractAlly extends AbstractPermanent { PhysicalCard active = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.name(self.getBlueprint().getName())); if (active != null) - action.appendEffect(new HealCharactersEffect(playerId, active)); + action.appendEffect(new HealCharactersEffect(self, active)); return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java index d83ee6b40..60a82a752 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java @@ -51,7 +51,7 @@ public abstract class AbstractCompanion extends AbstractPermanent { PhysicalCard active = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.name(self.getBlueprint().getName())); if (active != null) - action.appendEffect(new HealCharactersEffect(playerId, active)); + action.appendEffect(new HealCharactersEffect(self, active)); return Collections.singletonList(action); } 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 93595795b..151459654 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,8 +41,8 @@ public class Card1_010 extends AbstractAttachable { public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { RequiredTriggerAction action = new RequiredTriggerAction(self); - action.appendEffect(new HealCharactersEffect(self.getOwner(), self.getAttachedTo())); - action.appendEffect(new HealCharactersEffect(self.getOwner(), self.getAttachedTo())); + action.appendEffect(new HealCharactersEffect(self, self.getAttachedTo())); + action.appendEffect(new HealCharactersEffect(self, self.getAttachedTo())); return Collections.singletonList(action); } else if (effectResult.getType() == EffectResult.Type.START_OF_TURN) { RequiredTriggerAction action = new RequiredTriggerAction(self); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_025.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_025.java index 976dc797e..822469999 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_025.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_025.java @@ -40,7 +40,7 @@ public class Card1_025 extends AbstractResponseOldEvent { if (self.getZone() == Zone.HAND && PlayConditions.winsSkirmish(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.race(Race.DWARF))) { SkirmishResult skirmishResult = (SkirmishResult) effectResult; PlayEventAction action = new PlayEventAction(self); - action.appendEffect(new HealCharactersEffect(playerId, skirmishResult.getWinners().get(0))); + action.appendEffect(new HealCharactersEffect(self, skirmishResult.getWinners().get(0))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_040.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_040.java index 222ca9011..cae9edb7e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_040.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_040.java @@ -57,7 +57,7 @@ public class Card1_040 extends AbstractAlly { if (effectResult.getType() == EffectResult.Type.START_OF_TURN) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new HealCharactersEffect(self.getOwner(), Filters.and(Filters.type(CardType.ALLY), Filters.isAllyHome(3, Block.FELLOWSHIP)))); + new HealCharactersEffect(self, Filters.and(Filters.type(CardType.ALLY), Filters.isAllyHome(3, Block.FELLOWSHIP)))); return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java index de9758ad5..72eb0361a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java @@ -53,7 +53,7 @@ public class Card1_045 extends AbstractAlly { if (effectResult.getType() == EffectResult.Type.START_OF_TURN) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new HealCharactersEffect(self.getOwner(), Filters.and(Filters.type(CardType.ALLY), Filters.isAllyHome(6, Block.FELLOWSHIP)))); + new HealCharactersEffect(self, Filters.and(Filters.type(CardType.ALLY), Filters.isAllyHome(6, Block.FELLOWSHIP)))); return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_290.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_290.java index 1c817f5f9..bbfcf47f1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_290.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_290.java @@ -40,7 +40,7 @@ public class Card1_290 extends AbstractCompanion { action.appendCost( new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Filters.type(CardType.COMPANION), Filters.signet(Signet.FRODO), Filters.not(Filters.sameCard(self)))); action.appendEffect( - new HealCharactersEffect(playerId, self)); + new HealCharactersEffect(self, self)); return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_297.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_297.java index e9e14c58a..455ec5372 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_297.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_297.java @@ -52,7 +52,7 @@ public class Card1_297 extends AbstractAlly { public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { if (effectResult.getType() == EffectResult.Type.START_OF_TURN) { RequiredTriggerAction action = new RequiredTriggerAction(self); - action.appendEffect(new HealCharactersEffect(self.getOwner(), self)); + action.appendEffect(new HealCharactersEffect(self, 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_309.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_309.java index 6ebe80643..d6bc5fd21 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_309.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_309.java @@ -48,7 +48,7 @@ public class Card1_309 extends AbstractAlly { action.appendCost(new ExertCharactersEffect(self, self)); PhysicalCard sam = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.name("Sam")); if (sam != null) { - action.appendEffect(new HealCharactersEffect(playerId, sam)); + action.appendEffect(new HealCharactersEffect(self, sam)); } return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_014.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_014.java index 2ced66338..281e03757 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_014.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_014.java @@ -39,7 +39,7 @@ public class Card2_014 extends AbstractPermanent { OptionalTriggerAction action = new OptionalTriggerAction(self); action.setText("Heal " + GameUtils.getCardLink(dwarfCompanion)); action.appendEffect( - new HealCharactersEffect(playerId, dwarfCompanion)); + new HealCharactersEffect(self, dwarfCompanion)); actions.add(action); } return actions; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/site/Card2_120.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/site/Card2_120.java index eb625c4eb..d3b4d9453 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/site/Card2_120.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/site/Card2_120.java @@ -42,7 +42,7 @@ public class Card2_120 extends AbstractSite { OptionalTriggerAction action = new OptionalTriggerAction(self); action.setText("Heal " + GameUtils.getCardLink(hobbitCompanion)); action.appendEffect( - new HealCharactersEffect(playerId, hobbitCompanion)); + new HealCharactersEffect(self, hobbitCompanion)); actions.add(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_122.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_122.java index 16e4fb5d5..4a3f9a5d3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_122.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_122.java @@ -38,7 +38,7 @@ public class Card3_122 extends AbstractCompanion { action.appendCost( new AddTwilightEffect(self, 2)); action.appendEffect( - new HealCharactersEffect(playerId, self)); + new HealCharactersEffect(self, 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_263.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_263.java index 430e14b4f..f714094cd 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 @@ -46,7 +46,7 @@ public class Card4_263 extends AbstractAttachableFPPossession { if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( - new HealCharactersEffect(playerId, self.getAttachedTo())); + new HealCharactersEffect(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/rohan/Card4_365.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_365.java index b11afd27a..5b82a2879 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_365.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_365.java @@ -95,7 +95,7 @@ public class Card4_365 extends AbstractCompanion { @Override protected void doPlayEffect(LotroGame game) { _action.appendEffect( - new HealCharactersEffect(_action.getActionSource().getOwner(), _attachPermanentAction.getTarget())); + new HealCharactersEffect(_action.getActionSource(), _attachPermanentAction.getTarget())); } } } 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 f46cafefe..b56756c65 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 @@ -58,7 +58,7 @@ public class Card4_303 extends AbstractAttachableFPPossession { action.appendEffect( new RemoveBurdenEffect(self)); action.appendEffect( - new HealCharactersEffect(playerId, self.getAttachedTo())); + new HealCharactersEffect(self, self.getAttachedTo())); } return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_344.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_344.java index 5deb704b4..c778f7ae8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_344.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_344.java @@ -33,7 +33,7 @@ public class Card4_344 extends AbstractSite { && game.getGameState().getCurrentSite() == self) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new HealCharactersEffect(game.getGameState().getCurrentPlayerId(), + new HealCharactersEffect(self, Filters.and( Filters.or(CardType.COMPANION, CardType.ALLY), Filters.mounted))); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/elven/Card5_012.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/elven/Card5_012.java index f7cdb148f..82417c71e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/elven/Card5_012.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/elven/Card5_012.java @@ -41,7 +41,7 @@ public class Card5_012 extends AbstractAttachableFPPossession { && PlayConditions.canSpot(game, CardType.MINION, Filters.wounded)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( - new HealCharactersEffect(playerId, self.getAttachedTo())); + new HealCharactersEffect(self, self.getAttachedTo())); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gondor/Card5_031.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gondor/Card5_031.java index 474a779db..22e095e25 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gondor/Card5_031.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gondor/Card5_031.java @@ -62,7 +62,7 @@ public class Card5_031 extends AbstractCompanion { } }); action.appendEffect( - new HealCharactersEffect(playerId, self)); + new HealCharactersEffect(self, self)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gondor/Card5_036.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gondor/Card5_036.java index da5e5368d..b72cb72ae 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gondor/Card5_036.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gondor/Card5_036.java @@ -38,7 +38,7 @@ public class Card5_036 extends AbstractCompanion { action.appendCost( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Culture.GONDOR, CardType.CONDITION)); action.appendEffect( - new HealCharactersEffect(playerId, self)); + new HealCharactersEffect(self, self)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_068.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_068.java index b4e35b869..3ac31551c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_068.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_068.java @@ -40,7 +40,7 @@ public class Card5_068 extends AbstractEvent { new StrengthModifier(self, Filters.sameCard(card), 2), Phase.SKIRMISH)); if (isMounted) action.appendEffect( - new HealCharactersEffect(playerId, card)); + new HealCharactersEffect(self, card)); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_084.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_084.java index 4443990cd..5ac2cbdba 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_084.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_084.java @@ -35,7 +35,7 @@ public class Card5_084 extends AbstractEvent { action.appendCost( new ChooseAndExertCharactersEffect(action, playerId, 1, 1, 2, Filters.name("Theoden"))); action.appendEffect( - new HealCharactersEffect(playerId, Filters.and(CardType.COMPANION, Filters.not(Filters.name("Theoden")), Signet.THÉODEN))); + new HealCharactersEffect(self, Filters.and(CardType.COMPANION, Filters.not(Filters.name("Theoden")), Signet.THÉODEN))); return action; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_091.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_091.java index fd5d2a449..157aa824e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_091.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_091.java @@ -49,7 +49,7 @@ public class Card5_091 extends AbstractAttachableFPPossession { action.appendCost( new DiscardCardsFromPlayEffect(self, self)); action.appendEffect( - new HealCharactersEffect(playerId, self.getAttachedTo())); + new HealCharactersEffect(self, self.getAttachedTo())); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_094.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_094.java index 1db540799..2f773c630 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_094.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_094.java @@ -48,7 +48,7 @@ public class Card5_094 extends AbstractPermanent { new StrengthModifier(self, Filters.sameCard(card), 3), Phase.SKIRMISH)); if (atPlains) action.appendEffect( - new HealCharactersEffect(playerId, card)); + new HealCharactersEffect(self, card)); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_122.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_122.java index f305597f4..1a3e97655 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_122.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_122.java @@ -53,7 +53,7 @@ public class Card5_122 extends AbstractCompanion { } }); action.appendEffect( - new HealCharactersEffect(playerId, self)); + new HealCharactersEffect(self, self)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_117.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_117.java index d7fe79002..6ce7db23b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_117.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_117.java @@ -35,9 +35,9 @@ public class Card5_117 extends AbstractEvent { action.appendCost( new ChooseAndPlayCardFromDiscardEffect(playerId, game.getGameState().getDiscard(playerId), Filters.name("Smeagol"))); action.appendEffect( - new HealCharactersEffect(playerId, Filters.and(Race.HOBBIT, Keyword.RING_BOUND))); + new HealCharactersEffect(self, Filters.and(Race.HOBBIT, Keyword.RING_BOUND))); action.appendEffect( - new HealCharactersEffect(playerId, Filters.and(Race.HOBBIT, Keyword.RING_BOUND))); + new HealCharactersEffect(self, Filters.and(Race.HOBBIT, Keyword.RING_BOUND))); return action; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/elven/Card6_015.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/elven/Card6_015.java index 09e43edea..e1903c0e8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/elven/Card6_015.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/elven/Card6_015.java @@ -43,7 +43,7 @@ public class Card6_015 extends AbstractAlly { if (effectResult.getType() == EffectResult.Type.START_OF_TURN) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new HealCharactersEffect(self.getOwner(), self)); + new HealCharactersEffect(self, self)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/elven/Card6_018.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/elven/Card6_018.java index 510f0117e..d148e3554 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/elven/Card6_018.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/elven/Card6_018.java @@ -40,7 +40,7 @@ public class Card6_018 extends AbstractAlly { if (effectResult.getType() == EffectResult.Type.START_OF_TURN) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( - new HealCharactersEffect(self.getOwner(), self)); + new HealCharactersEffect(self, self)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseAndHealCharactersEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseAndHealCharactersEffect.java index 129653ca1..7e0f76a5f 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseAndHealCharactersEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ChooseAndHealCharactersEffect.java @@ -53,7 +53,7 @@ public class ChooseAndHealCharactersEffect extends ChooseActiveCardsEffect { protected void cardsSelected(LotroGame game, Collection cards) { SubAction subAction = new SubAction(_action); for (int i = 0; i < _count; i++) - subAction.appendEffect(new HealCharactersEffect(_playerId, Filters.in(cards))); + subAction.appendEffect(new HealCharactersEffect(_action.getActionSource(), Filters.in(cards))); game.getActionsEnvironment().addActionToStack(subAction); } } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/HealCharactersEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/HealCharactersEffect.java index ad52c2dc6..4a21b6ea8 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/HealCharactersEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/HealCharactersEffect.java @@ -5,6 +5,7 @@ import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.GameState; import com.gempukku.lotro.game.state.LotroGame; +import com.gempukku.lotro.logic.GameUtils; import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -14,16 +15,16 @@ import java.util.Collection; import java.util.Collections; public class HealCharactersEffect extends AbstractPreventableCardEffect { - private String _playerId; + private PhysicalCard _source; - public HealCharactersEffect(String playerId, PhysicalCard... cards) { + public HealCharactersEffect(PhysicalCard source, PhysicalCard... cards) { super(cards); - _playerId = playerId; + _source = source; } - public HealCharactersEffect(String playerId, Filter filter) { + public HealCharactersEffect(PhysicalCard source, Filter filter) { super(filter); - _playerId = playerId; + _source = source; } @Override @@ -54,7 +55,7 @@ public class HealCharactersEffect extends AbstractPreventableCardEffect { Collection cardsToHeal = getAffectedCardsMinusPrevented(game); if (cardsToHeal.size() > 0) { - game.getGameState().sendMessage(_playerId + " heals " + getAppendedNames(cardsToHeal)); + game.getGameState().sendMessage(GameUtils.getCardLink(_source) + " heals " + getAppendedNames(cardsToHeal)); for (PhysicalCard cardToHeal : cardsToHeal) { game.getGameState().removeWound(cardToHeal); }