From 0db7c5cff4e18cae0778596c72a224e88c7ae637 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 16 Jul 2015 16:54:32 +0200 Subject: [PATCH 1/2] * Fixed a bug of the rollback turns feature locking sometimes the UI. --- .../AI/basic/PreventRepeatedActionsTest.java | 69 +++++++++++++++++++ Mage/src/mage/game/GameImpl.java | 10 +-- 2 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/AI/basic/PreventRepeatedActionsTest.java diff --git a/Mage.Tests/src/test/java/org/mage/test/AI/basic/PreventRepeatedActionsTest.java b/Mage.Tests/src/test/java/org/mage/test/AI/basic/PreventRepeatedActionsTest.java new file mode 100644 index 0000000000..56b924d8e9 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/AI/basic/PreventRepeatedActionsTest.java @@ -0,0 +1,69 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package org.mage.test.AI.basic; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import mage.filter.common.FilterLandPermanent; +import mage.game.permanent.Permanent; +import org.junit.Assert; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBaseAI; + +/** + * + * @author LevelX2 + */ +public class PreventRepeatedActionsTest extends CardTestPlayerBaseAI { + + /** + * Check that an equipment is not switched again an again between creatures + * + */ + @Test + public void testEquipOnlyOnce() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 6); + + // Equipped creature gets +1/+1. + // Equip {1}({1}: Attach to target creature you control. Equip only as a sorcery.) + addCard(Zone.BATTLEFIELD, playerA, "Fireshrieker", 1); + addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion", 2); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + int tappedLands = 0; + for (Permanent permanent : currentGame.getBattlefield().getAllActivePermanents(new FilterLandPermanent(), playerA.getId(), currentGame)) { + if (permanent.isTapped()) { + tappedLands++; + } + } + Assert.assertEquals("AI should only used Equipment once", 2, tappedLands); + } + +} diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java index 7327c57c8b..07fb43d580 100644 --- a/Mage/src/mage/game/GameImpl.java +++ b/Mage/src/mage/game/GameImpl.java @@ -2649,16 +2649,16 @@ public abstract class GameImpl implements Game, Serializable { GameState restore = gameStatesRollBack.get(turnToGoTo); if (restore != null) { informPlayers(GameLog.getPlayerRequestColoredText("Player request: Rolling back to start of turn " + restore.getTurnNum())); - for (Player playerObject : getPlayers().values()) { - if (playerObject.isHuman() && playerObject.isInGame()) { - playerObject.abort(); - } - } state.restoreForRollBack(restore); playerList.setCurrent(state.getActivePlayerId()); // because restore uses the objects without copy each copy the state again gameStatesRollBack.put(getTurnNum(), state.copy()); executingRollback = true; + for (Player playerObject : getPlayers().values()) { + if (playerObject.isHuman() && playerObject.isInGame()) { + playerObject.abort(); + } + } fireUpdatePlayersEvent(); } } From 3e78e406a707ea4605dc09713f5cee5915eb8397 Mon Sep 17 00:00:00 2001 From: Gal Lerman Date: Thu, 16 Jul 2015 21:14:14 +0300 Subject: [PATCH 2/2] changed chronozoa to {this} in text --- Mage.Sets/src/mage/sets/planarchaos/Chronozoa.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/sets/planarchaos/Chronozoa.java b/Mage.Sets/src/mage/sets/planarchaos/Chronozoa.java index 008b1dd77b..a97add2ef4 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Chronozoa.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Chronozoa.java @@ -70,7 +70,7 @@ public class Chronozoa extends CardImpl { // When Chronozoa is put into a graveyard from play, if it had no time counters on it, put two tokens into play that are copies of it. this.addAbility(new ConditionalTriggeredAbility(new DiesCreatureTriggeredAbility(new CopyCardEffect(this, numCopies), false), new LastTimeCounterRemovedCondition(), - "When Chronozoa is put into a graveyard from play, if it had no time counters on it, put two tokens into play that are copies of it.")); + "When {this} is put into a graveyard from play, if it had no time counters on it, put two tokens into play that are copies of it.")); } public Chronozoa(final Chronozoa card) {