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

reworked some abilities which use card.moveToExile

Browse source
This commit is contained in:
Evan Kranzler 2021-02-28 16:08:23 -05:00
parent 098796f86e
commit 129a477f56
3 changed files with 87 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Mage/src/main/java/mage/abilities/effects/common/ExileAndGainLifeEqualPowerTargetEffect.java
View file

@ -4,6 +4,7 @@ package mage.abilities.effects.common;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -18,7 +19,7 @@ public class ExileAndGainLifeEqualPowerTargetEffect extends OneShotEffect {
staticText = "Exile target creature. Its controller gains life equal to its power";
}
public ExileAndGainLifeEqualPowerTargetEffect(final ExileAndGainLifeEqualPowerTargetEffect effect) {
private ExileAndGainLifeEqualPowerTargetEffect(final ExileAndGainLifeEqualPowerTargetEffect effect) {
super(effect);
}
@ -30,16 +31,17 @@ public class ExileAndGainLifeEqualPowerTargetEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Permanent permanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source));
if (permanent != null) {
Player player = game.getPlayer(permanent.getControllerId());
if (player != null) {
int creaturePower = permanent.getPower().getValue();
permanent.moveToExile(null, null, source, game);
game.getState().processAction(game);
player.gainLife(creaturePower, game, source);
}
if (permanent == null) {
return false;
}
Player controller = game.getPlayer(source.getControllerId());
Player player = game.getPlayer(permanent.getControllerId());
if (controller == null || player == null) {
return true;
}
return false;
int creaturePower = permanent.getPower().getValue();
controller.moveCards(permanent, Zone.EXILED, source, game);
player.gainLife(creaturePower, game, source);
return true;
}
}

25
Mage/src/main/java/mage/abilities/effects/common/ExileTargetAndSearchGraveyardHandLibraryEffect.java
View file

@ -1,17 +1,18 @@
package mage.abilities.effects.common;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.effects.common.search.SearchTargetGraveyardHandLibraryForCardNameAndExileEffect;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.Target;
import mage.target.TargetPermanent;
import java.util.UUID;
/**
*
* @author LevelX2
*/
public class ExileTargetAndSearchGraveyardHandLibraryEffect extends SearchTargetGraveyardHandLibraryForCardNameAndExileEffect {
@ -20,7 +21,7 @@ public class ExileTargetAndSearchGraveyardHandLibraryEffect extends SearchTarget
super(graveyardExileOptional, searchWhatText, searchForText);
}
public ExileTargetAndSearchGraveyardHandLibraryEffect(final ExileTargetAndSearchGraveyardHandLibraryEffect effect) {
private ExileTargetAndSearchGraveyardHandLibraryEffect(final ExileTargetAndSearchGraveyardHandLibraryEffect effect) {
super(effect);
}
@ -36,13 +37,15 @@ public class ExileTargetAndSearchGraveyardHandLibraryEffect extends SearchTarget
break;
}
}
if (exileTarget != null) {
Permanent permanentToExile = game.getPermanent(exileTarget.getFirstTarget());
if (permanentToExile != null) {
targetPlayerId = permanentToExile.getControllerId();
result = permanentToExile.moveToExile(null, "", source, game);
this.applySearchAndExile(game, source, permanentToExile.getName(), targetPlayerId);
}
Player player = game.getPlayer(source.getControllerId());
if (player == null || exileTarget == null) {
return result;
}
Permanent permanentToExile = game.getPermanent(exileTarget.getFirstTarget());
if (permanentToExile != null) {
targetPlayerId = permanentToExile.getControllerId();
result = player.moveCards(permanentToExile, Zone.EXILED, source, game);
this.applySearchAndExile(game, source, permanentToExile.getName(), targetPlayerId);
}
return result;