From 37e11aec6f9dd1329831a610e9819d908ad1021b Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 19 Dec 2011 10:46:30 +0000 Subject: [PATCH] - Fixed a problem, where if a card was played with a discount and also had Toil, the toil could not be played and card playing was cancelled and put into discard. --- .../com/gempukku/lotro/cards/actions/AttachPermanentAction.java | 2 +- .../com/gempukku/lotro/cards/actions/PlayPermanentAction.java | 2 +- gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentAction.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentAction.java index b2bd74396..dbb43d133 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentAction.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/AttachPermanentAction.java @@ -133,7 +133,7 @@ public class AttachPermanentAction extends AbstractCostToEffectAction implements if (_discountEffect != null) { int requiredDiscount = 0; if (_cardToAttach.getBlueprint().getSide() == Side.SHADOW) { - int twilightCost = game.getModifiersQuerying().getPlayOnTwilightCost(game.getGameState(), _cardToAttach, _target); + int twilightCost = game.getModifiersQuerying().getPlayOnTwilightCost(game.getGameState(), _cardToAttach, _target) + _twilightModifier; int underPool = twilightCost - game.getGameState().getTwilightPool(); if (underPool > 0) requiredDiscount = underPool; 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 3ca7c5926..589272254 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 @@ -103,7 +103,7 @@ public class PlayPermanentAction extends AbstractCostToEffectAction implements D if (_discountEffect != null) { int requiredDiscount = 0; if (_permanentPlayed.getBlueprint().getSide() == Side.SHADOW) { - int twilightCost = game.getModifiersQuerying().getTwilightCost(game.getGameState(), _permanentPlayed, _ignoreRoamingPenalty); + int twilightCost = game.getModifiersQuerying().getTwilightCost(game.getGameState(), _permanentPlayed, _ignoreRoamingPenalty) + _twilightModifier; int underPool = twilightCost - game.getGameState().getTwilightPool(); if (underPool > 0) requiredDiscount = underPool; 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 a802c2f90..f682be49f 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 @@ -4,6 +4,8 @@ - "Moving This Way" now reveals the Nazgul before putting it on bottom of deck. - "The Angle" should not freeze the game anymore, when used and can spot 6 companions. - "Southron Commander" should now display a proper text to the FP player when used. +- Fixed a problem, where if a card was played with a discount and also had Toil, the toil could not be played and card +playing was cancelled and put into discard. 15 Dec. 2011 - "Legolas Bow" now correctly allows to heal when Legolas bearing it is exerted to play an event or condition.