External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 21:02:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Some rework of handling of mana effects.

Browse source
This commit is contained in:
LevelX2 2018-05-13 22:52:14 +02:00
parent 25b10c4d67
commit 21e5591e29
254 changed files with 1449 additions and 1399 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage.Tests/src/test/java/org/mage/test/cards/mana/ConditionalManaTest.java
View file

@ -30,7 +30,6 @@ package org.mage.test.cards.mana;
import mage.abilities.keyword.FlyingAbility;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;

4
Mage.Tests/src/test/java/org/mage/test/cards/mana/NykthosShrineToNyxTest.java
View file

@ -125,6 +125,8 @@ public class NykthosShrineToNyxTest extends CardTestPlayerBase {
public void testNormalUseWithTokens() {
addCard(Zone.BATTLEFIELD, playerA, "Forest", 2);
addCard(Zone.BATTLEFIELD, playerA, "Island", 3);
// {T}: Add {C}.
// {2}, {T}: Choose a color. Add an amount of mana of that color equal to your devotion to that color.
addCard(Zone.BATTLEFIELD, playerA, "Nykthos, Shrine to Nyx", 1);
// Green mana doesn't empty from your mana pool as steps and phases end.
// Omnath, Locus of Mana gets +1/+1 for each green mana in your mana pool.
@ -150,7 +152,7 @@ public class NykthosShrineToNyxTest extends CardTestPlayerBase {
execute();
assertPermanentCount(playerA, "Simic Guildmage", 2);
Assert.assertEquals("amount of green mana", 5, playerA.getManaPool().getGreen()); // 6 green mana
Assert.assertEquals("amount of green mana", 5, playerA.getManaPool().getGreen()); // 5 green mana
assertPowerToughness(playerA, "Omnath, Locus of Mana", 6, 6);
}

1
Mage.Tests/src/test/java/org/mage/test/cards/mana/VorinclexVoiceOfHungerTest.java
View file

@ -69,6 +69,7 @@ public class VorinclexVoiceOfHungerTest extends CardTestPlayerBase {
@Test
// @Ignore // TODO: need to fix Vorinclex, Voice of Hunger -- it's double fireup mana tap event
public void testVorinclexVoiceofHungerRiverOfTearsManaMultiplier() {
// Mana pools don't empty as steps and phases end.
addCard(Zone.BATTLEFIELD, playerA, "Upwelling", 1);
addCard(Zone.HAND, playerA, "River of Tears", 1);
// Trample

202
Mage.Tests/src/test/java/org/mage/test/cards/triggers/SelvalaHeartOfTheWildsTest.java
View file

@ -1,96 +1,106 @@
/*
* 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.triggers;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author jeffwadsworth
*/
/**
* Selvala, Heart of the Wilds {1}{G}{G} Whenever another creature enters the
* battlefield, its controller may draw a card if its power is greater than each
* other creature's power Add X mana in any combination of colors to your mana
* pool, where X is the greatest power among creatures you control
*/
public class SelvalaHeartOfTheWildsTest extends CardTestPlayerBase {
@Test
public void testTrigger() {
// No card will be drawn due to the Memnite having a lower power than any other permanent on the battlefield
addCard(Zone.LIBRARY, playerA, "Island", 2);
addCard(Zone.BATTLEFIELD, playerA, "Selvala, Heart of the Wilds", 1); // 2/3
addCard(Zone.BATTLEFIELD, playerA, "Shivan Dragon", 1); // 5/5
addCard(Zone.HAND, playerA, "Memnite"); // 1/1
addCard(Zone.BATTLEFIELD, playerB, "Blinking Spirit", 1); // 2/2
addCard(Zone.BATTLEFIELD, playerB, "Nightmare", 1); // 4/4
addCard(Zone.BATTLEFIELD, playerB, "Swamp", 4);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Memnite");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertHandCount(playerA, 0); // no cards drawn
}
@Test
public void testTriggerWithGiantGrowth() {
// After Memnite enters the battlefield, the trigger fires. In response, 2 Giant Growths targeting the Memnite
// pumps its power to the highest on the battlefield allowing the controller to draw a card.
addCard(Zone.LIBRARY, playerA, "Island", 2);
addCard(Zone.BATTLEFIELD, playerA, "Selvala, Heart of the Wilds", 1); // 2/3
addCard(Zone.BATTLEFIELD, playerA, "Shivan Dragon", 1); // 5/5
addCard(Zone.BATTLEFIELD, playerA, "Forest", 2);
addCard(Zone.HAND, playerA, "Memnite"); // 1/1
addCard(Zone.HAND, playerA, "Giant Growth", 2);
addCard(Zone.BATTLEFIELD, playerB, "Blinking Spirit", 1); // 2/2
addCard(Zone.BATTLEFIELD, playerB, "Nightmare", 1); // 4/4
addCard(Zone.BATTLEFIELD, playerB, "Swamp", 4);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Memnite");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Giant Growth", "Memnite");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Giant Growth", "Memnite"); // a whopping 7/7
setChoice(playerA, "Yes");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertHandCount(playerA, 2); // 2 cards drawn
}
}
/*
* 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.triggers;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author jeffwadsworth
*/
/**
* Selvala, Heart of the Wilds {1}{G}{G} Whenever another creature enters the
* battlefield, its controller may draw a card if its power is greater than each
* other creature's power Add X mana in any combination of colors to your mana
* pool, where X is the greatest power among creatures you control
*/
public class SelvalaHeartOfTheWildsTest extends CardTestPlayerBase {
@Test
public void testTrigger() {
// No card will be drawn due to the Memnite having a lower power than any other permanent on the battlefield
addCard(Zone.LIBRARY, playerA, "Island", 2);
addCard(Zone.BATTLEFIELD, playerA, "Selvala, Heart of the Wilds", 1); // 2/3
addCard(Zone.BATTLEFIELD, playerA, "Shivan Dragon", 1); // 5/5
addCard(Zone.HAND, playerA, "Memnite"); // 1/1
addCard(Zone.BATTLEFIELD, playerB, "Blinking Spirit", 1); // 2/2
addCard(Zone.BATTLEFIELD, playerB, "Nightmare", 1); // 4/4
addCard(Zone.BATTLEFIELD, playerB, "Swamp", 4);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Memnite");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertHandCount(playerA, 0); // no cards drawn
}
@Test
public void testTriggerWithGiantGrowth() {
// After Memnite enters the battlefield, the trigger fires. In response, 2 Giant Growths targeting the Memnite
// pumps its power to the highest on the battlefield allowing the controller to draw a card.
addCard(Zone.LIBRARY, playerA, "Island", 2);
// Whenever another creature enters the battlefield, its controller may draw a card if its power is greater than each other creature's power.
// {G}, {T}: Add X mana in any combination of colors, where X is the greatest power among creatures you control.
addCard(Zone.BATTLEFIELD, playerA, "Selvala, Heart of the Wilds", 1); // 2/3
addCard(Zone.BATTLEFIELD, playerA, "Shivan Dragon", 1); // 5/5
addCard(Zone.BATTLEFIELD, playerA, "Forest", 2);
addCard(Zone.HAND, playerA, "Memnite"); // 1/1
addCard(Zone.HAND, playerA, "Giant Growth", 2);
addCard(Zone.BATTLEFIELD, playerB, "Blinking Spirit", 1); // 2/2
// Flying
// Nightmare's power and toughness are each equal to the number of Swamps you control.
addCard(Zone.BATTLEFIELD, playerB, "Nightmare", 1); // 4/4
addCard(Zone.BATTLEFIELD, playerB, "Swamp", 4);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Memnite");
setChoice(playerA, "X=0");
setChoice(playerA, "X=0");
setChoice(playerA, "X=0");
setChoice(playerA, "X=0");
setChoice(playerA, "X=5");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Giant Growth", "Memnite");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Giant Growth", "Memnite"); // a whopping 7/7
setChoice(playerA, "Yes");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertPowerToughness(playerA, "Memnite", 7, 7);
assertGraveyardCount(playerA, "Giant Growth", 2);
assertHandCount(playerA, 1); // 2 cards drawn
}
}

2
Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
View file

@ -445,7 +445,7 @@ public class TestPlayer implements Player {
} else {
game.restoreState(bookmark, ability.getRule());
}
groupsForTargetHandling = null;
}
}
} else if (action.getAction().startsWith("manaActivate:")) {