github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-12 09:11:05 -09:00
Code Issues Projects Releases Packages Wiki Activity

* Hixus, Prison Warden - Fixed that the triggered ability did not exile the creature.

Browse source
This commit is contained in:
LevelX2 2015-07-10 14:45:24 +02:00
parent 5739fd7a57
commit 2deb89bfa7
2 changed files with 107 additions and 11 deletions
Mage.Sets/src/mage/sets/magicorigins
HixusPrisonWarden.java
Mage.Tests/src/test/java/org/mage/test/cards/triggers/combat/damage
HixusPrisonWardenTest.java

24
Mage.Sets/src/mage/sets/magicorigins/HixusPrisonWarden.java
View file

@ -67,7 +67,7 @@ public class HixusPrisonWarden extends CardImpl {
// Flash
this.addAbility(FlashAbility.getInstance());
// Whenever a creature deals combat damage to you, if Hixus, Prison Warden entered the battlefield this turn, exile that creature until Hixus leaves the battlefield.
this.addAbility(new HixusPrisonWardenTriggeredAbility(new HixusPrisonWardenExileEffect()));
}
@ -87,7 +87,7 @@ class HixusPrisonWardenTriggeredAbility extends TriggeredAbilityImpl {
public HixusPrisonWardenTriggeredAbility(Effect effect) {
super(Zone.BATTLEFIELD, effect);
this.addEffect(new CreateDelayedTriggeredAbilityEffect(new OnLeaveReturnExiledToBattlefieldAbility()));
}
}
public HixusPrisonWardenTriggeredAbility(final HixusPrisonWardenTriggeredAbility ability) {
super(ability);
@ -101,22 +101,22 @@ class HixusPrisonWardenTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkInterveningIfClause(Game game) {
MageObject mageObject = getSourceObject(game);
return (mageObject instanceof Permanent) && ((Permanent)mageObject).getTurnsOnBattlefield() ==1;
return (mageObject instanceof Permanent) && ((Permanent) mageObject).getTurnsOnBattlefield() == 0;
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.DAMAGED_PLAYER;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
DamagedPlayerEvent damageEvent = (DamagedPlayerEvent)event;
DamagedPlayerEvent damageEvent = (DamagedPlayerEvent) event;
Permanent sourcePermanent = game.getPermanent(event.getSourceId());
if (damageEvent.getPlayerId().equals(getControllerId()) &&
damageEvent.isCombatDamage() &&
sourcePermanent != null &&
sourcePermanent.getCardType().contains(CardType.CREATURE)) {
if (damageEvent.getPlayerId().equals(getControllerId())
&& damageEvent.isCombatDamage()
&& sourcePermanent != null
&& sourcePermanent.getCardType().contains(CardType.CREATURE)) {
getEffects().get(0).setTargetPointer(new FixedTarget(event.getSourceId()));
return true;
}
@ -152,8 +152,10 @@ class HixusPrisonWardenExileEffect extends OneShotEffect {
// If Prison Warden leaves the battlefield before its triggered ability resolves,
// the target creature won't be exiled.
if (permanent != null) {
return new ExileTargetEffect(CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter()), permanent.getIdName()).apply(game, source);
Effect effect = new ExileTargetEffect(CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter()), permanent.getIdName());
effect.setTargetPointer(getTargetPointer());
return effect.apply(game, source);
}
return false;
}
}
}

94
Mage.Tests/src/test/java/org/mage/test/cards/triggers/combat/damage/HixusPrisonWardenTest.java Normal file
View file

@ -0,0 +1,94 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package org.mage.test.cards.triggers.combat.damage;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.game.permanent.Permanent;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author LevelX2
*/
public class HixusPrisonWardenTest extends CardTestPlayerBase {
@Test
public void testCreatureIsExiled() {
addCard(Zone.BATTLEFIELD, playerA, "Plains", 5);
// Flash
// Whenever a creature deals combat damage to you, if Hixus, Prison Warden entered the battlefield this turn, exile that creature until Hixus leaves the battlefield.
addCard(Zone.HAND, playerA, "Hixus, Prison Warden", 1); // 4/4
addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1);
attack(2, playerB, "Silvercoat Lion");
castSpell(2, PhaseStep.DECLARE_BLOCKERS, playerA, "Hixus, Prison Warden");
setStopAt(2, PhaseStep.POSTCOMBAT_MAIN);
execute();
assertLife(playerA, 18);
assertLife(playerB, 20);
assertPermanentCount(playerA, "Hixus, Prison Warden", 1);
assertExileCount("Silvercoat Lion", 1);
}
@Test
public void testCreatureIsExiledAndDoesReturn() {
addCard(Zone.BATTLEFIELD, playerA, "Plains", 5);
// Flash
// Whenever a creature deals combat damage to you, if Hixus, Prison Warden entered the battlefield this turn, exile that creature until Hixus leaves the battlefield.
addCard(Zone.HAND, playerA, "Hixus, Prison Warden", 1); // 4/4
addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
addCard(Zone.HAND, playerB, "Boomerang", 1);
addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1);
attack(2, playerB, "Silvercoat Lion");
castSpell(2, PhaseStep.DECLARE_BLOCKERS, playerA, "Hixus, Prison Warden");
castSpell(2, PhaseStep.POSTCOMBAT_MAIN, playerB, "Boomerang", "Hixus, Prison Warden");
setStopAt(2, PhaseStep.END_TURN);
execute();
assertLife(playerA, 18);
assertLife(playerB, 20);
assertGraveyardCount(playerB, "Boomerang", 1);
assertHandCount(playerA, "Hixus, Prison Warden", 1);
assertPermanentCount(playerB, "Silvercoat Lion", 1);
Permanent lion = getPermanent("Silvercoat Lion", playerB);
Assert.assertEquals("The lion did come into play this turn", true, lion.hasSummoningSickness());
}
}