ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- "Ancient Enmity" should now correctly discard cards from minion's owner hand only.

Browse Source
This commit is contained in:
marcins78
2013-08-20 14:40:44 +00:00
parent a06f29cba8
commit 4a9f10bffd
2 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
View File

@@ -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.
<b>20 Jun. 2013</b>
- "They Sang as They Slew" correctly counts the exerted cards.

33
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java
View File

@@ -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<? extends RequiredTriggerAction> getRequiredAfterTriggers(LotroGame lotroGame, EffectResult effectResult) {
if (TriggerConditions.winsSkirmish(lotroGame, effectResult, elf)) {
CharacterWonSkirmishResult skirmishResult = (CharacterWonSkirmishResult) effectResult;
Set<PhysicalCard> losers = skirmishResult.getInvolving();
Set<String> opponents = new HashSet<String>();
for (PhysicalCard loser : losers)
opponents.add(loser.getOwner());
List<RequiredTriggerAction> actions = new LinkedList<RequiredTriggerAction>();
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;
}