diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_347.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_347.java index 3d23b0e6e..98749acf6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_347.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_347.java @@ -3,6 +3,7 @@ package com.gempukku.lotro.cards.set4.site; import com.gempukku.lotro.cards.AbstractSite; import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.common.Block; +import com.gempukku.lotro.common.Keyword; import com.gempukku.lotro.common.Race; import com.gempukku.lotro.filters.Filter; import com.gempukku.lotro.filters.Filters; @@ -27,6 +28,8 @@ import java.util.List; public class Card4_347 extends AbstractSite { public Card4_347() { super("Deep of Helm", Block.TWO_TOWERS, 5, 6, Direction.LEFT); + addKeyword(Keyword.PLAINS); + addKeyword(Keyword.BATTLEGROUND); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_349.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_349.java new file mode 100644 index 000000000..36c82ab54 --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_349.java @@ -0,0 +1,35 @@ +package com.gempukku.lotro.cards.set4.site; + +import com.gempukku.lotro.cards.AbstractSite; +import com.gempukku.lotro.cards.modifiers.StrengthModifier; +import com.gempukku.lotro.common.Block; +import com.gempukku.lotro.common.CardType; +import com.gempukku.lotro.common.Keyword; +import com.gempukku.lotro.common.PossessionClass; +import com.gempukku.lotro.filters.Filters; +import com.gempukku.lotro.game.PhysicalCard; +import com.gempukku.lotro.game.state.LotroGame; +import com.gempukku.lotro.logic.modifiers.Modifier; + +import java.util.Collections; +import java.util.List; + +/** + * Set: The Two Towers + * Twilight Cost: 6 + * Type: Site + * Site: 5T + * Game Text: Battleground. Each companion and minion bearing a hand weapon is strength +2. + */ +public class Card4_349 extends AbstractSite { + public Card4_349() { + super("Helm's Gate", Block.TWO_TOWERS, 5, 6, Direction.LEFT); + addKeyword(Keyword.BATTLEGROUND); + } + + @Override + public List getAlwaysOnModifiers(LotroGame game, PhysicalCard self) { + return Collections.singletonList( + new StrengthModifier(self, Filters.and(Filters.or(CardType.COMPANION, CardType.MINION), Filters.hasAttached(PossessionClass.HAND_WEAPON)), 2)); + } +} diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java index 4a1e3ef30..c576c0b57 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java @@ -288,7 +288,7 @@ public class Filters { }; } - public static Filter hasAttached(final Filter... filters) { + public static Filter hasAttached(final Filterable... filters) { return new Filter() { @Override public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {