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

- "Gwaihir" no longer crashed the game, when it is not attached to anything and has its Skirmish action activated.

Browse Source
This commit is contained in:
marcin.sciesinski
2017-11-13 16:06:24 -08:00
parent 099434a4f9
commit 8d51ec7599
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
View File

@@ -30,7 +30,8 @@
- Added "Forest River" - Added "Forest River"
- Added "Thrór's Throne" - Added "Thrór's Throne"
- Added "The Arkenstone, King's Jewel" - Added "The Arkenstone, King's Jewel"
- "Gwaihir" no longer crashed the game, when it is not attached to anything and has its Skirmish action activated.
<b>17 Dec. 2015</b> <b>17 Dec. 2015</b>
- "Armor of Khazad" no longer allows to return itself from discard and can now be transferred. - "Armor of Khazad" no longer allows to return itself from discard and can now be transferred.

28
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_015.java
View File

@@ -19,7 +19,7 @@ import com.gempukku.lotro.logic.timing.EffectResult;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
/** /**
* Set: The Short Rest * Set: The Short Rest
* Side: Free * Side: Free
* Culture: Gandalf * Culture: Gandalf
@@ -33,15 +33,15 @@ public class Card31_015 extends AbstractFollower {
public Card31_015() { public Card31_015() {
super(Side.FREE_PEOPLE, 1, 1, 0, 0, Culture.GANDALF, "Gwaihir", "Lord of the Eagles", true); super(Side.FREE_PEOPLE, 1, 1, 0, 0, Culture.GANDALF, "Gwaihir", "Lord of the Eagles", true);
} }
@Override @Override
public Race getRace() { public Race getRace() {
return Race.EAGLE; return Race.EAGLE;
} }
@Override @Override
protected boolean canPayAidCost(LotroGame game, PhysicalCard self) { protected boolean canPayAidCost(LotroGame game, PhysicalCard self) {
return (PlayConditions.canDiscardFromHand(game, self.getOwner(), 1, Culture.GANDALF)); return (PlayConditions.canDiscardFromHand(game, self.getOwner(), 1, Culture.GANDALF));
} }
@Override @Override
@@ -51,16 +51,14 @@ public class Card31_015 extends AbstractFollower {
@Override @Override
protected List<? extends Action> getExtraPhaseActions(final String playerId, LotroGame game, final PhysicalCard self) { protected List<? extends Action> getExtraPhaseActions(final String playerId, LotroGame game, final PhysicalCard self) {
if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self)) { if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self)
final ActivateCardAction action = new ActivateCardAction(self); && self.getAttachedTo() != null) {
PhysicalCard bearer = self.getAttachedTo(); final ActivateCardAction action = new ActivateCardAction(self);
action.appendCost(new TransferToSupportEffect(self)); PhysicalCard bearer = self.getAttachedTo();
if (Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), bearer, Filters.inSkirmish) action.appendCost(new TransferToSupportEffect(self));
&& Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.and(Race.ORC, Filters.mounted), Filters.inSkirmish)) { action.appendEffect(new CancelSkirmishEffect(bearer, Filters.inSkirmishAgainst(Race.ORC, Filters.mounted)));
action.appendEffect(new CancelSkirmishEffect(bearer)); return Collections.singletonList(action);
return Collections.singletonList(action); }
}
}
return null; return null;
} }
} }