From 9b3eff603c209e5687f9bd38515c3d7a4fc54652 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 1 May 2015 01:50:25 +0200 Subject: [PATCH] * Laboratory Maniac - Fixed check for win condition (you can now win together with Platinum Angel). --- .../mage/sets/innistrad/LaboratoryManiac.java | 3 +- .../sets/shadowmoor/ThoughtReflection.java | 25 ++++--- .../cards/replacement/WinLoseEffectsTest.java | 66 +++++++++++++++++++ Mage/src/mage/actions/MageDrawAction.java | 5 +- Mage/src/mage/game/events/GameEvent.java | 1 + Mage/src/mage/players/Library.java | 2 +- 6 files changed, 85 insertions(+), 17 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/replacement/WinLoseEffectsTest.java diff --git a/Mage.Sets/src/mage/sets/innistrad/LaboratoryManiac.java b/Mage.Sets/src/mage/sets/innistrad/LaboratoryManiac.java index 2ff2661bd0..a5587cda00 100644 --- a/Mage.Sets/src/mage/sets/innistrad/LaboratoryManiac.java +++ b/Mage.Sets/src/mage/sets/innistrad/LaboratoryManiac.java @@ -56,7 +56,6 @@ public class LaboratoryManiac extends CardImpl { this.subtype.add("Human"); this.subtype.add("Wizard"); - this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); @@ -107,7 +106,7 @@ class LaboratoryManiacEffect extends ReplacementEffectImpl { @Override public boolean checksEventType(GameEvent event, Game game) { - return event.getType() == EventType.LOSES; + return event.getType() == EventType.EMPTY_DRAW; } @Override diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ThoughtReflection.java b/Mage.Sets/src/mage/sets/shadowmoor/ThoughtReflection.java index ee982d4346..bb1939bbfa 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ThoughtReflection.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ThoughtReflection.java @@ -51,9 +51,7 @@ public class ThoughtReflection extends CardImpl { public ThoughtReflection(UUID ownerId) { super(ownerId, 53, "Thought Reflection", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}{U}{U}"); this.expansionSetCode = "SHM"; - - this.color.setBlue(true); - + // If you would draw a card, draw two cards instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ThoughtReflectionReplacementEffect())); @@ -90,6 +88,16 @@ class ThoughtReflectionReplacementEffect extends ReplacementEffectImpl { return true; } + @Override + public boolean checksEventType(GameEvent event, Game game) { + return event.getType() == GameEvent.EventType.DRAW_CARD; + } + + @Override + public boolean applies(GameEvent event, Ability source, Game game) { + return event.getPlayerId().equals(source.getControllerId()); + } + @Override public boolean replaceEvent(GameEvent event, Ability source, Game game) { Player you = game.getPlayer(event.getPlayerId()); @@ -97,14 +105,5 @@ class ThoughtReflectionReplacementEffect extends ReplacementEffectImpl { you.drawCards(2, game, event.getAppliedEffects()); } return true; - } - - @Override - public boolean applies(GameEvent event, Ability source, Game game) { - if (event.getType() == GameEvent.EventType.DRAW_CARD - && event.getPlayerId().equals(source.getControllerId())) { - return true; - } - return false; - } + } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/WinLoseEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/WinLoseEffectsTest.java new file mode 100644 index 0000000000..cf99cec6c9 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/WinLoseEffectsTest.java @@ -0,0 +1,66 @@ +/* + * 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.cards.replacement; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Assert; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ + +public class WinLoseEffectsTest extends CardTestPlayerBase { + + /** + * When Platinum Angel and Laboratory Maniac are on the same side of the field, you can't win by + * drawing with no cards left in the library. It seems that Laboratory Maniac is replacing the + * game loss rather than the card draw. + */ + @Test + public void testCard() { + addCard(Zone.BATTLEFIELD, playerA, "Platinum Angel"); + addCard(Zone.BATTLEFIELD, playerA, "Laboratory Maniac", 1); + // If you would draw a card, draw two cards instead. + addCard(Zone.BATTLEFIELD, playerA, "Thought Reflection", 4); + + + setStopAt(40, PhaseStep.END_TURN); + execute(); + + Assert.assertEquals("Player A library is empty", 0 , playerA.getLibrary().size()); + Assert.assertTrue("Player A has not won but should have", playerA.hasWon()); + assertLife(playerA, 20); + assertLife(playerB, 20); + + } + +} diff --git a/Mage/src/mage/actions/MageDrawAction.java b/Mage/src/mage/actions/MageDrawAction.java index 90d80b7474..f3d8e13400 100644 --- a/Mage/src/mage/actions/MageDrawAction.java +++ b/Mage/src/mage/actions/MageDrawAction.java @@ -57,7 +57,10 @@ public class MageDrawAction extends MageAction { game.fireInformEvent(player.getName() + " draws " + CardUtil.numberToText(numDrawn, "a") + " card" + (numDrawn > 1 ? "s" : "")); } if (player.isEmptyDraw()) { - game.doAction(new MageLoseGameAction(player, MageLoseGameAction.DRAW_REASON)); + GameEvent event = GameEvent.getEvent(GameEvent.EventType.EMPTY_DRAW, player.getId(), player.getId()); + if (!game.replaceEvent(event)) { + game.doAction(new MageLoseGameAction(player, MageLoseGameAction.DRAW_REASON)); + } } setScore(player, score); diff --git a/Mage/src/mage/game/events/GameEvent.java b/Mage/src/mage/game/events/GameEvent.java index 662d13af58..bec94b870d 100644 --- a/Mage/src/mage/game/events/GameEvent.java +++ b/Mage/src/mage/game/events/GameEvent.java @@ -87,6 +87,7 @@ public class GameEvent { flag not used for this event */ ZONE_CHANGE, + EMPTY_DRAW, DRAW_CARD, DREW_CARD, MIRACLE_CARD_REVEALED, MADNESS_CARD_EXILED, diff --git a/Mage/src/mage/players/Library.java b/Mage/src/mage/players/Library.java index 4a920c885e..190d01782d 100644 --- a/Mage/src/mage/players/Library.java +++ b/Mage/src/mage/players/Library.java @@ -55,7 +55,7 @@ public class Library implements Serializable { private static Random rnd = new Random(); private boolean emptyDraw; - private final Deque library = new ArrayDeque(); + private final Deque library = new ArrayDeque<>(); private final UUID playerId; public Library(UUID playerId) {