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

Added AuraReplacementEffect; cards with the Aura subtype don't change the zone they are in if there is no valid target on the battlefield. Also, when entering the Battlefield and it was not cast this effect gets the target to witch to attach it.

Browse source 
Updated Aura Enchantment cards affected by the AuraReplacementEffect.
This commit is contained in:
North 2012-04-13 22:16:40 +03:00
parent 655a84a65f
commit 9632a3297d
5 changed files with 155 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Sets/src/mage/sets/darkascension/CurseOfMisfortunes.java
View file

@ -45,6 +45,7 @@ import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.TargetPlayer;
import mage.target.common.TargetCardInLibrary;
import mage.target.targetpointer.FixedTarget;
/**
*
@ -114,9 +115,9 @@ class CurseOfMisfortunesEffect extends OneShotEffect<CurseOfMisfortunesEffect> {
if (player.searchLibrary(targetCard, game)) {
Card card = game.getCard(targetCard.getFirstTarget());
if (card != null) {
this.setTargetPointer(new FixedTarget(targetPlayer.getId()));
player.shuffleLibrary(game);
card.putOntoBattlefield(game, Constants.Zone.LIBRARY, source.getSourceId(), source.getControllerId());
return targetPlayer.addAttachment(card.getId(), game);
return card.putOntoBattlefield(game, Constants.Zone.LIBRARY, source.getId(), source.getControllerId());
}
}
player.shuffleLibrary(game);

13
Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java
View file

@ -38,8 +38,8 @@ import mage.Constants.SubLayer;
import mage.Constants.TargetController;
import mage.Constants.Zone;
import mage.abilities.Ability;
import mage.abilities.common.OnEventTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.common.OnEventTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.effects.Effect;
@ -56,6 +56,7 @@ import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.TargetPermanent;
import mage.target.common.TargetCreaturePermanent;
import mage.target.targetpointer.FixedTarget;
/**
*
@ -197,11 +198,8 @@ class NecroticPlagueEffect2 extends OneShotEffect<NecroticPlagueEffect2> {
if (controller.chooseTarget(Outcome.Detriment, target, source, game)) {
Card card = game.getCard(cardId);
if (card != null) {
card.putOntoBattlefield(game, Zone.GRAVEYARD, source.getId(), source.getControllerId());
Permanent permanent = game.getPermanent(target.getFirstTarget());
if (permanent != null) {
return permanent.addAttachment(cardId, game);
}
this.setTargetPointer(new FixedTarget(target.getFirstTarget()));
return card.putOntoBattlefield(game, Zone.GRAVEYARD, source.getId(), source.getControllerId());
}
}
}
@ -218,5 +216,4 @@ class NecroticPlagueEffect2 extends OneShotEffect<NecroticPlagueEffect2> {
return new NecroticPlagueEffect2(this);
}
}
}

13
Mage.Sets/src/mage/sets/zendikar/Gigantiform.java
View file

@ -50,11 +50,9 @@ import mage.abilities.keyword.TrampleAbility;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.filter.FilterCard;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.TargetPermanent;
import mage.target.common.TargetCardInLibrary;
@ -179,15 +177,8 @@ class GigantiformEffect extends OneShotEffect<GigantiformEffect> {
TargetCardInLibrary target = new TargetCardInLibrary(filter);
if (player != null && player.chooseUse(Outcome.PutCardInPlay, message, game) && player.searchLibrary(target, game)) {
Card card = player.getLibrary().getCard(target.getFirstTarget(), game);
TargetCreaturePermanent targetCreature = new TargetCreaturePermanent(new FilterCreaturePermanent("creature to attach Gigantiform to"));
if (card != null && card.putOntoBattlefield(game, Zone.HAND, source.getId(), source.getControllerId())
&& player.chooseTarget(Outcome.BoostCreature, targetCreature, source, game)) {
Permanent aura = game.getPermanent(card.getId());
Permanent creature = game.getPermanent(targetCreature.getFirstTarget());
if (aura != null && creature != null) {
creature.addAttachment(aura.getId(), game);
}
if (card != null) {
card.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), source.getControllerId());
}
player.shuffleLibrary(game);
return true;

140
Mage/src/mage/abilities/effects/AuraReplacementEffect.java Normal file
View file

@ -0,0 +1,140 @@
/*
* 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 mage.abilities.effects;
import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Duration;
import mage.Constants.Outcome;
import mage.Constants.Zone;
import mage.MageObject;
import mage.abilities.Ability;
import mage.cards.Card;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.Permanent;
import mage.game.permanent.PermanentCard;
import mage.game.stack.StackAbility;
import mage.players.Player;
import mage.target.Target;
/**
*
* @author North
*/
public class AuraReplacementEffect extends ReplacementEffectImpl<AuraReplacementEffect> {
public AuraReplacementEffect() {
super(Duration.EndOfGame, Outcome.Neutral);
}
public AuraReplacementEffect(final AuraReplacementEffect effect) {
super(effect);
}
@Override
public AuraReplacementEffect copy() {
return new AuraReplacementEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
return true;
}
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
Zone fromZone = ((ZoneChangeEvent) event).getFromZone();
Card card = game.getCard(event.getTargetId());
UUID sourceId = event.getSourceId();
UUID controllerId = event.getPlayerId();
UUID targetId = null;
MageObject sourceObject = game.getObject(sourceId);
if (sourceObject instanceof StackAbility) {
StackAbility stackAbility = (StackAbility) sourceObject;
if (!stackAbility.getEffects().isEmpty()) {
targetId = stackAbility.getEffects().get(0).getTargetPointer().getFirst(stackAbility);
}
}
if (targetId == null) {
Target target = card.getSpellAbility().getTargets().get(0);
Player player = game.getPlayer(card.getOwnerId());
if (player != null && player.choose(Outcome.BoostCreature, target, sourceId, game)) {
targetId = target.getFirstTarget();
}
}
Permanent targetPermanent = game.getPermanent(targetId);
Player targetPlayer = game.getPlayer(targetId);
if (targetPermanent != null || targetPlayer != null) {
switch (fromZone) {
case GRAVEYARD:
game.getPlayer(card.getOwnerId()).removeFromGraveyard(card, game);
break;
case HAND:
game.getPlayer(card.getOwnerId()).removeFromHand(card, game);
break;
case LIBRARY:
game.getPlayer(card.getOwnerId()).removeFromLibrary(card, game);
break;
default:
}
game.rememberLKI(card.getId(), fromZone, card);
PermanentCard permanent = new PermanentCard(card, card.getOwnerId());
game.getBattlefield().addPermanent(permanent);
game.setZone(card.getId(), Zone.BATTLEFIELD);
game.applyEffects();
permanent.entersBattlefield(event.getSourceId(), game);
game.fireEvent(new ZoneChangeEvent(permanent, controllerId, fromZone, Zone.BATTLEFIELD));
if (targetPermanent != null) {
targetPermanent.addAttachment(permanent.getId(), game);
}
if (targetPlayer != null) {
targetPlayer.addAttachment(permanent.getId(), game);
}
}
return true;
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (event.getType() == GameEvent.EventType.ZONE_CHANGE
&& ((ZoneChangeEvent) event).getToZone() == Zone.BATTLEFIELD
&& ((ZoneChangeEvent) event).getFromZone() != Zone.HAND) {
Card card = game.getCard(event.getTargetId());
if (card != null && card.getCardType().contains(CardType.ENCHANTMENT) && card.hasSubtype("Aura")) {
return true;
}
}
return false;
}
}

6
Mage/src/mage/abilities/effects/ContinuousEffects.java
View file

@ -29,7 +29,6 @@
package mage.abilities.effects;
import java.io.Serializable;
import java.util.Map.Entry;
import java.util.*;
import mage.Constants.AsThoughEffectType;
import mage.Constants.Duration;
@ -60,15 +59,18 @@ public class ContinuousEffects implements Serializable {
private final ApplyCountersEffect applyCounters;
private final PlaneswalkerRedirectionEffect planeswalkerRedirectionEffect;
private final AuraReplacementEffect auraReplacementEffect;
public ContinuousEffects() {
applyCounters = new ApplyCountersEffect();
planeswalkerRedirectionEffect = new PlaneswalkerRedirectionEffect();
auraReplacementEffect = new AuraReplacementEffect();
}
public ContinuousEffects(final ContinuousEffects effect) {
this.applyCounters = effect.applyCounters.copy();
this.planeswalkerRedirectionEffect = effect.planeswalkerRedirectionEffect.copy();
this.auraReplacementEffect = effect.auraReplacementEffect.copy();
layeredEffects = effect.layeredEffects.copy();
replacementEffects = effect.replacementEffects.copy();
preventionEffects = effect.preventionEffects.copy();
@ -190,6 +192,8 @@ public class ContinuousEffects implements Serializable {
List<ReplacementEffect> replaceEffects = new ArrayList<ReplacementEffect>();
if (planeswalkerRedirectionEffect.applies(event, null, game))
replaceEffects.add(planeswalkerRedirectionEffect);
if(auraReplacementEffect.applies(event, null, game))
replaceEffects.add(auraReplacementEffect);
//get all applicable transient Replacement effects
for (ReplacementEffect effect: replacementEffects) {
Ability ability = replacementEffects.getAbility(effect.getId());