From 48be0de6d3f5148d26763f40ae425e9f2754071d Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Tue, 14 Nov 2017 16:18:15 -0500 Subject: [PATCH 01/13] Fixed "Smaug's Den" --- .../lotro/cards/set30/site/Card30_056.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/site/Card30_056.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/site/Card30_056.java index 8af45eabd..b6e4ce606 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/site/Card30_056.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/site/Card30_056.java @@ -39,15 +39,13 @@ public class Card30_056 extends AbstractSite { ActivateCardAction action = new ActivateCardAction(self); List possibleEffects = new LinkedList(); - if (Filters.filter(game.getGameState().getHand(playerId), game.getGameState(), game.getModifiersQuerying(), Filters.name("Smaug")).size() > 0) { - possibleEffects.add( + possibleEffects.add( new ChooseAndPlayCardFromDeckEffect(playerId, Filters.name("Smaug")) { - @Override - public String getText(LotroGame game) { - return "Play Smaug from your draw deck"; - } - }); - } + @Override + public String getText(LotroGame game) { + return "Play Smaug from your draw deck"; + } + }); if (PlayConditions.canPlayFromDiscard(playerId, game, Filters.name("Smaug"))) { possibleEffects.add( new ChooseAndPlayCardFromDiscardEffect(playerId, game, Filters.name("Smaug")) { @@ -65,4 +63,4 @@ public class Card30_056 extends AbstractSite { } return null; } -} \ No newline at end of file +} From e74f1d31276de8a6eae728f1939fd385b7475fe7 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Tue, 14 Nov 2017 22:29:58 -0500 Subject: [PATCH 02/13] Really fixed "Emeralds of Girion" --- .../com/gempukku/lotro/cards/set31/dwarven/Card31_003.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_003.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_003.java index 4046e6d9b..3ab447d18 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_003.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_003.java @@ -37,7 +37,8 @@ public class Card31_003 extends AbstractPermanent { @Override protected List getExtraPhaseActions(String playerId, LotroGame game, final PhysicalCard self) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self)) { + if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self) + && PlayConditions.canExert(self, game, Race.ELF)) { final ActivateCardAction action = new ActivateCardAction(self); action.appendCost( new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.ELF)); From 091b0f3ee825fca2125d4f6bdcd3b4d3003939ea Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Thu, 16 Nov 2017 06:10:11 -0500 Subject: [PATCH 03/13] Fixed "Mithril-coat" --- .../java/com/gempukku/lotro/cards/set31/dwarven/Card31_005.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/dwarven/Card31_005.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_005.java index 3f2e909ef..b918de04f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_005.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_005.java @@ -44,7 +44,7 @@ public class Card31_005 extends AbstractAttachableFPPossession { modifiers.add( new ArcheryTotalModifier(self, Side.SHADOW, -1)); modifiers.add( - new TwilightCostModifier(self, Filters.and(Side.SHADOW, CardType.POSSESSION), + new TwilightCostModifier(self, Filters.and(Side.SHADOW, CardType.CONDITION), new Condition() { @Override public boolean isFullfilled(GameState gameState, ModifiersQuerying modifiersQuerying) { From 1ac5b43f58cb0a1c584073a31ecf53064272d8d2 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Thu, 16 Nov 2017 12:45:12 -0500 Subject: [PATCH 04/13] Changes in card quantities for The Hobbit Also reordered lists numerically for ease of reference --- .../gemp-lotr-server/src/main/resources/lotrFormats.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json index 778f31fe8..0e881cf21 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json @@ -317,9 +317,9 @@ "code":"hobbit_tsr", "sites":"HOBBIT", "cancelRingBearerSkirmish":true, - "restricted":["30_2", "30_22", "30_5", "30_43", "30_44", "30_45", "30_46", "30_6", "30_7", "30_8", "30_9", "30_21", "30_10", "30_25", "30_26", "30_27", "30_28", "30_29", "30_11", "30_12", "30_15", "30_16", "30_17", "30_18", "30_58", "30_47", "30_48", "30_19", "31_1", "31_4", "31_6", "31_8", "31_9", "31_10", "31_15", "31_24", "31_34", "31_36", "31_39", "31_58", "31_62", "31_65"], - "limit2":["30_33", "30_34", "30_36", "30_37", "30_38", "30_41", "31_13", "31_14", "31_16", "31_29", "31_40", "31_43", "31_56"], - "limit3":["30_23", "30_1", "30_3", "30_4", "30_24", "30_30", "30_13", "30_14", "30_31", "30_20", "30_32", "30_39", "30_40", "31_2", "31_3", "31_5", "31_7", "31_11", "31_12", "31_17", "31_18", "31_19", "31_20", "31_21", "31_22", "31_23", "31_25", "31_26", "31_27", "31_28", "31_30", "31_31", "31_32", "31_33", "31_35", "31_37", "31_38", "31_41", "31_42", "31_47", "31_57", "31_59", "31_60", "31_61", "31_63", "31_64", "31_66", "31_67", "31_68", "31_69"], + "restricted":["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_16", "30_17", "30_18", "30_19", "30_21", "30_22", "30_25", "30_26", "30_27", "30_28", "30_29", "30_43", "30_44", "30_45", "30_46", "30_47", "30_48", "30_58", "31_1", "31_4", "31_6", "31_8", "31_9", "31_10", "31_14", "31_15", "31_16", "31_24", "31_34", "31_36", "31_39", "31_40", "31_43", "31_56", "31_58", "31_62", "31_65"], + "limit2":["30_33", "30_34", "30_36", "30_37", "30_38", "30_41", "31_2", "31_3", "31_5", "31_7", "31_11", "31_12", "31_13", "31_17", "31_18", "31_29", "31_37", "31_38", "31_41", "31_42"], + "limit3":["30_1", "30_3", "30_4", "30_13", "30_14", "30_20", "30_23", "30_24", "30_30", "30_31", "30_32", "30_39", "30_40", "31_19", "31_20", "31_21", "31_22", "31_23", "31_25", "31_26", "31_27", "31_28", "31_30", "31_31", "31_32", "31_33", "31_35", "31_47", "31_57", "31_59", "31_60", "31_61", "31_63", "31_64", "31_66", "31_67", "31_68", "31_69"], "set":[30, 31], "restrictedName":["Gandalf", "Bilbo"], "hall":true From c3cdc6f83d06560c098443781571dcef5fdc1b01 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Thu, 16 Nov 2017 13:38:23 -0500 Subject: [PATCH 05/13] The Hobbit --- .../gemp-lotr-server/src/main/resources/lotrFormats.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json index 0e881cf21..8d1d17a20 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json @@ -317,9 +317,9 @@ "code":"hobbit_tsr", "sites":"HOBBIT", "cancelRingBearerSkirmish":true, - "restricted":["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_16", "30_17", "30_18", "30_19", "30_21", "30_22", "30_25", "30_26", "30_27", "30_28", "30_29", "30_43", "30_44", "30_45", "30_46", "30_47", "30_48", "30_58", "31_1", "31_4", "31_6", "31_8", "31_9", "31_10", "31_14", "31_15", "31_16", "31_24", "31_34", "31_36", "31_39", "31_40", "31_43", "31_56", "31_58", "31_62", "31_65"], - "limit2":["30_33", "30_34", "30_36", "30_37", "30_38", "30_41", "31_2", "31_3", "31_5", "31_7", "31_11", "31_12", "31_13", "31_17", "31_18", "31_29", "31_37", "31_38", "31_41", "31_42"], - "limit3":["30_1", "30_3", "30_4", "30_13", "30_14", "30_20", "30_23", "30_24", "30_30", "30_31", "30_32", "30_39", "30_40", "31_19", "31_20", "31_21", "31_22", "31_23", "31_25", "31_26", "31_27", "31_28", "31_30", "31_31", "31_32", "31_33", "31_35", "31_47", "31_57", "31_59", "31_60", "31_61", "31_63", "31_64", "31_66", "31_67", "31_68", "31_69"], + "restricted":["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_16", "30_17", "30_18", "30_19", "30_21", "30_22", "30_25", "30_26", "30_27", "30_28", "30_29", "30_43", "30_44", "30_45", "30_46", "30_47", "30_48", "30_58", "31_1", "31_4", "31_6", "31_8", "31_9", "31_10", "31_14", "31_15", "31_16", "31_24", "31_29", "31_34", "31_36", "31_39", "31_40", "31_43", "31_56", "31_58", "31_62", "31_65"], + "limit2":["30_33", "30_34", "30_36", "30_37", "30_38", "30_41", "31_2", "31_3", "31_5", "31_7", "31_11", "31_12", "31_13", "31_17", "31_18", "31_20", "31_21", "31_22", "31_23", "31_25", "31_26", "31_28", "31_33", "31_37", "31_38", "31_41", "31_42", "31_57", "31_60", "31_64", "31_66", "31_67", "31_68", "31_69"], + "limit3":["30_1", "30_3", "30_4", "30_13", "30_14", "30_20", "30_23", "30_24", "30_30", "30_31", "30_32", "30_39", "30_40", "31_19", "31_27", "31_30", "31_31", "31_32", "31_35", "31_47", "31_59", "31_61", "31_63"], "set":[30, 31], "restrictedName":["Gandalf", "Bilbo"], "hall":true From 4b5816636ca476d052fbcf21e907c30c3ea5828b Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Thu, 16 Nov 2017 13:40:55 -0500 Subject: [PATCH 06/13] Fixed fix to "Mithril-coat" --- .../java/com/gempukku/lotro/cards/set31/dwarven/Card31_005.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/dwarven/Card31_005.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_005.java index b918de04f..aa55f857e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_005.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_005.java @@ -44,7 +44,7 @@ public class Card31_005 extends AbstractAttachableFPPossession { modifiers.add( new ArcheryTotalModifier(self, Side.SHADOW, -1)); modifiers.add( - new TwilightCostModifier(self, Filters.and(Side.SHADOW, CardType.CONDITION), + new TwilightCostModifier(self, Filters.and(Side.SHADOW, CardType.EVENT), new Condition() { @Override public boolean isFullfilled(GameState gameState, ModifiersQuerying modifiersQuerying) { From 2c6ce3ba24cbafddbb419c1cb31371e8c8ae3aa1 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Thu, 16 Nov 2017 16:19:18 -0500 Subject: [PATCH 07/13] Fixed "He Gives Me Courage" --- .../java/com/gempukku/lotro/cards/set30/gandalf/Card30_030.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_030.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_030.java index b28ef28b0..4463edfc7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_030.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_030.java @@ -47,7 +47,7 @@ public class Card30_030 extends AbstractEvent { action.appendCost( new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Filters.gandalf)); action.appendCost( - new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Keyword.WISE, CardType.ALLY)); + new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Keyword.WISE, Culture.ELVEN, CardType.ALLY)); action.appendEffect( new RemoveBurdenEffect(playerId, self, 2)); }; From 2de73129727c9925c4d3296299c86bff18f7d989 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Thu, 16 Nov 2017 16:29:03 -0500 Subject: [PATCH 08/13] Fixed "Bilbo, Master in Riddles" --- .../java/com/gempukku/lotro/cards/set30/shire/Card30_045.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/shire/Card30_045.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/shire/Card30_045.java index 767ef4b5c..cb872d46f 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,11 @@ public class Card30_045 extends AbstractCompanion { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( new StrengthModifier(self, Filters.sameCard(card), null, - new CardPhaseLimitEvaluator(game, self, Phase.SKIRMISH, -2, new ConstantEvaluator(-4))))); + new CardPhaseLimitEvaluator(game, self, Phase.SKIRMISH, -4, new ConstantEvaluator(-2))))); } }); return Collections.singletonList(action); } return null; } -} \ No newline at end of file +} From b722e45af1221b647aa641ab995f9ce6d3d0ec58 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sat, 18 Nov 2017 10:58:03 -0500 Subject: [PATCH 09/13] "Wicked Spider" now correctly spots 6 companions --- .../com/gempukku/lotro/cards/set31/spider/Card31_063.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/spider/Card31_063.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java index 258728ee0..f7038bd16 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java @@ -45,7 +45,7 @@ public class Card31_063 extends AbstractMinion { new ChooseActiveCardEffect(self, playerId, "Choose a Spider", Race.SPIDER) { @Override protected void cardSelected(LotroGame game, PhysicalCard spider) { - if (PlayConditions.canSpot(game, 5, CardType.COMPANION)) { + if (PlayConditions.canSpot(game, 6, CardType.COMPANION)) { action.appendEffect( new AddUntilStartOfPhaseModifierEffect( new StrengthModifier(self, Filters.sameCard(spider), 5), Phase.REGROUP)); @@ -60,4 +60,4 @@ public class Card31_063 extends AbstractMinion { } return null; } -} \ No newline at end of file +} From 405a6d6b11fe1effeef123b0ff24e542921711eb Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sat, 18 Nov 2017 11:01:39 -0500 Subject: [PATCH 10/13] "Bert" now only triggers from opponent discarding --- .../gempukku/lotro/cards/set31/troll/Card31_064.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_064.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_064.java index b2268bd56..a35db8cea 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_064.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_064.java @@ -60,10 +60,12 @@ public class Card31_064 extends AbstractMinion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (TriggerConditions.forEachDiscardedFromPlay(game, effectResult, CardType.CONDITION)) { - OptionalTriggerAction action = new OptionalTriggerAction(self); - action.appendEffect( - new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.ALLY)); - return Collections.singletonList(action); + if (!discardEffect.getPerformingPlayer().equals(self.getOwner())) { + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.appendEffect( + new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.ALLY)); + return Collections.singletonList(action); + } } return null; } From df8cd5c758fbb4101d2e8260288d00069ee68161 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sat, 18 Nov 2017 11:08:10 -0500 Subject: [PATCH 11/13] Fixed "Smaug" discarding action should no longer discard companions, rings, or Bard --- .../java/com/gempukku/lotro/cards/set30/smaug/Card30_058.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/smaug/Card30_058.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/smaug/Card30_058.java index 648df1bf8..214325c64 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/smaug/Card30_058.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/smaug/Card30_058.java @@ -67,7 +67,7 @@ public class Card30_058 extends AbstractMinion { action.appendCost( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.MINION, Filters.not(self))); action.appendEffect( - new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Side.FREE_PEOPLE, Filters.not(CardType.COMPANION, PossessionClass.RING, Filters.name("Bard")))); + new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Side.FREE_PEOPLE, Filters.and(Filters.not(CardType.COMPANION), Filters.not(PossessionClass.RING), Filters.not(Filters.name("Bard"))))); return Collections.singletonList(action); } return null; From 729867624b58b87a0180628003ec8c9c0ebfe218 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sat, 18 Nov 2017 12:18:29 -0500 Subject: [PATCH 12/13] Updated "The Arkenstone, King's Jewel" Text and code now match card image --- .../java/com/gempukku/lotro/cards/set31/smaug/Card31_056.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/smaug/Card31_056.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/smaug/Card31_056.java index c129d21bc..32a20a956 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/smaug/Card31_056.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/smaug/Card31_056.java @@ -34,7 +34,7 @@ import java.util.List; * Twilight Cost 2 * Strength bonus: -2 * 'Plays on Bilbo. - * At sites 7 to 9, wound bearer at the start of the maneuver phase. (If bearer is Bilbo, add a doubt instead.) + * At sites 7 to 9, wound bearer at the end of the maneuver phase. (If bearer is Bilbo, add a doubt instead.) * Thorin gains this ability: "Maneuver: Add a doubt to transfer the Arkenstone to Thorin (or add 3 doubts to discard it)" */ public class Card31_056 extends AbstractAttachable { @@ -88,7 +88,7 @@ public class Card31_056 extends AbstractAttachable { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.startOfPhase(game, effectResult, Phase.MANEUVER) + if (TriggerConditions.endOfPhase(game, effectResult, Phase.MANEUVER) && (game.getGameState().getCurrentSiteNumber() == 7 || game.getGameState().getCurrentSiteNumber()==9)) { RequiredTriggerAction action = new RequiredTriggerAction(self); if (Filters.name("Bilbo").accepts(game.getGameState(), game.getModifiersQuerying(), self.getAttachedTo())) { From 1f351ab283ce25c83d6617ddb3512580fd2449c6 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Tue, 21 Nov 2017 21:32:19 -0500 Subject: [PATCH 13/13] "Old Thrush" must be attached to use the ability --- .../java/com/gempukku/lotro/cards/set31/shire/Card31_042.java | 1 + 1 file changed, 1 insertion(+) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/shire/Card31_042.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/shire/Card31_042.java index e7e3be1a3..434d85102 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/shire/Card31_042.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/shire/Card31_042.java @@ -49,6 +49,7 @@ public class Card31_042 extends AbstractFollower { @Override protected List getExtraPhaseActions(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseFPCardDuringPhase(game, Phase.MANEUVER, self) + && PlayConditions.canSpot(game, Filters.hasAttached(self)) && PlayConditions.canSelfDiscard(self, game)) { ActivateCardAction action= new ActivateCardAction(self); action.appendCost(