From c59906f4ed4be80ba4e411ad89135c3237e2df38 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 21 Nov 2011 23:41:58 +0000 Subject: [PATCH] - Cards played from other zones than hand should not count for initiative (as if in hand), while they are being played. --- .../com/gempukku/lotro/cards/actions/PlayEventAction.java | 4 +++- .../com/gempukku/lotro/cards/actions/PlayPermanentAction.java | 4 +++- .../gemp-lotr-web/src/main/webapp/includes/changeLog.html | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayEventAction.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayEventAction.java index ebcd92572..0f7582a19 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayEventAction.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayEventAction.java @@ -84,8 +84,10 @@ public class PlayEventAction extends AbstractCostToEffectAction { if (!_cardRemoved) { _cardRemoved = true; game.getGameState().sendMessage(_eventPlayed.getOwner() + " plays " + GameUtils.getCardLink(_eventPlayed) + " from " + _eventPlayed.getZone().getHumanReadable()); + boolean fromHand = (_eventPlayed.getZone() == Zone.HAND); game.getGameState().removeCardsFromZone(_eventPlayed.getOwner(), Collections.singleton(_eventPlayed)); - game.getGameState().addCardToZone(game, _eventPlayed, Zone.VOID); + if (fromHand) + game.getGameState().addCardToZone(game, _eventPlayed, Zone.VOID); game.getGameState().eventPlayed(_eventPlayed); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentAction.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentAction.java index fb0cd914a..67c708ebe 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentAction.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentAction.java @@ -84,8 +84,10 @@ public class PlayPermanentAction extends AbstractCostToEffectAction { if (!_cardRemoved) { _cardRemoved = true; + boolean fromHand = (_permanentPlayed.getZone() == Zone.HAND); game.getGameState().removeCardsFromZone(_permanentPlayed.getOwner(), Collections.singleton(_permanentPlayed)); - game.getGameState().addCardToZone(game, _permanentPlayed, Zone.VOID); + if (fromHand) + game.getGameState().addCardToZone(game, _permanentPlayed, Zone.VOID); } if (!_discountResolved) { diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html index 5d348a222..e9afc16f8 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html @@ -9,6 +9,7 @@ - "Terrible and Evil" exerts Gandalf X times now, rather than only once. - If there is more than one minion assigned to a character (but not yet skirmishing) and one of the minion gets removed from skirmish (for example - killed), the assignment should not be cancelled. +- Cards played from other zones than hand should not count for initiative (as if in hand), while they are being played. 20 Nov. 2011 - "Sauron" no longer has his twilight cost reduced by the twilight pool size, instead of burdens spotted.