mirror of
https://github.com/correl/mage.git
synced 2025-04-07 01:06:54 -09:00
Changed replacement effects of OrbOfDreams and Corpsejack Menace to selfScope = false. Extended Orb of Dreams test.
This commit is contained in:
parent
b46bdef429
commit
cb18bf2bd4
3 changed files with 15 additions and 7 deletions
Mage.Sets/src/mage/sets
Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters
|
@ -30,6 +30,7 @@ package mage.sets.betrayersofkamigawa;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import mage.Constants;
|
import mage.Constants;
|
||||||
import mage.Constants.CardType;
|
import mage.Constants.CardType;
|
||||||
|
import mage.Constants.Duration;
|
||||||
import mage.Constants.Rarity;
|
import mage.Constants.Rarity;
|
||||||
import mage.abilities.Ability;
|
import mage.abilities.Ability;
|
||||||
import mage.abilities.common.SimpleStaticAbility;
|
import mage.abilities.common.SimpleStaticAbility;
|
||||||
|
@ -65,7 +66,7 @@ public class OrbOfDreams extends CardImpl<OrbOfDreams> {
|
||||||
private class OrbOfDreamsEffect extends ReplacementEffectImpl<OrbOfDreamsEffect> {
|
private class OrbOfDreamsEffect extends ReplacementEffectImpl<OrbOfDreamsEffect> {
|
||||||
|
|
||||||
OrbOfDreamsEffect() {
|
OrbOfDreamsEffect() {
|
||||||
super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Tap);
|
super(Duration.WhileOnBattlefield, Constants.Outcome.Tap, false);
|
||||||
staticText = "Permanents enter the battlefield tapped";
|
staticText = "Permanents enter the battlefield tapped";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,9 +28,11 @@
|
||||||
package mage.sets.returntoravnica;
|
package mage.sets.returntoravnica;
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import mage.Constants;
|
|
||||||
import mage.Constants.CardType;
|
import mage.Constants.CardType;
|
||||||
|
import mage.Constants.Duration;
|
||||||
|
import mage.Constants.Outcome;
|
||||||
import mage.Constants.Rarity;
|
import mage.Constants.Rarity;
|
||||||
|
import mage.Constants.Zone;
|
||||||
import mage.MageInt;
|
import mage.MageInt;
|
||||||
import mage.abilities.Ability;
|
import mage.abilities.Ability;
|
||||||
import mage.abilities.common.SimpleStaticAbility;
|
import mage.abilities.common.SimpleStaticAbility;
|
||||||
|
@ -66,7 +68,7 @@ public class CorpsejackMenace extends CardImpl<CorpsejackMenace> {
|
||||||
this.toughness = new MageInt(4);
|
this.toughness = new MageInt(4);
|
||||||
|
|
||||||
// If one or more +1/+1 counters would be placed on a creature you control, twice that many +1/+1 counters are placed on it instead.
|
// If one or more +1/+1 counters would be placed on a creature you control, twice that many +1/+1 counters are placed on it instead.
|
||||||
this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CorpsejackMenaceReplacementEffect()));
|
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CorpsejackMenaceReplacementEffect()));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,7 +85,7 @@ public class CorpsejackMenace extends CardImpl<CorpsejackMenace> {
|
||||||
|
|
||||||
class CorpsejackMenaceReplacementEffect extends ReplacementEffectImpl<CorpsejackMenaceReplacementEffect> {
|
class CorpsejackMenaceReplacementEffect extends ReplacementEffectImpl<CorpsejackMenaceReplacementEffect> {
|
||||||
CorpsejackMenaceReplacementEffect() {
|
CorpsejackMenaceReplacementEffect() {
|
||||||
super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.BoostCreature);
|
super(Duration.WhileOnBattlefield, Outcome.BoostCreature, false);
|
||||||
staticText = "If one or more +1/+1 counters would be placed on a creature you control, twice that many +1/+1 counters are placed on it instead";
|
staticText = "If one or more +1/+1 counters would be placed on a creature you control, twice that many +1/+1 counters are placed on it instead";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -123,4 +125,4 @@ class CorpsejackMenaceReplacementEffect extends ReplacementEffectImpl<Corpsejack
|
||||||
public CorpsejackMenaceReplacementEffect copy() {
|
public CorpsejackMenaceReplacementEffect copy() {
|
||||||
return new CorpsejackMenaceReplacementEffect(this);
|
return new CorpsejackMenaceReplacementEffect(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,21 +30,26 @@ public class OrbOfDreamsTest extends CardTestPlayerBase {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testOrbNotTappingItself() {
|
public void testOrbNotTappingItself() {
|
||||||
addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3);
|
addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 5);
|
||||||
addCard(Constants.Zone.HAND, playerA, "Orb of Dreams");
|
addCard(Constants.Zone.HAND, playerA, "Orb of Dreams");
|
||||||
|
addCard(Constants.Zone.HAND, playerA, "Razortip Whip");
|
||||||
|
|
||||||
castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Orb of Dreams");
|
castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Orb of Dreams");
|
||||||
|
castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Razortip Whip");
|
||||||
|
|
||||||
setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT);
|
setStopAt(1, Constants.PhaseStep.END_TURN);
|
||||||
execute();
|
execute();
|
||||||
|
|
||||||
assertLife(playerA, 20);
|
assertLife(playerA, 20);
|
||||||
assertLife(playerB, 20);
|
assertLife(playerB, 20);
|
||||||
|
|
||||||
assertPermanentCount(playerA, "Orb of Dreams", 1);
|
assertPermanentCount(playerA, "Orb of Dreams", 1);
|
||||||
|
assertPermanentCount(playerA, "Razortip Whip", 1);
|
||||||
|
|
||||||
Permanent orbOfDreams = getPermanent("Orb of Dreams", playerA.getId());
|
Permanent orbOfDreams = getPermanent("Orb of Dreams", playerA.getId());
|
||||||
Assert.assertFalse("Orb has tapped itself, but may not", orbOfDreams.isTapped());
|
Assert.assertFalse("Orb has tapped itself, but may not", orbOfDreams.isTapped());
|
||||||
|
Permanent razortipWhip = getPermanent("Razortip Whip", playerA.getId());
|
||||||
|
Assert.assertTrue("Razortip Whip must be tapped from Orb of Dreams but isn't", razortipWhip.isTapped());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue