diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/site/Card11_261.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/site/Card11_261.java index a00f4501c..ce99e3153 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/site/Card11_261.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/site/Card11_261.java @@ -5,12 +5,14 @@ import com.gempukku.lotro.cards.TriggerConditions; import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Keyword; import com.gempukku.lotro.common.Race; +import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; -import com.gempukku.lotro.logic.effects.HealCharactersEffect; +import com.gempukku.lotro.logic.effects.ChooseAndHealCharactersEffect; import com.gempukku.lotro.logic.timing.EffectResult; +import java.util.Collection; import java.util.Collections; import java.util.List; @@ -31,10 +33,13 @@ public class Card11_261 extends AbstractNewSite { public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (TriggerConditions.movesTo(game, effectResult, self) && playerId.equals(game.getGameState().getCurrentPlayerId())) { - OptionalTriggerAction action = new OptionalTriggerAction(self); - action.appendEffect( - new HealCharactersEffect(self, Race.HOBBIT, CardType.COMPANION)); - return Collections.singletonList(action); + Collection hobbitCompanions = Filters.filterActive(game.getGameState(), game.getModifiersQuerying(), Race.HOBBIT, CardType.COMPANION); + if (hobbitCompanions.size() > 0) { + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.appendEffect( + new ChooseAndHealCharactersEffect(action, playerId, 0, hobbitCompanions.size(), Filters.in(hobbitCompanions))); + return Collections.singletonList(action); + } } return null; } 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 e7a437ec1..38c2db7b8 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 @@ -1,6 +1,7 @@ package com.gempukku.lotro.cards.set2.site; import com.gempukku.lotro.cards.AbstractSite; +import com.gempukku.lotro.cards.TriggerConditions; import com.gempukku.lotro.common.Block; import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Keyword; @@ -8,13 +9,12 @@ import com.gempukku.lotro.common.Race; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.GameUtils; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; -import com.gempukku.lotro.logic.effects.HealCharactersEffect; +import com.gempukku.lotro.logic.effects.ChooseAndHealCharactersEffect; import com.gempukku.lotro.logic.timing.EffectResult; import java.util.Collection; -import java.util.LinkedList; +import java.util.Collections; import java.util.List; /** @@ -33,20 +33,15 @@ public class Card2_120 extends AbstractSite { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (effectResult.getType() == EffectResult.Type.WHEN_MOVE_TO - && game.getGameState().getCurrentSite() == self) { - List actions = new LinkedList(); - + if (TriggerConditions.movesTo(game, effectResult, self) + && playerId.equals(game.getGameState().getCurrentPlayerId())) { Collection hobbitCompanions = Filters.filterActive(game.getGameState(), game.getModifiersQuerying(), Race.HOBBIT, CardType.COMPANION); - for (final PhysicalCard hobbitCompanion : hobbitCompanions) { + if (hobbitCompanions.size() > 0) { OptionalTriggerAction action = new OptionalTriggerAction(self); - action.setText("Heal " + GameUtils.getCardLink(hobbitCompanion)); action.appendEffect( - new HealCharactersEffect(self, hobbitCompanion)); - actions.add(action); + new ChooseAndHealCharactersEffect(action, playerId, 0, hobbitCompanions.size(), Filters.in(hobbitCompanions))); + return Collections.singletonList(action); } - - return actions; } return null; } 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 c94463c5b..e40c400f1 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 @@ -1,4 +1,7 @@
+22 Dec. 2011
+- "Valley of the Silverlode" should not correctly allow to heal every Hobbit companion.
+
 19 Dec. 2011
 - "Chamber of Mazarbul" now has an Underground keyword.
 - "Moving This Way" now reveals the Nazgul before putting it on bottom of deck.