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

Cards played as attachment count for initiative until "Play" is triggered.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-12-05 05:46:24 +00:00
parent f5dc4da6f8
commit d3fb1d8b22
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentAction.java
View File

@@ -117,7 +117,10 @@ public class AttachPermanentAction extends AbstractCostToEffectAction implements
public Effect nextEffect(LotroGame game) { public Effect nextEffect(LotroGame game) {
if (!_cardRemoved) { if (!_cardRemoved) {
_cardRemoved = true; _cardRemoved = true;
boolean fromHand = (_cardToAttach.getZone() == Zone.HAND);
game.getGameState().removeCardsFromZone(_cardToAttach.getOwner(), Collections.singleton(_cardToAttach)); game.getGameState().removeCardsFromZone(_cardToAttach.getOwner(), Collections.singleton(_cardToAttach));
if (fromHand)
game.getGameState().addCardToZone(game, _cardToAttach, Zone.VOID);
} }
if (!_targetChosen) { if (!_targetChosen) {
@@ -173,12 +176,16 @@ public class AttachPermanentAction extends AbstractCostToEffectAction implements
} else { } else {
if (!_cardDiscarded) { if (!_cardDiscarded) {
_cardDiscarded = true; _cardDiscarded = true;
if (_cardToAttach.getZone() != null)
game.getGameState().removeCardsFromZone(_cardToAttach.getOwner(), Collections.singleton(_cardToAttach));
game.getGameState().addCardToZone(game, _cardToAttach, Zone.DISCARD); game.getGameState().addCardToZone(game, _cardToAttach, Zone.DISCARD);
} }
} }
} else { } else {
if (!_cardDiscarded) { if (!_cardDiscarded) {
_cardDiscarded = true; _cardDiscarded = true;
if (_cardToAttach.getZone() != null)
game.getGameState().removeCardsFromZone(_cardToAttach.getOwner(), Collections.singleton(_cardToAttach));
game.getGameState().addCardToZone(game, _cardToAttach, Zone.DISCARD); game.getGameState().addCardToZone(game, _cardToAttach, Zone.DISCARD);
} }
} }