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

Fixed Lynde's triggered ability (#10301)

Browse source 
Fixes magefree/mage#10045.

Lynde wasn't keeping track which zone cards were in before bring them back, let alone zone change counters.

Many similar effects are only looking at the current zone rather than zone change counters.
This commit is contained in:
Alexander Novotny 2023-04-30 15:59:22 -07:00 committed by GitHub
parent c270e5f20e
commit 5c6de9815f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 89 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Sets/src/mage/cards/l/LyndeCheerfulTormentor.java
View file

@ -3,6 +3,7 @@ package mage.cards.l;
import java.util.UUID;
import mage.MageInt;
import mage.MageObject;
import mage.MageObjectReference;
import mage.abilities.Ability;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
@ -90,7 +91,7 @@ class LyndeCheerfulTormentorCurseDiesTriggeredAbility extends TriggeredAbilityIm
if (zEvent.isDiesEvent()) {
Permanent permanent = zEvent.getTarget();
if (permanent != null && permanent.hasSubtype(SubType.CURSE, game) && permanent.isOwnedBy(controllerId)) {
getEffects().setValue("curse", zEvent.getTargetId());
getEffects().setValue("curse", new MageObjectReference(game.getCard(zEvent.getTargetId()), game));
return true;
}
}
@ -127,7 +128,7 @@ class LyndeCheerfulTormentorReturnCurseEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
Card curse = game.getCard((UUID)getValue("curse"));
Card curse = ((MageObjectReference) getValue("curse")).getCard(game);
if (controller != null && curse != null) {
game.getState().setValue("attachTo:" + curse.getId(), controller.getId());
controller.moveCards(curse, Zone.BATTLEFIELD, source, game);

86
Mage.Tests/src/test/java/org/mage/test/cards/single/mic/LyndeCheerfulTormentorTest.java Normal file
View file

@ -0,0 +1,86 @@
package org.mage.test.cards.single.mic;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
import mage.constants.PhaseStep;
import mage.constants.Zone;
/**
* {@link mage.cards.l.LyndeCheerfulTormentor Lynde, Cheerful Tormentor}
* {1}{U}{B}{R}
* Legendary Creature — Human Warlock
* Deathtouch
* Whenever a Curse is put into your graveyard from the battlefield, return it to the battlefield attached to you at the beginning of the next end step.
* At the beginning of your upkeep, you may attach a Curse attached to you to one of your opponents. If you do, draw two cards.
* 2/4
*
* @author alexander-novo
*/
public class LyndeCheerfulTormentorTest extends CardTestPlayerBase {
private static final String lynde = "Lynde, Cheerful Tormentor";
/**
* Reported Bug: https://github.com/magefree/mage/issues/10045
*
* Lynde can bring back curses from any zone if they were moved from the graveyard to somewhere else (such as by
* and effect that exiles a player's graveyard) before being brought back.
*/
@Test
public void onlyBringsBackCursesFromGraveyard() {
// {3}{R}{R} - Curse
String curse = "Curse of Bloodletting";
// {1}{W} - Destroy target enchantment
String disenchant = "Disenchant";
// Land - When ETB, exile target player's graveyard
String bog = "Bojuka Bog";
String mountain = "Mountain";
String plains = "Plains";
// The necessary cards for the test
addCard(Zone.HAND, playerA, curse);
addCard(Zone.BATTLEFIELD, playerA, lynde);
addCard(Zone.HAND, playerB, disenchant);
addCard(Zone.HAND, playerB, bog);
// The mana needed to cast those cards
addCard(Zone.BATTLEFIELD, playerA, mountain, 5);
addCard(Zone.BATTLEFIELD, playerB, plains, 2);
// Player A plays the curse
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, curse, playerB);
// Player B destroys the curse with disenchant.
// There are two things to resolve - disenchant and Lynde's trigger
castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, disenchant, curse);
waitStackResolved(2, PhaseStep.PRECOMBAT_MAIN, 2);
// The curse should have been destroyed and sent to the graveyard
checkPermanentCount("after disenchant", 2, PhaseStep.PRECOMBAT_MAIN, playerA, curse, 0);
checkGraveyardCount("after disenchant", 2, PhaseStep.PRECOMBAT_MAIN, playerA, curse, 1);
// Player B then exiles player A's graveyard with bojuka bog
playLand(2, PhaseStep.PRECOMBAT_MAIN, playerB, bog);
addTarget(playerB, playerA);
waitStackResolved(2, PhaseStep.PRECOMBAT_MAIN, 1);
// Bojuka bog should have exiled the curse from the graveyard
checkGraveyardCount("after bog", 2, PhaseStep.PRECOMBAT_MAIN, playerA, curse, 0);
checkExileCount("after bog", 2, PhaseStep.PRECOMBAT_MAIN, playerA, curse, 1);
// Fast forward to the end step. Make sure Lynde's delayed trigger goes off
checkStackObject("at end step", 2, PhaseStep.END_TURN, playerA,
"At the beginning of the next end step, return it to the battlefield attached to you",
1);
waitStackResolved(2, PhaseStep.END_TURN, 1);
setStopAt(2, PhaseStep.END_TURN);
execute();
// The curse should still be in exile, not on the battlefield
assertPermanentCount(playerA, curse, 0);
assertExileCount(playerA, curse, 1);
}
}