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

Simlifying code.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-02-10 10:26:00 +00:00
parent fcb3bfd8fa
commit beee3a5342
2 changed files with 3 additions and 2 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/AbstractAttachableFPPossession.java
View File

@@ -49,7 +49,7 @@ public abstract class AbstractAttachableFPPossession extends AbstractAttachable
Filters.or( Filters.or(
CardType.COMPANION, CardType.COMPANION,
Filters.allyAtHome)); Filters.allyAtHome));
} else if (attachedTo.isAllyAtHome(gameState.getCurrentSiteNumber(), gameState.getCurrentSite().getBlueprint().getSiteBlock())) { } else if (attachedTo.isAllyAtHome(gameState.getCurrentSiteNumber(), gameState.getCurrentSiteBlock())) {
validTransferFilter = Filters.and(validTargetFilter, validTransferFilter = Filters.and(validTargetFilter,
Filters.or( Filters.or(
CardType.COMPANION, CardType.COMPANION,

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_031.java
View File

@@ -1,6 +1,7 @@
package com.gempukku.lotro.cards.set1.elven; package com.gempukku.lotro.cards.set1.elven;
import com.gempukku.lotro.cards.AbstractAttachableFPPossession; import com.gempukku.lotro.cards.AbstractAttachableFPPossession;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.cards.effects.SelfDiscardEffect; import com.gempukku.lotro.cards.effects.SelfDiscardEffect;
import com.gempukku.lotro.cards.modifiers.conditions.LocationCondition; import com.gempukku.lotro.cards.modifiers.conditions.LocationCondition;
import com.gempukku.lotro.common.*; import com.gempukku.lotro.common.*;
@@ -53,7 +54,7 @@ public class Card1_031 extends AbstractAttachableFPPossession {
@Override @Override
public List<RequiredTriggerAction> getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { public List<RequiredTriggerAction> getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) {
if (game.getModifiersQuerying().hasKeyword(game.getGameState(), game.getGameState().getCurrentSite(), Keyword.UNDERGROUND)) { if (PlayConditions.location(game, Keyword.UNDERGROUND)) {
RequiredTriggerAction action = new RequiredTriggerAction(self); RequiredTriggerAction action = new RequiredTriggerAction(self);
action.appendEffect(new SelfDiscardEffect(self)); action.appendEffect(new SelfDiscardEffect(self));
return Collections.singletonList(action); return Collections.singletonList(action);