External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-25 04:39:18 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Parallax Wave - Fixed a bug that always all exiled objects returned also if they were exiled by an earlier instance of Parallax Wave (combo with Opalescence).

Browse source
This commit is contained in:
LevelX2 2015-03-11 16:25:53 +01:00
parent 23de61b433
commit a7e4ceb234
3 changed files with 126 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Mage.Sets/src/mage/sets/nemesis/ParallaxWave.java
View file

@ -28,12 +28,13 @@
package mage.sets.nemesis;
import java.util.UUID;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.common.LeavesBattlefieldTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.RemoveCountersSourceCost;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.ExileTargetEffect;
import mage.abilities.effects.common.ExileTargetForSourceEffect;
import mage.abilities.keyword.FadingAbility;
import mage.cards.Card;
import mage.cards.CardImpl;
@ -46,6 +47,7 @@ import mage.game.ExileZone;
import mage.game.Game;
import mage.players.Player;
import mage.target.common.TargetCreaturePermanent;
import mage.util.CardUtil;
/**
*
@ -63,7 +65,7 @@ public class ParallaxWave extends CardImpl {
this.addAbility(new FadingAbility(5, this));
// Remove a fade counter from Parallax Wave: Exile target creature.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(this.getId(), this.getName()), new RemoveCountersSourceCost(CounterType.FADE.createInstance()));
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new RemoveCountersSourceCost(CounterType.FADE.createInstance()));
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
@ -100,16 +102,22 @@ class ParallaxWaveEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
ExileZone exileZone = game.getExile().getExileZone(source.getSourceId());
if (exileZone != null) {
for (Card card: exileZone.getCards(game)) {
Player player = game.getPlayer(card.getOwnerId());
if (player != null) {
player.putOntoBattlefieldWithInfo(card, game, Zone.EXILED, source.getSourceId());
MageObject sourceObject = source.getSourceObject(game);
if (sourceObject != null) {
UUID exileZoneId = CardUtil.getObjectExileZoneId(game, sourceObject);
if (exileZoneId != null) {
ExileZone exileZone = game.getExile().getExileZone(exileZoneId);
if (exileZone != null) {
for (Card card: exileZone.getCards(game)) {
Player player = game.getPlayer(card.getOwnerId());
if (player != null) {
player.putOntoBattlefieldWithInfo(card, game, Zone.EXILED, source.getSourceId());
}
}
exileZone.clear();
}
return true;
}
exileZone.clear();
return true;
}
return false;
}

4
Mage.Sets/src/mage/sets/urzasdestiny/Opalescence.java
View file

@ -27,9 +27,7 @@
*/
package mage.sets.urzasdestiny;
import java.util.Iterator;
import java.util.UUID;
import mage.MageObjectReference;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.ContinuousEffectImpl;
@ -87,7 +85,7 @@ class OpalescenceEffect extends ContinuousEffectImpl {
public OpalescenceEffect() {
super(Duration.WhileOnBattlefield, Outcome.BecomeCreature);
staticText = "Each other non-Aura enchantment is a creature with power and toughness each equal to its converted mana cost.";
staticText = "Each other non-Aura enchantment is a creature with power and toughness each equal to its converted mana cost";
}
public OpalescenceEffect(final OpalescenceEffect effect) {