diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html index 9121149c4..bde8255a3 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html @@ -6,6 +6,7 @@ - "Pathfinder" and "Follow Smeagol" no longer allow to replace your own site. - "Gimli, Sprinter" now wounds hunter minion twice. - "Ring of Accretion" is now discarded, even if you choose to reveal 0 cards. +- "Ancient Enmity" should now correctly discard cards from minion's owner hand only. 20 Jun. 2013 - "They Sang as They Slew" correctly counts the exerted cards. diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java index c52e5e83c..845247f3f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java @@ -6,10 +6,7 @@ import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseActionProxyEffect; import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; import com.gempukku.lotro.cards.effects.DiscardCardAtRandomFromHandEffect; -import com.gempukku.lotro.common.Culture; -import com.gempukku.lotro.common.Phase; -import com.gempukku.lotro.common.Race; -import com.gempukku.lotro.common.Side; +import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.AbstractActionProxy; import com.gempukku.lotro.game.PhysicalCard; @@ -18,12 +15,10 @@ import com.gempukku.lotro.logic.actions.RequiredTriggerAction; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.modifiers.StrengthModifier; import com.gempukku.lotro.logic.timing.EffectResult; -import com.gempukku.lotro.logic.timing.results.CharacterWonSkirmishResult; +import com.gempukku.lotro.logic.timing.results.CharacterLostSkirmishResult; -import java.util.HashSet; -import java.util.LinkedList; +import java.util.Collections; import java.util.List; -import java.util.Set; /** * Set: The Fellowship of the Ring @@ -59,21 +54,13 @@ public class Card1_029 extends AbstractOldEvent { new AbstractActionProxy() { @Override public List getRequiredAfterTriggers(LotroGame lotroGame, EffectResult effectResult) { - if (TriggerConditions.winsSkirmish(lotroGame, effectResult, elf)) { - CharacterWonSkirmishResult skirmishResult = (CharacterWonSkirmishResult) effectResult; - Set losers = skirmishResult.getInvolving(); - Set opponents = new HashSet(); - for (PhysicalCard loser : losers) - opponents.add(loser.getOwner()); - - List actions = new LinkedList(); - for (String opponent : opponents) { - RequiredTriggerAction action = new RequiredTriggerAction(self); - action.appendEffect(new DiscardCardAtRandomFromHandEffect(self, opponent, true)); - action.appendEffect(new DiscardCardAtRandomFromHandEffect(self, opponent, true)); - actions.add(action); - } - return actions; + if (TriggerConditions.losesSkirmishInvolving(lotroGame, effectResult, CardType.MINION, elf)) { + CharacterLostSkirmishResult skirmishResult = (CharacterLostSkirmishResult) effectResult; + PhysicalCard loser = skirmishResult.getLoser(); + RequiredTriggerAction action = new RequiredTriggerAction(self); + action.appendEffect(new DiscardCardAtRandomFromHandEffect(self, loser.getOwner(), true)); + action.appendEffect(new DiscardCardAtRandomFromHandEffect(self, loser.getOwner(), true)); + return Collections.singletonList(action); } return null; }