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

Another portion of fixes.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-08-30 21:08:12 +00:00
parent 743f2bba50
commit b2c073eb3b
11 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,8 +24,7 @@ public class AbstractAttachableFPPossession extends AbstractAttachable {
protected void appendTransferPossessionAction(List<Action> actions, LotroGame game, PhysicalCard self, Filter validTargetFilter) { protected void appendTransferPossessionAction(List<Action> actions, LotroGame game, PhysicalCard self, Filter validTargetFilter) {
GameState gameState = game.getGameState(); GameState gameState = game.getGameState();
if (gameState.getCurrentPhase() == Phase.FELLOWSHIP if (gameState.getCurrentPhase() == Phase.FELLOWSHIP
&& self.getZone() == Zone.ATTACHED && self.getZone() == Zone.ATTACHED) {
&& (!isUnique() || !Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.name(getName())))) {
Filter vaildTransferFilter; Filter vaildTransferFilter;

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CancelStrengthBonusModifier.java
View File

@@ -4,7 +4,7 @@ import com.gempukku.lotro.filters.Filter;
import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.GameState; import com.gempukku.lotro.game.state.GameState;
import com.gempukku.lotro.logic.modifiers.AbstractModifier; import com.gempukku.lotro.logic.modifiers.AbstractModifier;
import com.gempukku.lotro.logic.modifiers.ModifiersLogic; import com.gempukku.lotro.logic.modifiers.ModifiersQuerying;
public class CancelStrengthBonusModifier extends AbstractModifier { public class CancelStrengthBonusModifier extends AbstractModifier {
public CancelStrengthBonusModifier(PhysicalCard source, Filter affectFilter) { public CancelStrengthBonusModifier(PhysicalCard source, Filter affectFilter) {
@@ -12,7 +12,7 @@ public class CancelStrengthBonusModifier extends AbstractModifier {
} }
@Override @Override
public boolean appliesStrengthModifier(GameState gameState, ModifiersLogic modifiersLogic, PhysicalCard modifierSource, boolean result) { public boolean appliesStrengthModifier(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard modifierSource, boolean result) {
return false; return false;
} }
} }

8
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/ProxyingModifier.java
View File

@@ -68,6 +68,14 @@ public class ProxyingModifier implements Modifier {
return result; return result;
} }
@Override
public boolean appliesStrengthModifier(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard modifierSource, boolean result) {
Modifier modifier = getProxiedModifier(gameState, modifiersQuerying);
if (modifier != null)
return modifier.appliesStrengthModifier(gameState, modifiersQuerying, modifierSource, result);
return result;
}
@Override @Override
public int getVitality(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard, int result) { public int getVitality(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard, int result) {
Modifier modifier = getProxiedModifier(gameState, modifiersQuerying); Modifier modifier = getProxiedModifier(gameState, modifiersQuerying);

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

@@ -51,7 +51,7 @@ public class Card1_035 extends AbstractLotroCardBlueprint {
@Override @Override
public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) { public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
List<? extends Action> playableActions = physicalCard.getBlueprint().getPlayablePhaseActions(playerId, game, physicalCard); List<? extends Action> playableActions = physicalCard.getBlueprint().getPlayablePhaseActions(playerId, game, physicalCard);
return (playableActions.size() > 0); return (playableActions != null && playableActions.size() > 0);
} }
}), 0, 1) { }), 0, 1) {
@Override @Override

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

@@ -37,9 +37,9 @@ public class Card1_038 extends AbstractLotroCardBlueprint {
@Override @Override
public List<? extends Action> getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) { public List<? extends Action> getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) {
if (PlayConditions.canPlayFPCardDuringPhase(game.getGameState(), Phase.ARCHERY, self) if (PlayConditions.canPlayFPCardDuringPhase(game.getGameState(), Phase.ARCHERY, self)
&& Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.ELF), Filters.keyword(Keyword.ARCHERY), Filters.type(CardType.COMPANION))) { && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.ELF), Filters.keyword(Keyword.ARCHER), Filters.type(CardType.COMPANION))) {
PlayEventAction action = new PlayEventAction(self); PlayEventAction action = new PlayEventAction(self);
action.addCost(new SpotEffect(Filters.and(Filters.keyword(Keyword.ELF), Filters.keyword(Keyword.ARCHERY), Filters.type(CardType.COMPANION)))); action.addCost(new SpotEffect(Filters.and(Filters.keyword(Keyword.ELF), Filters.keyword(Keyword.ARCHER), Filters.type(CardType.COMPANION))));
action.addEffect(new AddUntilEndOfPhaseModifierEffect( action.addEffect(new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 1), Phase.ARCHERY)); new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 1), Phase.ARCHERY));

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

@@ -55,9 +55,8 @@ public class Card1_047 extends AbstractAttachableFPPossession {
if (game.getGameState().getCurrentPhase() == Phase.SKIRMISH if (game.getGameState().getCurrentPhase() == Phase.SKIRMISH
&& self.getZone() == Zone.ATTACHED && self.getZone() == Zone.ATTACHED
&& && (PlayConditions.canExert(game.getGameState(), game.getModifiersQuerying(), self.getAttachedTo())
(PlayConditions.canExert(game.getGameState(), game.getModifiersQuerying(), self.getAttachedTo()) || game.getGameState().getHand(playerId).size() >= 2)) {
|| game.getGameState().getHand(playerId).size() >= 2)) {
final CostToEffectAction action = new CostToEffectAction(self, "Exert Arwen or discard 2 cards from hand to make her Strength +1"); final CostToEffectAction action = new CostToEffectAction(self, "Exert Arwen or discard 2 cards from hand to make her Strength +1");
List<Effect> possibleCosts = new LinkedList<Effect>(); List<Effect> possibleCosts = new LinkedList<Effect>();
@@ -88,6 +87,8 @@ public class Card1_047 extends AbstractAttachableFPPossession {
new AddUntilEndOfPhaseModifierEffect( new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(self.getAttachedTo()), 1), new StrengthModifier(self, Filters.sameCard(self.getAttachedTo()), 1),
Phase.SKIRMISH)); Phase.SKIRMISH));
actions.add(action);
} }
return actions; return actions;

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

@@ -55,6 +55,7 @@ public class Card1_056 extends AbstractAlly {
action.addEffect(new WoundCharacterEffect(urukHai)); action.addEffect(new WoundCharacterEffect(urukHai));
} }
}); });
actions.add(action);
} }
return actions; return actions;

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

@@ -55,6 +55,7 @@ public class Card1_057 extends AbstractAlly {
action.addEffect(new WoundCharacterEffect(urukHai)); action.addEffect(new WoundCharacterEffect(urukHai));
} }
}); });
actions.add(action);
} }
return actions; return actions;

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/AbstractModifier.java
View File

@@ -46,7 +46,7 @@ public abstract class AbstractModifier implements Modifier {
} }
@Override @Override
public boolean appliesStrengthModifier(GameState gameState, ModifiersLogic modifiersLogic, PhysicalCard modifierSource, boolean result) { public boolean appliesStrengthModifier(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard modifierSource, boolean result) {
return result; return result;
} }

8
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/CompositeModifier.java
View File

@@ -67,6 +67,14 @@ public class CompositeModifier implements Modifier {
return result; return result;
} }
@Override
public boolean appliesStrengthModifier(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard modifierSource, boolean result) {
for (Modifier modifier : _modifiers)
result = modifier.appliesStrengthModifier(gameState, modifiersQuerying, modifierSource, result);
return result;
}
@Override @Override
public int getVitality(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard, int result) { public int getVitality(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard, int result) {
for (Modifier modifier : _modifiers) for (Modifier modifier : _modifiers)

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/Modifier.java
View File

@@ -18,7 +18,7 @@ public interface Modifier {
public int getStrength(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard, int result); public int getStrength(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard, int result);
public boolean appliesStrengthModifier(GameState gameState, ModifiersLogic modifiersLogic, PhysicalCard modifierSource, boolean result); public boolean appliesStrengthModifier(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard modifierSource, boolean result);
public int getVitality(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard, int result); public int getVitality(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard, int result);