Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Colossal Whale - Fixed a bug that the leaves battlefield event of Colossal Whale was triggered if the return from the exiled creature had a dies or leaves triggered ability on creatures.

Browse source
This commit is contained in:
LevelX2 2014-03-15 17:47:51 +01:00
parent a98d7eaffb
commit fc4fb90115
1 changed files with 61 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

95
Mage.Sets/src/mage/sets/magic2014/ColossalWhale.java
View file

@ -40,7 +40,6 @@ import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.WatcherScope;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerIdPredicate;
@ -50,7 +49,6 @@ import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.Permanent;
import mage.target.common.TargetCreaturePermanent;
import mage.watchers.WatcherImpl;
/**
*
@ -71,8 +69,9 @@ public class ColossalWhale extends CardImpl<ColossalWhale> {
this.addAbility(new IslandwalkAbility());
// Whenever Colossal Whale attacks, you may exile target creature defending player controls until Colossal Whale leaves the battlefield.
this.addAbility(new ColossalWhaleAbility());
this.addWatcher(new ColossalWhaleWatcher());
// Implemented as triggered effect that doesn't uses the stack (implementation with watcher does not work correctly because if the returned creature
// has a DiesTriggeredAll ability it triggers for the dying Banish Priest, what shouldn't happen)
this.addAbility(new ColossalWhaleReturnExiledAbility());
}
@ -143,52 +142,80 @@ class ColossalWhaleExileEffect extends OneShotEffect<ColossalWhaleExileEffect> {
@Override
public boolean apply(Game game, Ability source) {
Permanent permanent = game.getPermanent(source.getSourceId());
// If Chained to the Rocks leaves the battlefield before its triggered ability resolves,
// If Whale leaves the battlefield before its triggered ability resolves,
// the target creature won't be exiled.
if (permanent != null) {
new ExileTargetEffect(source.getSourceId(), permanent.getName()).apply(game, source);
return new ExileTargetEffect(source.getSourceId(), permanent.getName()).apply(game, source);
}
return false;
}
}
class ColossalWhaleWatcher extends WatcherImpl<ColossalWhaleWatcher> {
/**
* Returns the exiled card as Banisher Priest leaves battlefield
* Uses no stack
* @author LevelX2
*/
ColossalWhaleWatcher () {
super("BattlefieldLeft", WatcherScope.CARD);
class ColossalWhaleReturnExiledAbility extends TriggeredAbilityImpl<ColossalWhaleReturnExiledAbility> {
public ColossalWhaleReturnExiledAbility() {
super(Zone.BATTLEFIELD, new ReturnExiledCreatureColossalWhaleEffect());
this.usesStack = false;
this.setRuleVisible(false);
}
ColossalWhaleWatcher(final ColossalWhaleWatcher watcher) {
super(watcher);
public ColossalWhaleReturnExiledAbility(final ColossalWhaleReturnExiledAbility ability) {
super(ability);
}
@Override
public void watch(GameEvent event, Game game) {
public ColossalWhaleReturnExiledAbility copy() {
return new ColossalWhaleReturnExiledAbility(this);
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.ZONE_CHANGE && event.getTargetId().equals(this.getSourceId())) {
ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
if (zEvent.getFromZone() == Zone.BATTLEFIELD) {
ExileZone exile = game.getExile().getExileZone(this.getSourceId());
Card sourceCard = game.getCard(this.getSourceId());
if (exile != null && sourceCard != null) {
LinkedList<UUID> cards = new LinkedList<>(exile);
for (UUID cardId: cards) {
Card card = game.getCard(cardId);
card.moveToZone(Zone.BATTLEFIELD, this.getSourceId(), game, false);
game.informPlayers(new StringBuilder(sourceCard.getName()).append(": ").append(card.getName()).append(" was returned to battlefield from exile").toString());
}
exile.clear();
}
return true;
}
}
}
@Override
public void reset() {
//don't reset condition each turn - only when this leaves the battlefield
}
@Override
public ColossalWhaleWatcher copy() {
return new ColossalWhaleWatcher(this);
return false;
}
}
class ReturnExiledCreatureColossalWhaleEffect extends OneShotEffect<ReturnExiledCreatureColossalWhaleEffect> {
public ReturnExiledCreatureColossalWhaleEffect() {
super(Outcome.Benefit);
this.staticText = "Return exiled creatures";
}
public ReturnExiledCreatureColossalWhaleEffect(final ReturnExiledCreatureColossalWhaleEffect effect) {
super(effect);
}
@Override
public ReturnExiledCreatureColossalWhaleEffect copy() {
return new ReturnExiledCreatureColossalWhaleEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
ExileZone exile = game.getExile().getExileZone(source.getSourceId());
Card sourceCard = game.getCard(source.getSourceId());
if (exile != null && sourceCard != null) {
LinkedList<UUID> cards = new LinkedList<>(exile);
for (UUID cardId : cards) {
Card card = game.getCard(cardId);
card.moveToZone(Zone.BATTLEFIELD, source.getSourceId(), game, false);
game.informPlayers(new StringBuilder(sourceCard.getName()).append(": ").append(card.getName()).append(" returns to battlefield from exile").toString());
}
exile.clear();
return true;
}
return false;
}
}