diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js index ae5e12d48..5cadb0891 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js @@ -289,7 +289,6 @@ var set20 = { '20_294': 'http://lotrtcg.org/coreset/ringwraith/liftingtheveil.jpg', '20_295': 'http://lotrtcg.org/coreset/ringwraith/morgulblade.jpg', '20_296': 'http://lotrtcg.org/coreset/ringwraith/nineformortalmen(r2).jpg', - '20_297': 'http://lotrtcg.org/coreset/ringwraith/ominouslandscape.jpg', '20_298': 'http://lotrtcg.org/coreset/ringwraith/palebladew(r2).jpg', '20_299': 'http://lotrtcg.org/coreset/ringwraith/petrifyingfear.jpg', '20_300': 'http://lotrtcg.org/coreset/ringwraith/theringscompulsion.jpg', @@ -465,7 +464,6 @@ var set20 = { '20_473': 'http://lotrtcg.org/coreset/rohan/mightofthemark.jpg', '20_474': 'http://lotrtcg.org/coreset/rohan/notadefeat.jpg', '20_475': 'http://lotrtcg.org/coreset/shire/halflingdexterity.jpg', - '20_476': 'http://lotrtcg.org/coreset/isengard/stmtn(r1).jpg', '20_477': 'http://lotrtcg.org/coreset/shire/dimpleboffinbots(r1).jpg', '20_478': 'http://www.lotrtcg.org/coreset/isengard/torturedandmutilated(r2).jpg', '20_479': 'http://lotrtcg.org/coreset/shire/crossingthethreshold(r2).jpg' diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/isengard/Card20_476.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/isengard/Card20_476.java deleted file mode 100644 index b9830749f..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/isengard/Card20_476.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.gempukku.lotro.cards.set20.isengard; - -import com.gempukku.lotro.cards.AbstractEvent; -import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.actions.PlayEventAction; -import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; -import com.gempukku.lotro.cards.effects.AddUntilStartOfPhaseModifierEffect; -import com.gempukku.lotro.common.*; -import com.gempukku.lotro.filters.Filters; -import com.gempukku.lotro.game.PhysicalCard; -import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; -import com.gempukku.lotro.logic.modifiers.KeywordModifier; -import com.gempukku.lotro.logic.modifiers.StrengthModifier; - -/** - * 0 - * Savagery to Match Their Numbers - * Event • Skirmish - * Make an Uruk-hai strength +2, or spot 5 companions to make an Uruk-hai strength +4 and fierce until the regroup phase. - * http://lotrtcg.org/coreset/isengard/stmtn(r1).png - */ -public class Card20_476 extends AbstractEvent { - public Card20_476() { - super(Side.SHADOW, 0, Culture.ISENGARD, "Savagery to Match Their Numbers", Phase.SKIRMISH); - } - - @Override - public PlayEventAction getPlayCardAction(String playerId, LotroGame game, final PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) { - final PlayEventAction action = new PlayEventAction(self); - action.appendEffect( - new ChooseActiveCardEffect(self, playerId, "Choose an Uruk-hai", Race.URUK_HAI) { - @Override - protected void cardSelected(LotroGame game, PhysicalCard urukHai) { - if (PlayConditions.canSpot(game, 5, CardType.COMPANION)) { - action.appendEffect( - new AddUntilStartOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(urukHai), 4), Phase.REGROUP)); - action.appendEffect( - new AddUntilStartOfPhaseModifierEffect( - new KeywordModifier(self, Filters.sameCard(urukHai), Keyword.FIERCE), Phase.REGROUP)); - } else { - action.appendEffect( - new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(urukHai), 2))); - } - } - }); - return action; - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/wraith/Card20_297.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/wraith/Card20_297.java deleted file mode 100644 index a80228613..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/wraith/Card20_297.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.gempukku.lotro.cards.set20.wraith; - -import com.gempukku.lotro.cards.AbstractPermanent; -import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.TriggerConditions; -import com.gempukku.lotro.cards.actions.PlayPermanentAction; -import com.gempukku.lotro.cards.effects.SelfDiscardEffect; -import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect; -import com.gempukku.lotro.cards.modifiers.ResistanceModifier; -import com.gempukku.lotro.common.*; -import com.gempukku.lotro.game.PhysicalCard; -import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.actions.RequiredTriggerAction; -import com.gempukku.lotro.logic.modifiers.Modifier; -import com.gempukku.lotro.logic.timing.EffectResult; - -import java.util.Collections; -import java.util.List; - -/** - * 1 - * •Ominous Landscape - * Ringwraith Condition • Support Area - * To play, exert a Nazgul. - * Each companion is resistance -2. - * Discard this condition at the beginning of the regroup phase. - */ -public class Card20_297 extends AbstractPermanent { - public Card20_297() { - super(Side.SHADOW, 0, CardType.CONDITION, Culture.WRAITH, Zone.SUPPORT, "Ominous Landscape", null, true); - } - - @Override - public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int withTwilightRemoved, int twilightModifier, boolean ignoreRoamingPenalty, boolean ignoreCheckingDeadPile) { - return super.checkPlayRequirements(playerId, game, self, withTwilightRemoved, twilightModifier, ignoreRoamingPenalty, ignoreCheckingDeadPile) - && PlayConditions.canExert(self, game, Race.NAZGUL); - } - - @Override - public PlayPermanentAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) { - PlayPermanentAction action = super.getPlayCardAction(playerId, game, self, twilightModifier, ignoreRoamingPenalty); - action.appendCost( - new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.NAZGUL)); - return action; - } - - @Override - public Modifier getAlwaysOnModifier(LotroGame game, PhysicalCard self) { - return new ResistanceModifier(self, CardType.COMPANION, -2); - } - - @Override - public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.startOfPhase(game, effectResult, Phase.REGROUP)) { - RequiredTriggerAction action = new RequiredTriggerAction(self); - action.appendEffect( - new SelfDiscardEffect(self)); - return Collections.singletonList(action); - } - return null; - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set20-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/set20-rarity.txt index 5f4e1297e..e94735db3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set20-rarity.txt +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set20-rarity.txt @@ -288,7 +288,6 @@ 20S294 20S295 20S296 -20S297 20S298 20S299 20S300 @@ -464,7 +463,6 @@ 20S473 20S474 20S475 -20S476 20S477 20S478 20S479 \ No newline at end of file