mirror of
https://github.com/correl/mage.git
synced 2024-11-28 19:19:55 +00:00
[DMU] fix #9655
This commit is contained in:
parent
6ec43c44ab
commit
ce8a191f56
2 changed files with 102 additions and 3 deletions
|
@ -86,6 +86,7 @@ class SerraParagonPlayEffect extends AsThoughEffectImpl {
|
||||||
&& source.isControlledBy(affectedControllerId)
|
&& source.isControlledBy(affectedControllerId)
|
||||||
&& game.isActivePlayer(affectedControllerId)
|
&& game.isActivePlayer(affectedControllerId)
|
||||||
&& !SerraParagonWatcher.checkPlayer(source, game)
|
&& !SerraParagonWatcher.checkPlayer(source, game)
|
||||||
|
&& card.isPermanent(game)
|
||||||
&& (card.isLand(game) || card.getManaValue() <= 3)
|
&& (card.isLand(game) || card.getManaValue() <= 3)
|
||||||
&& Zone.GRAVEYARD.match(game.getState().getZone(card.getId()));
|
&& Zone.GRAVEYARD.match(game.getState().getZone(card.getId()));
|
||||||
}
|
}
|
||||||
|
@ -136,7 +137,8 @@ class SerraParagonTriggeredAbility extends TriggeredAbilityImpl {
|
||||||
class SerraParagonGainEffect extends ContinuousEffectImpl {
|
class SerraParagonGainEffect extends ContinuousEffectImpl {
|
||||||
|
|
||||||
private final MageObjectReference mor;
|
private final MageObjectReference mor;
|
||||||
private final Ability ability = new DiesSourceTriggeredAbility(new ExileSourceEffect().setText("exile it")).setTriggerPhrase("When this permanent is put into a graveyard from the battlefield, ");
|
private final Ability ability = new DiesSourceTriggeredAbility(new ExileSourceEffect().setText("exile it"))
|
||||||
|
.setTriggerPhrase("When this permanent is put into a graveyard from the battlefield, ");
|
||||||
|
|
||||||
{
|
{
|
||||||
ability.addEffect(new GainLifeEffect(2).concatBy("and"));
|
ability.addEffect(new GainLifeEffect(2).concatBy("and"));
|
||||||
|
@ -191,7 +193,9 @@ class SerraParagonWatcher extends Watcher {
|
||||||
|| event.getType() == GameEvent.EventType.LAND_PLAYED)
|
|| event.getType() == GameEvent.EventType.LAND_PLAYED)
|
||||||
&& event.hasApprovingIdentifier(MageIdentifier.SerraParagonWatcher)) {
|
&& event.hasApprovingIdentifier(MageIdentifier.SerraParagonWatcher)) {
|
||||||
map.computeIfAbsent(
|
map.computeIfAbsent(
|
||||||
event.getAdditionalReference().getApprovingMageObjectReference(), x -> new HashSet<>()
|
event.getAdditionalReference()
|
||||||
|
.getApprovingMageObjectReference(),
|
||||||
|
x -> new HashSet<>()
|
||||||
).add(event.getPlayerId());
|
).add(event.getPlayerId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -207,7 +211,7 @@ class SerraParagonWatcher extends Watcher {
|
||||||
.getState()
|
.getState()
|
||||||
.getWatcher(SerraParagonWatcher.class)
|
.getWatcher(SerraParagonWatcher.class)
|
||||||
.map
|
.map
|
||||||
.getOrDefault(new MageObjectReference(source), Collections.emptySet())
|
.getOrDefault(new MageObjectReference(source.getSourceId(), game), Collections.emptySet())
|
||||||
.contains(source.getControllerId());
|
.contains(source.getControllerId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,95 @@
|
||||||
|
package org.mage.test.cards.single.dmu;
|
||||||
|
|
||||||
|
import mage.constants.PhaseStep;
|
||||||
|
import mage.constants.Zone;
|
||||||
|
import org.junit.Assert;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.mage.test.serverside.base.CardTestPlayerBase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author TheElk801
|
||||||
|
*/
|
||||||
|
public class SerraParagonTest extends CardTestPlayerBase {
|
||||||
|
|
||||||
|
private static final String paragon = "Serra Paragon";
|
||||||
|
private static final String swamp = "Swamp";
|
||||||
|
private static final String mox = "Mox Pearl";
|
||||||
|
private static final String sinkhole = "Sinkhole";
|
||||||
|
private static final String naturalize = "Naturalize";
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testLandGainsAbility() {
|
||||||
|
addCard(Zone.BATTLEFIELD, playerA, "Snow-Covered Swamp");
|
||||||
|
addCard(Zone.BATTLEFIELD, playerA, paragon);
|
||||||
|
addCard(Zone.GRAVEYARD, playerA, swamp);
|
||||||
|
addCard(Zone.HAND, playerA, sinkhole);
|
||||||
|
|
||||||
|
playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, swamp);
|
||||||
|
|
||||||
|
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, sinkhole, swamp);
|
||||||
|
|
||||||
|
setStopAt(1, PhaseStep.END_TURN);
|
||||||
|
execute();
|
||||||
|
|
||||||
|
assertLife(playerA, 20 + 2);
|
||||||
|
assertExileCount(playerA, swamp, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testLandPlayedOnce() {
|
||||||
|
addCard(Zone.BATTLEFIELD, playerA, paragon);
|
||||||
|
addCard(Zone.GRAVEYARD, playerA, swamp, 2);
|
||||||
|
|
||||||
|
playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, swamp);
|
||||||
|
|
||||||
|
playLand(1, PhaseStep.POSTCOMBAT_MAIN, playerA, swamp);
|
||||||
|
|
||||||
|
setStopAt(1, PhaseStep.END_TURN);
|
||||||
|
try {
|
||||||
|
execute();
|
||||||
|
} catch (Throwable e) {
|
||||||
|
if (!e.getMessage().contains("Can't find ability to activate command: Play Swamp")) {
|
||||||
|
Assert.fail("Should have had error about not being able to play land, but got:\n" + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testNonlandGainsAbility() {
|
||||||
|
addCard(Zone.BATTLEFIELD, playerA, "Forest");
|
||||||
|
addCard(Zone.BATTLEFIELD, playerA, paragon);
|
||||||
|
addCard(Zone.GRAVEYARD, playerA, mox);
|
||||||
|
addCard(Zone.HAND, playerA, naturalize);
|
||||||
|
|
||||||
|
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, mox);
|
||||||
|
|
||||||
|
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, naturalize, mox);
|
||||||
|
|
||||||
|
setStopAt(1, PhaseStep.END_TURN);
|
||||||
|
execute();
|
||||||
|
|
||||||
|
assertLife(playerA, 20 + 2);
|
||||||
|
assertPermanentCount(playerA, mox, 0);
|
||||||
|
assertExileCount(playerA, mox, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testNonlandPlayedOnce() {
|
||||||
|
addCard(Zone.BATTLEFIELD, playerA, paragon);
|
||||||
|
addCard(Zone.GRAVEYARD, playerA, mox, 2);
|
||||||
|
|
||||||
|
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, mox);
|
||||||
|
|
||||||
|
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, mox);
|
||||||
|
|
||||||
|
setStopAt(1, PhaseStep.END_TURN);
|
||||||
|
try {
|
||||||
|
execute();
|
||||||
|
Assert.fail("Two spells were cast from graveyard");
|
||||||
|
} catch (Throwable e) {
|
||||||
|
if (!e.getMessage().contains("Can't find ability to activate command: Cast Mox Pearl")) {
|
||||||
|
Assert.fail("Should have had error about not being able to cast spell, but got:\n" + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue