External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-24 20:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3 from magefree/master

Browse source 
Merging
This commit is contained in:
Blinke 2015-10-21 23:00:46 +02:00
commit dbf160bac3
92 changed files with 1417 additions and 753 deletions
Download patch file Download diff file Expand all files Collapse all files

52
Mage.Sets/src/mage/sets/Commander2015.java Normal file
View file

@ -0,0 +1,52 @@
/*
* 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.sets;
import java.util.GregorianCalendar;
import mage.cards.ExpansionSet;
import mage.constants.SetType;
/**
*
* @author fireshoes
*/
public class Commander2015 extends ExpansionSet {
private static final Commander2015 fINSTANCE = new Commander2015();
public static Commander2015 getInstance() {
return fINSTANCE;
}
private Commander2015() {
super("Commander 2015 Edition", "C15", "mage.sets.commander2015", new GregorianCalendar(2015, 11, 13).getTime(), SetType.SUPPLEMENTAL);
this.blockName = "Command Zone";
}
}

1
Mage.Sets/src/mage/sets/archenemy/SkirkCommando.java
View file

@ -52,7 +52,6 @@ public class SkirkCommando extends CardImpl {
super(ownerId, 47, "Skirk Commando", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}{R}");
this.expansionSetCode = "ARC";
this.subtype.add("Goblin");
this.subtype.add("Shaman");
this.power = new MageInt(2);
this.toughness = new MageInt(1);

3
Mage.Sets/src/mage/sets/battleforzendikar/DustStalker.java
View file

@ -59,8 +59,7 @@ public class DustStalker extends CardImpl {
public DustStalker(UUID ownerId) {
super(ownerId, 202, "Dust Stalker", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{B}{R}");
this.expansionSetCode = "BFZ";
this.supertype.add("Creautre");
this.supertype.add("Eldrazi");
this.subtype.add("Eldrazi");
this.power = new MageInt(5);
this.toughness = new MageInt(3);

21
Mage.Sets/src/mage/sets/battleforzendikar/SerpentineSpike.java
View file

@ -39,6 +39,7 @@ import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.AnotherTargetPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.common.TargetCreaturePermanent;
@ -60,9 +61,23 @@ public class SerpentineSpike extends CardImpl {
this.addAbility(ability);
// Serpentine Spike deals 2 damage to target creature, 3 damage to another target creature, and 4 damage to a third target creature. If a creature dealt damage this way would die this turn, exile it instead.
this.getSpellAbility().addEffect(new SerpentineSpikeEffect());
this.getSpellAbility().addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature (2 damage)")));
this.getSpellAbility().addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature (3 damage)")));
this.getSpellAbility().addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature (4 damage)")));
TargetCreaturePermanent target = new TargetCreaturePermanent(new FilterCreaturePermanent("creature (2 damage)"));
target.setTargetTag(1);
this.getSpellAbility().addTarget(target);
FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature (3 damage)");
filter.add(new AnotherTargetPredicate(2));
target = new TargetCreaturePermanent(filter);
target.setTargetTag(2);
this.getSpellAbility().addTarget(target);
filter = new FilterCreaturePermanent("another target creature (4 damage)");
filter.add(new AnotherTargetPredicate(3));
target = new TargetCreaturePermanent(filter);
target.setTargetTag(3);
this.getSpellAbility().addTarget(target);
Effect effect = new DealtDamageToCreatureBySourceDies(this, Duration.EndOfTurn);
effect.setText("If a creature dealt damage this way would die this turn, exile it instead");
this.getSpellAbility().addEffect(effect);

1
Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheRealm.java
View file

@ -62,6 +62,7 @@ public class GenjuOfTheRealm extends CardImpl {
super(ownerId, 151, "Genju of the Realm", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{W}{U}{B}{R}{G}");
this.expansionSetCode = "BOK";
this.subtype.add("Aura");
this.supertype.add("Legendary");
// Enchant Land

2
Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamoSightbender.java
View file

@ -62,7 +62,7 @@ public class MinamoSightbender extends CardImpl {
this.subtype.add("Wizard");
this.power = new MageInt(1);
this.toughness = new MageInt(1);
this.toughness = new MageInt(2);
// {X}, {T}: Target creature with power X or less can't be blocked this turn.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new ManaCostsImpl("{X}"));

42
Mage.Sets/src/mage/sets/betrayersofkamigawa/WardOfPiety.java
View file

@ -28,11 +28,11 @@
package mage.sets.betrayersofkamigawa;
import java.util.UUID;
import mage.MageObjectReference;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.PreventionEffectData;
import mage.abilities.effects.PreventionEffectImpl;
import mage.abilities.effects.RedirectionEffect;
import mage.abilities.effects.common.AttachEffect;
import mage.abilities.keyword.EnchantAbility;
import mage.cards.CardImpl;
@ -44,7 +44,6 @@ import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.TargetPermanent;
import mage.target.common.TargetCreatureOrPlayer;
import mage.target.common.TargetCreaturePermanent;
@ -60,7 +59,6 @@ public class WardOfPiety extends CardImpl {
this.expansionSetCode = "BOK";
this.subtype.add("Aura");
// Enchant creature
TargetPermanent auraTarget = new TargetCreaturePermanent();
this.getSpellAbility().addTarget(auraTarget);
@ -84,10 +82,12 @@ public class WardOfPiety extends CardImpl {
}
}
class WardOfPietyPreventDamageTargetEffect extends PreventionEffectImpl {
class WardOfPietyPreventDamageTargetEffect extends RedirectionEffect {
protected MageObjectReference redirectToObject;
public WardOfPietyPreventDamageTargetEffect() {
super(Duration.EndOfTurn, 1, false, true);
super(Duration.EndOfTurn, 1, true);
staticText = "The next 1 damage that would be dealt to enchanted creature this turn is dealt to target creature or player instead";
}
@ -106,35 +106,21 @@ class WardOfPietyPreventDamageTargetEffect extends PreventionEffectImpl {
}
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
PreventionEffectData preventionData = preventDamageAction(event, source, game);
// deal damage now
if (preventionData.getPreventedDamage() > 0) {
Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source));
if (permanent != null) {
game.informPlayers("Dealing " + preventionData.getPreventedDamage() + " damage to " + permanent.getLogName() + " instead");
// keep the original source id as it is redirecting
permanent.damage(preventionData.getPreventedDamage(), event.getSourceId(), game, false, true);
}
Player player = game.getPlayer(getTargetPointer().getFirst(game, source));
if (player != null) {
game.informPlayers("Dealing " + preventionData.getPreventedDamage() + " damage to " + player.getLogName() + " instead");
// keep the original source id as it is redirecting
player.damage(preventionData.getPreventedDamage(), event.getSourceId(), game, false, true);
}
}
return false;
public void init(Ability source, Game game) {
super.init(source, game);
redirectToObject = new MageObjectReference(source.getTargets().get(0).getFirstTarget(), game);
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (super.applies(event, source, game)) {
Permanent enchantment = game.getPermanent(source.getSourceId());
if (enchantment != null && event.getTargetId().equals(enchantment.getAttachedTo())) {
Permanent enchantment = game.getPermanent(source.getSourceId());
if (enchantment != null && event.getTargetId().equals(enchantment.getAttachedTo())) {
if (redirectToObject.equals(new MageObjectReference(source.getTargets().get(0).getFirstTarget(), game))) {
redirectTarget = source.getTargets().get(0);
return true;
}
}
return false;
}
}
}

2
Mage.Sets/src/mage/sets/championsofkamigawa/CrushingPain.java
View file

@ -54,7 +54,7 @@ public class CrushingPain extends CardImpl {
public CrushingPain (UUID ownerId) {
super(ownerId, 162, "Crushing Pain", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}");
this.expansionSetCode = "CHK";
this.subtype.add("Arcane");
// Crushing Pain deals 6 damage to target creature that was dealt damage this turn.
this.getSpellAbility().addEffect(new DamageTargetEffect(6));

2
Mage.Sets/src/mage/sets/championsofkamigawa/EtherealHaze.java
View file

@ -45,7 +45,7 @@ public class EtherealHaze extends CardImpl {
public EtherealHaze (UUID ownerId) {
super(ownerId, 9, "Ethereal Haze", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}");
this.expansionSetCode = "CHK";
this.subtype.add("Arcane");
// Prevent all damage that would be dealt by creatures this turn.
this.getSpellAbility().addEffect(new PreventAllDamageByAllEffect(new FilterCreaturePermanent("creatures"), Duration.EndOfTurn, false));

2
Mage.Sets/src/mage/sets/championsofkamigawa/UnearthlyBlizzard.java
View file

@ -43,7 +43,7 @@ import mage.target.common.TargetCreaturePermanent;
public class UnearthlyBlizzard extends CardImpl {
public UnearthlyBlizzard(UUID ownerId) {
super(ownerId, 196, "Unearthly Blizzard", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}");
super(ownerId, 196, "Unearthly Blizzard", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{R}");
this.expansionSetCode = "CHK";
this.subtype.add("Arcane");

40
Mage.Sets/src/mage/sets/championsofkamigawa/VassalsDuty.java
View file

@ -31,8 +31,7 @@ import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.PreventionEffectData;
import mage.abilities.effects.PreventionEffectImpl;
import mage.abilities.effects.RedirectionEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
@ -42,8 +41,7 @@ import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.TargetPlayer;
import mage.target.common.TargetControlledCreaturePermanent;
/**
@ -53,6 +51,7 @@ import mage.target.common.TargetControlledCreaturePermanent;
public class VassalsDuty extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("legendary creature you control");
static {
filter.add(new SupertypePredicate("Legendary"));
}
@ -61,10 +60,9 @@ public class VassalsDuty extends CardImpl {
super(ownerId, 48, "Vassal's Duty", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}");
this.expansionSetCode = "CHK";
// {1}: The next 1 damage that would be dealt to target legendary creature you control this turn is dealt to you instead.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VassalsDutyPreventDamageTargetEffect(Duration.EndOfTurn, 1), new GenericManaCost(1));
ability.addTarget(new TargetControlledCreaturePermanent(1,1,filter, false));
ability.addTarget(new TargetControlledCreaturePermanent(1, 1, filter, false));
this.addAbility(ability);
}
@ -78,10 +76,10 @@ public class VassalsDuty extends CardImpl {
}
}
class VassalsDutyPreventDamageTargetEffect extends PreventionEffectImpl {
class VassalsDutyPreventDamageTargetEffect extends RedirectionEffect {
public VassalsDutyPreventDamageTargetEffect(Duration duration, int amount) {
super(duration, amount, false);
super(duration, amount, true);
staticText = "The next " + amount + " damage that would be dealt to target legendary creature you control this turn is dealt to you instead";
}
@ -94,29 +92,13 @@ class VassalsDutyPreventDamageTargetEffect extends PreventionEffectImpl {
return new VassalsDutyPreventDamageTargetEffect(this);
}
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
PreventionEffectData preventionResult = preventDamageAction(event, source, game);
// deal damage now
if (preventionResult.getPreventedDamage() > 0) {
UUID redirectTo = source.getControllerId();
Player player = game.getPlayer(redirectTo);
if (player != null) {
game.informPlayers("Dealing " + preventionResult.getPreventedDamage() + " to " + player.getLogName() + " instead");
// keep the original source id as it is redirecting
player.damage(preventionResult.getPreventedDamage(), event.getSourceId(), game, false, true);
}
}
// damage amount is reduced or set to 0 so complete replacement of damage event is never neccessary
return false;
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (!this.used && super.applies(event, source, game)) {
if (event.getTargetId().equals(getTargetPointer().getFirst(game, source))) {
return game.getPermanent(event.getTargetId()) != null;
}
if (event.getTargetId().equals(getTargetPointer().getFirst(game, source))) {
TargetPlayer target = new TargetPlayer();
target.add(source.getControllerId(), game);
redirectTarget = target;
return true;
}
return false;
}

7
Mage.Sets/src/mage/sets/coldsnap/LightningStorm.java
View file

@ -29,6 +29,7 @@ package mage.sets.coldsnap;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.ActivatedAbilityImpl;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.DiscardTargetCost;
import mage.abilities.dynamicvalue.DynamicValue;
@ -59,7 +60,6 @@ public class LightningStorm extends CardImpl {
super(ownerId, 89, "Lightning Storm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{R}{R}");
this.expansionSetCode = "CSP";
// Lightning Storm deals X damage to target creature or player, where X is 3 plus the number of charge counters on it.
Effect effect = new DamageTargetEffect(new LightningStormCountCondition(CounterType.CHARGE));
effect.setText("{this} deals X damage to target creature or player, where X is 3 plus the number of charge counters on it");
@ -67,7 +67,7 @@ public class LightningStorm extends CardImpl {
this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());
// Discard a land card: Put two charge counters on Lightning Storm. You may choose a new target for it. Any player may activate this ability but only if Lightning Storm is on the stack.
SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.STACK,
new LightningStormAddCounterEffect() ,
new LightningStormAddCounterEffect(),
new DiscardTargetCost(new TargetCardInHand(new FilterLandCard())));
ability.setMayActivate(TargetController.ANY);
ability.addEffect(new InfoEffect("Any player may activate this ability but only if {this} is on the stack"));
@ -85,6 +85,7 @@ public class LightningStorm extends CardImpl {
}
class LightningStormCountCondition implements DynamicValue {
private final CounterType counter;
public LightningStormCountCondition(CounterType counter) {
@ -141,7 +142,7 @@ class LightningStormAddCounterEffect extends OneShotEffect {
Spell spell = game.getStack().getSpell(source.getSourceId());
if (spell != null) {
spell.addCounters(CounterType.CHARGE.createInstance(2), game);
return spell.chooseNewTargets(game, source.getControllerId(), false, false, null);
return spell.chooseNewTargets(game, ((ActivatedAbilityImpl) source).getActivatorId(), false, false, null);
}
return false;
}

52
Mage.Sets/src/mage/sets/commander2015/EternalWitness.java Normal file
View file

@ -0,0 +1,52 @@
/*
* 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.sets.commander2015;
import java.util.UUID;
/**
*
* @author fireshoes
*/
public class EternalWitness extends mage.sets.fifthdawn.EternalWitness {
public EternalWitness(UUID ownerId) {
super(ownerId);
this.cardNumber = 183;
this.expansionSetCode = "C15";
}
public EternalWitness(final EternalWitness card) {
super(card);
}
@Override
public EternalWitness copy() {
return new EternalWitness(this);
}
}

129
Mage.Sets/src/mage/sets/commander2015/KalemneDiscipleOfIroas.java Normal file
View file

@ -0,0 +1,129 @@
/*
* 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.sets.commander2015;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.common.SpellCastControllerTriggeredAbility;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.abilities.effects.common.counter.AddCountersControllerEffect;
import mage.abilities.keyword.DoubleStrikeAbility;
import mage.abilities.keyword.VigilanceAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.Filter;
import mage.filter.FilterSpell;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
import mage.game.Game;
import mage.players.Player;
/**
*
* @author fireshoes
*/
public class KalemneDiscipleOfIroas extends CardImpl {
private static final FilterSpell filterSpell = new FilterSpell("a creature spell with converted mana cost 5 or greater");
static {
filterSpell.add(new CardTypePredicate(CardType.CREATURE));
filterSpell.add(new ConvertedManaCostPredicate(Filter.ComparisonType.GreaterThan, 4));
}
public KalemneDiscipleOfIroas(UUID ownerId) {
super(ownerId, 999, "Kalemne, Disciple of Iroas", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{2}{R}{W}");
this.expansionSetCode = "C15";
this.supertype.add("Legendary");
this.subtype.add("Giant");
this.subtype.add("Soldier");
this.power = new MageInt(3);
this.toughness = new MageInt(3);
// Double strike
this.addAbility(DoubleStrikeAbility.getInstance());
// Vigilance
this.addAbility(VigilanceAbility.getInstance());
// Whenever you cast a creature spell with converted mana cost 5 or greater, you get an experience counter.
Effect effect = new AddCountersControllerEffect(CounterType.EXPERIENCE.createInstance(1), false);
effect.setText("you get an experience counter");
Ability ability = new SpellCastControllerTriggeredAbility(effect, filterSpell, false);
this.addAbility(ability);
// Kalemne, Disciple of Iroas gets +1/+1 for each experience counter you have.
DynamicValue value = new SourceControllerExperienceCountersCount();
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(value, value, Duration.WhileOnBattlefield)));
}
public KalemneDiscipleOfIroas(final KalemneDiscipleOfIroas card) {
super(card);
}
@Override
public KalemneDiscipleOfIroas copy() {
return new KalemneDiscipleOfIroas(this);
}
}
class SourceControllerExperienceCountersCount implements DynamicValue {
@Override
public int calculate(Game game, Ability sourceAbility, Effect effect) {
int amount = 0;
Player player = game.getPlayer(sourceAbility.getControllerId());
if (player != null) {
amount = player.getCounters().getCount(CounterType.EXPERIENCE);
}
return amount;
}
@Override
public DynamicValue copy() {
return new SourceControllerExperienceCountersCount();
}
@Override
public String toString() {
return "1";
}
@Override
public String getMessage() {
return "experience counter you have";
}
}

2
Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java
View file

@ -63,6 +63,8 @@ public class EtherswornAdjudicator extends CardImpl {
public EtherswornAdjudicator(UUID ownerId) {
super(ownerId, 26, "Ethersworn Adjudicator", Rarity.MYTHIC, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}{U}");
this.expansionSetCode = "CON";
this.subtype.add("Vedalken");
this.subtype.add("Knight");
this.power = new MageInt(4);
this.toughness = new MageInt(4);

2
Mage.Sets/src/mage/sets/conflux/PathToExile.java
View file

@ -98,7 +98,7 @@ class PathToExileEffect extends OneShotEffect {
if (player.searchLibrary(target, game)) {
Card card = player.getLibrary().getCard(target.getFirstTarget(), game);
if (card != null) {
controller.moveCards(card, Zone.BATTLEFIELD, source, game, true, false, false, null);
player.moveCards(card, Zone.BATTLEFIELD, source, game, true, false, false, null);
}
}
player.shuffleLibrary(game);

1
Mage.Sets/src/mage/sets/darkascension/ArchdemonOfGreed.java
View file

@ -65,6 +65,7 @@ public class ArchdemonOfGreed extends CardImpl {
super(ownerId, 71, "Archdemon of Greed", Rarity.RARE, new CardType[]{CardType.CREATURE}, "");
this.expansionSetCode = "DKA";
this.subtype.add("Demon");
this.color.setBlack(true);
this.nightCard = true;
this.canTransform = true;

61
Mage.Sets/src/mage/sets/dissension/UtopiaSprawl.java
View file

@ -32,20 +32,18 @@ import mage.Mana;
import mage.ObjectColor;
import mage.abilities.Ability;
import mage.abilities.common.AsEntersBattlefieldAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.AttachEffect;
import mage.abilities.effects.common.ChooseColorEffect;
import mage.abilities.effects.common.ManaEffect;
import mage.abilities.keyword.EnchantAbility;
import mage.abilities.mana.TriggeredManaAbility;
import mage.cards.CardImpl;
import mage.choices.ChoiceColor;
import mage.constants.CardType;
import mage.constants.ColoredManaSymbol;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
@ -60,18 +58,13 @@ import mage.target.common.TargetLandPermanent;
*/
public class UtopiaSprawl extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent("Forest");
private static final FilterLandPermanent filter = new FilterLandPermanent("Forest", "Forest");
static {
filter.add(new SubtypePredicate("Forest"));
}
public UtopiaSprawl(UUID ownerId) {
super(ownerId, 99, "Utopia Sprawl", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{G}");
this.expansionSetCode = "DIS";
this.subtype.add("Aura");
// Enchant Forest
TargetPermanent auraTarget = new TargetLandPermanent(filter);
this.getSpellAbility().addTarget(auraTarget);
@ -79,7 +72,7 @@ public class UtopiaSprawl extends CardImpl {
Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability);
// As Utopia Sprawl enters the battlefield, choose a color.
this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect()));
this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Detriment)));
// Whenever enchanted Forest is tapped for mana, its controller adds one mana of the chosen color to his or her mana pool.
this.addAbility(new UtopiaSprawlTriggeredAbility());
}
@ -94,42 +87,8 @@ public class UtopiaSprawl extends CardImpl {
}
}
class ChooseColorEffect extends OneShotEffect {
public ChooseColorEffect() {
super(Outcome.BoostCreature);
staticText = "choose a color";
}
public ChooseColorEffect(final ChooseColorEffect effect) {
super(effect);
}
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
Permanent permanent = game.getPermanent(source.getSourceId());
if (player != null && permanent != null) {
ChoiceColor colorChoice = new ChoiceColor();
if (player.choose(Outcome.Neutral, colorChoice, game)) {
game.informPlayers(permanent.getName() + ": " + player.getLogName() + " has chosen " + colorChoice.getChoice());
game.getState().setValue(permanent.getId() + "_color", colorChoice.getColor());
permanent.addInfo("chosen color", "<font color = 'blue'>Chosen color: " + colorChoice.getColor().getDescription() + "</font>", game);
}
}
return false;
}
@Override
public ChooseColorEffect copy() {
return new ChooseColorEffect(this);
}
}
class UtopiaSprawlTriggeredAbility extends TriggeredManaAbility {
public UtopiaSprawlTriggeredAbility() {
super(Zone.BATTLEFIELD, new UtopiaSprawlEffect());
}
@ -146,10 +105,7 @@ class UtopiaSprawlTriggeredAbility extends TriggeredManaAbility {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
Permanent enchantment = game.getPermanent(this.getSourceId());
if (enchantment != null && event.getSourceId().equals(enchantment.getAttachedTo())) {
return true;
}
return false;
return enchantment != null && event.getSourceId().equals(enchantment.getAttachedTo());
}
@Override
@ -159,11 +115,10 @@ class UtopiaSprawlTriggeredAbility extends TriggeredManaAbility {
@Override
public String getRule() {
return "Whenever enchanted Forest is tapped for mana, its controller adds one mana of the chosen color to his or her mana pool";
return "Whenever enchanted Forest is tapped for mana, its controller adds one mana of the chosen color to his or her mana pool.";
}
}
class UtopiaSprawlEffect extends ManaEffect {
public UtopiaSprawlEffect() {
@ -178,9 +133,9 @@ class UtopiaSprawlEffect extends ManaEffect {
@Override
public boolean apply(Game game, Ability source) {
Permanent enchantment = game.getPermanent(source.getSourceId());
if(enchantment != null){
if (enchantment != null) {
Permanent land = game.getPermanent(enchantment.getAttachedTo());
if(land != null){
if (land != null) {
Player player = game.getPlayer(land.getControllerId());
if (player != null) {
player.getManaPool().addMana(getMana(game, source), game, source);
@ -205,4 +160,4 @@ class UtopiaSprawlEffect extends ManaEffect {
public UtopiaSprawlEffect copy() {
return new UtopiaSprawlEffect(this);
}
}
}

2
Mage.Sets/src/mage/sets/dragonsmaze/SmeltWardGatekeepers.java
View file

@ -70,7 +70,7 @@ public class SmeltWardGatekeepers extends CardImpl {
super(ownerId, 39, "Smelt-Ward Gatekeepers", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}");
this.expansionSetCode = "DGM";
this.subtype.add("Human");
this.subtype.add("Soldier");
this.subtype.add("Warrior");
this.power = new MageInt(2);
this.toughness = new MageInt(4);

29
Mage.Sets/src/mage/sets/dragonsoftarkir/LivingLore.java
View file

@ -71,7 +71,7 @@ public class LivingLore extends CardImpl {
this.addAbility(new EntersBattlefieldAbility(new LivingLoreExileEffect(), "exile an instant or sorcery card from your graveyard"));
// Living Lore's power and toughness are each equal to the exiled card's converted mana cost.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LivingLoreSetPowerToughnessSourceEffect()));
this.addAbility(new SimpleStaticAbility(Zone.ALL, new LivingLoreSetPowerToughnessSourceEffect()));
// Whenever Living Lore deals combat damage, you may sacrifice it. If you do, you may cast the exiled card without paying its mana cost.
this.addAbility(new DealsCombatDamageTriggeredAbility(new LivingLoreSacrificeEffect(), true));
@ -106,14 +106,14 @@ class LivingLoreExileEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
MageObject sourceObject = source.getSourceObject(game);
if (sourceObject != null && controller != null){
Permanent sourcePermanent = game.getPermanentEntering(source.getSourceId());
if (sourcePermanent != null && controller != null) {
TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(new FilterInstantOrSorceryCard("instant or sorcery card from your graveyard"));
if (controller.chooseTarget(outcome, target, source, game)) {
UUID exileId = CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter());
UUID exileId = CardUtil.getExileZoneId(game, source.getSourceId(), game.getState().getZoneChangeCounter(source.getSourceId()) + 1);
Card card = controller.getGraveyard().get(target.getFirstTarget(), game);
if (card != null) {
controller.moveCardToExileWithInfo(card, exileId, sourceObject.getIdName(), source.getSourceId(), game, Zone.GRAVEYARD, true);
controller.moveCardsToExile(card, source, game, true, exileId, sourcePermanent.getIdName());
}
}
return true;
@ -126,7 +126,7 @@ class LivingLoreExileEffect extends OneShotEffect {
class LivingLoreSetPowerToughnessSourceEffect extends ContinuousEffectImpl {
public LivingLoreSetPowerToughnessSourceEffect() {
super(Duration.WhileOnBattlefield, Layer.PTChangingEffects_7, SubLayer.SetPT_7b, Outcome.BoostCreature);
super(Duration.Custom, Layer.PTChangingEffects_7, SubLayer.SetPT_7b, Outcome.BoostCreature);
staticText = "{this}'s power and toughness are each equal to the exiled card's converted mana cost";
}
@ -141,20 +141,23 @@ class LivingLoreSetPowerToughnessSourceEffect extends ContinuousEffectImpl {
@Override
public boolean apply(Game game, Ability source) {
MageObject mageObject = source.getSourceObject(game);
Permanent permanent = game.getPermanent(source.getSourceId());
if (permanent != null && mageObject == null && new MageObjectReference(permanent, game).refersTo(mageObject, game)) {
discard();
return false;
int zcc = game.getState().getZoneChangeCounter(source.getSourceId());
if (permanent == null) {
permanent = game.getPermanentEntering(source.getSourceId());
zcc++;
}
UUID exileId = CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter());
if (permanent == null) {
return true;
}
UUID exileId = CardUtil.getExileZoneId(game, source.getSourceId(), zcc);
if (exileId != null) {
ExileZone exileZone = game.getExile().getExileZone(exileId);
if (exileZone == null) {
return false;
}
Card exiledCard = null;
for (Card card :exileZone.getCards(game)) {
for (Card card : exileZone.getCards(game)) {
exiledCard = card;
break;
}
@ -197,7 +200,7 @@ class LivingLoreSacrificeEffect extends OneShotEffect {
ExileZone exileZone = game.getExile().getExileZone(exileId);
Card exiledCard = null;
if (exileZone != null) {
for (Card card :exileZone.getCards(game)) {
for (Card card : exileZone.getCards(game)) {
exiledCard = card;
break;
}

42
Mage.Sets/src/mage/sets/exodus/KorChant.java
View file

@ -35,6 +35,8 @@ import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.AnotherTargetPredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.target.TargetSource;
@ -53,8 +55,15 @@ public class KorChant extends CardImpl {
// All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
this.getSpellAbility().addEffect(new KorChantEffect());
this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent());
this.getSpellAbility().addTarget(new KorChantSecondTarget());
TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent();
target.setTargetTag(1);
this.getSpellAbility().addTarget(target);
FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature");
filter.add(new AnotherTargetPredicate(2));
TargetCreaturePermanent target2 = new TargetCreaturePermanent(filter);
target2.setTargetTag(2);
this.getSpellAbility().addTarget(target2);
}
public KorChant(final KorChant card) {
@ -67,33 +76,8 @@ public class KorChant extends CardImpl {
}
}
class KorChantSecondTarget extends TargetCreaturePermanent {
KorChantSecondTarget() {
super();
this.targetName = "another creature";
}
KorChantSecondTarget(final KorChantSecondTarget target) {
super(target);
}
@Override
public boolean canTarget(UUID controllerId, UUID id, Ability source, Game game) {
if (source.getTargets().get(0).getTargets().contains(id)) {
return false;
}
return super.canTarget(controllerId, id, source, game);
}
@Override
public KorChantSecondTarget copy() {
return new KorChantSecondTarget(this);
}
}
class KorChantEffect extends RedirectionEffect {
protected TargetSource target = new TargetSource();
KorChantEffect() {
@ -121,7 +105,7 @@ class KorChantEffect extends RedirectionEffect {
public boolean checksEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.DAMAGE_CREATURE;
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (event.getTargetId().equals(this.getTargetPointer().getFirst(game, source))

8
Mage.Sets/src/mage/sets/fatereforged/WildSlash.java
View file

@ -29,7 +29,6 @@ package mage.sets.fatereforged;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.LockedInCondition;
import mage.abilities.condition.common.FerociousCondition;
import mage.abilities.decorator.ConditionalContinuousRuleModifyingEffect;
@ -41,7 +40,6 @@ import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.target.common.TargetCreatureOrPlayer;
@ -60,12 +58,12 @@ public class WildSlash extends CardImpl {
ContinuousRuleModifyingEffect effect = new DamageCantBePreventedEffect();
effect.setText("<i>Ferocious</i> &mdash; If you control a creature with power 4 or greater, damage can't be prevented this turn.<br>");
this.getSpellAbility().addEffect(new ConditionalContinuousRuleModifyingEffect(effect,
new LockedInCondition(FerociousCondition.getInstance())));
new LockedInCondition(FerociousCondition.getInstance())));
// Wild Slash deals 2 damage to target creature or player.
this.getSpellAbility().addEffect(new DamageTargetEffect(2));
this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());
}
public WildSlash(final WildSlash card) {

1
Mage.Sets/src/mage/sets/fifthedition/ShanodinDryads.java
View file

@ -43,6 +43,7 @@ public class ShanodinDryads extends CardImpl {
public ShanodinDryads(UUID ownerId) {
super(ownerId, 187, "Shanodin Dryads", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}");
this.expansionSetCode = "5ED";
this.subtype.add("Nymph");
this.subtype.add("Dryad");
this.power = new MageInt(1);

4
Mage.Sets/src/mage/sets/gatecrash/UrbanEvolution.java
View file

@ -46,16 +46,12 @@ public class UrbanEvolution extends CardImpl {
public UrbanEvolution(UUID ownerId) {
super(ownerId, 204, "Urban Evolution", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{U}{G}");
this.expansionSetCode = "GTC";
this.subtype.add("Wizard");
//Draw three cards.
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3));
//You may play an additional land this turn.
this.getSpellAbility().addEffect(new PlayAdditionalLandsControllerEffect(1, Duration.EndOfTurn));
}
public UrbanEvolution(final UrbanEvolution card) {

8
Mage.Sets/src/mage/sets/guildpact/UlashtTheHateSeed.java
View file

@ -73,7 +73,7 @@ public class UlashtTheHateSeed extends CardImpl {
// Ulasht, the Hate Seed enters the battlefield with a +1/+1 counter on it for each other red creature you control and a +1/+1 counter on it for each other green creature you control.
this.addAbility(new EntersBattlefieldAbility(new UlashtTheHateSeedEffect(), "with a +1/+1 counter on it for each other red creature you control and a +1/+1 counter on it for each other green creature you control."));
// {1}, Remove a +1/+1 counter from Ulasht: Choose one - Ulasht deals 1 damage to target creature;
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(1));
ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance()));
@ -101,7 +101,7 @@ class UlashtTheHateSeedEffect extends OneShotEffect {
private static final FilterControlledCreaturePermanent filterGreen = new FilterControlledCreaturePermanent();
private static final FilterControlledCreaturePermanent filterRed = new FilterControlledCreaturePermanent();
static {
filterGreen.add(new AnotherPredicate());
filterGreen.add(new ColorPredicate(ObjectColor.GREEN));
@ -121,7 +121,7 @@ class UlashtTheHateSeedEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
Permanent permanent = game.getPermanent(source.getSourceId());
Permanent permanent = game.getPermanentEntering(source.getSourceId());
if (permanent != null && player != null) {
int amount = game.getBattlefield().count(filterRed, source.getSourceId(), source.getControllerId(), game);
amount += game.getBattlefield().count(filterGreen, source.getSourceId(), source.getControllerId(), game);
@ -138,4 +138,4 @@ class UlashtTheHateSeedEffect extends OneShotEffect {
return new UlashtTheHateSeedEffect(this);
}
}
}

2
Mage.Sets/src/mage/sets/innistrad/UnbreathingHorde.java
View file

@ -102,7 +102,7 @@ class UnbreathingHordeEffect1 extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
Permanent permanent = game.getPermanent(source.getSourceId());
Permanent permanent = game.getPermanentEntering(source.getSourceId());
if (permanent != null && player != null) {
int amount = game.getBattlefield().countAll(filter1, source.getControllerId(), game) - 1;
amount += player.getGraveyard().count(filter2, game);

39
Mage.Sets/src/mage/sets/jacevsvraska/DroolingGroodion.java
View file

@ -44,6 +44,7 @@ import mage.constants.SubLayer;
import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.AnotherTargetPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.common.TargetControlledCreaturePermanent;
@ -66,8 +67,17 @@ public class DroolingGroodion extends CardImpl {
// {2}{B}{G}, Sacrifice a creature: Target creature gets +2/+2 until end of turn. Another target creature gets -2/-2 until end of turn.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DroolingGroodionEffect(), new ManaCostsImpl("{2}{B}{G}"));
ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, new FilterControlledCreaturePermanent(), true)));
ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature (first target)")));
ability.addTarget(new TargetOtherCreaturePermanent(new FilterCreaturePermanent("creature (second target)")));
TargetCreaturePermanent target = new TargetCreaturePermanent(new FilterCreaturePermanent("creature (first target)"));
target.setTargetTag(1);
ability.addTarget(target);
FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature (second target");
filter.add(new AnotherTargetPredicate(2));
target = new TargetCreaturePermanent(filter);
target.setTargetTag(2);
ability.addTarget(target);
this.addAbility(ability);
}
@ -112,28 +122,3 @@ class DroolingGroodionEffect extends ContinuousEffectImpl {
return true;
}
}
class TargetOtherCreaturePermanent extends TargetCreaturePermanent {
public TargetOtherCreaturePermanent(FilterCreaturePermanent filter) {
super(filter);
}
public TargetOtherCreaturePermanent(final TargetOtherCreaturePermanent target) {
super(target);
}
@Override
public boolean canTarget(UUID controllerId, UUID id, Ability source, Game game) {
if (source.getTargets().get(0).getTargets().contains(id)) {
return false;
}
return super.canTarget(controllerId, id, source, game);
}
@Override
public TargetOtherCreaturePermanent copy() {
return new TargetOtherCreaturePermanent(this);
}
}

1
Mage.Sets/src/mage/sets/journeyintonyx/PensiveMinotaur.java
View file

@ -43,6 +43,7 @@ public class PensiveMinotaur extends CardImpl {
super(ownerId, 105, "Pensive Minotaur", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}");
this.expansionSetCode = "JOU";
this.subtype.add("Minotaur");
this.subtype.add("Warrior");
this.power = new MageInt(2);
this.toughness = new MageInt(3);

2
Mage.Sets/src/mage/sets/lorwyn/FodderLaunch.java
View file

@ -46,7 +46,7 @@ import mage.target.common.TargetCreaturePermanent;
public class FodderLaunch extends CardImpl {
public FodderLaunch(UUID ownerId) {
super(ownerId, 114, "Fodder Launch", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{B}");
super(ownerId, 114, "Fodder Launch", Rarity.UNCOMMON, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{3}{B}");
this.expansionSetCode = "LRW";
this.subtype.add("Goblin");

101
Mage.Sets/src/mage/sets/magic2010/HarmsWay.java
View file

@ -30,8 +30,7 @@ package mage.sets.magic2010;
import java.util.UUID;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.effects.PreventionEffectData;
import mage.abilities.effects.PreventionEffectImpl;
import mage.abilities.effects.RedirectionEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
@ -69,91 +68,65 @@ public class HarmsWay extends CardImpl {
}
}
class HarmsWayPreventDamageTargetEffect extends PreventionEffectImpl {
private final TargetSource target;
class HarmsWayPreventDamageTargetEffect extends RedirectionEffect {
private final TargetSource damageSource;
public HarmsWayPreventDamageTargetEffect() {
super(Duration.EndOfTurn, 2, false, true);
super(Duration.EndOfTurn, 2, true);
staticText = "The next 2 damage that a source of your choice would deal to you and/or permanents you control this turn is dealt to target creature or player instead";
this.target = new TargetSource();
this.damageSource = new TargetSource();
}
public HarmsWayPreventDamageTargetEffect(final HarmsWayPreventDamageTargetEffect effect) {
super(effect);
this.target = effect.target.copy();
this.damageSource = effect.damageSource.copy();
}
@Override
public HarmsWayPreventDamageTargetEffect copy() {
return new HarmsWayPreventDamageTargetEffect(this);
}
@Override
public void init(Ability source, Game game) {
this.target.choose(Outcome.PreventDamage, source.getControllerId(), source.getSourceId(), game);
this.damageSource.choose(Outcome.PreventDamage, source.getControllerId(), source.getSourceId(), game);
super.init(source, game);
}
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
PreventionEffectData preventionData = preventDamageAction(event, source, game);
// deal damage now
if (preventionData.getPreventedDamage() > 0) {
UUID redirectTo = source.getFirstTarget();
Permanent permanent = game.getPermanent(redirectTo);
if (permanent != null) {
game.informPlayers("Dealing " + preventionData.getPreventedDamage() + " to " + permanent.getLogName() + " instead");
// keep the original source id as it is redirecting
permanent.damage(preventionData.getPreventedDamage(), event.getSourceId(), game, false, true);
discard();
}
Player player = game.getPlayer(redirectTo);
if (player != null) {
game.informPlayers("Dealing " + preventionData.getPreventedDamage() + " to " + player.getLogName() + " instead");
// keep the original source id as it is redirecting
player.damage(preventionData.getPreventedDamage(), event.getSourceId(), game, false, true);
discard();
public boolean applies(GameEvent event, Ability source, Game game) {
// check source
MageObject object = game.getObject(event.getSourceId());
if (object == null) {
game.informPlayers("Couldn't find source of damage");
return false;
}
if (!object.getId().equals(damageSource.getFirstTarget())
&& (!(object instanceof Spell) || !((Spell) object).getSourceId().equals(damageSource.getFirstTarget()))) {
return false;
}
this.redirectTarget = source.getTargets().get(0);
// check target
// check permanent first
Permanent permanent = game.getPermanent(event.getTargetId());
if (permanent != null) {
if (permanent.getControllerId().equals(source.getControllerId())) {
// it's your permanent
return true;
}
}
return false;
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (super.applies(event, source, game)) {
// check source
MageObject object = game.getObject(event.getSourceId());
if (object == null) {
game.informPlayers("Couldn't find source of damage");
return false;
}
if (!object.getId().equals(target.getFirstTarget())
&& (!(object instanceof Spell) || !((Spell) object).getSourceId().equals(target.getFirstTarget()))) {
return false;
}
// check target
// check permanent first
Permanent permanent = game.getPermanent(event.getTargetId());
if (permanent != null) {
if (permanent.getControllerId().equals(source.getControllerId())) {
// it's your permanent
return true;
}
}
// check player
Player player = game.getPlayer(event.getTargetId());
if (player != null) {
if (player.getId().equals(source.getControllerId())) {
// it is you
return true;
}
// check player
Player player = game.getPlayer(event.getTargetId());
if (player != null) {
if (player.getId().equals(source.getControllerId())) {
// it is you
return true;
}
}
return false;
}
}

4
Mage.Sets/src/mage/sets/magic2010/Lifelink.java
View file

@ -40,10 +40,6 @@ public class Lifelink extends mage.sets.magic2012.Lifelink {
super(ownerId);
this.cardNumber = 18;
this.expansionSetCode = "M10";
this.subtype.add("Aura");
this.color.setWhite(true);
}
public Lifelink (final Lifelink card) {

2
Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java
View file

@ -48,7 +48,7 @@ import mage.game.events.GameEvent.EventType;
public class AjanisPridemate extends CardImpl {
public AjanisPridemate(UUID ownerId) {
super(ownerId, 3, "Ajani's Pridemate", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "1}{W}");
super(ownerId, 3, "Ajani's Pridemate", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{W}");
this.expansionSetCode = "M11";
this.subtype.add("Cat");
this.subtype.add("Soldier");

14
Mage.Sets/src/mage/sets/mirrodinbesieged/RedSunsZenith.java
View file

@ -1,16 +1,16 @@
/*
* Copyright 2011 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
@ -20,7 +20,7 @@
* 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.
@ -49,7 +49,9 @@ public class RedSunsZenith extends CardImpl {
super(ownerId, 74, "Red Sun's Zenith", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{R}");
this.expansionSetCode = "MBS";
// Red Sun's Zenith deals X damage to target creature or player.
// If a creature dealt damage this way would die this turn, exile it instead.
// Shuffle Red Sun's Zenith into its owner's library.
this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());
this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue()));
this.getSpellAbility().addEffect(new DealtDamageToCreatureBySourceDies(this, Duration.EndOfTurn));

2
Mage.Sets/src/mage/sets/modernmasters/ToothAndNail.java
View file

@ -102,7 +102,7 @@ class ToothAndNailPutCreatureOnBattlefieldEffect extends OneShotEffect {
TargetCardInHand target = new TargetCardInHand(0, 2, new FilterCreatureCard("creature cards"));
if (controller.choose(Outcome.PutCreatureInPlay, target, source.getSourceId(), game)) {
return controller.moveCards(new CardsImpl(getTargetPointer().getTargets(game, source)).getCards(game),
return controller.moveCards(new CardsImpl(target.getTargets()).getCards(game),
Zone.BATTLEFIELD, source, game, true, false, false, null);
}
return false;

2
Mage.Sets/src/mage/sets/odyssey/BalshanGriffin.java
View file

@ -49,7 +49,7 @@ import mage.target.common.TargetCardInHand;
public class BalshanGriffin extends CardImpl {
public BalshanGriffin(UUID ownerId) {
super(ownerId, 67, "Balshan Griffin", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{U}");
super(ownerId, 67, "Balshan Griffin", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{U}{U}");
this.expansionSetCode = "ODY";
this.subtype.add("Griffin");

2
Mage.Sets/src/mage/sets/odyssey/FerventDenial.java
View file

@ -44,7 +44,7 @@ import mage.target.TargetSpell;
public class FerventDenial extends CardImpl {
public FerventDenial(UUID ownerId) {
super(ownerId, 86, "Fervent Denial", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{U}");
super(ownerId, 86, "Fervent Denial", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{U}{U}");
this.expansionSetCode = "ODY";

4
Mage.Sets/src/mage/sets/onslaught/FutureSight.java
View file

@ -35,7 +35,6 @@ import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.FilterCard;
/**
*
@ -47,11 +46,10 @@ public class FutureSight extends CardImpl {
super(ownerId, 84, "Future Sight", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}{U}");
this.expansionSetCode = "ONS";
// Play with the top card of your library revealed.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect()));
// You may play the top card of your library.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayTheTopCardEffect(new FilterCard())));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayTheTopCardEffect()));
}
public FutureSight(final FutureSight card) {

2
Mage.Sets/src/mage/sets/onslaught/RiptideShapeshifter.java
View file

@ -56,7 +56,7 @@ import mage.players.Player;
public class RiptideShapeshifter extends CardImpl {
public RiptideShapeshifter(UUID ownerId) {
super(ownerId, 109, "Riptide Shapeshifter", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{U}");
super(ownerId, 109, "Riptide Shapeshifter", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{U}{U}");
this.expansionSetCode = "ONS";
this.subtype.add("Shapeshifter");

66
Mage.Sets/src/mage/sets/planechase/RaziaBorosArchangel.java
View file

@ -29,11 +29,12 @@ package mage.sets.planechase;
import java.util.UUID;
import mage.MageInt;
import mage.MageObjectReference;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.Effect;
import mage.abilities.effects.PreventionEffectImpl;
import mage.abilities.effects.RedirectionEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.HasteAbility;
import mage.abilities.keyword.VigilanceAbility;
@ -42,9 +43,11 @@ import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.AnotherTargetPredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.target.Target;
import mage.target.common.TargetControlledCreaturePermanent;
import mage.target.common.TargetCreaturePermanent;
@ -72,11 +75,18 @@ public class RaziaBorosArchangel extends CardImpl {
// Haste
this.addAbility(HasteAbility.getInstance());
// {tap}: The next 3 damage that would be dealt to target creature you control this turn is dealt to another target creature instead.
// {T}: The next 3 damage that would be dealt to target creature you control this turn is dealt to another target creature instead.
Effect effect = new RaziaBorosArchangelEffect(Duration.EndOfTurn, 3);
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost());
ability.addTarget(new TargetControlledCreaturePermanent());
ability.addTarget(new TargetCreaturePermanent());
Target target = new TargetControlledCreaturePermanent();
target.setTargetTag(1);
ability.addTarget(target);
FilterCreaturePermanent filter = new FilterCreaturePermanent("creature (damage is redirected to)");
filter.add(new AnotherTargetPredicate(2));
target = new TargetCreaturePermanent(filter);
target.setTargetTag(2);
ability.addTarget(target);
this.addAbility(ability);
}
@ -91,19 +101,17 @@ public class RaziaBorosArchangel extends CardImpl {
}
}
class RaziaBorosArchangelEffect extends PreventionEffectImpl {
class RaziaBorosArchangelEffect extends RedirectionEffect {
private int amount;
protected MageObjectReference redirectToObject;
public RaziaBorosArchangelEffect(Duration duration, int amount) {
super(duration);
this.amount = amount;
super(duration, 3, true);
staticText = "The next " + amount + " damage that would be dealt to target creature you control this turn is dealt to another target creature instead";
}
public RaziaBorosArchangelEffect(final RaziaBorosArchangelEffect effect) {
super(effect);
this.amount = effect.amount;
}
@Override
@ -117,42 +125,16 @@ class RaziaBorosArchangelEffect extends PreventionEffectImpl {
}
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
GameEvent preventEvent = new GameEvent(GameEvent.EventType.PREVENT_DAMAGE, source.getFirstTarget(), source.getSourceId(), source.getControllerId(), event.getAmount(), false);
if (!game.replaceEvent(preventEvent)) {
int prevented;
if (event.getAmount() >= this.amount) {
int damage = amount;
event.setAmount(event.getAmount() - amount);
this.used = true;
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.PREVENTED_DAMAGE, source.getFirstTarget(), source.getSourceId(), source.getControllerId(), damage));
prevented = damage;
} else {
int damage = event.getAmount();
event.setAmount(0);
amount -= damage;
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.PREVENTED_DAMAGE, source.getFirstTarget(), source.getSourceId(), source.getControllerId(), damage));
prevented = damage;
}
// deal damage now
if (prevented > 0) {
UUID redirectTo = source.getTargets().get(1).getFirstTarget();
Permanent permanent = game.getPermanent(redirectTo);
if (permanent != null) {
game.informPlayers("Dealing " + prevented + " to " + permanent.getName() + " instead");
// keep the original source id as it is redirecting
permanent.damage(prevented, event.getSourceId(), game, false, true);
}
}
}
return false;
public void init(Ability source, Game game) {
super.init(source, game);
redirectToObject = new MageObjectReference(source.getTargets().get(1).getFirstTarget(), game);
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (!this.used && super.applies(event, source, game)) {
if (source.getTargets().getFirstTarget().equals(event.getTargetId())) {
if (event.getTargetId().equals(getTargetPointer().getFirst(game, source))) {
if (redirectToObject.equals(new MageObjectReference(source.getTargets().get(1).getFirstTarget(), game))) {
redirectTarget = source.getTargets().get(1);
return true;
}
}

1
Mage.Sets/src/mage/sets/planechase/SilverMyr.java
View file

@ -40,7 +40,6 @@ public class SilverMyr extends mage.sets.mirrodin.SilverMyr {
super(ownerId);
this.cardNumber = 126;
this.expansionSetCode = "HOP";
this.subtype.add("Myr");
}
public SilverMyr (final SilverMyr card) {

10
Mage.Sets/src/mage/sets/ravnica/GolgariGraveTroll.java
View file

@ -28,10 +28,6 @@
package mage.sets.ravnica;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldAbility;
@ -42,6 +38,10 @@ import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.RegenerateSourceEffect;
import mage.abilities.keyword.DredgeAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterCreatureCard;
import mage.filter.predicate.mageobject.CardTypePredicate;
@ -104,7 +104,7 @@ class GolgariGraveTrollEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
Permanent permanent = game.getPermanent(source.getSourceId());
Permanent permanent = game.getPermanentEntering(source.getSourceId());
if (permanent != null && player != null) {
int amount = player.getGraveyard().count(filter, game);
if (amount > 0) {

2
Mage.Sets/src/mage/sets/returntoravnica/SphinxOfTheChimes.java
View file

@ -61,7 +61,7 @@ public class SphinxOfTheChimes extends CardImpl {
public SphinxOfTheChimes(UUID ownerId) {
super(ownerId, 52, "Sphinx of the Chimes", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{U}{U}");
this.expansionSetCode = "RTR";
this.subtype.add("Bird");
this.subtype.add("Sphinx");
this.power = new MageInt(5);
this.toughness = new MageInt(6);

1
Mage.Sets/src/mage/sets/saviorsofkamigawa/MatsuTribeBirdstalker.java
View file

@ -55,6 +55,7 @@ public class MatsuTribeBirdstalker extends CardImpl {
this.expansionSetCode = "SOK";
this.subtype.add("Snake");
this.subtype.add("Warrior");
this.subtype.add("Archer");
this.power = new MageInt(2);
this.toughness = new MageInt(2);

5
Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaDaredevil.java
View file

@ -58,9 +58,12 @@ public class OxiddaDaredevil extends CardImpl {
public OxiddaDaredevil (UUID ownerId) {
super(ownerId, 100, "Oxidda Daredevil", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}");
this.expansionSetCode = "SOM";
this.color.setRed(true);
this.subtype.add("Goblin");
this.subtype.add("Artificer");
this.power = new MageInt(2);
this.toughness = new MageInt(1);
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn),
new SacrificeTargetCost(new TargetControlledPermanent(filter))));

1
Mage.Sets/src/mage/sets/scourge/GoblinWarchief.java
View file

@ -60,6 +60,7 @@ public class GoblinWarchief extends CardImpl {
super(ownerId, 97, "Goblin Warchief", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{R}{R}");
this.expansionSetCode = "SCG";
this.subtype.add("Goblin");
this.subtype.add("Warrior");
this.power = new MageInt(2);
this.toughness = new MageInt(2);

6
Mage.Sets/src/mage/sets/stronghold/NomadsEnKor.java
View file

@ -32,8 +32,10 @@ import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.common.RedirectDamageFromSourceToTargetEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.target.common.TargetControlledCreaturePermanent;
@ -55,7 +57,7 @@ public class NomadsEnKor extends CardImpl {
this.toughness = new MageInt(1);
// {0}: The next 1 damage that would be dealt to Nomads en-Kor this turn is dealt to target creature you control instead.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShamanEnKorPreventionEffect(), new GenericManaCost(0));
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, true), new GenericManaCost(0));
ability.addTarget(new TargetControlledCreaturePermanent());
this.addAbility(ability);
}
@ -68,4 +70,4 @@ public class NomadsEnKor extends CardImpl {
public NomadsEnKor copy() {
return new NomadsEnKor(this);
}
}
}

139
Mage.Sets/src/mage/sets/stronghold/ShamanEnKor.java
View file

@ -29,14 +29,13 @@ package mage.sets.stronghold;
import java.util.UUID;
import mage.MageInt;
import mage.MageObject;
import mage.MageObjectReference;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.PreventionEffectData;
import mage.abilities.effects.PreventionEffectImpl;
import mage.abilities.effects.ReplacementEffectImpl;
import mage.abilities.effects.RedirectionEffect;
import mage.abilities.effects.common.RedirectDamageFromSourceToTargetEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
@ -44,11 +43,10 @@ import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.DamageEvent;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.TargetPermanent;
import mage.target.TargetSource;
import mage.target.common.TargetControlledCreaturePermanent;
import mage.target.common.TargetCreaturePermanent;
@ -70,12 +68,13 @@ public class ShamanEnKor extends CardImpl {
this.toughness = new MageInt(2);
// {0}: The next 1 damage that would be dealt to Shaman en-Kor this turn is dealt to target creature you control instead.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShamanEnKorPreventionEffect(), new GenericManaCost(0));
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, true), new GenericManaCost(0));
ability.addTarget(new TargetControlledCreaturePermanent());
this.addAbility(ability);
// {1}{W}: The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to Shaman en-Kor instead.
ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShamanEnKorReplacementEffect(), new ManaCostsImpl("{1}{W}"));
ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShamanEnKorRedirectFromTargetEffect(), new ManaCostsImpl("{1}{W}"));
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
}
@ -90,129 +89,43 @@ public class ShamanEnKor extends CardImpl {
}
}
class ShamanEnKorPreventionEffect extends PreventionEffectImpl {
ShamanEnKorPreventionEffect() {
super(Duration.EndOfTurn, 1, false);
staticText = "The next 1 damage that would be dealt to {this} this turn is dealt to target creature you control instead.";
}
ShamanEnKorPreventionEffect(final ShamanEnKorPreventionEffect effect) {
super(effect);
}
@Override
public ShamanEnKorPreventionEffect copy() {
return new ShamanEnKorPreventionEffect(this);
}
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
PreventionEffectData preventionResult = preventDamageAction(event, source, game);
if (preventionResult.getPreventedDamage() > 0) {
Permanent redirectTo = game.getPermanent(getTargetPointer().getFirst(game, source));
if (redirectTo != null) {
game.informPlayers("Dealing " + preventionResult.getPreventedDamage() + " to " + redirectTo.getName() + " instead.");
DamageEvent damageEvent = (DamageEvent) event;
redirectTo.damage(preventionResult.getPreventedDamage(), event.getSourceId(), game, damageEvent.isCombatDamage(), damageEvent.isPreventable(), event.getAppliedEffects());
}
}
return false;
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (!this.used && super.applies(event, source, game)) {
if (event.getTargetId().equals(source.getSourceId())) {
return game.getPermanent(getTargetPointer().getFirst(game, source)) != null;
}
}
return false;
}
}
class ShamanEnKorRedirectFromTargetEffect extends RedirectionEffect {
class ShamanEnKorReplacementEffect extends ReplacementEffectImpl {
protected TargetSource targetSource;
protected MageObjectReference sourceObject;
ShamanEnKorReplacementEffect() {
super(Duration.EndOfTurn, Outcome.RedirectDamage);
ShamanEnKorRedirectFromTargetEffect() {
super(Duration.EndOfTurn, Integer.MAX_VALUE, true);
staticText = "The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to {this} instead";
}
ShamanEnKorReplacementEffect(final ShamanEnKorReplacementEffect effect) {
ShamanEnKorRedirectFromTargetEffect(final ShamanEnKorRedirectFromTargetEffect effect) {
super(effect);
targetSource = effect.targetSource;
sourceObject = effect.sourceObject;
}
@Override
public void init(Ability source, Game game) {
Player player = game.getPlayer(source.getControllerId());
TargetSource target = new TargetSource();
target.setNotTarget(true);
if (player != null) {
TargetSource target = new TargetSource();
target.choose(Outcome.PreventDamage, player.getId(), source.getSourceId(), game);
this.targetSource = target;
this.sourceObject = new MageObjectReference(target.getFirstTarget(), game);
} else {
discard();
}
}
@Override
public boolean checksEventType(GameEvent event, Game game) {
return event.getType() == EventType.DAMAGE_CREATURE;
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (!this.used) {
if (targetSource != null) {
if (event.getSourceId().equals(targetSource.getFirstTarget())) {
// check source
MageObject object = game.getObject(event.getSourceId());
if (object == null) {
game.informPlayers("Couldn't find source of damage");
return false;
}
else {
if (event.getTargetId().equals(source.getFirstTarget())) {
Permanent permanent = game.getPermanent(source.getFirstTarget());
if (permanent != null) {
return true;
}
}
}
}
}
}
return false;
}
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
DamageEvent damageEvent = (DamageEvent)event;
Permanent sourcePermanent = game.getPermanent(source.getSourceId());
if (sourcePermanent != null) {
// get name of old target
Permanent targetPermanent = game.getPermanent(event.getTargetId());
StringBuilder message = new StringBuilder();
message.append(sourcePermanent.getName()).append(": gets ");
message.append(damageEvent.getAmount()).append(" damage redirected from ");
if (targetPermanent != null) {
message.append(targetPermanent.getName());
}
else {
Player targetPlayer = game.getPlayer(event.getTargetId());
if (targetPlayer != null) {
message.append(targetPlayer.getLogName());
}
else {
message.append("unknown");
}
}
game.informPlayers(message.toString());
// redirect damage
this.used = true;
sourcePermanent.damage(damageEvent.getAmount(), damageEvent.getSourceId(), game, damageEvent.isCombatDamage(), damageEvent.isPreventable(), event.getAppliedEffects());
return true;
public boolean applies(GameEvent event, Ability source, Game game) {
if (sourceObject.equals(new MageObjectReference(event.getSourceId(), game))) {
redirectTarget = new TargetPermanent();
redirectTarget.add(source.getSourceId(), game);
return event.getTargetId().equals(getTargetPointer().getFirst(game, source));
}
return false;
}
@ -223,7 +136,7 @@ class ShamanEnKorReplacementEffect extends ReplacementEffectImpl {
}
@Override
public ShamanEnKorReplacementEffect copy() {
return new ShamanEnKorReplacementEffect(this);
public ShamanEnKorRedirectFromTargetEffect copy() {
return new ShamanEnKorRedirectFromTargetEffect(this);
}
}

15
Mage.Sets/src/mage/sets/tempest/CursedScroll.java
View file

@ -29,9 +29,6 @@ package mage.sets.tempest;
import java.util.UUID;
import mage.MageObject;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
@ -42,7 +39,9 @@ import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.Cards;
import mage.cards.CardsImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -91,15 +90,15 @@ class CursedScrollEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player you = game.getPlayer(source.getControllerId());
Player controller = game.getPlayer(source.getControllerId());
MageObject sourceObject = game.getObject(source.getSourceId());
String cardName = (String) game.getState().getValue(source.getSourceId().toString() + NameACardEffect.INFO_KEY);
if (sourceObject != null && you != null && cardName != null && !cardName.isEmpty()) {
if (you.getHand().size() > 0) {
if (sourceObject != null && controller != null && cardName != null && !cardName.isEmpty()) {
if (controller.getHand().size() > 0) {
Cards revealed = new CardsImpl();
Card card = you.getHand().getRandom(game);
Card card = controller.getHand().getRandom(game);
revealed.add(card);
you.revealCards(sourceObject.getName(), revealed, game);
controller.revealCards(sourceObject.getIdName(), revealed, game);
if (card.getName().equals(cardName)) {
Permanent creature = game.getPermanent(targetPointer.getFirst(game, source));
if (creature != null) {

47
Mage.Sets/src/mage/sets/tempestremastered/Deadshot.java
View file

@ -36,29 +36,39 @@ import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.AnotherTargetPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.common.TargetCreaturePermanent;
import mage.target.targetpointer.SecondTargetPointer;
/**
*
* @author fireshoes
*/
public class Deadshot extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature");
static {
filter.add(new AnotherTargetPredicate(2));
}
public Deadshot(UUID ownerId) {
super(ownerId, 129, "Deadshot", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}");
this.expansionSetCode = "TPR";
// Tap target creature.
this.getSpellAbility().addEffect(new TapTargetEffect());
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
TargetCreaturePermanent target = new TargetCreaturePermanent();
target.setTargetTag(1);
this.getSpellAbility().addTarget(target);
// It deals damage equal to its power to another target creature.
this.getSpellAbility().addEffect(new DeadshotDamageEffect());
this.getSpellAbility().addTarget(new DeadshotTargetCreaturePermanent(filter));
target = new TargetCreaturePermanent(filter);
target.setTargetTag(2);
this.getSpellAbility().addTarget(target);
}
public Deadshot(final Deadshot card) {
@ -80,6 +90,7 @@ class DeadshotDamageEffect extends OneShotEffect {
public DeadshotDamageEffect(final DeadshotDamageEffect effect) {
super(effect);
this.setTargetPointer(new SecondTargetPointer());
}
@Override
@ -89,10 +100,10 @@ class DeadshotDamageEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Permanent ownCreature = game.getPermanent(source.getFirstTarget());
Permanent ownCreature = game.getPermanentOrLKIBattlefield(source.getFirstTarget());
if (ownCreature != null) {
int damage = ownCreature.getPower().getValue();
Permanent targetCreature = game.getPermanent(source.getTargets().get(1).getFirstTarget());
Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source));
if (targetCreature != null) {
targetCreature.damage(damage, ownCreature.getId(), game, false, true);
return true;
@ -101,27 +112,3 @@ class DeadshotDamageEffect extends OneShotEffect {
return false;
}
}
class DeadshotTargetCreaturePermanent extends TargetCreaturePermanent {
public DeadshotTargetCreaturePermanent(FilterCreaturePermanent filter) {
super(filter);
}
@Override
public boolean canTarget(UUID id, Ability source, Game game) {
if (source.getTargets().getFirstTarget().equals(id)) {
return false;
}
return super.canTarget(id, source, game);
}
@Override
public boolean canTarget(UUID controllerId, UUID id, Ability source, Game game) {
if (source.getTargets().getFirstTarget().equals(id)) {
return false;
}
return super.canTarget(controllerId, id, source, game);
}
}

53
Mage.Sets/src/mage/sets/tempestremastered/SpiritEnKor.java
View file

@ -32,18 +32,13 @@ import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.PreventionEffectData;
import mage.abilities.effects.PreventionEffectImpl;
import mage.abilities.effects.common.RedirectDamageFromSourceToTargetEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.DamageEvent;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.target.common.TargetControlledCreaturePermanent;
/**
@ -62,9 +57,10 @@ public class SpiritEnKor extends CardImpl {
// Flying
this.addAbility(FlyingAbility.getInstance());
// {0}: The next 1 damage that would be dealt to Spirit en-Kor this turn is dealt to target creature you control instead.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SpiritEnKorPreventionEffect(), new GenericManaCost(0));
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, true), new GenericManaCost(0));
ability.addTarget(new TargetControlledCreaturePermanent());
this.addAbility(ability);
}
@ -78,44 +74,3 @@ public class SpiritEnKor extends CardImpl {
return new SpiritEnKor(this);
}
}
class SpiritEnKorPreventionEffect extends PreventionEffectImpl {
SpiritEnKorPreventionEffect() {
super(Duration.EndOfTurn, 1, false);
staticText = "The next 1 damage that would be dealt to {this} this turn is dealt to target creature you control instead.";
}
SpiritEnKorPreventionEffect(final SpiritEnKorPreventionEffect effect) {
super(effect);
}
@Override
public SpiritEnKorPreventionEffect copy() {
return new SpiritEnKorPreventionEffect(this);
}
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
PreventionEffectData preventionResult = preventDamageAction(event, source, game);
if (preventionResult.getPreventedDamage() > 0) {
Permanent redirectTo = game.getPermanent(getTargetPointer().getFirst(game, source));
if (redirectTo != null) {
game.informPlayers("Dealing " + preventionResult.getPreventedDamage() + " to " + redirectTo.getName() + " instead.");
DamageEvent damageEvent = (DamageEvent) event;
redirectTo.damage(preventionResult.getPreventedDamage(), event.getSourceId(), game, damageEvent.isCombatDamage(), damageEvent.isPreventable(), event.getAppliedEffects());
}
}
return false;
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (!this.used && super.applies(event, source, game)) {
if (event.getTargetId().equals(source.getSourceId())) {
return game.getPermanent(getTargetPointer().getFirst(game, source)) != null;
}
}
return false;
}
}

51
Mage.Sets/src/mage/sets/tempestremastered/WarriorEnKor.java
View file

@ -32,17 +32,12 @@ import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.PreventionEffectData;
import mage.abilities.effects.PreventionEffectImpl;
import mage.abilities.effects.common.RedirectDamageFromSourceToTargetEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.DamageEvent;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.target.common.TargetControlledCreaturePermanent;
/**
@ -61,7 +56,8 @@ public class WarriorEnKor extends CardImpl {
this.toughness = new MageInt(2);
// {0}: The next 1 damage that would be dealt to Warrior en-Kor this turn is dealt to target creature you control instead.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WarriorEnKorPreventionEffect(), new GenericManaCost(0));
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, true), new GenericManaCost(0));
ability.addTarget(new TargetControlledCreaturePermanent());
this.addAbility(ability);
}
@ -75,44 +71,3 @@ public class WarriorEnKor extends CardImpl {
return new WarriorEnKor(this);
}
}
class WarriorEnKorPreventionEffect extends PreventionEffectImpl {
WarriorEnKorPreventionEffect() {
super(Duration.EndOfTurn, 1, false);
staticText = "The next 1 damage that would be dealt to {this} this turn is dealt to target creature you control instead.";
}
WarriorEnKorPreventionEffect(final WarriorEnKorPreventionEffect effect) {
super(effect);
}
@Override
public WarriorEnKorPreventionEffect copy() {
return new WarriorEnKorPreventionEffect(this);
}
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
PreventionEffectData preventionResult = preventDamageAction(event, source, game);
if (preventionResult.getPreventedDamage() > 0) {
Permanent redirectTo = game.getPermanent(getTargetPointer().getFirst(game, source));
if (redirectTo != null) {
game.informPlayers("Dealing " + preventionResult.getPreventedDamage() + " to " + redirectTo.getName() + " instead.");
DamageEvent damageEvent = (DamageEvent) event;
redirectTo.damage(preventionResult.getPreventedDamage(), event.getSourceId(), game, damageEvent.isCombatDamage(), damageEvent.isPreventable(), event.getAppliedEffects());
}
}
return false;
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (!this.used && super.applies(event, source, game)) {
if (event.getTargetId().equals(source.getSourceId())) {
return game.getPermanent(getTargetPointer().getFirst(game, source)) != null;
}
}
return false;
}
}

5
Mage.Sets/src/mage/sets/tenthedition/Clone.java
View file

@ -50,11 +50,6 @@ public class Clone extends CardImpl {
this.toughness = new MageInt(0);
// You may have Clone enter the battlefield as a copy of any creature on the battlefield.
// ;
// Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new EntersBattlefieldEffect(
// new CopyPermanentEffect(),
// "You may have {this} enter the battlefield as a copy of any creature on the battlefield",
// true));
this.addAbility(new EntersBattlefieldAbility(new CopyPermanentEffect(), true));
}

1
Mage.Sets/src/mage/sets/tenthedition/HighwayRobber.java
View file

@ -48,7 +48,6 @@ public class HighwayRobber extends CardImpl {
super(ownerId, 150, "Highway Robber", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}{B}");
this.expansionSetCode = "10E";
this.subtype.add("Human");
this.subtype.add("Rogue");
this.subtype.add("Mercenary");
this.power = new MageInt(2);

8
Mage.Sets/src/mage/sets/urzasdestiny/PatternOfRebirth.java
View file

@ -32,12 +32,13 @@ import mage.abilities.Ability;
import mage.abilities.common.DiesAttachedTriggeredAbility;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.AttachEffect;
import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect;
import mage.abilities.effects.common.search.SearchLibraryPutInPlayTargetPlayerEffect;
import mage.abilities.keyword.EnchantAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.SetTargetPointer;
import mage.filter.common.FilterCreatureCard;
import mage.target.TargetPermanent;
import mage.target.common.TargetCardInLibrary;
@ -54,7 +55,6 @@ public class PatternOfRebirth extends CardImpl {
this.expansionSetCode = "UDS";
this.subtype.add("Aura");
// Enchant creature
TargetPermanent auraTarget = new TargetCreaturePermanent();
this.getSpellAbility().addTarget(auraTarget);
@ -63,9 +63,9 @@ public class PatternOfRebirth extends CardImpl {
this.addAbility(ability);
// When enchanted creature dies, that creature's controller may search his or her library for a creature card and put that card onto the battlefield. If that player does, he or she shuffles his or her library.
Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterCreatureCard()), false, true, Outcome.PutCreatureInPlay);
Effect effect = new SearchLibraryPutInPlayTargetPlayerEffect(new TargetCardInLibrary(new FilterCreatureCard()), false, true, Outcome.PutCreatureInPlay);
effect.setText("that creature's controller may search his or her library for a creature card and put that card onto the battlefield. If that player does, he or she shuffles his or her library");
this.addAbility(new DiesAttachedTriggeredAbility(effect, "enchanted creature", true, true));
this.addAbility(new DiesAttachedTriggeredAbility(effect, "enchanted creature", true, true, SetTargetPointer.ATTACHED_TO_CONTROLLER));
}

1
Mage.Sets/src/mage/sets/urzassaga/GorillaWarrior.java
View file

@ -44,6 +44,7 @@ public class GorillaWarrior extends CardImpl {
super(ownerId, 256, "Gorilla Warrior", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}");
this.expansionSetCode = "USG";
this.subtype.add("Ape");
this.subtype.add("Warrior");
this.power = new MageInt(3);
this.toughness = new MageInt(2);

2
Mage.Sets/src/mage/sets/urzassaga/Sunder.java
View file

@ -46,7 +46,7 @@ import mage.game.permanent.Permanent;
public class Sunder extends CardImpl {
public Sunder(UUID ownerId) {
super(ownerId, 101, "Sunder", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}");
super(ownerId, 101, "Sunder", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}{U}");
this.expansionSetCode = "USG";
// Return all lands to their owners' hands.

1
Mage.Sets/src/mage/sets/zendikar/ArrowVolleyTrap.java
View file

@ -47,6 +47,7 @@ public class ArrowVolleyTrap extends CardImpl {
public ArrowVolleyTrap(UUID ownerId) {
super(ownerId, 2, "Arrow Volley Trap", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{W}{W}");
this.expansionSetCode = "ZEN";
this.subtype.add("Trap");
// If four or more creatures are attacking, you may pay {1}{W} rather than pay Arrow Volley Trap's mana cost.
this.getSpellAbility().addAlternativeCost(new ArrowVolleyTrapAlternativeCost());