Refactoring actions... again.

gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayEventAction.java

@@ -114,14 +114,4 @@ public class PlayEventAction extends AbstractCostToEffectAction {
 
         return null;
     }
-
-    @Override
-    public boolean wasSuccessful() {
-        return _cardPlayed && _playCardEffect.wasSuccessful() && !_playCardEffect.getPlayEventResult().isEventCancelled();
-    }
-
-    @Override
-    public boolean wasCarriedOut() {
-        return _cardPlayed && _playCardEffect.wasCarriedOut() && !_playCardEffect.getPlayEventResult().isEventCancelled();
-    }
 }

gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/actions/PlayPermanentAction.java

@@ -104,12 +104,10 @@ public class PlayPermanentAction extends AbstractCostToEffectAction {
         return null;
     }
 
-    @Override
     public boolean wasSuccessful() {
         return _cardPlayed && _playCardEffect.wasSuccessful();
     }
 
-    @Override
     public boolean wasCarriedOut() {
         return _cardPlayed && _playCardEffect.wasCarriedOut();
     }

gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndDiscardCardsFromHandEffect.java

@@ -8,14 +8,15 @@ import com.gempukku.lotro.logic.actions.SubAction;
 import com.gempukku.lotro.logic.decisions.CardsSelectionDecision;
 import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException;
 import com.gempukku.lotro.logic.effects.DiscardCardsFromHandEffect;
-import com.gempukku.lotro.logic.timing.AbstractEffect;
+import com.gempukku.lotro.logic.timing.AbstractSubActionEffect;
 import com.gempukku.lotro.logic.timing.Action;
 import com.gempukku.lotro.logic.timing.Effect;
+import com.gempukku.lotro.logic.timing.EffectResult;
 
 import java.util.Collection;
 import java.util.Set;
 
-public class ChooseAndDiscardCardsFromHandEffect extends AbstractEffect {
+public class ChooseAndDiscardCardsFromHandEffect extends AbstractSubActionEffect {
     private Action _action;
     private String _playerId;
     private boolean _forced;
@@ -60,9 +61,9 @@ public class ChooseAndDiscardCardsFromHandEffect extends AbstractEffect {
     }
 
     @Override
-    protected FullEffectResult playEffectReturningResult(final LotroGame game) {
+    public Collection<? extends EffectResult> playEffect(final LotroGame game) {
         if (_forced && !game.getModifiersQuerying().canDiscardCardsFromHand(game.getGameState(), _playerId, _action.getActionSource()))
-            return new FullEffectResult(null, false, false);
+            return null;
 
         Collection<PhysicalCard> hand = Filters.filter(game.getGameState().getHand(_playerId), game.getGameState(), game.getModifiersQuerying(), _filter);
 
@@ -71,7 +72,7 @@ public class ChooseAndDiscardCardsFromHandEffect extends AbstractEffect {
         if (hand.size() <= _minimum) {
             SubAction subAction = new SubAction(_action);
             subAction.appendEffect(new DiscardCardsFromHandEffect(_action.getActionSource(), _playerId, hand, _forced));
-            game.getActionsEnvironment().addActionToStack(subAction);
+            processSubAction(game, subAction);
             cardsBeingDiscarded(hand, success);
         } else {
             game.getUserFeedback().sendAwaitingDecision(_playerId,
@@ -81,13 +82,13 @@ public class ChooseAndDiscardCardsFromHandEffect extends AbstractEffect {
                             Set<PhysicalCard> cards = getSelectedCardsByResponse(result);
                             SubAction subAction = new SubAction(_action);
                             subAction.appendEffect(new DiscardCardsFromHandEffect(_action.getActionSource(), _playerId, cards, _forced));
-                            game.getActionsEnvironment().addActionToStack(subAction);
+                            processSubAction(game, subAction);
                             cardsBeingDiscarded(cards, success);
                         }
                     });
         }
 
-        return new FullEffectResult(null, success, success);
+        return null;
     }
 
     protected void cardsBeingDiscarded(Collection<PhysicalCard> cardsBeingDiscarded, boolean success) {

gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndDiscardCardsFromPlayEffect.java

@@ -13,6 +13,7 @@ import java.util.Collection;
 
 public class ChooseAndDiscardCardsFromPlayEffect extends ChooseActiveCardsEffect {
     private Action _action;
+    private SubAction _resultSubAction;
 
     public ChooseAndDiscardCardsFromPlayEffect(Action action, String playerId, int minimum, int maximum, Filterable... filters) {
         super(action.getActionSource(), playerId, "Choose cards to discard", minimum, maximum, filters);
@@ -27,12 +28,22 @@ public class ChooseAndDiscardCardsFromPlayEffect extends ChooseActiveCardsEffect
     @Override
     protected void cardsSelected(LotroGame game, Collection<PhysicalCard> cards) {
         cardsToBeDiscardedCallback(cards);
-        SubAction subAction = new SubAction(_action);
+        _resultSubAction = new SubAction(_action);
-        subAction.appendEffect(new DiscardCardsFromPlayEffect(_action.getActionSource(), Filters.in(cards)));
+        _resultSubAction.appendEffect(new DiscardCardsFromPlayEffect(_action.getActionSource(), Filters.in(cards)));
-        game.getActionsEnvironment().addActionToStack(subAction);
+        game.getActionsEnvironment().addActionToStack(_resultSubAction);
     }
 
     protected void cardsToBeDiscardedCallback(Collection<PhysicalCard> cards) {
 
     }
+
+    @Override
+    public boolean wasSuccessful() {
+        return _resultSubAction != null && _resultSubAction.wasSuccessful();
+    }
+
+    @Override
+    public boolean wasCarriedOut() {
+        return _resultSubAction != null && _resultSubAction.wasCarriedOut();
+    }
 }

gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndDiscardStackedCardsEffect.java

@@ -8,15 +8,17 @@ import com.gempukku.lotro.game.state.LotroGame;
 import com.gempukku.lotro.logic.actions.SubAction;
 import com.gempukku.lotro.logic.decisions.CardsSelectionDecision;
 import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException;
-import com.gempukku.lotro.logic.timing.AbstractEffect;
+import com.gempukku.lotro.logic.timing.AbstractSubActionEffect;
 import com.gempukku.lotro.logic.timing.Action;
 import com.gempukku.lotro.logic.timing.Effect;
+import com.gempukku.lotro.logic.timing.EffectResult;
 
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-public class ChooseAndDiscardStackedCardsEffect extends AbstractEffect {
+public class ChooseAndDiscardStackedCardsEffect extends AbstractSubActionEffect {
     private Action _action;
     private String _playerId;
     private int _minimum;
@@ -49,18 +51,16 @@ public class ChooseAndDiscardStackedCardsEffect extends AbstractEffect {
     }
 
     @Override
-    protected FullEffectResult playEffectReturningResult(final LotroGame game) {
+    public Collection<? extends EffectResult> playEffect(final LotroGame game) {
         List<PhysicalCard> discardableCards = new LinkedList<PhysicalCard>();
 
         for (PhysicalCard stackedOnCard : Filters.filterActive(game.getGameState(), game.getModifiersQuerying(), _stackedOnFilter))
             discardableCards.addAll(Filters.filter(game.getGameState().getStackedCards(stackedOnCard), game.getGameState(), game.getModifiersQuerying(), _stackedCardFilter));
 
-        final boolean success = discardableCards.size() >= _minimum;
-
         if (discardableCards.size() <= _minimum) {
             SubAction subAction = new SubAction(_action);
             subAction.appendEffect(new DiscardStackedCardsEffect(_action.getActionSource(), discardableCards));
-            game.getActionsEnvironment().addActionToStack(subAction);
+            processSubAction(game, subAction);
         } else {
             game.getUserFeedback().sendAwaitingDecision(_playerId,
                     new CardsSelectionDecision(1, "Choose cards to discard", discardableCards, _minimum, _maximum) {
@@ -69,11 +69,10 @@ public class ChooseAndDiscardStackedCardsEffect extends AbstractEffect {
                             Set<PhysicalCard> selectedCards = getSelectedCardsByResponse(result);
                             SubAction subAction = new SubAction(_action);
                             subAction.appendEffect(new DiscardStackedCardsEffect(_action.getActionSource(), selectedCards));
-                            game.getActionsEnvironment().addActionToStack(subAction);
+                            processSubAction(game, subAction);
                         }
                     });
         }
-
+        return null;
-        return new FullEffectResult(null, success, success);
     }
 }

gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndExertCharactersEffect.java

@@ -17,6 +17,7 @@ import java.util.Collection;
 public class ChooseAndExertCharactersEffect extends ChooseActiveCardsEffect {
     private Action _action;
     private int _count;
+    private SubAction _resultSubAction;
 
     public ChooseAndExertCharactersEffect(Action action, String playerId, int minimum, int maximum, Filterable... filters) {
         this(action, playerId, minimum, maximum, 1, filters);
@@ -41,11 +42,11 @@ public class ChooseAndExertCharactersEffect extends ChooseActiveCardsEffect {
 
     @Override
     protected final void cardsSelected(LotroGame game, Collection<PhysicalCard> characters) {
-        SubAction subAction = new SubAction(_action);
+        _resultSubAction = new SubAction(_action);
         for (int i = 0; i < _count; i++) {
-            subAction.appendEffect(new ExertCharactersEffect(_action.getActionSource(), Filters.in(characters)));
+            _resultSubAction.appendEffect(new ExertCharactersEffect(_action.getActionSource(), Filters.in(characters)));
         }
-        game.getActionsEnvironment().addActionToStack(subAction);
+        game.getActionsEnvironment().addActionToStack(_resultSubAction);
 
         for (PhysicalCard character : characters)
             forEachCardExertedCallback(character);
@@ -54,4 +55,14 @@ public class ChooseAndExertCharactersEffect extends ChooseActiveCardsEffect {
     protected void forEachCardExertedCallback(PhysicalCard character) {
 
     }
+
+    @Override
+    public boolean wasSuccessful() {
+        return _resultSubAction != null && _resultSubAction.wasSuccessful();
+    }
+
+    @Override
+    public boolean wasCarriedOut() {
+        return _resultSubAction != null && _resultSubAction.wasCarriedOut();
+    }
 }

gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromDeadPileEffect.java

@@ -1,5 +1,6 @@
 package com.gempukku.lotro.cards.effects.choose;
 
+import com.gempukku.lotro.cards.actions.PlayPermanentAction;
 import com.gempukku.lotro.common.Filterable;
 import com.gempukku.lotro.filters.Filter;
 import com.gempukku.lotro.filters.Filters;
@@ -73,11 +74,19 @@ public class ChooseAndPlayCardFromDeadPileEffect implements Effect {
 
     @Override
     public boolean wasSuccessful() {
-        return _playCardAction != null && _playCardAction.wasSuccessful();
+        if (_playCardAction == null)
+            return false;
+        if (_playCardAction instanceof PlayPermanentAction)
+            return ((PlayPermanentAction) _playCardAction).wasSuccessful();
+        return true;
     }
 
     @Override
     public boolean wasCarriedOut() {
-        return _playCardAction != null && _playCardAction.wasCarriedOut();
+        if (_playCardAction == null)
+            return false;
+        if (_playCardAction instanceof PlayPermanentAction)
+            return ((PlayPermanentAction) _playCardAction).wasCarriedOut();
+        return true;
     }
 }

gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromDeckEffect.java

@@ -1,5 +1,6 @@
 package com.gempukku.lotro.cards.effects.choose;
 
+import com.gempukku.lotro.cards.actions.PlayPermanentAction;
 import com.gempukku.lotro.common.Filterable;
 import com.gempukku.lotro.filters.Filters;
 import com.gempukku.lotro.game.PhysicalCard;
@@ -65,11 +66,19 @@ public class ChooseAndPlayCardFromDeckEffect implements Effect {
 
     @Override
     public boolean wasSuccessful() {
-        return _playCardAction != null && _playCardAction.wasSuccessful();
+        if (_playCardAction == null)
+            return false;
+        if (_playCardAction instanceof PlayPermanentAction)
+            return ((PlayPermanentAction) _playCardAction).wasSuccessful();
+        return true;
     }
 
     @Override
     public boolean wasCarriedOut() {
-        return _playCardAction != null && _playCardAction.wasCarriedOut();
+        if (_playCardAction == null)
+            return false;
+        if (_playCardAction instanceof PlayPermanentAction)
+            return ((PlayPermanentAction) _playCardAction).wasCarriedOut();
+        return true;
     }
 }

gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromDiscardEffect.java

@@ -1,5 +1,6 @@
 package com.gempukku.lotro.cards.effects.choose;
 
+import com.gempukku.lotro.cards.actions.PlayPermanentAction;
 import com.gempukku.lotro.common.Filterable;
 import com.gempukku.lotro.filters.Filter;
 import com.gempukku.lotro.filters.Filters;
@@ -73,11 +74,19 @@ public class ChooseAndPlayCardFromDiscardEffect implements Effect {
 
     @Override
     public boolean wasSuccessful() {
-        return _playCardAction != null && _playCardAction.wasSuccessful();
+        if (_playCardAction == null)
+            return false;
+        if (_playCardAction instanceof PlayPermanentAction)
+            return ((PlayPermanentAction) _playCardAction).wasSuccessful();
+        return true;
     }
 
     @Override
     public boolean wasCarriedOut() {
-        return _playCardAction != null && _playCardAction.wasCarriedOut();
+        if (_playCardAction == null)
+            return false;
+        if (_playCardAction instanceof PlayPermanentAction)
+            return ((PlayPermanentAction) _playCardAction).wasCarriedOut();
+        return true;
     }
 }

gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromHandEffect.java

@@ -1,5 +1,6 @@
 package com.gempukku.lotro.cards.effects.choose;
 
+import com.gempukku.lotro.cards.actions.PlayPermanentAction;
 import com.gempukku.lotro.common.Filterable;
 import com.gempukku.lotro.filters.Filter;
 import com.gempukku.lotro.filters.Filters;
@@ -74,11 +75,19 @@ public class ChooseAndPlayCardFromHandEffect implements Effect {
 
     @Override
     public boolean wasSuccessful() {
-        return _playCardAction != null && _playCardAction.wasSuccessful();
+        if (_playCardAction == null)
+            return false;
+        if (_playCardAction instanceof PlayPermanentAction)
+            return ((PlayPermanentAction) _playCardAction).wasSuccessful();
+        return true;
     }
 
     @Override
     public boolean wasCarriedOut() {
-        return _playCardAction != null && _playCardAction.wasCarriedOut();
+        if (_playCardAction == null)
+            return false;
+        if (_playCardAction instanceof PlayPermanentAction)
+            return ((PlayPermanentAction) _playCardAction).wasCarriedOut();
+        return true;
     }
 }

gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/AbstractCostToEffectAction.java

@@ -11,7 +11,6 @@ public abstract class AbstractCostToEffectAction implements CostToEffectAction {
     private LinkedList<Effect> _processedCosts = new LinkedList<Effect>();
 
     private LinkedList<Effect> _effects = new LinkedList<Effect>();
-    private LinkedList<Effect> _processedEffects = new LinkedList<Effect>();
 
     private Phase _actionTimeword;
     private String _performingPlayer;
@@ -72,24 +71,6 @@ public abstract class AbstractCostToEffectAction implements CostToEffectAction {
     }
 
     protected final Effect getNextEffect() {
-        final Effect effect = _effects.poll();
+        return _effects.poll();
-        if (effect != null)
-            _processedEffects.add(effect);
-        return effect;
-    }
-
-    @Override
-    public boolean wasSuccessful() {
-        for (Effect processedCost : _processedCosts) {
-            if (!processedCost.wasSuccessful())
-                return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean wasCarriedOut() {
-        return wasSuccessful();
     }
 }

gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/SubAction.java

@@ -64,7 +64,6 @@ public class SubAction implements Action {
         return effect;
     }
 
-    @Override
     public boolean wasSuccessful() {
         if (!_effects.isEmpty())
             return false;
@@ -76,7 +75,6 @@ public class SubAction implements Action {
         return true;
     }
 
-    @Override
     public boolean wasCarriedOut() {
         if (!_effects.isEmpty())
             return false;

gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractEffect.java

@@ -24,14 +24,14 @@ public abstract class AbstractEffect implements Effect {
     }
 
     @Override
-    public final boolean wasCarriedOut() {
+    public boolean wasCarriedOut() {
         if (_carriedOut == null)
             throw new IllegalStateException("Effect has to be played first");
         return _carriedOut;
     }
 
     @Override
-    public final boolean wasSuccessful() {
+    public boolean wasSuccessful() {
         if (_successful == null)
             throw new IllegalStateException("Effect has to be played first");
         return _successful;

gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Action.java

@@ -20,8 +20,4 @@ public interface Action {
     public String getText(LotroGame game);
 
     public Effect nextEffect(LotroGame game);
-
-    public boolean wasSuccessful();
-
-    public boolean wasCarriedOut();
 }

gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/PlayerReconcilesAction.java

@@ -99,14 +99,4 @@ public class PlayerReconcilesAction implements Action {
 
         return _effectQueue.poll();
     }
-
-    @Override
-    public boolean wasCarriedOut() {
-        return true;
-    }
-
-    @Override
-    public boolean wasSuccessful() {
-        return true;
-    }
 }

gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/ResolveSkirmishAction.java

@@ -116,14 +116,4 @@ public class ResolveSkirmishAction implements Action {
         else
             return Collections.emptyList();
     }
-
-    @Override
-    public boolean wasCarriedOut() {
-        return true;
-    }
-
-    @Override
-    public boolean wasSuccessful() {
-        return true;
-    }
 }

gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/SimpleEffectAction.java

@@ -54,14 +54,4 @@ public class SimpleEffectAction implements Action {
         _effect = null;
         return result;
     }
-
-    @Override
-    public boolean wasCarriedOut() {
-        return true;
-    }
-
-    @Override
-    public boolean wasSuccessful() {
-        return true;
-    }
 }

gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/actions/SystemAction.java

@@ -38,14 +38,4 @@ public abstract class SystemAction implements Action {
     public String getText(LotroGame game) {
         throw new UnsupportedOperationException("System action has no text");
     }
-
-    @Override
-    public boolean wasCarriedOut() {
-        return true;
-    }
-
-    @Override
-    public boolean wasSuccessful() {
-        return true;
-    }
 }