External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #11721 (Myojin of Grim Betrayal) (#11740)

Browse source 
Co-authored-by: Matthew Wilson <matthew_w@vaadin.com>
This commit is contained in:
Matthew Wilson 2024-02-01 02:14:01 +02:00 • committed by GitHub
parent 0db2599fa5
commit 5192e23a59
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 75 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Sets/src/mage/cards/m/MyojinOfGrimBetrayal.java
View file

@ -61,9 +61,9 @@ public class MyojinOfGrimBetrayal extends CardImpl {
ability.addWatcher(new CardsPutIntoGraveyardWatcher()); ability.addWatcher(new CardsPutIntoGraveyardWatcher());
this.addAbility(ability); this.addAbility(ability);
} }
private MyojinOfGrimBetrayal(final MyojinOfGrimBetrayal card) { super(card); } private MyojinOfGrimBetrayal(final MyojinOfGrimBetrayal card) { super(card); }
@Override @Override
public MyojinOfGrimBetrayal copy() {return new MyojinOfGrimBetrayal(this); } public MyojinOfGrimBetrayal copy() {return new MyojinOfGrimBetrayal(this); }
} }
@ -92,7 +92,7 @@ class MyojinOfGrimBetrayalEffect extends OneShotEffect {
return false; return false;
} }
Cards cards = new CardsImpl(watcher.getCardsPutIntoGraveyardFromBattlefield(game)); Cards cards = new CardsImpl(watcher.getCardsPutIntoGraveyardFromAnywhere(game));
cards.removeIf(uuid -> !game.getCard(uuid).isCreature(game)); cards.removeIf(uuid -> !game.getCard(uuid).isCreature(game));
return controller.moveCards(cards, Zone.BATTLEFIELD, source, game); return controller.moveCards(cards, Zone.BATTLEFIELD, source, game);
@ -100,4 +100,4 @@ class MyojinOfGrimBetrayalEffect extends OneShotEffect {
@Override @Override
public MyojinOfGrimBetrayalEffect copy() { return new MyojinOfGrimBetrayalEffect(this); } public MyojinOfGrimBetrayalEffect copy() { return new MyojinOfGrimBetrayalEffect(this); }
} }

71
Mage.Tests/src/test/java/org/mage/test/cards/single/nec/MyojinOfGrimBetrayalTest.java Normal file
View file

@ -0,0 +1,71 @@
package org.mage.test.cards.single.nec;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
* {@link mage.cards.m.MyojinOfGrimBetrayal Myojin of Grim Betrayal} {5}{B}{B}{B}{B}
* Legendary Creature - Spirit 5/2
* Myojin of Grim Betrayal enters the battlefield with an indestructible counter on it if you cast it from your hand.
* Remove an indestructible counter from Myojin of Grim Betrayal:
* Put onto the battlefield under your control all creature cards in all graveyards that were put there from anywhere this turn.
*
* Issue #11721 - The second ability of Myojin was only returning
* creatures that were put into the graveyard from the battlefield.
*
* @author DominionSpy
*/
public class MyojinOfGrimBetrayalTest extends CardTestPlayerBase {
@Test
public void test_MyojinOfGrimBetrayal() {
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 9 + 2 + 1 + 2 + 4);
addCard(Zone.BATTLEFIELD, playerA, "Vampire Hexmage");
addCard(Zone.BATTLEFIELD, playerA, "Thrull Wizard");
addCard(Zone.EXILED, playerB, "Llanowar Elves");
addCard(Zone.HAND, playerA, "Myojin of Grim Betrayal");
addCard(Zone.HAND, playerA, "Archfiend of Ifnir");
addCard(Zone.HAND, playerA, "Banehound");
addCard(Zone.HAND, playerA, "Mind Raker");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Myojin of Grim Betrayal");
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, playerA);
// Creature put into graveyard from battlefield (Vampire Hexmage)
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sacrifice", "Thrull Wizard");
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, playerA);
// Creature put into graveyard from hand (Archfiend of Ifnir)
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cycling");
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, playerA);
// Creature put into graveyard from stack (Banehound)
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Banehound");
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{1}{B}", "Banehound");
setChoice(playerA, false);
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, playerA);
showExile("exile b", 1, PhaseStep.PRECOMBAT_MAIN, playerB);
showGraveyard("grave b", 1, PhaseStep.PRECOMBAT_MAIN, playerB);
// Creature put into graveyard from exile (Llanowar Elves)
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mind Raker");
setChoice(playerA, true);
addTarget(playerA, "Llanowar Elves");
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, playerA);
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Remove");
setStrictChooseMode(true);
setStopAt(1, PhaseStep.END_TURN);
execute();
assertPermanentCount(playerA, "Vampire Hexmage", 1);
assertPermanentCount(playerA, "Archfiend of Ifnir", 1);
assertPermanentCount(playerA, "Banehound", 1);
assertPermanentCount(playerA, "Llanowar Elves", 1);
}
}