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

- If a cost of an action (effect or play card) is prevented, the action does not have any effect.

Browse Source
This commit is contained in:
marcins78
2012-10-24 15:26:29 +00:00
parent 25d422e52a
commit 2ff4338def
26 changed files with 6 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();
}

5
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ForEachBurdenYouSpotEffect.java
View File

@@ -43,11 +43,6 @@ public abstract class ForEachBurdenYouSpotEffect implements Effect {
return true;
}
@Override
public boolean wasSuccessful() {
return true;
}
@Override
public boolean wasCarriedOut() {
return true;

5
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ForEachTwilightTokenYouSpotEffect.java
View File

@@ -43,11 +43,6 @@ public abstract class ForEachTwilightTokenYouSpotEffect implements Effect {
return true;
}
@Override
public boolean wasSuccessful() {
return true;
}
@Override
public boolean wasCarriedOut() {
return true;

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

@@ -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();

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

@@ -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();

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

@@ -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)

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

@@ -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)

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

@@ -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)

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

@@ -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)

9
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPlayCardFromStackedEffect.java
View File

@@ -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)

5
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndPutCardFromPlayOnTopOfDeckEffect.java
View File

@@ -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();

5
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndRemoveFromTheGameCardsInDiscardEffect.java
View File

@@ -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;

5
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndRemoveFromTheGameCardsInPlayEffect.java
View File

@@ -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();

7
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/discount/RemoveCardsFromDiscardDiscountEffect.java
View File

@@ -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;
}
}

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

@@ -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;

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

@@ -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;

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

@@ -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<PhysicalCard> cards) {
return GameUtils.getAppendedTextNames(cards);
}

5
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractSubActionEffect.java
View File

@@ -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();

5
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractSuccessfulEffect.java
View File

@@ -12,11 +12,6 @@ public abstract class AbstractSuccessfulEffect implements Effect {
return true;
}
@Override
public boolean wasSuccessful() {
return true;
}
@Override
public boolean wasCarriedOut() {
return true;

8
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Effect.java
View File

@@ -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

2
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/IndividualCardAtTest.java
View File

@@ -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));
}
}

3
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/DiscardEffectAtTest.java
View File

@@ -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());

4
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/DrawEffectAtTest.java
View File

@@ -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());

4
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/ExertEffectAtTest.java
View File

@@ -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());
}
}

5
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/effects/WoundEffectAtTest.java
View File

@@ -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());

1
gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
View File

@@ -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.
<b>23 Oct. 2012</b>
- "Harrowdale" might be working fine this time around.