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

* Laquatus's Champion - Fix that player didn't get life when Laquatus's Champion left the battlefield

Browse source
This commit is contained in:
Quercitron 2015-12-30 02:03:44 +03:00
parent 88ca1ec1b0
commit c73cee90a5
2 changed files with 119 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

72
Mage.Sets/src/mage/sets/torment/LaquatussChampion.java
View file

@ -33,17 +33,21 @@ import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.common.LeavesBattlefieldTriggeredAbility; import mage.abilities.common.LeavesBattlefieldTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.AdjustingSourceCosts;
import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.GainLifeTargetEffect;
import mage.abilities.effects.common.LoseLifeTargetEffect;
import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.RegenerateSourceEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.Zone; import mage.constants.Zone;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent;
import mage.players.Player; import mage.players.Player;
import mage.target.TargetPlayer; import mage.target.TargetPlayer;
import mage.target.targetpointer.FixedTarget;
import mage.util.CardUtil; import mage.util.CardUtil;
/** /**
@ -62,11 +66,11 @@ public class LaquatussChampion extends CardImpl {
this.toughness = new MageInt(3); this.toughness = new MageInt(3);
// When Laquatus's Champion enters the battlefield, target player loses 6 life. // When Laquatus's Champion enters the battlefield, target player loses 6 life.
Ability ability = new EntersBattlefieldTriggeredAbility(new LaquatussChampionEntersEffect(), false); Ability ability = new LaquatussChampionEntersBattlefieldTriggeredAbility();
ability.addTarget(new TargetPlayer()); ability.addTarget(new TargetPlayer());
this.addAbility(ability); this.addAbility(ability);
// When Laquatus's Champion leaves the battlefield, that player gains 6 life. // When Laquatus's Champion leaves the battlefield, that player gains 6 life.
this.addAbility(new LeavesBattlefieldTriggeredAbility(new LaquatussChampionLeavesEffect(), false)); this.addAbility(new LaquatussChampionLeavesBattlefieldTriggeredAbility());
// {B}: Regenerate Laquatus's Champion. // {B}: Regenerate Laquatus's Champion.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}")));
} }
@ -81,60 +85,58 @@ public class LaquatussChampion extends CardImpl {
} }
} }
class LaquatussChampionEntersEffect extends OneShotEffect { class LaquatussChampionEntersBattlefieldTriggeredAbility extends EntersBattlefieldTriggeredAbility implements AdjustingSourceCosts {
public LaquatussChampionEntersEffect() { public LaquatussChampionEntersBattlefieldTriggeredAbility() {
super(Outcome.LoseLife); super(new LoseLifeTargetEffect(6), false);
this.staticText = "target player loses 6 life";
} }
public LaquatussChampionEntersEffect(final LaquatussChampionEntersEffect effect) { public LaquatussChampionEntersBattlefieldTriggeredAbility(LaquatussChampionEntersBattlefieldTriggeredAbility ability) {
super(effect); super(ability);
} }
@Override @Override
public LaquatussChampionEntersEffect copy() { public LaquatussChampionEntersBattlefieldTriggeredAbility copy() {
return new LaquatussChampionEntersEffect(this); return new LaquatussChampionEntersBattlefieldTriggeredAbility(this);
} }
@Override @Override
public boolean apply(Game game, Ability source) { public void adjustCosts(Ability ability, Game game) {
Player player = game.getPlayer(this.getTargetPointer().getFirst(game, source)); Player player = game.getPlayer(ability.getFirstTarget());
if (player != null) { if (player != null) {
player.loseLife(6, game); String key = CardUtil.getCardZoneString("targetPlayer", this.getSourceId(), game);
game.getState().setValue(CardUtil.getCardZoneString("targetPlayer", source.getSourceId(), game), player.getId()); game.getState().setValue(key, player.getId());
return true;
} }
return false;
} }
} }
class LaquatussChampionLeavesEffect extends OneShotEffect { class LaquatussChampionLeavesBattlefieldTriggeredAbility extends LeavesBattlefieldTriggeredAbility {
public LaquatussChampionLeavesEffect() { public LaquatussChampionLeavesBattlefieldTriggeredAbility() {
super(Outcome.Benefit); super(new GainLifeTargetEffect(6), false);
this.staticText = "that player gains 6 life";
} }
public LaquatussChampionLeavesEffect(final LaquatussChampionLeavesEffect effect) { public LaquatussChampionLeavesBattlefieldTriggeredAbility(LaquatussChampionLeavesBattlefieldTriggeredAbility ability) {
super(effect); super(ability);
} }
@Override @Override
public LaquatussChampionLeavesEffect copy() { public boolean checkTrigger(GameEvent event, Game game) {
return new LaquatussChampionLeavesEffect(this); if (super.checkTrigger(event, game)) {
} String key = CardUtil.getCardZoneString("targetPlayer", this.getSourceId(), game, true);
Object object = game.getState().getValue(key);
@Override if (object instanceof UUID) {
public boolean apply(Game game, Ability source) { for (Effect effect : this.getEffects()) {
Object object = game.getState().getValue(CardUtil.getCardZoneString("targetPlayer", source.getSourceId(), game)); effect.setTargetPointer(new FixedTarget((UUID) object));
if (object instanceof UUID) { }
Player player = game.getPlayer((UUID) object);
if (player != null) {
player.gainLife(6, game);
return true; return true;
} }
} }
return false; return false;
} }
@Override
public LaquatussChampionLeavesBattlefieldTriggeredAbility copy() {
return new LaquatussChampionLeavesBattlefieldTriggeredAbility(this);
}
} }

82
Mage.Tests/src/test/java/org/mage/test/cards/single/tor/LaquatussChampionTest.java Normal file
View file

@ -0,0 +1,82 @@
package org.mage.test.cards.single.tor;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author Quercitron
*/
public class LaquatussChampionTest extends CardTestPlayerBase {
@Test
public void testEntersBattlefieldTriggeredAbility() {
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 6);
addCard(Zone.HAND, playerA, "Laquatus's Champion");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Laquatus's Champion");
addTarget(playerA, playerB);
setStopAt(1, PhaseStep.END_TURN);
execute();
assertLife(playerB, 14);
}
@Test
public void testLeavesBattlefieldTriggeredAbility() {
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 7);
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 7);
addCard(Zone.HAND, playerA, "Laquatus's Champion");
addCard(Zone.HAND, playerA, "Terminate");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Laquatus's Champion");
addTarget(playerA, playerB);
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Terminate", "Laquatus's Champion");
setStopAt(1, PhaseStep.END_TURN);
execute();
assertLife(playerB, 20);
}
@Test
public void testDoubleZoneChange() {
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 6);
addCard(Zone.BATTLEFIELD, playerA, "Plains", 1);
addCard(Zone.HAND, playerA, "Laquatus's Champion");
addCard(Zone.HAND, playerA, "Cloudshift");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Laquatus's Champion");
addTarget(playerA, playerB);
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Cloudshift", "Laquatus's Champion");
addTarget(playerA, playerB);
setStopAt(1, PhaseStep.END_TURN);
execute();
assertLife(playerB, 14);
}
@Test
public void testLeavesBattlefieldWhenFirstAbilityInStack() {
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 7);
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 7);
addCard(Zone.HAND, playerA, "Laquatus's Champion");
addCard(Zone.HAND, playerA, "Terminate");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Laquatus's Champion");
addTarget(playerA, playerB);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Terminate", "Laquatus's Champion", "enters the battlefield", StackClause.WHILE_ON_STACK);
setStopAt(1, PhaseStep.END_TURN);
execute();
assertLife(playerB, 20);
}
}