From 2ff4338deff50c80a86d5ba6f484042a8f0d9e0a Mon Sep 17 00:00:00 2001 From: marcins78 Date: Wed, 24 Oct 2012 15:26:29 +0000 Subject: [PATCH] - If a cost of an action (effect or play card) is prevented, the action does not have any effect. --- .../lotro/cards/actions/PlayPermanentAction.java | 4 ---- .../cards/effects/ForEachBurdenYouSpotEffect.java | 5 ----- .../effects/ForEachTwilightTokenYouSpotEffect.java | 5 ----- .../choose/ChooseAndDiscardCardsFromPlayEffect.java | 5 ----- .../choose/ChooseAndExertCharactersEffect.java | 5 ----- .../choose/ChooseAndPlayCardFromDeadPileEffect.java | 9 --------- .../choose/ChooseAndPlayCardFromDeckEffect.java | 9 --------- .../choose/ChooseAndPlayCardFromDiscardEffect.java | 9 --------- .../choose/ChooseAndPlayCardFromHandEffect.java | 9 --------- .../choose/ChooseAndPlayCardFromStackedEffect.java | 9 --------- .../ChooseAndPutCardFromPlayOnTopOfDeckEffect.java | 5 ----- ...hooseAndRemoveFromTheGameCardsInDiscardEffect.java | 5 ----- .../ChooseAndRemoveFromTheGameCardsInPlayEffect.java | 5 ----- .../RemoveCardsFromDiscardDiscountEffect.java | 7 +------ .../logic/actions/AbstractCostToEffectAction.java | 2 +- .../com/gempukku/lotro/logic/actions/SubAction.java | 11 ----------- .../gempukku/lotro/logic/timing/AbstractEffect.java | 7 ------- .../lotro/logic/timing/AbstractSubActionEffect.java | 5 ----- .../lotro/logic/timing/AbstractSuccessfulEffect.java | 5 ----- .../java/com/gempukku/lotro/logic/timing/Effect.java | 8 -------- .../com/gempukku/lotro/at/IndividualCardAtTest.java | 2 +- .../lotro/at/effects/DiscardEffectAtTest.java | 3 --- .../gempukku/lotro/at/effects/DrawEffectAtTest.java | 4 ---- .../gempukku/lotro/at/effects/ExertEffectAtTest.java | 4 ++-- .../gempukku/lotro/at/effects/WoundEffectAtTest.java | 5 ----- .../src/main/webapp/includes/changeLog.html | 1 + 26 files changed, 6 insertions(+), 142 deletions(-) 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 0b3757e17..9c45f1648 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 @@ -146,10 +146,6 @@ public class PlayPermanentAction extends AbstractCostToEffectAction implements D return null; } - public boolean wasSuccessful() { - return _cardPlayed && _playCardEffect.wasSuccessful(); - } - public boolean wasCarriedOut() { return _cardPlayed && _playCardEffect.wasCarriedOut(); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ForEachBurdenYouSpotEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ForEachBurdenYouSpotEffect.java index 83acd7281..c3654a83f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ForEachBurdenYouSpotEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ForEachBurdenYouSpotEffect.java @@ -43,11 +43,6 @@ public abstract class ForEachBurdenYouSpotEffect implements Effect { return true; } - @Override - public boolean wasSuccessful() { - return true; - } - @Override public boolean wasCarriedOut() { return true; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ForEachTwilightTokenYouSpotEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ForEachTwilightTokenYouSpotEffect.java index 8230e0ac3..20b9c404a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ForEachTwilightTokenYouSpotEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ForEachTwilightTokenYouSpotEffect.java @@ -43,11 +43,6 @@ public abstract class ForEachTwilightTokenYouSpotEffect implements Effect { return true; } - @Override - public boolean wasSuccessful() { - return true; - } - @Override public boolean wasCarriedOut() { return true; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndDiscardCardsFromPlayEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndDiscardCardsFromPlayEffect.java index 07fd35775..bcddf2deb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndDiscardCardsFromPlayEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndDiscardCardsFromPlayEffect.java @@ -42,11 +42,6 @@ public class ChooseAndDiscardCardsFromPlayEffect extends ChooseActiveCardsEffect } - @Override - public boolean wasSuccessful() { - return super.wasSuccessful() && _resultSubAction != null && _resultSubAction.wasSuccessful(); - } - @Override public boolean wasCarriedOut() { return super.wasCarriedOut() && _resultSubAction != null && _resultSubAction.wasCarriedOut(); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndExertCharactersEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndExertCharactersEffect.java index 1e1f6fcdd..7ff5a32a4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndExertCharactersEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndExertCharactersEffect.java @@ -77,11 +77,6 @@ public class ChooseAndExertCharactersEffect extends ChooseActiveCardsEffect { } - @Override - public boolean wasSuccessful() { - return super.wasSuccessful() && _resultSubAction != null && _resultSubAction.wasSuccessful(); - } - @Override public boolean wasCarriedOut() { return super.wasCarriedOut() && _resultSubAction != null && _resultSubAction.wasCarriedOut(); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromDeadPileEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromDeadPileEffect.java index cf77c79a9..3a8d9b116 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromDeadPileEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromDeadPileEffect.java @@ -70,15 +70,6 @@ public class ChooseAndPlayCardFromDeadPileEffect implements Effect { } } - @Override - public boolean wasSuccessful() { - if (_playCardAction == null) - return false; - if (_playCardAction instanceof PlayPermanentAction) - return ((PlayPermanentAction) _playCardAction).wasSuccessful(); - return true; - } - @Override public boolean wasCarriedOut() { if (_playCardAction == null) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromDeckEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromDeckEffect.java index b7f6bbc9d..6f4d88a91 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromDeckEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromDeckEffect.java @@ -83,15 +83,6 @@ public class ChooseAndPlayCardFromDeckEffect implements Effect { protected void afterCardPlayed(PhysicalCard cardPlayed) { } - @Override - public boolean wasSuccessful() { - if (_playCardAction == null) - return false; - if (_playCardAction instanceof PlayPermanentAction) - return ((PlayPermanentAction) _playCardAction).wasSuccessful(); - return true; - } - @Override public boolean wasCarriedOut() { if (_playCardAction == null) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromDiscardEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromDiscardEffect.java index e64a84ee9..468f0a491 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromDiscardEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromDiscardEffect.java @@ -84,15 +84,6 @@ public class ChooseAndPlayCardFromDiscardEffect implements Effect { protected void afterCardPlayed(PhysicalCard cardPlayed) { } - @Override - public boolean wasSuccessful() { - if (_playCardAction == null) - return false; - if (_playCardAction instanceof PlayPermanentAction) - return ((PlayPermanentAction) _playCardAction).wasSuccessful(); - return true; - } - @Override public boolean wasCarriedOut() { if (_playCardAction == null) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromHandEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromHandEffect.java index 3b8f1e7b8..8efa78151 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromHandEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromHandEffect.java @@ -95,15 +95,6 @@ public class ChooseAndPlayCardFromHandEffect implements Effect { protected void afterCardPlayed(PhysicalCard cardPlayed) { } - @Override - public boolean wasSuccessful() { - if (_playCardAction == null) - return false; - if (_playCardAction instanceof PlayPermanentAction) - return ((PlayPermanentAction) _playCardAction).wasSuccessful(); - return true; - } - @Override public boolean wasCarriedOut() { if (_playCardAction == null) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromStackedEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromStackedEffect.java index a2cdbd7d5..d074c42a0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromStackedEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromStackedEffect.java @@ -84,15 +84,6 @@ public class ChooseAndPlayCardFromStackedEffect implements Effect { protected void afterCardPlayed(PhysicalCard cardPlayed) { } - @Override - public boolean wasSuccessful() { - if (_playCardAction == null) - return false; - if (_playCardAction instanceof PlayPermanentAction) - return ((PlayPermanentAction) _playCardAction).wasSuccessful(); - return true; - } - @Override public boolean wasCarriedOut() { if (_playCardAction == null) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPutCardFromPlayOnTopOfDeckEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPutCardFromPlayOnTopOfDeckEffect.java index 9ee133165..fba97d806 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPutCardFromPlayOnTopOfDeckEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPutCardFromPlayOnTopOfDeckEffect.java @@ -24,11 +24,6 @@ public class ChooseAndPutCardFromPlayOnTopOfDeckEffect extends ChooseActiveCardE game.getActionsEnvironment().addActionToStack(_resultSubAction); } - @Override - public boolean wasSuccessful() { - return super.wasSuccessful() && _resultSubAction != null && _resultSubAction.wasSuccessful(); - } - @Override public boolean wasCarriedOut() { return super.wasCarriedOut() && _resultSubAction != null && _resultSubAction.wasCarriedOut(); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndRemoveFromTheGameCardsInDiscardEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndRemoveFromTheGameCardsInDiscardEffect.java index 56d49a33b..44ffe9159 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndRemoveFromTheGameCardsInDiscardEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndRemoveFromTheGameCardsInDiscardEffect.java @@ -76,11 +76,6 @@ public class ChooseAndRemoveFromTheGameCardsInDiscardEffect extends AbstractSubA _success = cards.size() >= _minimum; } - @Override - public boolean wasSuccessful() { - return super.wasSuccessful() && _success; - } - @Override public boolean wasCarriedOut() { return super.wasCarriedOut() && _success; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndRemoveFromTheGameCardsInPlayEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndRemoveFromTheGameCardsInPlayEffect.java index 7f0c20d45..8dfdc02e3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndRemoveFromTheGameCardsInPlayEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndRemoveFromTheGameCardsInPlayEffect.java @@ -28,11 +28,6 @@ public class ChooseAndRemoveFromTheGameCardsInPlayEffect extends ChooseActiveCar game.getActionsEnvironment().addActionToStack(_resultSubAction); } - @Override - public boolean wasSuccessful() { - return super.wasSuccessful() && _resultSubAction != null && _resultSubAction.wasSuccessful(); - } - @Override public boolean wasCarriedOut() { return super.wasCarriedOut() && _resultSubAction != null && _resultSubAction.wasCarriedOut(); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/discount/RemoveCardsFromDiscardDiscountEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/discount/RemoveCardsFromDiscardDiscountEffect.java index 14586d0d8..a1ba36b3a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/discount/RemoveCardsFromDiscardDiscountEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/discount/RemoveCardsFromDiscardDiscountEffect.java @@ -100,12 +100,7 @@ public class RemoveCardsFromDiscardDiscountEffect implements DiscountEffect { } @Override - public boolean wasSuccessful() { + public boolean wasCarriedOut() { return !_required || _paid; } - - @Override - public boolean wasCarriedOut() { - return _paid; - } } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/AbstractCostToEffectAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/AbstractCostToEffectAction.java index 7e9402b22..02198e4f1 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/AbstractCostToEffectAction.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/AbstractCostToEffectAction.java @@ -69,7 +69,7 @@ public abstract class AbstractCostToEffectAction implements CostToEffectAction { protected boolean isCostFailed() { for (Effect processedCost : _processedCosts) { - if (!processedCost.wasSuccessful()) + if (!processedCost.wasCarriedOut()) return true; } return false; diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/SubAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/SubAction.java index 770a1de16..1010a886f 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/SubAction.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/SubAction.java @@ -82,17 +82,6 @@ public class SubAction implements Action { return effect; } - public boolean wasSuccessful() { - if (!_effects.isEmpty()) - return false; - for (Effect effect : _processedEffects) { - if (!effect.wasSuccessful()) - return false; - } - - return true; - } - public boolean wasCarriedOut() { if (!_effects.isEmpty()) return false; diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractEffect.java index c7896960e..f9acba93b 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractEffect.java @@ -27,13 +27,6 @@ public abstract class AbstractEffect implements Effect { return _carriedOut && !_prevented; } - @Override - public boolean wasSuccessful() { - if (_successful == null) - throw new IllegalStateException("Effect has to be played first"); - return _successful; - } - protected final String getAppendedTextNames(Collection cards) { return GameUtils.getAppendedTextNames(cards); } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractSubActionEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractSubActionEffect.java index 9eb4071ee..c41230a47 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractSubActionEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractSubActionEffect.java @@ -11,11 +11,6 @@ public abstract class AbstractSubActionEffect implements Effect { game.getActionsEnvironment().addActionToStack(_subAction); } - @Override - public boolean wasSuccessful() { - return _subAction != null && _subAction.wasSuccessful(); - } - @Override public boolean wasCarriedOut() { return _subAction != null && _subAction.wasCarriedOut(); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractSuccessfulEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractSuccessfulEffect.java index 6b7f23ec5..93bd3d0a7 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractSuccessfulEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractSuccessfulEffect.java @@ -12,11 +12,6 @@ public abstract class AbstractSuccessfulEffect implements Effect { return true; } - @Override - public boolean wasSuccessful() { - return true; - } - @Override public boolean wasCarriedOut() { return true; diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Effect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Effect.java index 361fe44e6..808577e5d 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Effect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Effect.java @@ -47,14 +47,6 @@ public interface Effect { */ public void playEffect(LotroGame game); - /** - * Returns if the effect playing called earlier was successful or not. This is - * required for checking if cost was paid and effects can be carried out. - * - * @return - */ - public boolean wasSuccessful(); - /** * Returns if the effect was carried out (not prevented) in full. This is required * for checking if effect that player can prevent by paying some cost should be diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/IndividualCardAtTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/IndividualCardAtTest.java index 5dbf33073..ffcad44ed 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/IndividualCardAtTest.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/IndividualCardAtTest.java @@ -623,6 +623,6 @@ public class IndividualCardAtTest extends AbstractAtTest { assertEquals(1, _game.getGameState().getTokenCount(scourgeOfTheShire, Token.SHIRE)); assertEquals(Zone.ATTACHED, hobbitSword.getZone()); - assertEquals(3, _game.getGameState().getTokenCount(corsairWarGalley, Token.RAIDER)); + assertEquals(1, _game.getGameState().getTokenCount(corsairWarGalley, Token.RAIDER)); } } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/DiscardEffectAtTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/DiscardEffectAtTest.java index 9587cfcb1..a1998ac34 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/DiscardEffectAtTest.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/DiscardEffectAtTest.java @@ -54,7 +54,6 @@ public class DiscardEffectAtTest extends AbstractAtTest { carryOutEffectInPhaseActionByPlayer(P1, discardEffect); - assertTrue(discardEffect.wasSuccessful()); assertTrue(discardEffect.wasCarriedOut()); assertEquals(2, discardedFromPlay.size()); @@ -98,7 +97,6 @@ public class DiscardEffectAtTest extends AbstractAtTest { carryOutEffectInPhaseActionByPlayer(P1, discardEffect); - assertTrue(discardEffect.wasSuccessful()); assertTrue(discardEffect.wasCarriedOut()); assertEquals(3, discardedFromPlay.size()); @@ -142,7 +140,6 @@ public class DiscardEffectAtTest extends AbstractAtTest { carryOutEffectInPhaseActionByPlayer(P1, discardEffect); - assertTrue(discardEffect.wasSuccessful()); assertTrue(discardEffect.wasCarriedOut()); assertEquals(1, discardedFromPlay.size()); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/DrawEffectAtTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/DrawEffectAtTest.java index 95b59b36f..890638f10 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/DrawEffectAtTest.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/DrawEffectAtTest.java @@ -54,7 +54,6 @@ public class DrawEffectAtTest extends AbstractAtTest { assertEquals(1, _game.getGameState().getHand(P1).size()); assertEquals(0, _game.getGameState().getDeck(P1).size()); assertTrue(_game.getGameState().getHand(P1).contains(merry)); - assertTrue(drawEffect.wasSuccessful()); assertTrue(drawEffect.wasCarriedOut()); assertEquals(1, triggerCount.get()); @@ -93,7 +92,6 @@ public class DrawEffectAtTest extends AbstractAtTest { assertEquals(1, _game.getGameState().getHand(P1).size()); assertEquals(0, _game.getGameState().getDeck(P1).size()); assertTrue(_game.getGameState().getHand(P1).contains(merry)); - assertFalse(drawEffect.wasSuccessful()); assertFalse(drawEffect.wasCarriedOut()); assertEquals(1, triggerCount.get()); @@ -135,7 +133,6 @@ public class DrawEffectAtTest extends AbstractAtTest { assertEquals(0, _game.getGameState().getDeck(P1).size()); assertTrue(_game.getGameState().getHand(P1).contains(merry)); assertTrue(_game.getGameState().getHand(P1).contains(merry2)); - assertTrue(drawEffect.wasSuccessful()); assertTrue(drawEffect.wasCarriedOut()); assertEquals(2, triggerCount.get()); @@ -187,7 +184,6 @@ public class DrawEffectAtTest extends AbstractAtTest { assertEquals(0, _game.getGameState().getHand(P1).size()); assertEquals(1, _game.getGameState().getDeck(P1).size()); - assertTrue(drawEffect.wasSuccessful()); assertFalse(drawEffect.wasCarriedOut()); assertEquals(0, triggerCount.get()); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/ExertEffectAtTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/ExertEffectAtTest.java index 6504b9e71..3c12a8cee 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/ExertEffectAtTest.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/ExertEffectAtTest.java @@ -8,9 +8,10 @@ import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCardImpl; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import org.junit.Test; public class ExertEffectAtTest extends AbstractAtTest { @Test @@ -32,7 +33,6 @@ public class ExertEffectAtTest extends AbstractAtTest { carryOutEffectInPhaseActionByPlayer(P1, action); assertEquals(3, _game.getGameState().getWounds(merry)); - assertFalse(exertEffect.wasSuccessful()); assertFalse(exertEffect.wasCarriedOut()); } } \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/WoundEffectAtTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/WoundEffectAtTest.java index e270f6bbb..56f6e7c6e 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/WoundEffectAtTest.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/WoundEffectAtTest.java @@ -55,7 +55,6 @@ public class WoundEffectAtTest extends AbstractAtTest { carryOutEffectInPhaseActionByPlayer(P1, woundEffect); assertEquals(1, _game.getGameState().getWounds(merry)); - assertTrue(woundEffect.wasSuccessful()); assertTrue(woundEffect.wasCarriedOut()); assertEquals(1, triggerCount.get()); @@ -92,7 +91,6 @@ public class WoundEffectAtTest extends AbstractAtTest { carryOutEffectInPhaseActionByPlayer(P1, woundEffect); assertEquals(0, _game.getGameState().getWounds(merry)); - assertFalse(woundEffect.wasSuccessful()); assertFalse(woundEffect.wasCarriedOut()); assertEquals(0, triggerCount.get()); @@ -146,7 +144,6 @@ public class WoundEffectAtTest extends AbstractAtTest { assertEquals(0, _game.getGameState().getWounds(merry)); assertEquals(1, _game.getGameState().getWounds(pippin)); - assertTrue(woundEffect.wasSuccessful()); assertFalse(woundEffect.wasCarriedOut()); assertEquals(0, triggerCount.get()); @@ -201,7 +198,6 @@ public class WoundEffectAtTest extends AbstractAtTest { carryOutEffectInPhaseActionByPlayer(P1, woundEffect); assertEquals(0, _game.getGameState().getWounds(merry)); - assertTrue(woundEffect.wasSuccessful()); assertFalse(woundEffect.wasCarriedOut()); assertEquals(0, triggerCount.get()); @@ -256,7 +252,6 @@ public class WoundEffectAtTest extends AbstractAtTest { carryOutEffectInPhaseActionByPlayer(P1, woundEffect); assertEquals(1, _game.getGameState().getWounds(merry)); - assertTrue(woundEffect.wasSuccessful()); assertTrue(woundEffect.wasCarriedOut()); assertEquals(1, triggerCount.get()); 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 0d972a99c..db2dc8288 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 @@ -3,6 +3,7 @@ - Added replay speed buttons. - If two (or more) required before actions happen, FP player has a choice which one to play first. If that action prevents the effect, other required actions that depend on that effect will no longer be playable. +- If a cost of an action (effect or play card) is prevented, the action does not have any effect. 23 Oct. 2012 - "Harrowdale" might be working fine this time around.