github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-28 19:19:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed Uro, Titan of Nature's Wrath (getSpellOrLKIStack return ability instead spell after card triggers);

Browse source
This commit is contained in:
Oleg Agafonov 2020-01-14 11:48:15 +04:00
parent dae2c57c45
commit 92eba9861d
3 changed files with 59 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/cards/u/UroTitanOfNaturesWrath.java
View file

@ -18,7 +18,6 @@ import mage.constants.SuperType;
import mage.filter.StaticFilters;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.game.stack.Spell;
import java.util.UUID;
@ -81,8 +80,7 @@ class UroTitanOfNaturesWrathEffect extends OneShotEffect {
if (permanent == null) {
return false;
}
Spell spell = game.getSpellOrLKIStack(source.getSourceId());
if (spell != null && spell.getSpellAbility() instanceof EscapeAbility) {
if (EscapeAbility.wasCastedWithEscape(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter())) {
return false;
}
return permanent.sacrifice(source.getSourceId(), game);

56
Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java
View file

@ -1,4 +1,3 @@
package org.mage.test.cards.triggers;
import mage.constants.PhaseStep;
@ -8,7 +7,6 @@ import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author LevelX2
*/
public class EntersTheBattlefieldTriggerTest extends CardTestPlayerBase {
@ -74,7 +72,6 @@ public class EntersTheBattlefieldTriggerTest extends CardTestPlayerBase {
* Scion of Vitu-Ghazi if it is NOT cast from the hand, it will still allow
* the Populate effect. It should only allow these when it is cast from
* hand.
*
*/
@Test
public void testScionOfVituGhaziConditionNotTrue() {
@ -108,7 +105,7 @@ public class EntersTheBattlefieldTriggerTest extends CardTestPlayerBase {
/**
* Dread Cacodemon's abilities should only trigger when cast from hand.
*
* <p>
* Testing when cast from hand abilities take effect. Cast from hand
* destroys opponents creatures and taps all other creatures owner controls.
*/
@ -141,7 +138,7 @@ public class EntersTheBattlefieldTriggerTest extends CardTestPlayerBase {
/**
* Dread Cacodemon's abilities should only trigger when cast from hand.
*
* <p>
* Testing when card is not cast from hand, abilities do not take effect.
* All opponents creatures remain alive and owner's creatures are not
* tapped.
@ -181,7 +178,6 @@ public class EntersTheBattlefieldTriggerTest extends CardTestPlayerBase {
/**
* Test that the cast from hand condition works for target permanent
*
*/
@Test
public void testWildPair() {
@ -284,24 +280,24 @@ public class EntersTheBattlefieldTriggerTest extends CardTestPlayerBase {
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Noxious Ghoul");
/*
* playerA's Carnivorous Plant will get -1/-1 from Noxious Ghoul -> 3/4
* playerB's Carnivorous Plant will get -1/-1 from Noxious Ghoul -> 3/4
* playerA's Carnivorous Plant will get -1/-1 from Noxious Ghoul -> 3/4
* playerB's Carnivorous Plant will get -1/-1 from Noxious Ghoul -> 3/4
*/
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Clone");
setChoice(playerA, "Noxious Ghoul");
/*
* playerA's Carnivorous Plant will get -1/-1 from Clone -> 2/3
* playerB's Carnivorous Plant will get -1/-1 from Clone -> 2/3
* playerA's Carnivorous Plant will get -1/-1 from Clone -> 2/3
* playerB's Carnivorous Plant will get -1/-1 from Clone -> 2/3
*/
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Ego Erasure", "targetPlayer=PlayerA", "Whenever");
/*
* playerA' Noxious Ghoul will get -2/0 -> 1/3
* playerA's Carnivorous Plant will get -2/0 > 0/3
* playerA' Noxious Ghoul will get -1/-1 from Clone -> 0/2
* playerA' Noxious Ghoul will get -1/-1 from itself -> -1/1
* playerA's Carnivorous Plant will get -1/-1 from Noxious Ghoul -> -1/2
* playerB's Carnivorous Plant will get -1/-1 from Noxious Ghoul -> 1/2
* playerA' Noxious Ghoul will get -2/0 -> 1/3
* playerA's Carnivorous Plant will get -2/0 > 0/3
* playerA' Noxious Ghoul will get -1/-1 from Clone -> 0/2
* playerA' Noxious Ghoul will get -1/-1 from itself -> -1/1
* playerA's Carnivorous Plant will get -1/-1 from Noxious Ghoul -> -1/2
* playerB's Carnivorous Plant will get -1/-1 from Noxious Ghoul -> 1/2
*/
setStopAt(1, PhaseStep.END_TURN);
@ -380,4 +376,32 @@ public class EntersTheBattlefieldTriggerTest extends CardTestPlayerBase {
assertLife(playerA, 15);
}
@Test
public void test_MultiTriggersAndSpellLKI() {
// getSpellOrLKIStack can return last triggered ability (e.g. null) instead real spell
// need to fix it (always return last spell)
// When Uro enters the battlefield, sacrifice it unless it escaped.
// Whenever Uro enters the battlefield or attacks, you gain 3 life and draw a card, then you may put a land card from your hand onto the battlefield.
// Escape-{G}{G}{U}{U}, Exile five other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.)
addCard(Zone.GRAVEYARD, playerA, "Uro, Titan of Nature's Wrath");
addCard(Zone.BATTLEFIELD, playerA, "Forest", 2);
addCard(Zone.BATTLEFIELD, playerA, "Island", 2);
addCard(Zone.GRAVEYARD, playerA, "Balduvian Bears", 5);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Uro, Titan of Nature's Wrath");
setChoice(playerA, "Balduvian Bears^Balduvian Bears^Balduvian Bears^Balduvian Bears^Balduvian Bears");
setChoice(playerA, "When {this} enters the battlefield, sacrifice it"); // sacrifice trigger must go first
setChoice(playerA, "No"); // do not put land to battlefield
// sacrifice trigger must found escape ability by getSpellOrLKIStack and keep uro on battlefield
setStrictChooseMode(true);
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertAllCommandsUsed();
assertPermanentCount(playerA, "Uro, Titan of Nature's Wrath", 1);
}
}

18
Mage/src/main/java/mage/abilities/keyword/EscapeAbility.java
View file

@ -8,15 +8,19 @@ import mage.constants.SpellAbilityType;
import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.game.Game;
import mage.target.common.TargetCardInYourGraveyard;
import mage.util.CardUtil;
import java.util.UUID;
/**
* @author TheElk801
*/
public class EscapeAbility extends SpellAbility {
private static final FilterCard filter = new FilterCard("card to exile");
private static final String CASTED_WITH_ESCAPE_KEY = "escapeActivated";
static {
filter.add(AnotherPredicate.instance);
@ -61,4 +65,18 @@ public class EscapeAbility extends SpellAbility {
return "Escape&mdash;" + this.manaCost + ", Exile " + CardUtil.numberToText(this.exileCount) +
" other cards from your graveyard. <i>(You may cast this card from your graveyard for its escape cost.)</i>";
}
@Override
public boolean activate(Game game, boolean noMana) {
if (super.activate(game, noMana)) {
game.getState().setValue(CASTED_WITH_ESCAPE_KEY + getSourceId().toString() + (getSourceObjectZoneChangeCounter() + 1), Boolean.TRUE);
return true;
}
return false;
}
public static boolean wasCastedWithEscape(Game game, UUID sourceId, int sourceZCC) {
Object activated = game.getState().getValue(CASTED_WITH_ESCAPE_KEY + sourceId.toString() + sourceZCC);
return activated != null;
}
}