ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"Gandalf's Staff"

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-09-26 16:30:55 +00:00
parent 2881fda47b
commit 34cbdff0d8
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java
View File

@@ -45,7 +45,7 @@ public abstract class AbstractAttachable extends AbstractLotroCardBlueprint {
if (possessionClass != null) {
boolean extraPossessionClass = isExtraPossessionClass();
List<PhysicalCard> attachedCards = game.getGameState().getAttachedCards(physicalCard);
Collection<PhysicalCard> matchingClassPossessions = Filters.filter(attachedCards, gameState, modifiersQuerying, Filters.type(CardType.POSSESSION), Filters.keyword(possessionClass));
Collection<PhysicalCard> 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 &&

6
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java
View File

@@ -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<Action> actions, LotroGame game, PhysicalCard self, Filter validTargetFilter) {

2
gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Keyword.java
View File

@@ -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;