From 4a50b15a25a58057efaf1205ba38bc0a3c7c5b3b Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Sun, 11 Aug 2019 05:27:02 -0700 Subject: [PATCH] "The Mirror of Galadriel", "Revealer of Portents" is now an artifact "Lorien Patrol" now wounds a minion --- .../lotro/cards/set40/elven/Card40_055.java | 10 ++++----- .../lotro/cards/set40/elven/Card40_060.java | 21 +++++++++++-------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/elven/Card40_055.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/elven/Card40_055.java index 3341ba76f..7b886f976 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/elven/Card40_055.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/elven/Card40_055.java @@ -1,18 +1,18 @@ package com.gempukku.lotro.cards.set40.elven; -import com.gempukku.lotro.logic.cardtype.AbstractEvent; -import com.gempukku.lotro.logic.timing.PlayConditions; -import com.gempukku.lotro.logic.actions.PlayEventAction; -import com.gempukku.lotro.logic.effects.choose.ChooseAndExertCharactersEffect; import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Phase; import com.gempukku.lotro.common.Side; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; +import com.gempukku.lotro.logic.actions.PlayEventAction; +import com.gempukku.lotro.logic.cardtype.AbstractEvent; import com.gempukku.lotro.logic.effects.AddThreatsEffect; import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect; import com.gempukku.lotro.logic.effects.WoundCharactersEffect; +import com.gempukku.lotro.logic.effects.choose.ChooseAndExertCharactersEffect; +import com.gempukku.lotro.logic.timing.PlayConditions; import java.util.Collection; @@ -48,7 +48,7 @@ public class Card40_055 extends AbstractEvent{ action.appendEffect( new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.MINION) { @Override - protected void cardsSelected(LotroGame game, Collection cards) { + protected void woundedCardsCallback(Collection cards) { if (cards.size()>0) { PhysicalCard minion = cards.iterator().next(); if (minion.getBlueprint().getCulture() == Culture.ISENGARD) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/elven/Card40_060.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/elven/Card40_060.java index 595a4a2d0..582e9c099 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/elven/Card40_060.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/elven/Card40_060.java @@ -1,20 +1,23 @@ package com.gempukku.lotro.cards.set40.elven; -import com.gempukku.lotro.logic.cardtype.AbstractPermanent; -import com.gempukku.lotro.logic.timing.PlayConditions; -import com.gempukku.lotro.logic.timing.TriggerConditions; -import com.gempukku.lotro.logic.effects.PutCardFromStackedOnTopOfDeckEffect; -import com.gempukku.lotro.logic.effects.choose.ChooseAndExertCharactersEffect; -import com.gempukku.lotro.logic.effects.choose.ChooseAndStackCardsFromHandEffect; -import com.gempukku.lotro.logic.effects.choose.ChooseStackedCardsEffect; -import com.gempukku.lotro.common.*; +import com.gempukku.lotro.common.CardType; +import com.gempukku.lotro.common.Culture; +import com.gempukku.lotro.common.Phase; +import com.gempukku.lotro.common.Side; 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.ActivateCardAction; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; +import com.gempukku.lotro.logic.cardtype.AbstractPermanent; +import com.gempukku.lotro.logic.effects.PutCardFromStackedOnTopOfDeckEffect; +import com.gempukku.lotro.logic.effects.choose.ChooseAndExertCharactersEffect; +import com.gempukku.lotro.logic.effects.choose.ChooseAndStackCardsFromHandEffect; +import com.gempukku.lotro.logic.effects.choose.ChooseStackedCardsEffect; import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.EffectResult; +import com.gempukku.lotro.logic.timing.PlayConditions; +import com.gempukku.lotro.logic.timing.TriggerConditions; import java.util.Collection; import java.util.Collections; @@ -34,7 +37,7 @@ import java.util.List; */ public class Card40_060 extends AbstractPermanent{ public Card40_060() { - super(Side.FREE_PEOPLE, 2, CardType.CONDITION, Culture.ELVEN, "The Mirror of Galadriel", "Revealer of Portents", true); + super(Side.FREE_PEOPLE, 2, CardType.ARTIFACT, Culture.ELVEN, "The Mirror of Galadriel", "Revealer of Portents", true); } @Override