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

* Scion of Vitu-Ghazi - Fixed that conditional trigger was not handled correctly.

Browse source
This commit is contained in:
LevelX2 2016-03-01 15:39:37 +01:00
parent 5b15f96342
commit b19b43c4c8
3 changed files with 57 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Mage.Sets/src/mage/sets/dragonsmaze/ScionOfVituGhazi.java
View file

@ -25,15 +25,14 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.sets.dragonsmaze;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.TriggeredAbility;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.condition.common.CastFromHandCondition;
import mage.abilities.decorator.ConditionalOneShotEffect;
import mage.abilities.decorator.ConditionalTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.effects.common.PopulateEffect;
import mage.cards.CardImpl;
@ -46,8 +45,6 @@ import mage.watchers.common.CastFromHandWatcher;
*
* @author LevelX2
*/
public class ScionOfVituGhazi extends CardImpl {
public ScionOfVituGhazi(UUID ownerId) {
@ -58,12 +55,10 @@ public class ScionOfVituGhazi extends CardImpl {
this.power = new MageInt(4);
this.toughness = new MageInt(4);
// When Scion of Vitu-Ghazi enters the battlefield, if you cast it from your hand, put a 1/1 white Bird creature token with flying onto the battlefield, then populate.
Ability ability = new EntersBattlefieldTriggeredAbility(
new ConditionalOneShotEffect(new CreateTokenEffect(new BirdToken()), new CastFromHandCondition(),
"if you cast it from your hand, put a 1/1 white Bird creature token with flying onto the battlefield,"));
TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new BirdToken()), false);
ability.addEffect(new PopulateEffect("then"));
this.addAbility(ability, new CastFromHandWatcher());
this.addAbility(new ConditionalTriggeredAbility(ability, new CastFromHandCondition(),
"When {this} enters the battlefield, if you cast it from your hand, put a 1/1 white Bird creature token with flying onto the battlefield, then populate."), new CastFromHandWatcher());
}
public ScionOfVituGhazi(final ScionOfVituGhazi card) {

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

@ -95,4 +95,40 @@ public class EntersTheBattlefieldTriggerTest extends CardTestPlayerBase {
assertLife(playerB, 17);
}
/**
* 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() {
addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 4);
// When Scion of Vitu-Ghazi enters the battlefield, if you cast it from your hand, put a 1/1 white Bird creature token with flying onto the battlefield, then populate.
addCard(Zone.HAND, playerA, "Scion of Vitu-Ghazi", 1); // 4/4 - {3}{W}{W}
// Put target creature card from a graveyard onto the battlefield under your control. You lose life equal to its converted mana cost.
addCard(Zone.HAND, playerA, "Reanimate", 1); // {B}
addCard(Zone.BATTLEFIELD, playerB, "Swamp", 2);
// Destroy target nonartifact, nonblack creature. It can't be regenerated.
addCard(Zone.HAND, playerB, "Terror", 1); // {1}{B}
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Scion of Vitu-Ghazi");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Terror", "Scion of Vitu-Ghazi");
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Reanimate", "Scion of Vitu-Ghazi");
setStopAt(1, PhaseStep.END_TURN);
execute();
assertGraveyardCount(playerB, "Terror", 1);
assertGraveyardCount(playerA, "Reanimate", 1);
assertPermanentCount(playerA, "Scion of Vitu-Ghazi", 1);
assertPermanentCount(playerA, "Bird", 2); // only 2 from cast from hand creation and populate. Populate may not trigger from reanimate
assertLife(playerA, 15);
assertLife(playerB, 20);
}
}

12
Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java
View file

@ -37,21 +37,15 @@ import mage.filter.predicate.permanent.ControllerPredicate;
import mage.filter.predicate.permanent.TokenPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.game.permanent.PermanentToken;
import mage.game.permanent.token.Token;
import mage.players.Player;
import mage.target.Target;
import mage.target.TargetPermanent;
import mage.target.targetpointer.FixedTarget;
import mage.util.CardUtil;
/**
*
* @author LevelX2
*/
//
// 701.27. Populate
//
@ -61,8 +55,6 @@ import mage.util.CardUtil;
// 701.27b If you control no creature tokens when instructed to populate, you
// won’t put a token onto the battlefield.
//
public class PopulateEffect extends OneShotEffect {
private static final FilterPermanent filter = new FilterPermanent("token for populate");
@ -94,13 +86,15 @@ public class PopulateEffect extends OneShotEffect {
player.choose(Outcome.Copy, target, source.getSourceId(), game);
Permanent tokenToCopy = game.getPermanent(target.getFirstTarget());
if (tokenToCopy != null) {
if (!game.isSimulation())
if (!game.isSimulation()) {
game.informPlayers("Token selected for populate: " + tokenToCopy.getLogName());
}
Effect effect = new PutTokenOntoBattlefieldCopyTargetEffect();
effect.setTargetPointer(new FixedTarget(target.getFirstTarget()));
return effect.apply(game, source);
}
}
return true;
}
return false;
}