From cf81da89eac9ddd539d4e7066442a45256a55dcb Mon Sep 17 00:00:00 2001 From: marcins78 Date: Tue, 23 Oct 2012 15:45:33 +0000 Subject: [PATCH] - "Bilbo, Bearer of Things Burgled" can now only play either non-events or Regroup events (not Skirmish events and thee like). --- .../com/gempukku/lotro/cards/set9/shire/Card9_049.java | 10 +++++----- .../src/main/webapp/includes/changeLog.html | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/shire/Card9_049.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/shire/Card9_049.java index ce81d85da..685033261 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/shire/Card9_049.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/shire/Card9_049.java @@ -5,10 +5,8 @@ import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.cards.effects.AddBurdenEffect; import com.gempukku.lotro.cards.effects.ChoiceEffect; import com.gempukku.lotro.cards.effects.choose.ChooseAndPlayCardFromHandEffect; -import com.gempukku.lotro.common.Culture; -import com.gempukku.lotro.common.Keyword; -import com.gempukku.lotro.common.Phase; -import com.gempukku.lotro.common.Race; +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.actions.ActivateCardAction; @@ -65,7 +63,9 @@ public class Card9_049 extends AbstractCompanion { action.appendCost( new AddBurdenEffect(self, 1)); action.appendEffect( - new ChooseAndPlayCardFromHandEffect(playerId, game, Culture.SHIRE, Keyword.TALE)); + new ChooseAndPlayCardFromHandEffect(playerId, game, Culture.SHIRE, Keyword.TALE, + Filters.or(Filters.not(CardType.EVENT), + Filters.and(CardType.EVENT, Keyword.REGROUP)))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html index 4afb7b3d8..5afdf4f20 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html @@ -6,6 +6,7 @@ all optional effects have to be used via cards). If you want to use Muster, just what effect you're using). Then you choose which cards you want to discard, up to the number of Muster cards you have. All cards are discarded and then you draw an equal number of cards. - "Arwen's Fate" now can't be played if you don't control exertable Aragorn or Arwen. +- "Bilbo, Bearer of Things Burgled" can now only play either non-events or Regroup events (not Skirmish events and thee like). 16 Oct. 2012 - "Down to the Last Child" now triggers on companion/ally losing skirmish, not Uruk-hai winning, so if companion loses