From 34cbdff0d841c414ce511e2a08264604811c7e36 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 26 Sep 2011 16:30:55 +0000 Subject: [PATCH] "Gandalf's Staff" --- .../java/com/gempukku/lotro/cards/AbstractAttachable.java | 2 +- .../lotro/cards/AbstractAttachableFPPossession.java | 6 +++++- .../src/main/java/com/gempukku/lotro/common/Keyword.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java index fcb053aab..d6fe66744 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java @@ -45,7 +45,7 @@ public abstract class AbstractAttachable extends AbstractLotroCardBlueprint { if (possessionClass != null) { boolean extraPossessionClass = isExtraPossessionClass(); List attachedCards = game.getGameState().getAttachedCards(physicalCard); - Collection matchingClassPossessions = Filters.filter(attachedCards, gameState, modifiersQuerying, Filters.type(CardType.POSSESSION), Filters.keyword(possessionClass)); + Collection matchingClassPossessions = Filters.filter(attachedCards, gameState, modifiersQuerying, Filters.or(Filters.type(CardType.POSSESSION), Filters.type(CardType.ARTIFACT)), Filters.keyword(possessionClass)); if (matchingClassPossessions.size() > 1) return false; if (!extraPossessionClass && matchingClassPossessions.size() == 1 && diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java index 1f080e1de..c36a6dedb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java @@ -19,7 +19,11 @@ public abstract class AbstractAttachableFPPossession extends AbstractAttachable } public AbstractAttachableFPPossession(int twilight, Culture culture, Keyword possessionClass, String name, boolean unique) { - super(Side.FREE_PEOPLE, CardType.POSSESSION, twilight, culture, possessionClass, name, unique); + this(twilight, culture, CardType.POSSESSION, possessionClass, name, unique); + } + + public AbstractAttachableFPPossession(int twilight, Culture culture, CardType cardType, Keyword possessionClass, String name, boolean unique) { + super(Side.FREE_PEOPLE, cardType, twilight, culture, possessionClass, name, unique); } private void appendTransferPossessionAction(List actions, LotroGame game, PhysicalCard self, Filter validTargetFilter) { diff --git a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Keyword.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Keyword.java index 40e017701..2f0fc0773 100644 --- a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Keyword.java +++ b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Keyword.java @@ -16,7 +16,7 @@ public enum Keyword { DAMAGE("Damage", true, true), DEFENDER("Defender", true, true), FIERCE("Fierce", true), ARCHER("Archer", true), RANGER("Ranger", true), TRACKER("Tracker", true), HAND_WEAPON("Hand Weapon"), ARMOR("Armor"), HELM("Helm"), MOUNT("Mount"), RANGED_WEAPON("Ranged Weapon"), - CLOAK("Cloak"), PIPE("Pipe"), PIPEWEED("Pipeweed"), SHIELD("Shield"), BRACERS("Bracers"); + CLOAK("Cloak"), PIPE("Pipe"), PIPEWEED("Pipeweed"), SHIELD("Shield"), BRACERS("Bracers"), STAFF("Staff"); private String _humanReadable; private boolean _infoDisplayable;