From ceaa800d79d2f68750bbd81268f844efbb788ad3 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Tue, 28 Nov 2017 12:27:45 -0500 Subject: [PATCH 01/14] Corrected "Battle Fury" strength modifier Previously gave +4 strength for bearing any follower, rather than a [DWARVEN] follower --- .../com/gempukku/lotro/cards/set30/dwarven/Card30_003.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_003.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_003.java index ec4169918..bc147a960 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_003.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_003.java @@ -29,7 +29,7 @@ public class Card30_003 extends AbstractEvent { final PlayEventAction action = new PlayEventAction(self); action.appendEffect( new ChooseAndAddUntilEOPStrengthBonusEffect(action, self, playerId, - new CardMatchesEvaluator(3, 4, Filters.hasAttached(CardType.FOLLOWER)), Race.DWARF, Filters.or(CardType.COMPANION, CardType.ALLY))); + new CardMatchesEvaluator(3, 4, Filters.hasAttached(Filters.and(CardType.FOLLOWER, Culture.DWARVEN))), Race.DWARF, Filters.or(CardType.COMPANION, CardType.ALLY))); return action; } -} \ No newline at end of file +} From 7d83b7ee9eb53ed79306d07b4928c5e5cad101cd Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Tue, 28 Nov 2017 12:31:05 -0500 Subject: [PATCH 02/14] Skill for "Nori" now useable in the maneuver phase Previously, it was a skirmish action --- .../com/gempukku/lotro/cards/set30/dwarven/Card30_015.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_015.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_015.java index d09c5b95b..92596f91e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_015.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_015.java @@ -22,7 +22,7 @@ import java.util.List; * Strength: 7 * Vitality: 3 * Resistance: 6 - * Game Text: Skirmish: Exert Nori twice and discard a [DWARVEN] follower to discard a possession + * Game Text: Maneuver: Exert Nori twice and discard a [DWARVEN] follower to discard a possession */ public class Card30_015 extends AbstractCompanion { public Card30_015() { @@ -32,7 +32,7 @@ public class Card30_015 extends AbstractCompanion { @Override protected List getExtraInPlayPhaseActions(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self) + if (PlayConditions.canUseFPCardDuringPhase(game, Phase.MANEUVER, self) && PlayConditions.canExert(self, game, 2, self) && PlayConditions.canDiscardFromPlay(self, game, Culture.DWARVEN, CardType.FOLLOWER)) { ActivateCardAction action = new ActivateCardAction(self); @@ -48,4 +48,4 @@ public class Card30_015 extends AbstractCompanion { } return null; } -} \ No newline at end of file +} From 6203a97c92a0f3cdaba880092691921af4a0b3b9 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Tue, 28 Nov 2017 12:35:56 -0500 Subject: [PATCH 03/14] Corrected "Tauriel" maneuver action Previously allowed the opponent to pick which minion was returned --- .../com/gempukku/lotro/cards/set31/elven/Card31_010.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/elven/Card31_010.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/elven/Card31_010.java index 1445c1624..0c5c67ad5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/elven/Card31_010.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/elven/Card31_010.java @@ -42,13 +42,7 @@ public class Card31_010 extends AbstractAlly { action.appendCost( new SelfExertEffect(action, self)); action.appendEffect( - new ChooseOpponentEffect(playerId) { - @Override - protected void opponentChosen(String opponentId) { - action.appendEffect( - new ChooseAndReturnCardsToHandEffect(action, opponentId, 1, 1, Race.ORC, Filters.lessStrengthThan(8))); - } - }); + new ChooseAndReturnCardsToHandEffect(action, playerId, 1, 1, Race.ORC, Filters.lessStrengthThan(8))); return Collections.singletonList(action); } return null; From 6f665f2e22f20128e7cf4610425ff715dd6530f5 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Tue, 28 Nov 2017 12:53:12 -0500 Subject: [PATCH 04/14] Reworked "Beorn" discard prevention --- .../lotro/cards/set31/gandalf/Card31_013.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java index 91b820d39..e9927f932 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java @@ -37,19 +37,19 @@ public class Card31_013 extends AbstractFollower { super(Side.FREE_PEOPLE, 3, 2, 1, 0, Culture.GANDALF, "Beorn", "Skin-Changer", true); } - @Override - public Race getRace() { - return Race.MAN; - } + @Override + public Race getRace() { + return Race.MAN; + } - @Override + @Override public Modifier getAlwaysOnModifier(LotroGame game, PhysicalCard self) { - return new CantDiscardFromPlayByPlayerModifier(self, "Can't be discarded by opponent", self, self.getOwner()); - } + return new CantDiscardFromPlayModifier(self, "Cannot be discarded from play by Shadow cards", self, Side.SHADOW); + } @Override protected boolean canPayAidCost(LotroGame game, PhysicalCard self) { - return PlayConditions.canExert(self, game, Filters.gandalf); + return PlayConditions.canExert(self, game, Filters.gandalf); } @Override From 3e450259c11b6462ae127d0bf23d6f598ba10d7a Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 29 Nov 2017 11:12:14 -0500 Subject: [PATCH 05/14] Corrected "Dori" twilight cost --- .../com/gempukku/lotro/cards/set30/dwarven/Card30_008.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_008.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_008.java index 972781207..0eecc4178 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_008.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_008.java @@ -30,7 +30,7 @@ import java.util.List; */ public class Card30_008 extends AbstractFollower { public Card30_008() { - super(Side.FREE_PEOPLE, 2, 1, 0, 0, Culture.DWARVEN, "Dori", "Really a Decent Fellow", true); + super(Side.FREE_PEOPLE, 1, 1, 0, 0, Culture.DWARVEN, "Dori", "Really a Decent Fellow", true); } @Override @@ -53,4 +53,4 @@ public class Card30_008 extends AbstractFollower { return Collections.singletonList( new OverwhelmedByMultiplierModifier(self, Filters.hasAttached(self), 3)); } -} \ No newline at end of file +} From 72a32e9deb1cb41e2d5e43c660d9385b617fdbfa Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Thu, 30 Nov 2017 07:18:42 -0500 Subject: [PATCH 06/14] Corrected "Great Barricade" twilight cost --- .../com/gempukku/lotro/cards/set31/dwarven/Card31_004.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_004.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_004.java index b7fd3ea0d..88b002686 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_004.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_004.java @@ -34,7 +34,7 @@ import java.util.List; */ public class Card31_004 extends AbstractPermanent { public Card31_004() { - super(Side.FREE_PEOPLE, 1, CardType.POSSESSION, Culture.DWARVEN, Zone.SUPPORT, "Great Barricade", null, true); + super(Side.FREE_PEOPLE, 2, CardType.POSSESSION, Culture.DWARVEN, Zone.SUPPORT, "Great Barricade", null, true); addKeyword(Keyword.FORTIFICATION); } @@ -86,4 +86,4 @@ public class Card31_004 extends AbstractPermanent { } return null; } -} \ No newline at end of file +} From a79fd4482ae31f4697e3b27213f8cc6b69ece012 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Thu, 30 Nov 2017 07:19:22 -0500 Subject: [PATCH 07/14] Corrected "Dwarven Song" twilight cost --- .../com/gempukku/lotro/cards/set31/dwarven/Card31_002.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_002.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_002.java index dc55aae8a..26093e8e6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_002.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_002.java @@ -30,7 +30,7 @@ import java.util.List; */ public class Card31_002 extends AbstractEvent { public Card31_002() { - super(Side.FREE_PEOPLE, 1, Culture.DWARVEN, "Dwarven Song", Phase.REGROUP); + super(Side.FREE_PEOPLE, 3, Culture.DWARVEN, "Dwarven Song", Phase.REGROUP); } @Override @@ -70,4 +70,4 @@ public class Card31_002 extends AbstractEvent { }); return action; } -} \ No newline at end of file +} From 2b5f887360d48836e71d7079fe8d0e07f4c9d3f9 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Fri, 1 Dec 2017 10:46:08 -0500 Subject: [PATCH 08/14] Really fixed "Bilbo, Master in Riddles" --- .../com/gempukku/lotro/cards/set30/shire/Card30_045.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/shire/Card30_045.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/shire/Card30_045.java index cb872d46f..8618be5b2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/shire/Card30_045.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/shire/Card30_045.java @@ -65,11 +65,12 @@ public class Card30_045 extends AbstractCompanion { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( new StrengthModifier(self, Filters.sameCard(card), null, - new CardPhaseLimitEvaluator(game, self, Phase.SKIRMISH, -4, new ConstantEvaluator(-2))))); + new NegativeEvaluator(new CardPhaseLimitEvaluator( + game, self, Phase.SKIRMISH, 4, new ConstantEvaluator(2)))))); } - }); + }); return Collections.singletonList(action); } return null; - } + } } From 831725462efb838b1bfc5edfc3a130fe6d423aa0 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Fri, 1 Dec 2017 11:35:32 -0500 Subject: [PATCH 09/14] Fixed "Thranduil, Elven King" Should no longer participate in archery fire --- .../com/gempukku/lotro/cards/set31/elven/Card31_012.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/elven/Card31_012.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/elven/Card31_012.java index 115e3bbcc..de8a23c54 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/elven/Card31_012.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/elven/Card31_012.java @@ -15,8 +15,7 @@ import com.gempukku.lotro.game.state.GameState; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; -import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; -import com.gempukku.lotro.logic.modifiers.StrengthModifier; +import com.gempukku.lotro.logic.modifiers.*; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.Action; @@ -35,7 +34,7 @@ import java.util.List; * Vitality: 4 * Site: 5 * Game Text: Maneuver: Exert Thorin twice or discard a [DWARVEN] artifact to allow Thranduil - * to participate in archery fire and skirmishes until the regroup phase. + * to participate in skirmishes until the regroup phase. */ public class Card31_012 extends AbstractAlly { public Card31_012() { @@ -68,8 +67,10 @@ public class Card31_012 extends AbstractAlly { action.appendEffect( new AddUntilStartOfPhaseModifierEffect( new AllyParticipatesInArcheryFireAndSkirmishesModifier(self, self), Phase.REGROUP)); + action.appendEffect( + new CantTakeWoundsModifier(self, new PhaseCondition(Phase.ARCHERY), self)); return Collections.singletonList(action); } return null; } -} \ No newline at end of file +} From e4a4095c7c1c61c4a8d484b25cd46d746f6e24d2 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Fri, 1 Dec 2017 13:56:38 -0500 Subject: [PATCH 10/14] Importing package for "Bilbo, Master in Riddles" --- .../java/com/gempukku/lotro/cards/set30/shire/Card30_045.java | 1 + 1 file changed, 1 insertion(+) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/shire/Card30_045.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/shire/Card30_045.java index 8618be5b2..1c634b72a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/shire/Card30_045.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/shire/Card30_045.java @@ -6,6 +6,7 @@ import com.gempukku.lotro.cards.TriggerConditions; import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.cards.modifiers.evaluator.CardPhaseLimitEvaluator; +import com.gempukku.lotro.cards.modifiers.evaluator.NegativeEvaluator; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; From 6679b6b525522e473bc5246ef1b739e79aa6ee1a Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Fri, 1 Dec 2017 13:57:37 -0500 Subject: [PATCH 11/14] "Ancestral Feuds" now has the proper limit --- .../com/gempukku/lotro/cards/set31/gundabad/Card31_029.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_029.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_029.java index 64fd96513..2640c0be7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_029.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_029.java @@ -7,8 +7,7 @@ import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; import com.gempukku.lotro.cards.effects.RemoveTwilightEffect; import com.gempukku.lotro.cards.effects.SelfDiscardEffect; import com.gempukku.lotro.cards.effects.choose.ChooseAndAddUntilEOPStrengthBonusEffect; -import com.gempukku.lotro.cards.modifiers.evaluator.CountSpottableEvaluator; -import com.gempukku.lotro.cards.modifiers.evaluator.MultiplyEvaluator; +import com.gempukku.lotro.cards.modifiers.evaluator.*; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; @@ -58,7 +57,8 @@ public class Card31_029 extends AbstractPermanent { action.appendCost(new RemoveTwilightEffect(3)); action.appendEffect( new ChooseAndAddUntilEOPStrengthBonusEffect(action, self, playerId, - new MultiplyEvaluator(-1, new CountSpottableEvaluator(3, CardType.ALLY, Culture.ELVEN)), Culture.DWARVEN, Filters.character)); + new NegativeEvaluator(new CardPhaseLimitEvaluator(game, self, Phase.SKIRMISH, 3, + new CountActiveEvaluator(CardType.ALLY, Culture.ELVEN))), Filters.and(Culture.DWARVEN, Filters.character))); return Collections.singletonList(action); } return null; From 3f756f753dd1a0f3526df9640b9b355260a05b93 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Fri, 1 Dec 2017 14:59:21 -0500 Subject: [PATCH 12/14] Reworked fix for "Thranduil, Elven King" We'll see how this does --- .../java/com/gempukku/lotro/cards/set31/elven/Card31_012.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/elven/Card31_012.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/elven/Card31_012.java index de8a23c54..b6345c2ab 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/elven/Card31_012.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/elven/Card31_012.java @@ -8,6 +8,7 @@ import com.gempukku.lotro.cards.effects.DiscardBottomCardFromDeckEffect; import com.gempukku.lotro.cards.effects.choose.ChooseAndDiscardCardsFromPlayEffect; import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect; import com.gempukku.lotro.cards.modifiers.AllyParticipatesInArcheryFireAndSkirmishesModifier; +import com.gempukku.lotro.cards.modifiers.CantTakeArcheryWoundsModifier; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; @@ -68,7 +69,8 @@ public class Card31_012 extends AbstractAlly { new AddUntilStartOfPhaseModifierEffect( new AllyParticipatesInArcheryFireAndSkirmishesModifier(self, self), Phase.REGROUP)); action.appendEffect( - new CantTakeWoundsModifier(self, new PhaseCondition(Phase.ARCHERY), self)); + new AddUntilStartOfPhaseModifierEffect( + new CantTakeArcheryWoundsModifier(self, self), Phase.ASSIGNMENT)); return Collections.singletonList(action); } return null; From 1e35fd8bc4e2b43079c58abcd4669b6922419139 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Fri, 1 Dec 2017 15:02:17 -0500 Subject: [PATCH 13/14] Importing package for "Beorn, Skin-Changer" --- .../java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java index e9927f932..0bfec914b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java @@ -11,7 +11,7 @@ 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.modifiers.CantDiscardFromPlayByPlayerModifier; +import com.gempukku.lotro.logic.modifiers.CantDiscardFromPlayModifier; import com.gempukku.lotro.logic.modifiers.Modifier; import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; From 23cdad21e986af26aae8dd629510f0782bdc4363 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Fri, 1 Dec 2017 15:16:50 -0500 Subject: [PATCH 14/14] "Beorn" now only prevents discarding when borne From The Hunters starter rule book: "While your follower is in your support area, it has no effect on the game." --- .../com/gempukku/lotro/cards/set31/gandalf/Card31_013.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java index 0bfec914b..adee5b23d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java @@ -13,6 +13,7 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.modifiers.CantDiscardFromPlayModifier; import com.gempukku.lotro.logic.modifiers.Modifier; +import com.gempukku.lotro.logic.modifiers.SpotCondition; import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -44,7 +45,8 @@ public class Card31_013 extends AbstractFollower { @Override public Modifier getAlwaysOnModifier(LotroGame game, PhysicalCard self) { - return new CantDiscardFromPlayModifier(self, "Cannot be discarded from play by Shadow cards", self, Side.SHADOW); + return new CantDiscardFromPlayModifier(self, "Cannot be discarded from play by Shadow cards", + new SpotCondition(Filters.hasAttached(self)), self, Side.SHADOW); } @Override