github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 19:16:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10 from magefree/master

Browse source 
Merge https://github.com/magefree/mage
This commit is contained in:
Zzooouhh 2017-10-12 17:28:02 +02:00 committed by GitHub
commit c73bfc6625
103 changed files with 544 additions and 413 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/MTGO1v1Commander.java
View file

@ -36,17 +36,20 @@ public class MTGO1v1Commander extends Commander {
public MTGO1v1Commander() { public MTGO1v1Commander() {
super("MTGO 1v1 Commander"); super("MTGO 1v1 Commander");
banned.add("Ancestral Recall"); banned.add("Ancestral Recall");
banned.add("Arcum Dagsson");
banned.add("Back to Basics"); banned.add("Back to Basics");
banned.add("Balance"); banned.add("Balance");
banned.add("Baral, Chief of Compliance");
banned.add("Bazaar of Baghdad"); banned.add("Bazaar of Baghdad");
banned.add("Black Lotus"); banned.add("Black Lotus");
banned.add("Braids, Cabal Minion"); banned.add("Braids, Cabal Minion");
banned.add("Brainstorm"); banned.add("Brainstorm");
banned.add("Channel"); banned.add("Channel");
banned.add("Derevi, Empyrial Tactician"); banned.add("Derevi, Empyrial Tactician");
banned.add("Demonic Tutor");
banned.add("Dig Through Time"); banned.add("Dig Through Time");
banned.add("Edric, Spymaster of Trest"); banned.add("Edric, Spymaster of Trest");
banned.add("Emrakul, the Aeons Torn");
banned.add("Enlightened Tutor");
banned.add("Entomb"); banned.add("Entomb");
banned.add("Fastbond"); banned.add("Fastbond");
banned.add("Food Chain"); banned.add("Food Chain");
@ -55,6 +58,7 @@ public class MTGO1v1Commander extends Commander {
banned.add("Griselbrand"); banned.add("Griselbrand");
banned.add("Hermit Druid"); banned.add("Hermit Druid");
banned.add("Humility"); banned.add("Humility");
banned.add("Imperial Seal");
banned.add("Karakas"); banned.add("Karakas");
banned.add("Library of Alexandria"); banned.add("Library of Alexandria");
banned.add("Mana Crypt"); banned.add("Mana Crypt");
@ -68,6 +72,7 @@ public class MTGO1v1Commander extends Commander {
banned.add("Mox Pearl"); banned.add("Mox Pearl");
banned.add("Mox Ruby"); banned.add("Mox Ruby");
banned.add("Mox Sapphire"); banned.add("Mox Sapphire");
banned.add("Mystical Tutor");
banned.add("Natural Order"); banned.add("Natural Order");
banned.add("Necropotence"); banned.add("Necropotence");
banned.add("Oath of Druids"); banned.add("Oath of Druids");
@ -88,8 +93,8 @@ public class MTGO1v1Commander extends Commander {
banned.add("Treachery"); banned.add("Treachery");
banned.add("Treasure Cruise"); banned.add("Treasure Cruise");
banned.add("Vial Smasher the Fierce"); banned.add("Vial Smasher the Fierce");
banned.add("Vampiric Tutor");
banned.add("Yamgmoth's Bargain"); banned.add("Yamgmoth's Bargain");
banned.add("Yisan, the Wanderer Bard");
banned.add("Zur the Enchanter"); banned.add("Zur the Enchanter");
} }
} }

7
Mage.Sets/src/mage/cards/a/ActOfAggression.java
View file

@ -54,12 +54,11 @@ public class ActOfAggression extends CardImpl {
} }
public ActOfAggression(UUID ownerId, CardSetInfo setInfo) { public ActOfAggression(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{R/P}{R/P}"); super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{R/P}{R/P}");
this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap that creature"));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn."));
} }
public ActOfAggression(final ActOfAggression card) { public ActOfAggression(final ActOfAggression card) {

9
Mage.Sets/src/mage/cards/a/ActOfTreason.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.cards.a; package mage.cards.a;
import java.util.UUID; import java.util.UUID;
@ -46,16 +45,14 @@ import mage.target.common.TargetCreaturePermanent;
public class ActOfTreason extends CardImpl { public class ActOfTreason extends CardImpl {
public ActOfTreason(UUID ownerId, CardSetInfo setInfo) { public ActOfTreason(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R}"); super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}");
// Gain control of target creature until end of turn. Untap that creature. // Gain control of target creature until end of turn. Untap that creature.
// It gains haste until end of turn. (It can attack and {T} this turn.) // It gains haste until end of turn. (It can attack and {T} this turn.)
this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addTarget(new TargetCreaturePermanent());
this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap that creature"));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn."));
} }
public ActOfTreason(final ActOfTreason card) { public ActOfTreason(final ActOfTreason card) {

6
Mage.Sets/src/mage/cards/a/AltarGolem.java
View file

@ -53,7 +53,7 @@ import mage.target.common.TargetControlledCreaturePermanent;
/** /**
* *
* @author jeffwadsworth * @author jeffwadsworth
*
*/ */
public class AltarGolem extends CardImpl { public class AltarGolem extends CardImpl {
@ -64,7 +64,7 @@ public class AltarGolem extends CardImpl {
} }
public AltarGolem(UUID ownerId, CardSetInfo setInfo) { public AltarGolem(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{7}"); super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{7}");
this.subtype.add(SubType.GOLEM); this.subtype.add(SubType.GOLEM);
this.power = new MageInt(0); this.power = new MageInt(0);
@ -74,7 +74,7 @@ public class AltarGolem extends CardImpl {
this.addAbility(TrampleAbility.getInstance()); this.addAbility(TrampleAbility.getInstance());
// Altar Golem's power and toughness are each equal to the number of creatures on the battlefield. // Altar Golem's power and toughness are each equal to the number of creatures on the battlefield.
DynamicValue amount = new PermanentsOnBattlefieldCount(new FilterCreaturePermanent("creatures in play")); DynamicValue amount = new PermanentsOnBattlefieldCount(new FilterCreaturePermanent("creatures on the battlefield"));
this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(amount, Duration.EndOfGame))); this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(amount, Duration.EndOfGame)));
// Altar Golem doesn't untap during your untap step. // Altar Golem doesn't untap during your untap step.

9
Mage.Sets/src/mage/cards/b/BattlefieldThaumaturge.java
View file

@ -55,7 +55,7 @@ import mage.util.CardUtil;
public class BattlefieldThaumaturge extends CardImpl { public class BattlefieldThaumaturge extends CardImpl {
public BattlefieldThaumaturge(UUID ownerId, CardSetInfo setInfo) { public BattlefieldThaumaturge(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}");
this.subtype.add(SubType.HUMAN, SubType.WIZARD); this.subtype.add(SubType.HUMAN, SubType.WIZARD);
this.power = new MageInt(2); this.power = new MageInt(2);
@ -79,10 +79,9 @@ public class BattlefieldThaumaturge extends CardImpl {
class BattlefieldThaumaturgeSpellsCostReductionEffect extends CostModificationEffectImpl { class BattlefieldThaumaturgeSpellsCostReductionEffect extends CostModificationEffectImpl {
public BattlefieldThaumaturgeSpellsCostReductionEffect() { public BattlefieldThaumaturgeSpellsCostReductionEffect() {
super(Duration.WhileOnBattlefield, Outcome.Benefit, CostModificationType.REDUCE_COST); super(Duration.WhileOnBattlefield, Outcome.Benefit, CostModificationType.REDUCE_COST);
this.staticText = "Each instant and sorcery spell you cast costs 1 less to cast for each creature it targets"; this.staticText = "Each instant and sorcery spell you cast costs {1} less to cast for each creature it targets";
} }
protected BattlefieldThaumaturgeSpellsCostReductionEffect(BattlefieldThaumaturgeSpellsCostReductionEffect effect) { protected BattlefieldThaumaturgeSpellsCostReductionEffect(BattlefieldThaumaturgeSpellsCostReductionEffect effect) {
@ -92,8 +91,8 @@ class BattlefieldThaumaturgeSpellsCostReductionEffect extends CostModificationEf
@Override @Override
public boolean apply(Game game, Ability source, Ability abilityToModify) { public boolean apply(Game game, Ability source, Ability abilityToModify) {
Set<UUID> creaturesTargeted = new HashSet<>(); Set<UUID> creaturesTargeted = new HashSet<>();
for (Target target: abilityToModify.getTargets()) { for (Target target : abilityToModify.getTargets()) {
for (UUID uuid: target.getTargets()) { for (UUID uuid : target.getTargets()) {
Permanent permanent = game.getPermanent(uuid); Permanent permanent = game.getPermanent(uuid);
if (permanent != null && permanent.isCreature()) { if (permanent != null && permanent.isCreature()) {
creaturesTargeted.add(permanent.getId()); creaturesTargeted.add(permanent.getId());

13
Mage.Sets/src/mage/cards/b/BlindWithAnger.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.cards.b; package mage.cards.b;
import java.util.UUID; import java.util.UUID;
@ -42,7 +41,6 @@ import mage.constants.SuperType;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.Target;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
/** /**
@ -57,14 +55,13 @@ public class BlindWithAnger extends CardImpl {
} }
public BlindWithAnger(UUID ownerId, CardSetInfo setInfo) { public BlindWithAnger(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{R}"); super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{R}");
this.subtype.add(SubType.ARCANE); this.subtype.add(SubType.ARCANE);
this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap target nonlegendary creature"));
this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn).setText("and gain control of it until end of turn"));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn."));
Target target = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
this.getSpellAbility().addTarget(target);
} }
public BlindWithAnger(final BlindWithAnger card) { public BlindWithAnger(final BlindWithAnger card) {

4
Mage.Sets/src/mage/cards/b/BloodcrazedHoplite.java
View file

@ -61,7 +61,7 @@ public class BloodcrazedHoplite extends CardImpl {
} }
public BloodcrazedHoplite(UUID ownerId, CardSetInfo setInfo) { public BloodcrazedHoplite(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}");
this.subtype.add(SubType.HUMAN, SubType.SOLDIER); this.subtype.add(SubType.HUMAN, SubType.SOLDIER);
this.power = new MageInt(2); this.power = new MageInt(2);
@ -88,7 +88,7 @@ public class BloodcrazedHoplite extends CardImpl {
class BloodcrazedHopliteTriggeredAbility extends TriggeredAbilityImpl { class BloodcrazedHopliteTriggeredAbility extends TriggeredAbilityImpl {
public BloodcrazedHopliteTriggeredAbility() { public BloodcrazedHopliteTriggeredAbility() {
super(Zone.ALL, new RemoveCounterTargetEffect(CounterType.P1P1.createInstance()), true); super(Zone.ALL, new RemoveCounterTargetEffect(CounterType.P1P1.createInstance()), false);
} }
public BloodcrazedHopliteTriggeredAbility(BloodcrazedHopliteTriggeredAbility ability) { public BloodcrazedHopliteTriggeredAbility(BloodcrazedHopliteTriggeredAbility ability) {

2
Mage.Sets/src/mage/cards/b/BonethornValesk.java
View file

@ -53,7 +53,7 @@ public class BonethornValesk extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Whenever a permanent is turned face up, Bonethorn Valesk deals 1 damage to target creature or player. // Whenever a permanent is turned face up, Bonethorn Valesk deals 1 damage to target creature or player.
Ability ability = new TurnedFaceUpAllTriggeredAbility(new DamageTargetEffect(1), new FilterPermanent()); Ability ability = new TurnedFaceUpAllTriggeredAbility(new DamageTargetEffect(1), new FilterPermanent("a permanent"));
ability.addTarget(new TargetCreatureOrPlayer()); ability.addTarget(new TargetCreatureOrPlayer());
this.addAbility(ability); this.addAbility(ability);
} }

9
Mage.Sets/src/mage/cards/c/CavalryMaster.java
View file

@ -49,12 +49,12 @@ public class CavalryMaster extends CardImpl {
static final private FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creatures you control with flanking"); static final private FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creatures you control with flanking");
static{ static {
filter.add(new AbilityPredicate(FlankingAbility.class)); filter.add(new AbilityPredicate(FlankingAbility.class));
} }
public CavalryMaster(UUID ownerId, CardSetInfo setInfo) { public CavalryMaster(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}{W}");
this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.HUMAN);
this.subtype.add(SubType.KNIGHT); this.subtype.add(SubType.KNIGHT);
@ -64,7 +64,10 @@ public class CavalryMaster extends CardImpl {
// Flanking // Flanking
this.addAbility(new FlankingAbility()); this.addAbility(new FlankingAbility());
// Other creatures you control with flanking have flanking. // Other creatures you control with flanking have flanking.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new FlankingAbility(), Duration.WhileOnBattlefield, filter, true))); this.addAbility(new SimpleStaticAbility(
Zone.BATTLEFIELD, new GainAbilityAllEffect(new FlankingAbility(), Duration.WhileOnBattlefield, filter, true)
.setText("Other creatures you control with flanking have flanking.")
));
} }
public CavalryMaster(final CavalryMaster card) { public CavalryMaster(final CavalryMaster card) {

4
Mage.Sets/src/mage/cards/c/ChariotOfVictory.java
View file

@ -52,13 +52,13 @@ import mage.constants.Zone;
public class ChariotOfVictory extends CardImpl { public class ChariotOfVictory extends CardImpl {
public ChariotOfVictory(UUID ownerId, CardSetInfo setInfo) { public ChariotOfVictory(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
this.subtype.add(SubType.EQUIPMENT); this.subtype.add(SubType.EQUIPMENT);
// Equipped creature has first strike, trample, and haste. // Equipped creature has first strike, trample, and haste.
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT)); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT));
Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT); Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT);
effect.setText(", trample"); effect.setText(", trample,");
ability.addEffect(effect); ability.addEffect(effect);
effect = new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT); effect = new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT);
effect.setText("and haste"); effect.setText("and haste");

2
Mage.Sets/src/mage/cards/c/ChillHaunting.java
View file

@ -50,7 +50,7 @@ public class ChillHaunting extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{B}"); super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{B}");
// As an additional cost to cast Chill Haunting, exile X creature cards from your graveyard. // As an additional cost to cast Chill Haunting, exile X creature cards from your graveyard.
this.getSpellAbility().addCost(new ExileXFromYourGraveCost(new FilterCreatureCard("cards from your graveyard"), true)); this.getSpellAbility().addCost(new ExileXFromYourGraveCost(new FilterCreatureCard("creature cards from your graveyard"), true));
// Target creature gets -X/-X until end of turn. // Target creature gets -X/-X until end of turn.
this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addTarget(new TargetCreaturePermanent());

5
Mage.Sets/src/mage/cards/c/CloakAndDagger.java
View file

@ -51,18 +51,19 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
public class CloakAndDagger extends CardImpl { public class CloakAndDagger extends CardImpl {
private static final FilterPermanent filter = new FilterCreaturePermanent("a Rogue creature"); private static final FilterPermanent filter = new FilterCreaturePermanent("a Rogue creature");
static { static {
filter.add(new SubtypePredicate(SubType.ROGUE)); filter.add(new SubtypePredicate(SubType.ROGUE));
} }
public CloakAndDagger(UUID ownerId, CardSetInfo setInfo) { public CloakAndDagger(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.ARTIFACT},"{2}"); super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.ARTIFACT}, "{2}");
this.subtype.add(SubType.ROGUE); this.subtype.add(SubType.ROGUE);
this.subtype.add(SubType.EQUIPMENT); this.subtype.add(SubType.EQUIPMENT);
// Equipped creature gets +2/+0 and has shroud. // Equipped creature gets +2/+0 and has shroud.
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0)); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0));
ability.addEffect(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT)); ability.addEffect(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT).setText("and has shroud"));
this.addAbility(ability); this.addAbility(ability);
// Whenever a Rogue creature enters the battlefield, you may attach Cloak and Dagger to it. // Whenever a Rogue creature enters the battlefield, you may attach Cloak and Dagger to it.
this.addAbility(new EntersBattlefieldAllTriggeredAbility( this.addAbility(new EntersBattlefieldAllTriggeredAbility(

7
Mage.Sets/src/mage/cards/c/ColossalHeroics.java
View file

@ -45,14 +45,13 @@ import mage.target.common.TargetCreaturePermanent;
public class ColossalHeroics extends CardImpl { public class ColossalHeroics extends CardImpl {
public ColossalHeroics(UUID ownerId, CardSetInfo setInfo) { public ColossalHeroics(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{G}"); super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{G}");
// Strive - Colossal Heroics costs {1}{G} more to cast for each target beyond the first. // Strive - Colossal Heroics costs {1}{G} more to cast for each target beyond the first.
this.addAbility(new StriveAbility("{1}{G}")); this.addAbility(new StriveAbility("{1}{G}"));
// Any number of target creatures each get +2/+2 until end of turn. Untap those creatures. // Any number of target creatures each get +2/+2 until end of turn. Untap those creatures.
Effect effect = new BoostTargetEffect(2,2, Duration.EndOfTurn); Effect effect = new BoostTargetEffect(2, 2, Duration.EndOfTurn);
effect.setText("Any number of target creatures each get +2/+2"); effect.setText("Any number of target creatures each get +2/+2 until end of turn.");
this.getSpellAbility().addEffect(effect); this.getSpellAbility().addEffect(effect);
effect = new UntapTargetEffect(); effect = new UntapTargetEffect();
effect.setText("Untap those creatures"); effect.setText("Untap those creatures");

17
Mage.Sets/src/mage/cards/c/ConqueringManticore.java
View file

@ -41,6 +41,9 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
/** /**
@ -49,8 +52,14 @@ import mage.target.common.TargetCreaturePermanent;
*/ */
public class ConqueringManticore extends CardImpl { public class ConqueringManticore extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
static {
filter.add(new ControllerPredicate(TargetController.OPPONENT));
}
public ConqueringManticore(UUID ownerId, CardSetInfo setInfo) { public ConqueringManticore(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{R}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}{R}");
this.subtype.add(SubType.MANTICORE); this.subtype.add(SubType.MANTICORE);
this.power = new MageInt(5); this.power = new MageInt(5);
@ -59,9 +68,9 @@ public class ConqueringManticore extends CardImpl {
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
Ability ability = new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn), false); Ability ability = new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn), false);
ability.addEffect(new UntapTargetEffect()); ability.addEffect(new UntapTargetEffect().setText("Untap that creature"));
ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn."));
ability.addTarget(new TargetCreaturePermanent()); ability.addTarget(new TargetCreaturePermanent(filter));
this.addAbility(ability); this.addAbility(ability);
} }

9
Mage.Sets/src/mage/cards/d/DakraMystic.java
View file

@ -52,7 +52,7 @@ import mage.players.Player;
public class DakraMystic extends CardImpl { public class DakraMystic extends CardImpl {
public DakraMystic(UUID ownerId, CardSetInfo setInfo) { public DakraMystic(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{U}");
this.subtype.add(SubType.MERFOLK); this.subtype.add(SubType.MERFOLK);
this.subtype.add(SubType.WIZARD); this.subtype.add(SubType.WIZARD);
@ -64,7 +64,6 @@ public class DakraMystic extends CardImpl {
ability.addCost(new TapSourceCost()); ability.addCost(new TapSourceCost());
this.addAbility(ability); this.addAbility(ability);
} }
public DakraMystic(final DakraMystic card) { public DakraMystic(final DakraMystic card) {
@ -81,7 +80,7 @@ class DakraMysticEffect extends OneShotEffect {
public DakraMysticEffect() { public DakraMysticEffect() {
super(Outcome.Detriment); super(Outcome.Detriment);
this.staticText = "Each player reveals the top card of his or her library. You may put the revealed cards into their owners graveyard. If you don't, each player draws a card"; this.staticText = "Each player reveals the top card of his or her library. You may put the revealed cards into their owners' graveyard. If you don't, each player draws a card";
} }
public DakraMysticEffect(final DakraMysticEffect effect) { public DakraMysticEffect(final DakraMysticEffect effect) {
@ -97,14 +96,14 @@ class DakraMysticEffect extends OneShotEffect {
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId()); Player controller = game.getPlayer(source.getControllerId());
if (controller != null) { if (controller != null) {
for(UUID playerId: game.getState().getPlayersInRange(controller.getId(), game)) { for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {
Player player = game.getPlayer(playerId); Player player = game.getPlayer(playerId);
if (player != null && player.getLibrary().hasCards()) { if (player != null && player.getLibrary().hasCards()) {
player.revealCards(player.getLogName(), new CardsImpl(player.getLibrary().getFromTop(game)), game); player.revealCards(player.getLogName(), new CardsImpl(player.getLibrary().getFromTop(game)), game);
} }
} }
if (controller.chooseUse(outcome, "Put revealed cards into graveyard?", source, game)) { if (controller.chooseUse(outcome, "Put revealed cards into graveyard?", source, game)) {
for(UUID playerId: game.getState().getPlayersInRange(controller.getId(), game)) { for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {
Player player = game.getPlayer(playerId); Player player = game.getPlayer(playerId);
if (player != null && player.getLibrary().hasCards()) { if (player != null && player.getLibrary().hasCards()) {
player.moveCards(player.getLibrary().getFromTop(game), Zone.GRAVEYARD, source, game); player.moveCards(player.getLibrary().getFromTop(game), Zone.GRAVEYARD, source, game);

9
Mage.Sets/src/mage/cards/d/DementiaSliver.java
View file

@ -59,7 +59,7 @@ public class DementiaSliver extends CardImpl {
} }
public DementiaSliver(UUID ownerId, CardSetInfo setInfo) { public DementiaSliver(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{B}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}{B}");
this.subtype.add(SubType.SLIVER); this.subtype.add(SubType.SLIVER);
this.power = new MageInt(3); this.power = new MageInt(3);
this.toughness = new MageInt(3); this.toughness = new MageInt(3);
@ -70,7 +70,12 @@ public class DementiaSliver extends CardImpl {
gainedAbility.addTarget(new TargetOpponent()); gainedAbility.addTarget(new TargetOpponent());
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, filter, new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, filter,
"All Slivers have \"{T}: Name a card. Target opponent reveals a card at random from his or her hand. If it's the named card, that player discards it\""))); "All Slivers have \"{T}: Choose a card name. "
+ "Target opponent reveals a card at random from his or her hand."
+ " If that card has the chosen name, that player discards it."
+ " Activate this ability only during your turn.\""
)
));
} }
public DementiaSliver(final DementiaSliver card) { public DementiaSliver(final DementiaSliver card) {

6
Mage.Sets/src/mage/cards/d/DictateOfErebos.java
View file

@ -45,19 +45,19 @@ import mage.filter.predicate.permanent.ControllerPredicate;
*/ */
public class DictateOfErebos extends CardImpl { public class DictateOfErebos extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature you control");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(new ControllerPredicate(TargetController.YOU));
} }
public DictateOfErebos(UUID ownerId, CardSetInfo setInfo) { public DictateOfErebos(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}{B}"); super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}{B}");
// Flash // Flash
this.addAbility(FlashAbility.getInstance()); this.addAbility(FlashAbility.getInstance());
// Whenever a creature you control dies, each opponent sacrifices a creature. // Whenever a creature you control dies, each opponent sacrifices a creature.
this.addAbility(new DiesCreatureTriggeredAbility(new SacrificeOpponentsEffect(new FilterControlledCreaturePermanent("a creature")), false, filter)); this.addAbility(new DiesCreatureTriggeredAbility(new SacrificeOpponentsEffect(new FilterControlledCreaturePermanent("creature")), false, filter));
} }
public DictateOfErebos(final DictateOfErebos card) { public DictateOfErebos(final DictateOfErebos card) {

7
Mage.Sets/src/mage/cards/d/DominusOfFealty.java
View file

@ -51,17 +51,16 @@ import mage.target.TargetPermanent;
public class DominusOfFealty extends CardImpl { public class DominusOfFealty extends CardImpl {
public DominusOfFealty(UUID ownerId, CardSetInfo setInfo) { public DominusOfFealty(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U/R}{U/R}{U/R}{U/R}{U/R}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{U/R}{U/R}{U/R}{U/R}{U/R}");
this.subtype.add(SubType.SPIRIT); this.subtype.add(SubType.SPIRIT);
this.subtype.add(SubType.AVATAR); this.subtype.add(SubType.AVATAR);
this.power = new MageInt(4); this.power = new MageInt(4);
this.toughness = new MageInt(4); this.toughness = new MageInt(4);
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
Ability ability = new BeginningOfUpkeepTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn), TargetController.YOU, true); Ability ability = new BeginningOfUpkeepTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn), TargetController.YOU, true);
ability.addEffect(new UntapTargetEffect()); ability.addEffect(new UntapTargetEffect().setText("If you do, untap it"));
ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("and it gains haste until end of turn"));
ability.addTarget(new TargetPermanent()); ability.addTarget(new TargetPermanent());
this.addAbility(ability); this.addAbility(ability);
} }

6
Mage.Sets/src/mage/cards/e/EldraziObligator.java
View file

@ -55,7 +55,7 @@ import mage.target.common.TargetCreaturePermanent;
public class EldraziObligator extends CardImpl { public class EldraziObligator extends CardImpl {
public EldraziObligator(UUID ownerId, CardSetInfo setInfo) { public EldraziObligator(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
this.subtype.add(SubType.ELDRAZI); this.subtype.add(SubType.ELDRAZI);
this.power = new MageInt(3); this.power = new MageInt(3);
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
@ -68,9 +68,9 @@ public class EldraziObligator extends CardImpl {
DoIfCostPaid costPaidEffect = new DoIfCostPaid(new GainControlTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}{C}")); DoIfCostPaid costPaidEffect = new DoIfCostPaid(new GainControlTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}{C}"));
Effect untapEffect = new UntapTargetEffect(); Effect untapEffect = new UntapTargetEffect();
untapEffect.setText("Untap that creature"); untapEffect.setText("untap that creature,");
Effect hasteEffect = new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn); Effect hasteEffect = new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn);
hasteEffect.setText("It gains haste until end of turn"); hasteEffect.setText("and it gains haste until end of turn");
costPaidEffect.addEffect(untapEffect); costPaidEffect.addEffect(untapEffect);
costPaidEffect.addEffect(hasteEffect); costPaidEffect.addEffect(hasteEffect);

2
Mage.Sets/src/mage/cards/e/Evangelize.java
View file

@ -53,7 +53,7 @@ public class Evangelize extends CardImpl {
// Gain control of target creature of an opponent's choice that he or she controls. // Gain control of target creature of an opponent's choice that he or she controls.
GainControlTargetEffect effect = new GainControlTargetEffect(Duration.EndOfGame); GainControlTargetEffect effect = new GainControlTargetEffect(Duration.EndOfGame);
effect.setText("Gain control of target creature of an opponent's choice that he or she controls"); effect.setText("Gain control of target creature of an opponent's choice he or she controls");
this.getSpellAbility().addEffect(effect); this.getSpellAbility().addEffect(effect);
this.getSpellAbility().addTarget(new TargetOpponentsChoicePermanent(1, 1, filter, false, true)); this.getSpellAbility().addTarget(new TargetOpponentsChoicePermanent(1, 1, filter, false, true));
} }

6
Mage.Sets/src/mage/cards/f/FirewakeSliver.java
View file

@ -53,7 +53,7 @@ import mage.target.common.TargetCreaturePermanent;
*/ */
public class FirewakeSliver extends CardImpl { public class FirewakeSliver extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All sliver creatures"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures");
private static final FilterCreaturePermanent targetSliverFilter = new FilterCreaturePermanent("Sliver"); private static final FilterCreaturePermanent targetSliverFilter = new FilterCreaturePermanent("Sliver");
static { static {
@ -62,7 +62,7 @@ public class FirewakeSliver extends CardImpl {
} }
public FirewakeSliver(UUID ownerId, CardSetInfo setInfo) { public FirewakeSliver(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{G}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}{G}");
this.subtype.add(SubType.SLIVER); this.subtype.add(SubType.SLIVER);
this.power = new MageInt(1); this.power = new MageInt(1);
@ -72,7 +72,7 @@ public class FirewakeSliver extends CardImpl {
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false)));
// All Slivers have "{1}, Sacrifice this permanent: Target Sliver creature gets +2/+2 until end of turn." // All Slivers have "{1}, Sacrifice this permanent: Target Sliver creature gets +2/+2 until end of turn."
Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2,2,Duration.EndOfTurn), new GenericManaCost(1)); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new GenericManaCost(1));
gainedAbility.addCost(new SacrificeSourceCost()); gainedAbility.addCost(new SacrificeSourceCost());
gainedAbility.addTarget(new TargetCreaturePermanent(targetSliverFilter)); gainedAbility.addTarget(new TargetCreaturePermanent(targetSliverFilter));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(

4
Mage.Sets/src/mage/cards/f/FlagstonesOfTrokair.java
View file

@ -53,14 +53,14 @@ public class FlagstonesOfTrokair extends CardImpl {
} }
public FlagstonesOfTrokair(UUID ownerId, CardSetInfo setInfo) { public FlagstonesOfTrokair(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.LAND},""); super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
addSuperType(SuperType.LEGENDARY); addSuperType(SuperType.LEGENDARY);
// {tap}: Add {W} to your mana pool. // {tap}: Add {W} to your mana pool.
this.addAbility(new WhiteManaAbility()); this.addAbility(new WhiteManaAbility());
// When Flagstones of Trokair is put into a graveyard from the battlefield, you may search your library for a Plains card and put it onto the battlefield tapped. If you do, shuffle your library. // When Flagstones of Trokair is put into a graveyard from the battlefield, you may search your library for a Plains card and put it onto the battlefield tapped. If you do, shuffle your library.
this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(FILTER), true, true), true)); this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(FILTER), true, false), true));
} }
public FlagstonesOfTrokair(final FlagstonesOfTrokair card) { public FlagstonesOfTrokair(final FlagstonesOfTrokair card) {

9
Mage.Sets/src/mage/cards/f/FlashConscription.java
View file

@ -59,11 +59,14 @@ public class FlashConscription extends CardImpl {
// Untap target creature and gain control of it until end of turn. That creature gains haste until end of turn. If {W} was spent to cast Flash Conscription, the creature gains "Whenever this creature deals combat damage, you gain that much life" until end of turn. // Untap target creature and gain control of it until end of turn. That creature gains haste until end of turn. If {W} was spent to cast Flash Conscription, the creature gains "Whenever this creature deals combat damage, you gain that much life" until end of turn.
this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new UntapTargetEffect());
this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn).setText("and gain control of it until end of turn"));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("That creature gains haste until end of turn"));
this.getSpellAbility().addEffect(new ConditionalContinuousEffect( this.getSpellAbility().addEffect(new ConditionalContinuousEffect(
new GainAbilityTargetEffect(new FlashConscriptionTriggeredAbility(), Duration.EndOfTurn), new GainAbilityTargetEffect(new FlashConscriptionTriggeredAbility(), Duration.EndOfTurn),
new ManaWasSpentCondition(ColoredManaSymbol.W), "If {W} was spent to cast {this}, the creature gains \"Whenever this creature deals combat damage, you gain that much life\" until end of turn")); new ManaWasSpentCondition(ColoredManaSymbol.W),
"If {W} was spent to cast {this}, the creature gains "
+ "\"Whenever this creature deals combat damage, you gain that much life\" until end of turn"
));
this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addTarget(new TargetCreaturePermanent());
} }

5
Mage.Sets/src/mage/cards/f/FlowstoneChanneler.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.costs.common.DiscardCardCost;
import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
@ -43,7 +43,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.target.common.TargetCardInHand;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
/** /**
@ -69,7 +68,7 @@ public class FlowstoneChanneler extends CardImpl {
ability.addEffect(effect); ability.addEffect(effect);
ability.addTarget(new TargetCreaturePermanent()); ability.addTarget(new TargetCreaturePermanent());
ability.addCost(new TapSourceCost()); ability.addCost(new TapSourceCost());
ability.addCost(new DiscardTargetCost(new TargetCardInHand())); ability.addCost(new DiscardCardCost());
this.addAbility(ability); this.addAbility(ability);
} }

6
Mage.Sets/src/mage/cards/f/FoeRazerRegent.java
View file

@ -67,7 +67,7 @@ public class FoeRazerRegent extends CardImpl {
} }
public FoeRazerRegent(UUID ownerId, CardSetInfo setInfo) { public FoeRazerRegent(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}{G}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{G}{G}");
this.subtype.add(SubType.DRAGON); this.subtype.add(SubType.DRAGON);
this.power = new MageInt(4); this.power = new MageInt(4);
this.toughness = new MageInt(5); this.toughness = new MageInt(5);
@ -118,8 +118,8 @@ class FoeRazerRegentTriggeredAbility extends TriggeredAbilityImpl {
public boolean checkTrigger(GameEvent event, Game game) { public boolean checkTrigger(GameEvent event, Game game) {
Permanent permanent = game.getPermanentOrLKIBattlefield(event.getSourceId()); Permanent permanent = game.getPermanentOrLKIBattlefield(event.getSourceId());
if (permanent != null && permanent.getControllerId().equals(getControllerId())) { if (permanent != null && permanent.getControllerId().equals(getControllerId())) {
for (Effect effect: this.getEffects()) { for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getSourceId())); effect.setTargetPointer(new FixedTarget(permanent, game));
} }
return true; return true;
} }

6
Mage.Sets/src/mage/cards/g/Goatnapper.java
View file

@ -57,7 +57,7 @@ public class Goatnapper extends CardImpl {
} }
public Goatnapper(UUID ownerId, CardSetInfo setInfo) { public Goatnapper(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
this.subtype.add(SubType.GOBLIN); this.subtype.add(SubType.GOBLIN);
this.subtype.add(SubType.ROGUE); this.subtype.add(SubType.ROGUE);
@ -65,8 +65,8 @@ public class Goatnapper extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
Ability ability = new EntersBattlefieldTriggeredAbility(new UntapTargetEffect(), false); Ability ability = new EntersBattlefieldTriggeredAbility(new UntapTargetEffect(), false);
ability.addTarget(new TargetPermanent(filter)); ability.addTarget(new TargetPermanent(filter));
ability.addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); ability.addEffect(new GainControlTargetEffect(Duration.EndOfTurn).setText("and gain control of it until end of turn"));
ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn"));
this.addAbility(ability); this.addAbility(ability);
} }

6
Mage.Sets/src/mage/cards/g/GoblinSkycutter.java
View file

@ -48,7 +48,7 @@ import mage.target.common.TargetCreaturePermanent;
/** /**
* *
* @author LoneFox * @author LoneFox
*
*/ */
public class GoblinSkycutter extends CardImpl { public class GoblinSkycutter extends CardImpl {
@ -59,7 +59,7 @@ public class GoblinSkycutter extends CardImpl {
} }
public GoblinSkycutter(UUID ownerId, CardSetInfo setInfo) { public GoblinSkycutter(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}");
this.subtype.add(SubType.GOBLIN); this.subtype.add(SubType.GOBLIN);
this.subtype.add(SubType.WARRIOR); this.subtype.add(SubType.WARRIOR);
this.power = new MageInt(2); this.power = new MageInt(2);
@ -67,7 +67,7 @@ public class GoblinSkycutter extends CardImpl {
// Sacrifice Goblin Skycutter: Goblin Skycutter deals 2 damage to target creature with flying. That creature loses flying until end of turn. // Sacrifice Goblin Skycutter: Goblin Skycutter deals 2 damage to target creature with flying. That creature loses flying until end of turn.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost());
ability.addEffect(new LoseAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); ability.addEffect(new LoseAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn).setText("that creature loses flying until end of turn"));
ability.addTarget(new TargetCreaturePermanent(filter)); ability.addTarget(new TargetCreaturePermanent(filter));
this.addAbility(ability); this.addAbility(ability);
} }

4
Mage.Sets/src/mage/cards/g/Godsend.java
View file

@ -63,7 +63,7 @@ import mage.util.CardUtil;
public class Godsend extends CardImpl { public class Godsend extends CardImpl {
public Godsend(UUID ownerId, CardSetInfo setInfo) { public Godsend(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}{W}{W}"); super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}{W}{W}");
addSuperType(SuperType.LEGENDARY); addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.EQUIPMENT); this.subtype.add(SubType.EQUIPMENT);
@ -195,7 +195,7 @@ class GodsendRuleModifyingEffect extends ContinuousRuleModifyingEffectImpl {
public GodsendRuleModifyingEffect() { public GodsendRuleModifyingEffect() {
super(Duration.WhileOnBattlefield, Outcome.Detriment); super(Duration.WhileOnBattlefield, Outcome.Detriment);
staticText = "Opponents can't cast cards with the same name as cards exiled with {this}"; staticText = "Your opponents can't cast cards with the same name as cards exiled with {this}";
} }
public GodsendRuleModifyingEffect(final GodsendRuleModifyingEffect effect) { public GodsendRuleModifyingEffect(final GodsendRuleModifyingEffect effect) {

4
Mage.Sets/src/mage/cards/g/Greenseeker.java
View file

@ -51,7 +51,7 @@ import java.util.UUID;
public class Greenseeker extends CardImpl { public class Greenseeker extends CardImpl {
public Greenseeker(UUID ownerId, CardSetInfo setInfo) { public Greenseeker(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}");
this.subtype.add(SubType.ELF); this.subtype.add(SubType.ELF);
this.subtype.add(SubType.SPELLSHAPER); this.subtype.add(SubType.SPELLSHAPER);
this.power = new MageInt(1); this.power = new MageInt(1);
@ -59,7 +59,7 @@ public class Greenseeker extends CardImpl {
// {G}, {tap}, Discard a card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library. // {G}, {tap}, Discard a card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, StaticFilters.FILTER_BASIC_LAND_CARD), true, true), new SearchLibraryPutInHandEffect(new TargetCardInLibrary(1, 1, StaticFilters.FILTER_BASIC_LAND_CARD), true, true),
new ManaCostsImpl("{G}")); new ManaCostsImpl("{G}"));
ability.addCost(new TapSourceCost()); ability.addCost(new TapSourceCost());
ability.addCost(new DiscardCardCost()); ability.addCost(new DiscardCardCost());

70
Mage.Sets/src/mage/cards/h/HauntingWind.java
View file

@ -29,7 +29,10 @@ package mage.cards.h;
import java.util.UUID; import java.util.UUID;
import mage.abilities.TriggeredAbilityImpl; import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.costs.Cost;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
@ -37,19 +40,20 @@ import mage.constants.Zone;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.game.stack.StackAbility;
import mage.target.targetpointer.FixedTarget;
/** /**
* *
* @author MarcoMarin * @author TheElk801
*/ */
public class HauntingWind extends CardImpl { public class HauntingWind extends CardImpl {
public HauntingWind(UUID ownerId, CardSetInfo setInfo) { public HauntingWind(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}"); super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}");
// Whenever an artifact becomes tapped or a player activates an artifact's ability without {tap} in its activation cost, Haunting Wind deals 1 damage to that artifact's controller. // Whenever an artifact becomes tapped or a player activates an artifact's ability without {tap} in its activation cost, Haunting Wind deals 1 damage to that artifact's controller.
this.addAbility(new HauntingWindTriggeredAbility());
this.addAbility(new AbilityActivatedTriggeredAbility2());
} }
public HauntingWind(final HauntingWind card) { public HauntingWind(final HauntingWind card) {
@ -62,36 +66,68 @@ public class HauntingWind extends CardImpl {
} }
} }
class AbilityActivatedTriggeredAbility2 extends TriggeredAbilityImpl { class HauntingWindTriggeredAbility extends TriggeredAbilityImpl {
AbilityActivatedTriggeredAbility2() { HauntingWindTriggeredAbility() {
super(Zone.BATTLEFIELD, new DamageControllerEffect(1)); super(Zone.BATTLEFIELD, new DamageTargetEffect(1));
} }
AbilityActivatedTriggeredAbility2(final AbilityActivatedTriggeredAbility2 ability) { HauntingWindTriggeredAbility(final HauntingWindTriggeredAbility ability) {
super(ability); super(ability);
} }
@Override @Override
public AbilityActivatedTriggeredAbility2 copy() { public HauntingWindTriggeredAbility copy() {
return new AbilityActivatedTriggeredAbility2(this); return new HauntingWindTriggeredAbility(this);
} }
@Override @Override
public boolean checkEventType(GameEvent event, Game game) { public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.ACTIVATED_ABILITY || return event.getType() == GameEvent.EventType.ACTIVATED_ABILITY
event.getType() == GameEvent.EventType.TAPPED; || event.getType() == GameEvent.EventType.TAPPED;
} }
@Override @Override
public boolean checkTrigger(GameEvent event, Game game) { public boolean checkTrigger(GameEvent event, Game game) {
Permanent isArtifact = game.getPermanent(event.getSourceId()); if (event.getType() == GameEvent.EventType.ACTIVATED_ABILITY) {
return isArtifact != null && isArtifact.isArtifact(); Permanent permanent = game.getPermanentOrLKIBattlefield(event.getSourceId());
if (permanent == null || !permanent.isArtifact()) {
return false;
}
StackAbility stackAbility = (StackAbility) game.getStack().getStackObject(event.getSourceId());
if (stackAbility == null) {
return false;
}
boolean triggerable = true;
for (Cost cost : stackAbility.getCosts()) {
if (cost instanceof TapSourceCost) {
triggerable = false;
break;
}
}
if (!triggerable) {
return false;
}
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(permanent.getControllerId(), game));
}
return true;
}
if (event.getType() == GameEvent.EventType.TAPPED) {
Permanent permanent = game.getPermanentOrLKIBattlefield(event.getTargetId());
if (permanent == null || !permanent.isArtifact()) {
return false;
}
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(permanent.getControllerId(), game));
}
return true;
}
return false;
} }
@Override @Override
public String getRule() { public String getRule() {
return "Whenever an artifact becomes tapped or a player activates an artifact's ability without {tap} in its activation cost, Haunting Wind deals 1 damage to that artifact's controller."; return "Whenever an artifact becomes tapped or a player activates an artifact's ability without {T} in its activation cost, {this} deals 1 damage to that artifact's controller.";
} }
} }

4
Mage.Sets/src/mage/cards/h/Hubris.java
View file

@ -52,7 +52,7 @@ import mage.target.common.TargetCreaturePermanent;
public class Hubris extends CardImpl { public class Hubris extends CardImpl {
public Hubris(UUID ownerId, CardSetInfo setInfo) { public Hubris(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{U}"); super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{U}");
// Return target creature and all Auras attached to it to their owners' hand. // Return target creature and all Auras attached to it to their owners' hand.
this.getSpellAbility().addEffect(new HubrisReturnEffect()); this.getSpellAbility().addEffect(new HubrisReturnEffect());
@ -80,7 +80,7 @@ class HubrisReturnEffect extends OneShotEffect {
public HubrisReturnEffect() { public HubrisReturnEffect() {
super(Outcome.Benefit); super(Outcome.Benefit);
this.staticText = "Return target creature and all Auras attached to it to their owners' hand"; this.staticText = "Return target creature and all Auras attached to it to their owners' hands";
} }
public HubrisReturnEffect(final HubrisReturnEffect effect) { public HubrisReturnEffect(final HubrisReturnEffect effect) {

4
Mage.Sets/src/mage/cards/k/KariZevsExpertise.java
View file

@ -63,8 +63,8 @@ public class KariZevsExpertise extends CardImpl {
// Gain control of target creature or Vehicle until end of turn. Untap it. It gains haste until end of turn. // Gain control of target creature or Vehicle until end of turn. Untap it. It gains haste until end of turn.
this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addTarget(new TargetPermanent(filter));
this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap it"));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gans haste until end of turn."));
// You may cast a card with converted mana cost 2 or less from your hand without paying its mana cost. // You may cast a card with converted mana cost 2 or less from your hand without paying its mana cost.
this.getSpellAbility().addEffect(new CastWithoutPayingManaCostEffect(2)); this.getSpellAbility().addEffect(new CastWithoutPayingManaCostEffect(2));

2
Mage.Sets/src/mage/cards/k/KrovikanWhispers.java
View file

@ -68,7 +68,7 @@ public class KrovikanWhispers extends CardImpl {
this.addAbility(ability); this.addAbility(ability);
// Cumulative upkeep-Pay {U} or {B}. // Cumulative upkeep-Pay {U} or {B}.
this.addAbility(new CumulativeUpkeepAbility(new OrCost(new ManaCostsImpl("{U}"), new ManaCostsImpl("{B}"), "Pay {U} or pay {B}"))); this.addAbility(new CumulativeUpkeepAbility(new OrCost(new ManaCostsImpl("{U}"), new ManaCostsImpl("{B}"), "{U} or {B}")));
// You control enchanted creature. // You control enchanted creature.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect()));

2
Mage.Sets/src/mage/cards/l/LaunchTheFleet.java
View file

@ -55,7 +55,7 @@ public class LaunchTheFleet extends CardImpl {
// Until end of turn, any number of target creatures each gain "Whenever this creature attacks, create a 1/1 white Soldier token tapped and attacking." // Until end of turn, any number of target creatures each gain "Whenever this creature attacks, create a 1/1 white Soldier token tapped and attacking."
this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, Integer.MAX_VALUE)); this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, Integer.MAX_VALUE));
Effect effect = new GainAbilityTargetEffect(new AttacksTriggeredAbility(new CreateTokenEffect(new SoldierToken(), 1, true, true), false), Duration.EndOfTurn); Effect effect = new GainAbilityTargetEffect(new AttacksTriggeredAbility(new CreateTokenEffect(new SoldierToken(), 1, true, true), false), Duration.EndOfTurn);
effect.setText("Until end of turn, any number of target creatures each gain \"Whenever this creature attacks, create a 1/1 white Soldier token tapped and attacking.\""); effect.setText("Until end of turn, any number of target creatures each gain \"Whenever this creature attacks, create a 1/1 white Soldier creature token that's tapped and attacking.\"");
this.getSpellAbility().addEffect(effect); this.getSpellAbility().addEffect(effect);
} }

8
Mage.Sets/src/mage/cards/l/LightningSerpent.java
View file

@ -29,8 +29,8 @@ package mage.cards.l;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.common.OnEventTriggeredAbility;
import mage.abilities.effects.common.EntersBattlefieldWithXCountersEffect; import mage.abilities.effects.common.EntersBattlefieldWithXCountersEffect;
import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.SacrificeSourceEffect;
import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.HasteAbility;
@ -39,8 +39,8 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.TargetController;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.game.events.GameEvent;
/** /**
* *
@ -49,7 +49,7 @@ import mage.counters.CounterType;
public class LightningSerpent extends CardImpl { public class LightningSerpent extends CardImpl {
public LightningSerpent(UUID ownerId, CardSetInfo setInfo) { public LightningSerpent(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{X}{R}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{X}{R}");
this.subtype.add(SubType.ELEMENTAL); this.subtype.add(SubType.ELEMENTAL);
this.subtype.add(SubType.SERPENT); this.subtype.add(SubType.SERPENT);
this.power = new MageInt(2); this.power = new MageInt(2);
@ -62,7 +62,7 @@ public class LightningSerpent extends CardImpl {
// Lightning Serpent enters the battlefield with X +1/+0 counters on it. // Lightning Serpent enters the battlefield with X +1/+0 counters on it.
this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P0.createInstance()))); this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P0.createInstance())));
// At the beginning of the end step, sacrifice Lightning Serpent. // At the beginning of the end step, sacrifice Lightning Serpent.
this.addAbility(new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect(), TargetController.ANY, false)); this.addAbility(new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_PRE, "beginning of the end step", true, new SacrificeSourceEffect()));
} }
public LightningSerpent(final LightningSerpent card) { public LightningSerpent(final LightningSerpent card) {

2
Mage.Sets/src/mage/cards/l/LightningStorm.java
View file

@ -69,7 +69,7 @@ public class LightningStorm extends CardImpl {
new LightningStormAddCounterEffect(), new LightningStormAddCounterEffect(),
new DiscardTargetCost(new TargetCardInHand(new FilterLandCard("a land card")))); new DiscardTargetCost(new TargetCardInHand(new FilterLandCard("a land card"))));
ability.setMayActivate(TargetController.ANY); ability.setMayActivate(TargetController.ANY);
ability.addEffect(new InfoEffect("Any player may activate this ability but only if {this} is on the stack")); ability.addEffect(new InfoEffect(" Any player may activate this ability but only if {this} is on the stack"));
this.addAbility(ability); this.addAbility(ability);
} }

4
Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java
View file

@ -58,7 +58,7 @@ import mage.target.targetpointer.FixedTarget;
*/ */
public class LimDulTheNecromancer extends CardImpl { public class LimDulTheNecromancer extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature an opponent controls");
private static final FilterPermanent filter2 = new FilterPermanent("Zombie"); private static final FilterPermanent filter2 = new FilterPermanent("Zombie");
static { static {
@ -67,7 +67,7 @@ public class LimDulTheNecromancer extends CardImpl {
} }
public LimDulTheNecromancer(UUID ownerId, CardSetInfo setInfo) { public LimDulTheNecromancer(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{B}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{B}{B}");
addSuperType(SuperType.LEGENDARY); addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.HUMAN);
this.subtype.add(SubType.WIZARD); this.subtype.add(SubType.WIZARD);

4
Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java
View file

@ -57,7 +57,7 @@ import mage.target.common.TargetCreatureOrPlayer;
public class MagusOfTheScroll extends CardImpl { public class MagusOfTheScroll extends CardImpl {
public MagusOfTheScroll(UUID ownerId, CardSetInfo setInfo) { public MagusOfTheScroll(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}");
this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.HUMAN);
this.subtype.add(SubType.WIZARD); this.subtype.add(SubType.WIZARD);
this.power = new MageInt(1); this.power = new MageInt(1);
@ -85,7 +85,7 @@ class MagusOfTheScrollEffect extends OneShotEffect {
public MagusOfTheScrollEffect() { public MagusOfTheScrollEffect() {
super(Outcome.Neutral); super(Outcome.Neutral);
staticText = "Reveal a card at random from your hand. If it's the named card, {this} deals 2 damage to target creature or player"; staticText = ", then reveal a card at random from your hand. If it's the named card, {this} deals 2 damage to target creature or player";
} }
public MagusOfTheScrollEffect(final MagusOfTheScrollEffect effect) { public MagusOfTheScrollEffect(final MagusOfTheScrollEffect effect) {

2
Mage.Sets/src/mage/cards/m/MangaraOfCorondor.java
View file

@ -59,7 +59,7 @@ public class MangaraOfCorondor extends CardImpl {
// {T}: Exile Mangara of Corondor and target permanent. // {T}: Exile Mangara of Corondor and target permanent.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileSourceEffect(), new TapSourceCost()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileSourceEffect(), new TapSourceCost());
ability.addEffect(new ExileTargetEffect()); ability.addEffect(new ExileTargetEffect().setText("and target permanent"));
ability.addTarget(new TargetPermanent()); ability.addTarget(new TargetPermanent());
this.addAbility(ability); this.addAbility(ability);
} }

20
Mage.Sets/src/mage/cards/m/MetallicMastery.java
View file

@ -36,9 +36,7 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.filter.FilterPermanent; import mage.target.common.TargetArtifactPermanent;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.target.TargetPermanent;
/** /**
* *
@ -46,20 +44,14 @@ import mage.target.TargetPermanent;
*/ */
public class MetallicMastery extends CardImpl { public class MetallicMastery extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("artifact");
static {
filter.add(new CardTypePredicate(CardType.ARTIFACT));
}
public MetallicMastery(UUID ownerId, CardSetInfo setInfo) { public MetallicMastery(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R}"); super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}");
// Gain control of target artifact until end of turn. Untap that artifact. It gains haste until end of turn.
this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addTarget(new TargetArtifactPermanent());
this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap that artifact"));
this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn."));
} }
public MetallicMastery(final MetallicMastery card) { public MetallicMastery(final MetallicMastery card) {

2
Mage.Sets/src/mage/cards/m/MirrorUniverse.java
View file

@ -55,7 +55,7 @@ public class MirrorUniverse extends CardImpl {
Zone.BATTLEFIELD, Zone.BATTLEFIELD,
new ExchangeLifeTargetEffect(), new ExchangeLifeTargetEffect(),
new TapSourceCost(), new TapSourceCost(),
new IsStepCondition(PhaseStep.UPKEEP), new IsStepCondition(PhaseStep.UPKEEP, true),
null); null);
ability.addCost(new SacrificeSourceCost()); ability.addCost(new SacrificeSourceCost());
ability.addTarget(new TargetOpponent()); ability.addTarget(new TargetOpponent());

6
Mage.Sets/src/mage/cards/m/MogissWarhound.java
View file

@ -51,7 +51,7 @@ import mage.constants.Zone;
public class MogissWarhound extends CardImpl { public class MogissWarhound extends CardImpl {
public MogissWarhound(UUID ownerId, CardSetInfo setInfo) { public MogissWarhound(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{1}{R}"); super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT, CardType.CREATURE}, "{1}{R}");
this.subtype.add(SubType.HOUND); this.subtype.add(SubType.HOUND);
this.power = new MageInt(2); this.power = new MageInt(2);
@ -62,11 +62,11 @@ public class MogissWarhound extends CardImpl {
// Mogis's Warhound attacks each turn if able. // Mogis's Warhound attacks each turn if able.
this.addAbility(new AttacksEachCombatStaticAbility()); this.addAbility(new AttacksEachCombatStaticAbility());
// Enchanted creature gets +2/+2 and attacks each turn if able. // Enchanted creature gets +2/+2 and attacks each turn if able.
Effect effect = new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield); Effect effect = new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield);
effect.setText("Enchanted creature gets +2/+2"); effect.setText("Enchanted creature gets +2/+2");
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect);
effect = new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA); effect = new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA);
effect.setText("and attacks each turn if able"); effect.setText("and attacks each combat if able");
ability.addEffect(effect); ability.addEffect(effect);
this.addAbility(ability); this.addAbility(ability);
} }

6
Mage.Sets/src/mage/cards/m/Molder.java
View file

@ -49,17 +49,17 @@ import mage.target.TargetPermanent;
public class Molder extends CardImpl { public class Molder extends CardImpl {
public Molder(UUID ownerId, CardSetInfo setInfo) { public Molder(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{X}{G}"); super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{X}{G}");
// Destroy target artifact or enchantment with converted mana cost X. It can't be regenerated. You gain X life. // Destroy target artifact or enchantment with converted mana cost X. It can't be regenerated. You gain X life.
this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
this.getSpellAbility().addTarget(new TargetPermanent(new FilterArtifactOrEnchantmentPermanent("artifact or enchantment with converted mana cost X"))); this.getSpellAbility().addTarget(new TargetPermanent(new FilterArtifactOrEnchantmentPermanent("artifact or enchantment with converted mana cost X")));
this.getSpellAbility().addEffect(new GainLifeEffect(new ManacostVariableValue())); this.getSpellAbility().addEffect(new GainLifeEffect(new ManacostVariableValue()));
} }
@Override @Override
public void adjustTargets(Ability ability, Game game) { public void adjustTargets(Ability ability, Game game) {
if(ability instanceof SpellAbility) { if (ability instanceof SpellAbility) {
ability.getTargets().clear(); ability.getTargets().clear();
int xValue = ability.getManaCostsToPay().getX(); int xValue = ability.getManaCostsToPay().getX();
FilterArtifactOrEnchantmentPermanent filter = new FilterArtifactOrEnchantmentPermanent("artifact or enchantment with converted mana cost X"); FilterArtifactOrEnchantmentPermanent filter = new FilterArtifactOrEnchantmentPermanent("artifact or enchantment with converted mana cost X");

12
Mage.Sets/src/mage/cards/m/MwonvuliAcidMoss.java
View file

@ -46,14 +46,17 @@ import mage.target.common.TargetCardInLibrary;
*/ */
public class MwonvuliAcidMoss extends CardImpl { public class MwonvuliAcidMoss extends CardImpl {
public MwonvuliAcidMoss(UUID ownerId, CardSetInfo setInfo) { private static final FilterLandCard filterForest = new FilterLandCard("Forest card");
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{G}{G}");
FilterLandCard filterForest = new FilterLandCard(); static {
filterForest.add(new SubtypePredicate(SubType.FOREST)); filterForest.add(new SubtypePredicate(SubType.FOREST));
}
public MwonvuliAcidMoss(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{G}{G}");
// Destroy target land. Search your library for a Forest card and put that card onto the battlefield tapped. Then shuffle your library. // Destroy target land. Search your library for a Forest card and put that card onto the battlefield tapped. Then shuffle your library.
this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); this.getSpellAbility().addEffect(new DestroyTargetEffect());
this.getSpellAbility().addTarget(new TargetPermanent(new FilterLandPermanent())); this.getSpellAbility().addTarget(new TargetPermanent(new FilterLandPermanent()));
this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filterForest), true, true)); this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filterForest), true, true));
} }
@ -67,4 +70,3 @@ public class MwonvuliAcidMoss extends CardImpl {
return new MwonvuliAcidMoss(this); return new MwonvuliAcidMoss(this);
} }
} }

4
Mage.Sets/src/mage/cards/n/NessianGameWarden.java
View file

@ -57,7 +57,7 @@ import mage.target.TargetCard;
public class NessianGameWarden extends CardImpl { public class NessianGameWarden extends CardImpl {
public NessianGameWarden(UUID ownerId, CardSetInfo setInfo) { public NessianGameWarden(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}{G}");
this.subtype.add(SubType.BEAST); this.subtype.add(SubType.BEAST);
this.power = new MageInt(4); this.power = new MageInt(4);
@ -87,7 +87,7 @@ class NessianGameWardenEffect extends OneShotEffect {
public NessianGameWardenEffect() { public NessianGameWardenEffect() {
super(Outcome.DrawCard); super(Outcome.DrawCard);
this.staticText = "look at the top X cards of your library, where X is the number of forests you control. You may reveal a creature card from among them and put it into your hand. Put the rest on the bottom of your library in any order"; this.staticText = "look at the top X cards of your library, where X is the number of Forests you control. You may reveal a creature card from among them and put it into your hand. Put the rest on the bottom of your library in any order";
} }
public NessianGameWardenEffect(final NessianGameWardenEffect effect) { public NessianGameWardenEffect(final NessianGameWardenEffect effect) {

5
Mage.Sets/src/mage/cards/n/NivmagusElemental.java
View file

@ -62,15 +62,14 @@ public class NivmagusElemental extends CardImpl {
} }
public NivmagusElemental(UUID ownerId, CardSetInfo setInfo) { public NivmagusElemental(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U/R}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{U/R}");
this.subtype.add(SubType.ELEMENTAL); this.subtype.add(SubType.ELEMENTAL);
this.power = new MageInt(1); this.power = new MageInt(1);
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Exile an instant or sorcery spell you control: Put two +1/+1 counters on Nivmagus Elemental. (That spell won't resolve.) // Exile an instant or sorcery spell you control: Put two +1/+1 counters on Nivmagus Elemental. (That spell won't resolve.)
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)),new ExileFromStackCost(new TargetSpell(filter))); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), new ExileFromStackCost(new TargetSpell(filter)));
this.addAbility(ability); this.addAbility(ability);
} }

6
Mage.Sets/src/mage/cards/o/OgreGeargrabber.java
View file

@ -62,14 +62,14 @@ public class OgreGeargrabber extends CardImpl {
} }
public OgreGeargrabber(UUID ownerId, CardSetInfo setInfo) { public OgreGeargrabber(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{R}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}{R}");
this.subtype.add(SubType.OGRE); this.subtype.add(SubType.OGRE);
this.subtype.add(SubType.WARRIOR); this.subtype.add(SubType.WARRIOR);
this.power = new MageInt(4); this.power = new MageInt(4);
this.toughness = new MageInt(4); this.toughness = new MageInt(4);
Ability ability = new AttacksTriggeredAbility(new OgreGeargrabberEffect1(), false); Ability ability = new AttacksTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn), false);
ability.addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); ability.addEffect(new OgreGeargrabberEffect1());
ability.addTarget(new TargetPermanent(1, 1, filter, false)); ability.addTarget(new TargetPermanent(1, 1, filter, false));
this.addAbility(ability); this.addAbility(ability);
} }

8
Mage.Sets/src/mage/cards/p/PendelhavenElder.java
View file

@ -52,6 +52,7 @@ import mage.filter.predicate.permanent.ControllerPredicate;
public class PendelhavenElder extends CardImpl { public class PendelhavenElder extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each 1/1 creature you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each 1/1 creature you control");
static { static {
filter.add(new PowerPredicate(ComparisonType.EQUAL_TO, 1)); filter.add(new PowerPredicate(ComparisonType.EQUAL_TO, 1));
filter.add(new ToughnessPredicate(ComparisonType.EQUAL_TO, 1)); filter.add(new ToughnessPredicate(ComparisonType.EQUAL_TO, 1));
@ -59,14 +60,17 @@ public class PendelhavenElder extends CardImpl {
} }
public PendelhavenElder(UUID ownerId, CardSetInfo setInfo) { public PendelhavenElder(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}");
this.subtype.add(SubType.ELF); this.subtype.add(SubType.ELF);
this.subtype.add(SubType.SHAMAN); this.subtype.add(SubType.SHAMAN);
this.power = new MageInt(1); this.power = new MageInt(1);
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// {tap}: Each 1/1 creature you control gets +1/+2 until end of turn. // {tap}: Each 1/1 creature you control gets +1/+2 until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 2, Duration.EndOfTurn, filter, false), new TapSourceCost())); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 2, Duration.EndOfTurn, filter, false)
.setText("Each 1/1 creature you control gets +1/+2 until end of turn."),
new TapSourceCost()
));
} }
public PendelhavenElder(final PendelhavenElder card) { public PendelhavenElder(final PendelhavenElder card) {

2
Mage.Sets/src/mage/cards/p/PharikaGodOfAffliction.java
View file

@ -91,7 +91,7 @@ class PharikaExileEffect extends OneShotEffect {
public PharikaExileEffect() { public PharikaExileEffect() {
super(Outcome.PutCreatureInPlay); super(Outcome.PutCreatureInPlay);
staticText = "Exile target creature card from a graveyard. It's owner creates a 1/1 black and green Snake enchantment creature token with deathtouch"; staticText = "Exile target creature card from a graveyard. Its owner creates a 1/1 black and green Snake enchantment creature token with deathtouch";
} }
public PharikaExileEffect(final PharikaExileEffect effect) { public PharikaExileEffect(final PharikaExileEffect effect) {

64
Mage.Sets/src/mage/cards/p/Powerleech.java
View file

@ -29,6 +29,8 @@ package mage.cards.p;
import java.util.UUID; import java.util.UUID;
import mage.abilities.TriggeredAbilityImpl; import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.costs.Cost;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.GainLifeEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
@ -37,18 +39,20 @@ import mage.constants.Zone;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.game.stack.StackAbility;
import mage.players.Player;
/** /**
* *
* @author MarcoMarin * @author TheElk801
*/ */
public class Powerleech extends CardImpl { public class Powerleech extends CardImpl {
public Powerleech(UUID ownerId, CardSetInfo setInfo) { public Powerleech(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}{G}"); super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{G}{G}");
// Whenever an artifact an opponent controls becomes tapped or an opponent activates an artifact's ability without {tap} in its activation cost, you gain 1 life. // Whenever an artifact an opponent controls becomes tapped or an opponent activates an artifact's ability without {tap} in its activation cost, you gain 1 life.
this.addAbility(new AbilityActivatedTriggeredAbility3()); this.addAbility(new PowerleechTriggeredAbility());
} }
public Powerleech(final Powerleech card) { public Powerleech(final Powerleech card) {
@ -60,37 +64,67 @@ public class Powerleech extends CardImpl {
return new Powerleech(this); return new Powerleech(this);
} }
} }
class AbilityActivatedTriggeredAbility3 extends TriggeredAbilityImpl {
AbilityActivatedTriggeredAbility3() { class PowerleechTriggeredAbility extends TriggeredAbilityImpl {
PowerleechTriggeredAbility() {
super(Zone.BATTLEFIELD, new GainLifeEffect(1)); super(Zone.BATTLEFIELD, new GainLifeEffect(1));
} }
AbilityActivatedTriggeredAbility3(final AbilityActivatedTriggeredAbility3 ability) { PowerleechTriggeredAbility(final PowerleechTriggeredAbility ability) {
super(ability); super(ability);
} }
@Override @Override
public AbilityActivatedTriggeredAbility3 copy() { public PowerleechTriggeredAbility copy() {
return new AbilityActivatedTriggeredAbility3(this); return new PowerleechTriggeredAbility(this);
} }
@Override @Override
public boolean checkEventType(GameEvent event, Game game) { public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.ACTIVATED_ABILITY || return event.getType() == GameEvent.EventType.ACTIVATED_ABILITY
event.getType() == GameEvent.EventType.TAPPED; || event.getType() == GameEvent.EventType.TAPPED;
} }
@Override @Override
public boolean checkTrigger(GameEvent event, Game game) { public boolean checkTrigger(GameEvent event, Game game) {
Permanent isArtifact = game.getPermanent(event.getSourceId()); Player player = game.getPlayer(controllerId);
return isArtifact != null && isArtifact.isArtifact() && if (player == null) {
!isArtifact.getControllerId().equals(this.getControllerId()); return false;
}
if (event.getType() == GameEvent.EventType.ACTIVATED_ABILITY) {
Permanent permanent = game.getPermanentOrLKIBattlefield(event.getSourceId());
if (permanent == null || !permanent.isArtifact()) {
return false;
}
StackAbility stackAbility = (StackAbility) game.getStack().getStackObject(event.getSourceId());
if (stackAbility == null) {
return false;
}
boolean triggerable = true;
for (Cost cost : stackAbility.getCosts()) {
if (cost instanceof TapSourceCost) {
triggerable = false;
break;
}
}
if (!triggerable) {
return false;
}
return player.hasOpponent(permanent.getControllerId(), game);
}
if (event.getType() == GameEvent.EventType.TAPPED) {
Permanent permanent = game.getPermanentOrLKIBattlefield(event.getTargetId());
if (permanent == null || !permanent.isArtifact()) {
return false;
}
return player.hasOpponent(permanent.getControllerId(), game);
}
return false;
} }
@Override @Override
public String getRule() { public String getRule() {
return "Whenever an artifact an opponent controls becomes tapped or an opponent activates an artifact's ability without {tap} in its activation cost, you gain 1 life."; return "Whenever an artifact an opponent controls becomes tapped or an opponent activates an artifact's ability without {T} in its activation cost, you gain 1 life.";
} }
} }

12
Mage.Sets/src/mage/cards/p/PrismaticGeoscope.java
View file

@ -29,19 +29,20 @@ package mage.cards.p;
import java.util.UUID; import java.util.UUID;
import mage.Mana; import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTappedAbility;
import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.dynamicvalue.common.DomainValue;
import mage.abilities.mana.DynamicManaAbility; import mage.abilities.mana.DynamicManaAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.AbilityWord;
import mage.constants.CardType; import mage.constants.CardType;
/** /**
* *
* @author fireshoes * @author fireshoes
*/ */
public class PrismaticGeoscope extends CardImpl { public class PrismaticGeoscope extends CardImpl {
public PrismaticGeoscope(UUID ownerId, CardSetInfo setInfo) { public PrismaticGeoscope(UUID ownerId, CardSetInfo setInfo) {
@ -51,8 +52,13 @@ public class PrismaticGeoscope extends CardImpl {
this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new EntersBattlefieldTappedAbility());
// <i>Domain</i> &mdash; {T}: Add X mana in any combination of colors to your mana pool, where X is the number of basic land types among lands you control. // <i>Domain</i> &mdash; {T}: Add X mana in any combination of colors to your mana pool, where X is the number of basic land types among lands you control.
this.addAbility(new DynamicManaAbility(new Mana(0,0,0,0,0,0,1, 0), new DomainValue(), new TapSourceCost(), Ability ability = new DynamicManaAbility(
"Add X mana in any combination of colors to your mana pool, where X is the number of basic land types among lands you control.")); new Mana(0, 0, 0, 0, 0, 0, 1, 0), new DomainValue(), new TapSourceCost(),
"Add X mana in any combination of colors to your mana pool,"
+ " where X is the number of basic land types among lands you control."
);
ability.setAbilityWord(AbilityWord.DOMAIN);
this.addAbility(ability);
} }
public PrismaticGeoscope(final PrismaticGeoscope card) { public PrismaticGeoscope(final PrismaticGeoscope card) {

8
Mage.Sets/src/mage/cards/p/PropheticFlamespeaker.java
View file

@ -58,7 +58,7 @@ import mage.target.targetpointer.FixedTarget;
public class PropheticFlamespeaker extends CardImpl { public class PropheticFlamespeaker extends CardImpl {
public PropheticFlamespeaker(UUID ownerId, CardSetInfo setInfo) { public PropheticFlamespeaker(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}{R}");
this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.HUMAN);
this.subtype.add(SubType.SHAMAN); this.subtype.add(SubType.SHAMAN);
@ -87,7 +87,7 @@ class PropheticFlamespeakerExileEffect extends OneShotEffect {
public PropheticFlamespeakerExileEffect() { public PropheticFlamespeakerExileEffect() {
super(Outcome.Detriment); super(Outcome.Detriment);
this.staticText = "Exile the top card of your library. You may play it this turn"; this.staticText = "exile the top card of your library. You may play it this turn";
} }
public PropheticFlamespeakerExileEffect(final PropheticFlamespeakerExileEffect effect) { public PropheticFlamespeakerExileEffect(final PropheticFlamespeakerExileEffect effect) {
@ -142,7 +142,7 @@ class PropheticFlamespeakerCastFromExileEffect extends AsThoughEffectImpl {
@Override @Override
public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) { public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
return source.getControllerId().equals(affectedControllerId) && return source.getControllerId().equals(affectedControllerId)
objectId.equals(getTargetPointer().getFirst(game, source)); && objectId.equals(getTargetPointer().getFirst(game, source));
} }
} }

16
Mage.Sets/src/mage/cards/r/Reiterate.java
View file

@ -33,9 +33,7 @@ import mage.abilities.keyword.BuybackAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.filter.FilterSpell; import mage.filter.StaticFilters;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.target.TargetSpell; import mage.target.TargetSpell;
/** /**
@ -44,22 +42,14 @@ import mage.target.TargetSpell;
*/ */
public class Reiterate extends CardImpl { public class Reiterate extends CardImpl {
private static final FilterSpell filter = new FilterSpell();
static {
filter.add(Predicates.or(
new CardTypePredicate(CardType.INSTANT),
new CardTypePredicate(CardType.SORCERY)));
}
public Reiterate(UUID ownerId, CardSetInfo setInfo) { public Reiterate(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}{R}"); super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{R}{R}");
// Buyback {3} // Buyback {3}
this.addAbility(new BuybackAbility("{3}")); this.addAbility(new BuybackAbility("{3}"));
// Copy target instant or sorcery spell. You may choose new targets for the copy. // Copy target instant or sorcery spell. You may choose new targets for the copy.
this.getSpellAbility().addTarget(new TargetSpell(filter)); this.getSpellAbility().addTarget(new TargetSpell(StaticFilters.FILTER_INSTANT_OR_SORCERY_SPELL));
this.getSpellAbility().addEffect(new CopyTargetSpellEffect()); this.getSpellAbility().addEffect(new CopyTargetSpellEffect());
} }

7
Mage.Sets/src/mage/cards/r/ReveilleSquad.java
View file

@ -92,7 +92,12 @@ class ReveilleSquadTriggeredAbility extends TriggeredAbilityImpl {
@Override @Override
public boolean checkTrigger(GameEvent event, Game game) { public boolean checkTrigger(GameEvent event, Game game) {
return game.getCombat().getDefenders().contains(controllerId); for (UUID attackerId : game.getCombat().getAttackers()) {
if (game.getCombat().getDefenderId(attackerId).equals(controllerId)) {
return true;
}
}
return false;
} }
@Override @Override

5
Mage.Sets/src/mage/cards/r/RiptideChimera.java
View file

@ -53,9 +53,8 @@ public class RiptideChimera extends CardImpl {
filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); filter.add(new CardTypePredicate(CardType.ENCHANTMENT));
} }
public RiptideChimera(UUID ownerId, CardSetInfo setInfo) { public RiptideChimera(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{2}{U}"); super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT, CardType.CREATURE}, "{2}{U}");
this.subtype.add(SubType.CHIMERA); this.subtype.add(SubType.CHIMERA);
this.power = new MageInt(3); this.power = new MageInt(3);
@ -65,7 +64,7 @@ public class RiptideChimera extends CardImpl {
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// At the beginning of your upkeep, return an enchantment you control to its owner's hand. // At the beginning of your upkeep, return an enchantment you control to its owner's hand.
Effect effect = new ReturnToHandChosenControlledPermanentEffect(filter, 1); Effect effect = new ReturnToHandChosenControlledPermanentEffect(filter, 1);
effect.setText("return an enchanment you control to its owner's hand"); effect.setText("return an enchantment you control to its owner's hand");
this.addAbility(new BeginningOfUpkeepTriggeredAbility(effect, TargetController.YOU, false)); this.addAbility(new BeginningOfUpkeepTriggeredAbility(effect, TargetController.YOU, false));
} }

2
Mage.Sets/src/mage/cards/r/RitualOfTheReturned.java
View file

@ -71,7 +71,7 @@ class RitualOfTheReturnedExileEffect extends OneShotEffect {
public RitualOfTheReturnedExileEffect() { public RitualOfTheReturnedExileEffect() {
super(Outcome.PutCreatureInPlay); super(Outcome.PutCreatureInPlay);
this.staticText = "Exile target creature card from your graveyard. Create a black Zombie creature token with power equal to the exiled card's power and toughness equal to the exiled card's toughness"; this.staticText = "Exile target creature card from your graveyard. Create a black Zombie creature token. Its power is equal to that card's power and its toughness is equal to that card's toughness.";
} }
public RitualOfTheReturnedExileEffect(final RitualOfTheReturnedExileEffect effect) { public RitualOfTheReturnedExileEffect(final RitualOfTheReturnedExileEffect effect) {

6
Mage.Sets/src/mage/cards/s/ScarwoodTreefolk.java
View file

@ -42,16 +42,14 @@ import mage.constants.SubType;
*/ */
public class ScarwoodTreefolk extends CardImpl { public class ScarwoodTreefolk extends CardImpl {
private static final String staticText = "{this} enters the battlefield tapped";
public ScarwoodTreefolk(UUID ownerId, CardSetInfo setInfo) { public ScarwoodTreefolk(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}");
this.subtype.add(SubType.TREEFOLK); this.subtype.add(SubType.TREEFOLK);
this.power = new MageInt(3); this.power = new MageInt(3);
this.toughness = new MageInt(5); this.toughness = new MageInt(5);
// Scarwood Treefolk enters the battlefield tapped. // Scarwood Treefolk enters the battlefield tapped.
this.addAbility(new EntersBattlefieldAbility(new TapSourceEffect(), staticText)); this.addAbility(new EntersBattlefieldAbility(new TapSourceEffect(), "tapped"));
} }
public ScarwoodTreefolk(final ScarwoodTreefolk card) { public ScarwoodTreefolk(final ScarwoodTreefolk card) {

4
Mage.Sets/src/mage/cards/s/ScreechingSliver.java
View file

@ -52,7 +52,7 @@ public class ScreechingSliver extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent(SubType.SLIVER, "All Slivers"); private static final FilterPermanent filter = new FilterPermanent(SubType.SLIVER, "All Slivers");
public ScreechingSliver(UUID ownerId, CardSetInfo setInfo) { public ScreechingSliver(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{U}");
this.subtype.add(SubType.SLIVER); this.subtype.add(SubType.SLIVER);
this.power = new MageInt(1); this.power = new MageInt(1);
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
@ -63,7 +63,7 @@ public class ScreechingSliver extends CardImpl {
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield,
filter, "All Sliver creatures have \"{T}: Target player puts the top card of his or her library into his or her graveyard.\""))); filter, "All Slivers have \"{T}: Target player puts the top card of his or her library into his or her graveyard.\"")));
} }
public ScreechingSliver(final ScreechingSliver card) { public ScreechingSliver(final ScreechingSliver card) {

5
Mage.Sets/src/mage/cards/s/ScrybRanger.java
View file

@ -53,13 +53,14 @@ import mage.target.common.TargetCreaturePermanent;
*/ */
public class ScrybRanger extends CardImpl { public class ScrybRanger extends CardImpl {
private static final FilterControlledLandPermanent filterForest = new FilterControlledLandPermanent("Forest"); private static final FilterControlledLandPermanent filterForest = new FilterControlledLandPermanent("a Forest");
static { static {
filterForest.add(new SubtypePredicate(SubType.FOREST)); filterForest.add(new SubtypePredicate(SubType.FOREST));
} }
public ScrybRanger(UUID ownerId, CardSetInfo setInfo) { public ScrybRanger(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}");
this.subtype.add(SubType.FAERIE); this.subtype.add(SubType.FAERIE);
this.power = new MageInt(1); this.power = new MageInt(1);

7
Mage.Sets/src/mage/cards/s/SetessanTactics.java
View file

@ -58,20 +58,19 @@ public class SetessanTactics extends CardImpl {
} }
public SetessanTactics(UUID ownerId, CardSetInfo setInfo) { public SetessanTactics(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{G}"); super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{G}");
// Strive - Setessan Tactics costs G more to cast for each target beyond the first. // Strive - Setessan Tactics costs G more to cast for each target beyond the first.
this.addAbility(new StriveAbility("{G}")); this.addAbility(new StriveAbility("{G}"));
// Until end of turn, any number of target creatures each get +1/+1 and gain "T: This creature fights another target creature." // Until end of turn, any number of target creatures each get +1/+1 and gain "T: This creature fights another target creature."
this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, Integer.MAX_VALUE)); this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, Integer.MAX_VALUE));
Effect effect = new BoostTargetEffect(1,1, Duration.EndOfTurn); Effect effect = new BoostTargetEffect(1, 1, Duration.EndOfTurn);
effect.setText("Until end of turn, any number of target creatures each get +1/+1"); effect.setText("Until end of turn, any number of target creatures each get +1/+1");
this.getSpellAbility().addEffect(effect); this.getSpellAbility().addEffect(effect);
Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FightTargetSourceEffect(), new TapSourceCost()); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FightTargetSourceEffect(), new TapSourceCost());
gainedAbility.addTarget(new TargetCreaturePermanent(filter)); gainedAbility.addTarget(new TargetCreaturePermanent(filter));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn, this.getSpellAbility().addEffect(new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn,
"and gain \"T: This creature fights another target creature.\"")); "and gain \"{T}: This creature fights another target creature.\""));
} }
public SetessanTactics(final SetessanTactics card) { public SetessanTactics(final SetessanTactics card) {

9
Mage.Sets/src/mage/cards/s/SidewinderSliver.java
View file

@ -49,19 +49,22 @@ public class SidewinderSliver extends CardImpl {
static final private FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures"); static final private FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures");
static{ static {
filter.add(new SubtypePredicate(SubType.SLIVER)); filter.add(new SubtypePredicate(SubType.SLIVER));
} }
public SidewinderSliver(UUID ownerId, CardSetInfo setInfo) { public SidewinderSliver(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}");
this.subtype.add(SubType.SLIVER); this.subtype.add(SubType.SLIVER);
this.power = new MageInt(1); this.power = new MageInt(1);
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// All Sliver creatures have flanking. // All Sliver creatures have flanking.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new FlankingAbility(), Duration.WhileOnBattlefield, filter, false))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
new GainAbilityAllEffect(new FlankingAbility(), Duration.WhileOnBattlefield, filter, false)
.setText("all Slivers have flanking")
));
} }
public SidewinderSliver(final SidewinderSliver card) { public SidewinderSliver(final SidewinderSliver card) {

6
Mage.Sets/src/mage/cards/s/SlaveOfBolas.java
View file

@ -54,12 +54,12 @@ import mage.target.targetpointer.FixedTarget;
public class SlaveOfBolas extends CardImpl { public class SlaveOfBolas extends CardImpl {
public SlaveOfBolas(UUID ownerId, CardSetInfo setInfo) { public SlaveOfBolas(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{U/R}{B}"); super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{U/R}{B}");
// Gain control of target creature. Untap that creature. It gains haste until end of turn. Sacrifice it at the beginning of the next end step. // Gain control of target creature. Untap that creature. It gains haste until end of turn. Sacrifice it at the beginning of the next end step.
this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap that creature"));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn"));
this.getSpellAbility().addEffect(new SlaveOfBolasEffect()); this.getSpellAbility().addEffect(new SlaveOfBolasEffect());
this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addTarget(new TargetCreaturePermanent());
} }

2
Mage.Sets/src/mage/cards/s/SpellSwindle.java
View file

@ -69,7 +69,7 @@ class SpellSwindleEffect extends OneShotEffect {
public SpellSwindleEffect() { public SpellSwindleEffect() {
super(Outcome.Detriment); super(Outcome.Detriment);
staticText = "Counter target spell. Create X colorless Treasure artifact tokens, where X is that spell's converted mana cost. " staticText = "Counter target spell. Create X colorless Treasure artifact tokens, where X is that spell's converted mana cost. "
+ "They have \"{T}, Sacrifice this artifact: Add one mana of any color to your mana pool\""; + "They have \"{T}, Sacrifice this artifact: Add one mana of any color to your mana pool.\"";
} }
public SpellSwindleEffect(final SpellSwindleEffect effect) { public SpellSwindleEffect(final SpellSwindleEffect effect) {

4
Mage.Sets/src/mage/cards/s/SpinalEmbrace.java
View file

@ -66,7 +66,7 @@ public class SpinalEmbrace extends CardImpl {
} }
public SpinalEmbrace(UUID ownerId, CardSetInfo setInfo) { public SpinalEmbrace(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{U}{U}{B}"); super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{U}{U}{B}");
// Cast Spinal Embrace only during combat. // Cast Spinal Embrace only during combat.
this.addAbility(new CastOnlyDuringPhaseStepSourceAbility(TurnPhase.COMBAT)); this.addAbility(new CastOnlyDuringPhaseStepSourceAbility(TurnPhase.COMBAT));
@ -77,7 +77,7 @@ public class SpinalEmbrace extends CardImpl {
Effect effect = new GainControlTargetEffect(Duration.EndOfTurn); Effect effect = new GainControlTargetEffect(Duration.EndOfTurn);
effect.setText("and gain control of it"); effect.setText("and gain control of it");
this.getSpellAbility().addEffect(effect); this.getSpellAbility().addEffect(effect);
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn"));
this.getSpellAbility().addEffect(new SpinalEmbraceAddDelayedEffect()); this.getSpellAbility().addEffect(new SpinalEmbraceAddDelayedEffect());
} }

8
Mage.Sets/src/mage/cards/s/Spirespine.java
View file

@ -51,7 +51,7 @@ import mage.constants.Zone;
public class Spirespine extends CardImpl { public class Spirespine extends CardImpl {
public Spirespine(UUID ownerId, CardSetInfo setInfo) { public Spirespine(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{2}{G}"); super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT, CardType.CREATURE}, "{2}{G}");
this.subtype.add(SubType.BEAST); this.subtype.add(SubType.BEAST);
this.power = new MageInt(4); this.power = new MageInt(4);
@ -61,12 +61,12 @@ public class Spirespine extends CardImpl {
this.addAbility(new BestowAbility(this, "{4}{G}")); this.addAbility(new BestowAbility(this, "{4}{G}"));
// Spirespine blocks each turn if able. // Spirespine blocks each turn if able.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BlocksIfAbleSourceEffect(Duration.WhileOnBattlefield))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BlocksIfAbleSourceEffect(Duration.WhileOnBattlefield)));
// Enchanted creature gets +4/+1 and blocks each turn if able. // Enchanted creature gets +4/+1 and blocks each combat if able.
Effect effect = new BoostEnchantedEffect(4,1, Duration.WhileOnBattlefield); Effect effect = new BoostEnchantedEffect(4, 1, Duration.WhileOnBattlefield);
effect.setText("Enchanted creature gets +4/+1"); effect.setText("Enchanted creature gets +4/+1");
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect);
effect = new BlocksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA); effect = new BlocksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA);
effect.setText("and blocks each turn if able"); effect.setText("and blocks each combat if able");
ability.addEffect(effect); ability.addEffect(effect);
this.addAbility(ability); this.addAbility(ability);
} }

2
Mage.Sets/src/mage/cards/s/StormFleetAerialist.java
View file

@ -60,7 +60,7 @@ public class StormFleetAerialist extends CardImpl {
// Raid - Storm Fleet Aerialist enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn. // Raid - Storm Fleet Aerialist enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn.
this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1), false), this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1), false),
RaidCondition.instance, RaidCondition.instance,
"<i>Raid</i> - {this} enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn", "<i>Raid</i> - {this} enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn.",
"{this} enters the battlefield with a +1/+1 counter"), "{this} enters the battlefield with a +1/+1 counter"),
new PlayerAttackedWatcher()); new PlayerAttackedWatcher());
} }

2
Mage.Sets/src/mage/cards/s/StranglingSoot.java
View file

@ -45,7 +45,7 @@ import mage.target.common.TargetCreaturePermanent;
*/ */
public class StranglingSoot extends CardImpl { public class StranglingSoot extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with toughess 3 or less"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with toughness 3 or less");
static { static {
filter.add(new ToughnessPredicate(ComparisonType.FEWER_THAN, 4)); filter.add(new ToughnessPredicate(ComparisonType.FEWER_THAN, 4));

2
Mage.Sets/src/mage/cards/s/SurgingAether.java
View file

@ -45,7 +45,7 @@ public class SurgingAether extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{U}"); super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{U}");
// Ripple 4 // Ripple 4
this.addAbility(new RippleAbility(4)); this.addAbility(new RippleAbility(4).setRuleAtTheTop(true));
// Return target permanent to its owner's hand. // Return target permanent to its owner's hand.
this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());

4
Mage.Sets/src/mage/cards/s/SurgingDementia.java
View file

@ -42,10 +42,10 @@ import mage.target.TargetPlayer;
public class SurgingDementia extends CardImpl { public class SurgingDementia extends CardImpl {
public SurgingDementia(UUID ownerId, CardSetInfo setInfo) { public SurgingDementia(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{B}"); super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{B}");
// Ripple 4 // Ripple 4
this.addAbility(new RippleAbility(4)); this.addAbility(new RippleAbility(4).setRuleAtTheTop(true));
// Target player discards a card. // Target player discards a card.
this.getSpellAbility().getEffects().add(new DiscardTargetEffect(1)); this.getSpellAbility().getEffects().add(new DiscardTargetEffect(1));

5
Mage.Sets/src/mage/cards/s/SurgingFlame.java
View file

@ -42,10 +42,11 @@ import mage.target.common.TargetCreatureOrPlayer;
public class SurgingFlame extends CardImpl { public class SurgingFlame extends CardImpl {
public SurgingFlame(UUID ownerId, CardSetInfo setInfo) { public SurgingFlame(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}"); super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{R}");
// Ripple 4 // Ripple 4
this.addAbility(new RippleAbility(4)); this.addAbility(new RippleAbility(4).setRuleAtTheTop(true));
// Surging Flame deals 2 damage to target creature or player. // Surging Flame deals 2 damage to target creature or player.
this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addEffect(new DamageTargetEffect(2));
this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());

4
Mage.Sets/src/mage/cards/s/SwarmbornGiant.java
View file

@ -56,7 +56,7 @@ import mage.game.events.GameEvent.EventType;
public class SwarmbornGiant extends CardImpl { public class SwarmbornGiant extends CardImpl {
public SwarmbornGiant(UUID ownerId, CardSetInfo setInfo) { public SwarmbornGiant(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}");
this.subtype.add(SubType.GIANT); this.subtype.add(SubType.GIANT);
this.power = new MageInt(6); this.power = new MageInt(6);
@ -118,6 +118,6 @@ class SwarmbornGiantTriggeredAbility extends TriggeredAbilityImpl {
@Override @Override
public String getRule() { public String getRule() {
return "Whenever you're dealt combat damage, " + super.getRule(); return "When you're dealt combat damage, " + super.getRule();
} }
} }

8
Mage.Sets/src/mage/cards/t/Threaten.java
View file

@ -45,11 +45,11 @@ import mage.target.common.TargetCreaturePermanent;
public class Threaten extends CardImpl { public class Threaten extends CardImpl {
public Threaten(UUID ownerId, CardSetInfo setInfo) { public Threaten(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R}"); super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}");
this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap target creature"));
this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn).setText("and gain control of it until end of turn"));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn."));
this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addTarget(new TargetCreaturePermanent());
} }

9
Mage.Sets/src/mage/cards/t/TraitorousBlood.java
View file

@ -46,15 +46,14 @@ import mage.target.common.TargetCreaturePermanent;
public class TraitorousBlood extends CardImpl { public class TraitorousBlood extends CardImpl {
public TraitorousBlood(UUID ownerId, CardSetInfo setInfo) { public TraitorousBlood(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}{R}"); super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{R}{R}");
// Gain control of target creature until end of turn. Untap it. It gains trample and haste until end of turn. // Gain control of target creature until end of turn. Untap it. It gains trample and haste until end of turn.
this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addTarget(new TargetCreaturePermanent());
this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap it"));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn).setText("It gains trample"));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("and hast until end of turn"));
} }
public TraitorousBlood(final TraitorousBlood card) { public TraitorousBlood(final TraitorousBlood card) {

9
Mage.Sets/src/mage/cards/t/TraitorousInstinct.java
View file

@ -46,14 +46,13 @@ import mage.target.common.TargetCreaturePermanent;
public class TraitorousInstinct extends CardImpl { public class TraitorousInstinct extends CardImpl {
public TraitorousInstinct(UUID ownerId, CardSetInfo setInfo) { public TraitorousInstinct(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}"); super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{R}");
this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addTarget(new TargetCreaturePermanent());
this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap that creature"));
this.getSpellAbility().addEffect(new BoostTargetEffect(2, 0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 0, Duration.EndOfTurn).setText("Until end of turn, it gets +2/+0"));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("and gains haste"));
} }
public TraitorousInstinct(final TraitorousInstinct card) { public TraitorousInstinct(final TraitorousInstinct card) {

6
Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java
View file

@ -72,9 +72,6 @@ public class VesuvanShapeshifter extends CardImpl {
this.power = new MageInt(0); this.power = new MageInt(0);
this.toughness = new MageInt(0); this.toughness = new MageInt(0);
// Morph {1}{U}
this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{U}")));
// As Vesuvan Shapeshifter turned face up, may choose another creature. If you do, until Vesuvan Shapeshifter is turned face down, it becomes a copy of that creature // As Vesuvan Shapeshifter turned face up, may choose another creature. If you do, until Vesuvan Shapeshifter is turned face down, it becomes a copy of that creature
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new AsTurnedFaceUpEffect(new VesuvanShapeshifterEffect(), false)); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new AsTurnedFaceUpEffect(new VesuvanShapeshifterEffect(), false));
ability.setWorksFaceDown(true); ability.setWorksFaceDown(true);
@ -91,6 +88,9 @@ public class VesuvanShapeshifter extends CardImpl {
effect = new VesuvanShapeshifterFaceDownEffect(); effect = new VesuvanShapeshifterFaceDownEffect();
ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.YOU, true); ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.YOU, true);
this.addAbility(ability); this.addAbility(ability);
// Morph {1}{U}
this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{U}")));
} }
public VesuvanShapeshifter(final VesuvanShapeshifter card) { public VesuvanShapeshifter(final VesuvanShapeshifter card) {

5
Mage.Sets/src/mage/cards/v/VexingSphinx.java
View file

@ -30,7 +30,7 @@ package mage.cards.v;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.costs.common.DiscardCardCost;
import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FlyingAbility;
import mage.abilities.dynamicvalue.common.CountersSourceCount; import mage.abilities.dynamicvalue.common.CountersSourceCount;
import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect;
@ -40,7 +40,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.SubType; import mage.constants.SubType;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.target.common.TargetCardInHand;
/** /**
* *
@ -59,7 +58,7 @@ public class VexingSphinx extends CardImpl {
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// Cumulative upkeep-Discard a card. // Cumulative upkeep-Discard a card.
this.addAbility(new CumulativeUpkeepAbility(new DiscardTargetCost(new TargetCardInHand()))); this.addAbility(new CumulativeUpkeepAbility(new DiscardCardCost()));
// When Vexing Sphinx dies, draw a card for each age counter on it. // When Vexing Sphinx dies, draw a card for each age counter on it.
this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(new CountersSourceCount(CounterType.AGE)))); this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(new CountersSourceCount(CounterType.AGE))));

4
Mage.Sets/src/mage/cards/w/WheelOfFate.java
View file

@ -43,7 +43,7 @@ import mage.constants.CardType;
public class WheelOfFate extends CardImpl { public class WheelOfFate extends CardImpl {
public WheelOfFate(UUID ownerId, CardSetInfo setInfo) { public WheelOfFate(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},""); super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "");
this.color.setRed(true); this.color.setRed(true);
@ -51,7 +51,7 @@ public class WheelOfFate extends CardImpl {
this.addAbility(new SuspendAbility(4, new ManaCostsImpl("{1}{R}"), this)); this.addAbility(new SuspendAbility(4, new ManaCostsImpl("{1}{R}"), this));
// Each player discards his or her hand, then draws seven cards. // Each player discards his or her hand, then draws seven cards.
this.getSpellAbility().addEffect(new DiscardHandAllEffect()); this.getSpellAbility().addEffect(new DiscardHandAllEffect());
this.getSpellAbility().addEffect(new DrawCardAllEffect(7)); this.getSpellAbility().addEffect(new DrawCardAllEffect(7).setText(", then draws seven cards"));
} }
public WheelOfFate(final WheelOfFate card) { public WheelOfFate(final WheelOfFate card) {

6
Mage.Sets/src/mage/cards/w/WormwoodDryad.java
View file

@ -50,7 +50,7 @@ import mage.constants.Zone;
public class WormwoodDryad extends CardImpl { public class WormwoodDryad extends CardImpl {
public WormwoodDryad(UUID ownerId, CardSetInfo setInfo) { public WormwoodDryad(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}");
this.subtype.add(SubType.DRYAD); this.subtype.add(SubType.DRYAD);
this.power = new MageInt(3); this.power = new MageInt(3);
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
@ -58,13 +58,13 @@ public class WormwoodDryad extends CardImpl {
// {G}: Wormwood Dryad gains forestwalk until end of turn and deals 1 damage to you. // {G}: Wormwood Dryad gains forestwalk until end of turn and deals 1 damage to you.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
new GainAbilitySourceEffect(new ForestwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl("{G}")); new GainAbilitySourceEffect(new ForestwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl("{G}"));
ability.addEffect(new DamageControllerEffect(1)); ability.addEffect(new DamageControllerEffect(1).setText("and deals 1 damage to you"));
this.addAbility(ability); this.addAbility(ability);
// {B}: Wormwood Dryad gains swampwalk until end of turn and deals 1 damage to you. // {B}: Wormwood Dryad gains swampwalk until end of turn and deals 1 damage to you.
ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
new GainAbilitySourceEffect(new SwampwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl("{B}")); new GainAbilitySourceEffect(new SwampwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl("{B}"));
ability.addEffect(new DamageControllerEffect(1)); ability.addEffect(new DamageControllerEffect(1).setText("and deals 1 damage to you"));
this.addAbility(ability); this.addAbility(ability);
} }

6
Mage/src/main/java/mage/abilities/SpellAbility.java
View file

@ -97,10 +97,12 @@ public class SpellAbility extends ActivatedAbilityImpl {
return false; return false;
} }
// fix for Gitaxian Probe and casting opponent's spells // fix for Gitaxian Probe and casting opponent's spells
if (!game.getContinuousEffects().asThough(getSourceId(), AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, playerId, game) if (!game.getContinuousEffects().asThough(getSourceId(), AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, playerId, game)) {
&& !controllerId.equals(playerId) && getZone() != Zone.HAND) { Card card = game.getCard(sourceId);
if (!(card != null && card.getOwnerId() == playerId)) {
return false; return false;
} }
}
// Check if rule modifying events prevent to cast the spell in check playable mode // Check if rule modifying events prevent to cast the spell in check playable mode
if (this.isCheckPlayableMode()) { if (this.isCheckPlayableMode()) {
if (game.getContinuousEffects().preventedByRuleModification( if (game.getContinuousEffects().preventedByRuleModification(

2
Mage/src/main/java/mage/abilities/condition/common/IsStepCondition.java
View file

@ -59,7 +59,7 @@ public class IsStepCondition implements Condition {
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder("during "); StringBuilder sb = new StringBuilder("during ");
if (onlyDuringYourSteps) { if (onlyDuringYourSteps) {
sb.append("your "); sb.append("your ").append(phaseStep.getStepText());
} else if (phaseStep == PhaseStep.UPKEEP) { } else if (phaseStep == PhaseStep.UPKEEP) {
sb.append("any upkeep step"); sb.append("any upkeep step");
} else { } else {

7
Mage/src/main/java/mage/abilities/costs/common/ExileFromStackCost.java
View file

@ -61,10 +61,15 @@ public class ExileFromStackCost extends CostImpl {
if (spellToExile == null) { if (spellToExile == null) {
return false; return false;
} }
String spellName = spellToExile.getName();
if (spellToExile.isCopy()) {
game.getStack().remove(spellToExile);
} else {
spellToExile.moveToExile(null, "", ability.getSourceId(), game); spellToExile.moveToExile(null, "", ability.getSourceId(), game);
}
paid = true; paid = true;
if (!game.isSimulation()) { if (!game.isSimulation()) {
game.informPlayers(player.getLogName() + " exiles " + spellToExile.getName() + " (as costs)"); game.informPlayers(player.getLogName() + " exiles " + spellName + " (as costs)");
} }
} }
} }

4
Mage/src/main/java/mage/abilities/effects/common/AddConditionalManaOfAnyColorEffect.java
View file

@ -63,7 +63,9 @@ public class AddConditionalManaOfAnyColorEffect extends ManaEffect {
staticText = "Add " staticText = "Add "
+ (amount instanceof StaticValue ? (CardUtil.numberToText(((StaticValue) amount).toString())) : "") + (amount instanceof StaticValue ? (CardUtil.numberToText(((StaticValue) amount).toString())) : "")
+ " mana " + " mana "
+ (oneChoice ? "of any one color" : "in any combination of colors") + (oneChoice ? "of any"
+ (amount instanceof StaticValue && (((StaticValue) amount).toString()).equals("1") ? "" : " one")
+ " color" : "in any combination of colors")
+ " to your mana pool. " + manaBuilder.getRule(); + " to your mana pool. " + manaBuilder.getRule();
} }

4
Mage/src/main/java/mage/abilities/effects/common/CreateTokenCopyTargetEffect.java
View file

@ -277,14 +277,14 @@ public class CreateTokenCopyTargetEffect extends OneShotEffect {
if (tapped && !attacking) { if (tapped && !attacking) {
sb.append("tapped "); sb.append("tapped ");
} }
sb.append("token"); sb.append("token that's a copy of target creature");
} else { } else {
sb.append(number); sb.append(number);
sb.append(" "); sb.append(" ");
if (tapped && !attacking) { if (tapped && !attacking) {
sb.append("tapped "); sb.append("tapped ");
} }
sb.append("tokens"); sb.append("tokens that are copies of target creature");
} }
if (attacking) { if (attacking) {
sb.append(" that are"); sb.append(" that are");

5
Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetEffect.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.abilities.effects.common; package mage.abilities.effects.common;
import mage.constants.Duration; import mage.constants.Duration;
@ -83,9 +82,9 @@ public class PreventDamageToTargetEffect extends PreventionEffectImpl {
} }
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (amountToPrevent == Integer.MAX_VALUE) { if (amountToPrevent == Integer.MAX_VALUE) {
sb.append("Prevent all damage that would be dealt to target "); sb.append("prevent all damage that would be dealt to target ");
} else { } else {
sb.append("Prevent the next ").append(amountToPrevent).append(" damage that would be dealt to target "); sb.append("prevent the next ").append(amountToPrevent).append(" damage that would be dealt to target ");
} }
sb.append(mode.getTargets().get(0).getTargetName()); sb.append(mode.getTargets().get(0).getTargetName());
if (!duration.toString().isEmpty()) { if (!duration.toString().isEmpty()) {

2
Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveTargetEffect.java
View file

@ -75,7 +75,7 @@ public class PutTopCardOfLibraryIntoGraveTargetEffect extends OneShotEffect {
} }
private String setText() { private String setText() {
StringBuilder sb = new StringBuilder("Target player puts the top "); StringBuilder sb = new StringBuilder("target player puts the top ");
if (numberCards.toString().equals("1")) { if (numberCards.toString().equals("1")) {
sb.append(" card"); sb.append(" card");
} else { } else {

15
Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java
View file

@ -27,7 +27,9 @@
*/ */
package mage.abilities.effects.common; package mage.abilities.effects.common;
import java.util.ArrayList;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import mage.MageObject; import mage.MageObject;
@ -38,6 +40,7 @@ import mage.cards.Card;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Zone; import mage.constants.Zone;
import mage.game.Game; import mage.game.Game;
import mage.game.stack.Spell;
import mage.players.Player; import mage.players.Player;
import mage.target.Target; import mage.target.Target;
import mage.util.CardUtil; import mage.util.CardUtil;
@ -74,12 +77,15 @@ public class ReturnToHandTargetEffect extends OneShotEffect {
if (controller == null) { if (controller == null) {
return false; return false;
} }
List<UUID> copyIds = new ArrayList<>();
Set<Card> cards = new LinkedHashSet<>(); Set<Card> cards = new LinkedHashSet<>();
if (multitargetHandling) { if (multitargetHandling) {
for (Target target : source.getTargets()) { for (Target target : source.getTargets()) {
for (UUID targetId : target.getTargets()) { for (UUID targetId : target.getTargets()) {
MageObject mageObject = game.getObject(targetId); MageObject mageObject = game.getObject(targetId);
if (mageObject instanceof Card) { if (mageObject instanceof Spell && ((Spell) mageObject).isCopy()) {
copyIds.add(targetId);
} else if (mageObject instanceof Card) {
cards.add((Card) mageObject); cards.add((Card) mageObject);
} }
} }
@ -88,10 +94,17 @@ public class ReturnToHandTargetEffect extends OneShotEffect {
for (UUID targetId : targetPointer.getTargets(game, source)) { for (UUID targetId : targetPointer.getTargets(game, source)) {
MageObject mageObject = game.getObject(targetId); MageObject mageObject = game.getObject(targetId);
if (mageObject != null) { if (mageObject != null) {
if (mageObject instanceof Spell && ((Spell) mageObject).isCopy()) {
copyIds.add(targetId);
} else {
cards.add((Card) mageObject); cards.add((Card) mageObject);
} }
} }
} }
}
for (UUID copyId : copyIds) {
game.getStack().remove(game.getSpell(copyId));
}
return controller.moveCards(cards, Zone.HAND, source, game); return controller.moveCards(cards, Zone.HAND, source, game);
} }

2
Mage/src/main/java/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java
View file

@ -80,6 +80,6 @@ public class TapAllTargetPlayerControlsEffect extends OneShotEffect {
if (staticText != null && !staticText.isEmpty()) { if (staticText != null && !staticText.isEmpty()) {
return staticText; return staticText;
} }
return "tap all " + filter.getMessage() + " target " + mode.getTargets().get(0).getMessage() + " controls"; return "tap all " + filter.toString() + " target " + mode.getTargets().get(0).getMessage() + " controls";
} }
} }

4
Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleAttachedEffect.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.abilities.effects.common.combat; package mage.abilities.effects.common.combat;
import mage.abilities.Ability; import mage.abilities.Ability;
@ -38,12 +37,11 @@ import mage.game.permanent.Permanent;
/** /**
* @author LevelX2 * @author LevelX2
*/ */
public class BlocksIfAbleAttachedEffect extends RequirementEffect { public class BlocksIfAbleAttachedEffect extends RequirementEffect {
public BlocksIfAbleAttachedEffect(Duration duration, AttachmentType attachmentType) { public BlocksIfAbleAttachedEffect(Duration duration, AttachmentType attachmentType) {
super(duration); super(duration);
this.staticText = attachmentType.verb() + " creature blocks each turn if able"; this.staticText = attachmentType.verb() + " creature blocks each combat if able";
} }
public BlocksIfAbleAttachedEffect(final BlocksIfAbleAttachedEffect effect) { public BlocksIfAbleAttachedEffect(final BlocksIfAbleAttachedEffect effect) {

4
Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleSourceEffect.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.abilities.effects.common.combat; package mage.abilities.effects.common.combat;
import mage.abilities.Ability; import mage.abilities.Ability;
@ -39,7 +38,6 @@ import mage.game.permanent.Permanent;
* *
* @author LevelX2 * @author LevelX2
*/ */
public class BlocksIfAbleSourceEffect extends RequirementEffect { public class BlocksIfAbleSourceEffect extends RequirementEffect {
public BlocksIfAbleSourceEffect(Duration duration) { public BlocksIfAbleSourceEffect(Duration duration) {
@ -78,7 +76,7 @@ public class BlocksIfAbleSourceEffect extends RequirementEffect {
@Override @Override
public String getText(Mode mode) { public String getText(Mode mode) {
return "{this} blocks each turn if able."; return "{this} blocks each combat if able.";
} }
} }

44
Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneTargetEffect.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.abilities.effects.common.combat; package mage.abilities.effects.common.combat;
import java.util.UUID; import java.util.UUID;
@ -35,35 +34,32 @@ import mage.constants.Duration;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
/** /**
* !! This effect does only support one target. * !! This effect does only support one target.
* *
* *
* http://tappedout.net/mtg-questions/must-be-blocked-if-able-effect-makes-other-attacking-creatures-essentially-unblockable/ * http://tappedout.net/mtg-questions/must-be-blocked-if-able-effect-makes-other-attacking-creatures-essentially-unblockable/
* *
* When you Declare Blockers, you choose an arrangement for your blockers, * When you Declare Blockers, you choose an arrangement for your blockers, then
* then check to see if there are any restrictions or requirements. * check to see if there are any restrictions or requirements.
* *
* If any restrictions are violated, the block is illegal. (For example, * If any restrictions are violated, the block is illegal. (For example, trying
* trying to block with Sightless Ghoul) * to block with Sightless Ghoul) If any requirements are violated, the least
* If any requirements are violated, the least possible number of requirements * possible number of requirements must be violated, otherwise the block is
* must be violated, otherwise the block is illegal. (For example, your opponent * illegal. (For example, your opponent control two creatures that he has cast
* control two creatures that he has cast Deadly Allure on, but you control only * Deadly Allure on, but you control only one creature. Blocking either one will
* one creature. Blocking either one will violate a requirement, "This creature * violate a requirement, "This creature must be blocked this turn if able", but
* must be blocked this turn if able", but it will also violate the least * it will also violate the least possible number of requirements, thus it is
* possible number of requirements, thus it is legal.) * legal.) If the block is illegal, the game state backs up and you declare
* If the block is illegal, the game state backs up and you declare blockers * blockers again. (Note that while you can, in some cases, circumvent
* again. (Note that while you can, in some cases, circumvent requirements * requirements such as "This creature must be blocked" or "This creature must
* such as "This creature must be blocked" or "This creature must block * block any attacking creature" you can never circumvent restrictions: "This
* any attacking creature" you can never circumvent restrictions: "This creature * creature can't block" or "Only one creature may block this turn.") Because
* can't block" or "Only one creature may block this turn.") * you declare ALL your blockers at once, THEN check for
* Because you declare ALL your blockers at once, THEN check for * restrictions/requirements, you may block Deadly Allure'd creatures with only
* restrictions/requirements, you may block Deadly Allure'd creatures * one creature, if you choose. This still works with Lure: This card sets up a
* with only one creature, if you choose. * requirement that ALL creatures must block it if able. Any block that violates
* This still works with Lure: This card sets up a requirement that ALL * more than the minimum number of requirements is still illegal.
* creatures must block it if able. Any block that violates more than
* the minimum number of requirements is still illegal.
* *
* @author LevelX2 * @author LevelX2
*/ */
@ -75,7 +71,7 @@ public class MustBeBlockedByAtLeastOneTargetEffect extends RequirementEffect {
public MustBeBlockedByAtLeastOneTargetEffect(Duration duration) { public MustBeBlockedByAtLeastOneTargetEffect(Duration duration) {
super(duration); super(duration);
staticText = "Target creature must be blocked this turn if able"; staticText = "target creature must be blocked this turn if able";
} }
public MustBeBlockedByAtLeastOneTargetEffect(final MustBeBlockedByAtLeastOneTargetEffect effect) { public MustBeBlockedByAtLeastOneTargetEffect(final MustBeBlockedByAtLeastOneTargetEffect effect) {

2
Mage/src/main/java/mage/abilities/effects/common/search/SearchTargetGraveyardHandLibraryForCardNameAndExileEffect.java
View file

@ -129,7 +129,7 @@ public abstract class SearchTargetGraveyardHandLibraryForCardNameAndExileEffect
@Override @Override
public String getText(Mode mode) { public String getText(Mode mode) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("Search ").append(this.searchWhatText); sb.append("search ").append(this.searchWhatText);
sb.append(" graveyard, hand, and library for "); sb.append(" graveyard, hand, and library for ");
sb.append(this.searchForText); sb.append(this.searchForText);
sb.append(" and exile them. Then that player shuffles his or her library"); sb.append(" and exile them. Then that player shuffles his or her library");

9
Mage/src/main/java/mage/abilities/keyword/CumulativeUpkeepAbility.java
View file

@ -31,6 +31,7 @@ import mage.abilities.Ability;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.costs.Cost; import mage.abilities.costs.Cost;
import mage.abilities.costs.CostsImpl; import mage.abilities.costs.CostsImpl;
import mage.abilities.costs.OrCost;
import mage.abilities.costs.mana.ManaCost; import mage.abilities.costs.mana.ManaCost;
import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
@ -70,9 +71,11 @@ public class CumulativeUpkeepAbility extends BeginningOfUpkeepTriggeredAbility {
@Override @Override
public String getRule() { public String getRule() {
StringBuilder sb = new StringBuilder("Cumulative upkeep "); StringBuilder sb = new StringBuilder("Cumulative upkeep");
if (!(cumulativeCost instanceof ManaCost)) { if (!(cumulativeCost instanceof ManaCost || cumulativeCost instanceof OrCost)) {
sb.append("&mdash; "); sb.append("&mdash;");
} else {
sb.append(' ');
} }
sb.append(cumulativeCost.getText()); sb.append(cumulativeCost.getText());
return sb.toString(); return sb.toString();

15
Mage/src/main/java/mage/abilities/keyword/EmbalmAbility.java
View file

@ -105,8 +105,13 @@ class EmbalmEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Card card = game.getCard(source.getSourceId()); Card card = game.getCard(source.getSourceId());
Player controller = game.getPlayer(source.getControllerId()); if (card == null) {
if (controller != null && card != null) { return false;
}
Player controller = game.getPlayer(card.getOwnerId());
if (controller == null) {
return false;
}
EmptyToken token = new EmptyToken(); EmptyToken token = new EmptyToken();
CardUtil.copyTo(token).from(card); // needed so that entersBattlefied triggered abilities see the attributes (e.g. Master Biomancer) CardUtil.copyTo(token).from(card); // needed so that entersBattlefied triggered abilities see the attributes (e.g. Master Biomancer)
token.getColor(game).setColor(ObjectColor.WHITE); token.getColor(game).setColor(ObjectColor.WHITE);
@ -115,13 +120,9 @@ class EmbalmEffect extends OneShotEffect {
} }
token.getManaCost().clear(); token.getManaCost().clear();
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.EMBALMED_CREATURE, token.getId(), source.getSourceId(), controller.getId())); game.fireEvent(GameEvent.getEvent(GameEvent.EventType.EMBALMED_CREATURE, token.getId(), source.getSourceId(), controller.getId()));
token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId(), false, false, null); token.putOntoBattlefield(1, game, source.getSourceId(), controller.getId(), false, false, null);
// Probably it makes sense to remove also the Embalm ability (it's not shown on the token cards). // Probably it makes sense to remove also the Embalm ability (it's not shown on the token cards).
// Also it can never get active or? But it's not mentioned in the reminder text. // Also it can never get active or? But it's not mentioned in the reminder text.
return true; return true;
} }
return false;
}
} }

15
Mage/src/main/java/mage/abilities/keyword/EternalizeAbility.java
View file

@ -110,8 +110,13 @@ class EternalizeEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Card card = game.getCard(source.getSourceId()); Card card = game.getCard(source.getSourceId());
Player controller = game.getPlayer(source.getControllerId()); if (card == null) {
if (controller != null && card != null) { return false;
}
Player controller = game.getPlayer(card.getOwnerId());
if (controller == null) {
return false;
}
EmptyToken token = new EmptyToken(); EmptyToken token = new EmptyToken();
CardUtil.copyTo(token).from(card); // needed so that entersBattlefied triggered abilities see the attributes (e.g. Master Biomancer) CardUtil.copyTo(token).from(card); // needed so that entersBattlefied triggered abilities see the attributes (e.g. Master Biomancer)
token.getColor(game).setColor(ObjectColor.BLACK); token.getColor(game).setColor(ObjectColor.BLACK);
@ -123,13 +128,9 @@ class EternalizeEffect extends OneShotEffect {
token.getPower().modifyBaseValue(4); token.getPower().modifyBaseValue(4);
token.getToughness().modifyBaseValue(4); token.getToughness().modifyBaseValue(4);
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.ETERNALIZED_CREATURE, token.getId(), source.getSourceId(), controller.getId())); game.fireEvent(GameEvent.getEvent(GameEvent.EventType.ETERNALIZED_CREATURE, token.getId(), source.getSourceId(), controller.getId()));
token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId(), false, false, null); token.putOntoBattlefield(1, game, source.getSourceId(), controller.getId(), false, false, null);
// Probably it makes sense to remove also the Eternalize ability (it's not shown on the token cards). // Probably it makes sense to remove also the Eternalize ability (it's not shown on the token cards).
// Also it can never get active or? But it's not mentioned in the reminder text. // Also it can never get active or? But it's not mentioned in the reminder text.
return true; return true;
} }
return false;
}
} }

12
Mage/src/main/java/mage/abilities/keyword/FlankingAbility.java
View file

@ -1,4 +1,3 @@
package mage.abilities.keyword; package mage.abilities.keyword;
import mage.abilities.TriggeredAbilityImpl; import mage.abilities.TriggeredAbilityImpl;
@ -11,12 +10,9 @@ import mage.game.events.GameEvent;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.target.targetpointer.FixedTarget; import mage.target.targetpointer.FixedTarget;
/** /**
* @author Plopman * @author Plopman
*/ */
public class FlankingAbility extends TriggeredAbilityImpl { public class FlankingAbility extends TriggeredAbilityImpl {
public FlankingAbility() { public FlankingAbility() {
@ -37,9 +33,8 @@ public class FlankingAbility extends TriggeredAbilityImpl {
if (event.getTargetId().equals(this.getSourceId())) { if (event.getTargetId().equals(this.getSourceId())) {
Permanent permanent = game.getPermanent(event.getSourceId()); Permanent permanent = game.getPermanent(event.getSourceId());
if (permanent != null) { if (permanent != null) {
boolean hasFlankingAbility = boolean hasFlankingAbility
permanent.getAbilities().stream().anyMatch(ability -> ability instanceof FlankingAbility); = permanent.getAbilities().stream().anyMatch(ability -> ability instanceof FlankingAbility);
if (!hasFlankingAbility) { if (!hasFlankingAbility) {
for (Effect effect : this.getEffects()) { for (Effect effect : this.getEffects()) {
@ -54,7 +49,7 @@ public class FlankingAbility extends TriggeredAbilityImpl {
@Override @Override
public String getRule() { public String getRule() {
return "Flanking"; return "flanking";
} }
@Override @Override
@ -62,5 +57,4 @@ public class FlankingAbility extends TriggeredAbilityImpl {
return new FlankingAbility(this); return new FlankingAbility(this);
} }
} }

6
Mage/src/main/java/mage/abilities/keyword/MorphAbility.java
View file

@ -138,7 +138,11 @@ public class MorphAbility extends StaticAbility implements AlternativeSourceCost
break; break;
} }
} }
sb.append(morphCosts.getText()).append(' '); sb.append(morphCosts.getText());
if (!(morphCosts.get(morphCosts.size() - 1) instanceof ManaCosts)) {
sb.append('.');
}
sb.append(' ');
if (megamorph) { if (megamorph) {
sb.append(REMINDER_TEXT_MEGA); sb.append(REMINDER_TEXT_MEGA);
} else { } else {

2
Mage/src/main/java/mage/abilities/keyword/RampageAbility.java
View file

@ -46,7 +46,7 @@ public class RampageAbility extends BecomesBlockedTriggeredAbility {
public RampageAbility(int amount) { public RampageAbility(int amount) {
super(null, false); super(null, false);
rule = "rampage " + amount + "(Whenever this creature becomes blocked, it gets +" rule = "rampage " + amount + " (Whenever this creature becomes blocked, it gets +"
+ amount + "/+" + amount + " until end of turn for each creature blocking it beyond the first.)"; + amount + "/+" + amount + " until end of turn for each creature blocking it beyond the first.)";
RampageValue rv = new RampageValue(amount); RampageValue rv = new RampageValue(amount);
this.addEffect(new BoostSourceEffect(rv, rv, Duration.EndOfTurn, true)); this.addEffect(new BoostSourceEffect(rv, rv, Duration.EndOfTurn, true));

4
Mage/src/main/java/mage/abilities/keyword/ShadowAbility.java
View file

@ -12,9 +12,11 @@ import mage.game.permanent.Permanent;
/** /**
* "Shadow" keyword * "Shadow" keyword
*
* @author Loki * @author Loki
*/ */
public class ShadowAbility extends EvasionAbility implements MageSingleton { public class ShadowAbility extends EvasionAbility implements MageSingleton {
private static final ShadowAbility instance = new ShadowAbility(); private static final ShadowAbility instance = new ShadowAbility();
private Object readResolve() throws ObjectStreamException { private Object readResolve() throws ObjectStreamException {
@ -31,7 +33,7 @@ public class ShadowAbility extends EvasionAbility implements MageSingleton {
@Override @Override
public String getRule() { public String getRule() {
return "Shadow <i>(This creature can block or be blocked by only creatures with shadow.)</i>"; return "shadow <i>(This creature can block or be blocked by only creatures with shadow.)</i>";
} }
@Override @Override

2
Mage/src/main/java/mage/filter/StaticFilters.java
View file

@ -59,7 +59,7 @@ public final class StaticFilters {
public static final FilterCreaturePermanent FILTER_PERMANENT_A_CREATURE = new FilterCreaturePermanent("a creature"); public static final FilterCreaturePermanent FILTER_PERMANENT_A_CREATURE = new FilterCreaturePermanent("a creature");
public static final FilterCreaturePermanent FILTER_PERMANENT_CREATURES = new FilterCreaturePermanent("creatures"); public static final FilterCreaturePermanent FILTER_PERMANENT_CREATURES = new FilterCreaturePermanent("creatures");
public static final FilterCreaturePermanent FILTER_PERMANENT_CREATURE_GOBLINS = new FilterCreaturePermanent(SubType.GOBLIN, "Goblin creatures"); public static final FilterCreaturePermanent FILTER_PERMANENT_CREATURE_GOBLINS = new FilterCreaturePermanent(SubType.GOBLIN, "Goblin creatures");
public static final FilterCreaturePermanent FILTER_PERMANENT_CREATURE_SLIVERS = new FilterCreaturePermanent(SubType.SLIVER, "Sliver creatures"); public static final FilterCreaturePermanent FILTER_PERMANENT_CREATURE_SLIVERS = new FilterCreaturePermanent(SubType.SLIVER, "all Sliver creatures");
public static final FilterPlaneswalkerPermanent FILTER_PERMANENT_PLANESWALKER = new FilterPlaneswalkerPermanent(); public static final FilterPlaneswalkerPermanent FILTER_PERMANENT_PLANESWALKER = new FilterPlaneswalkerPermanent();
public static final FilterPermanent FILTER_PERMANENT_NON_LAND = new FilterNonlandPermanent(); public static final FilterPermanent FILTER_PERMANENT_NON_LAND = new FilterNonlandPermanent();

28
Mage/src/main/java/mage/target/common/TargetOpponentsChoicePermanent.java
View file

@ -6,6 +6,7 @@
package mage.target.common; package mage.target.common;
import java.util.UUID; import java.util.UUID;
import mage.MageObject;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
@ -70,6 +71,33 @@ public class TargetOpponentsChoicePermanent extends TargetPermanent {
return super.chooseTarget(outcome, getOpponentId(playerId, source, game), source, game); return super.chooseTarget(outcome, getOpponentId(playerId, source, game), source, game);
} }
@Override
public boolean canChoose(UUID sourceId, UUID sourceControllerId, Game game) {
MageObject sourceObject = game.getObject(sourceId);
Player player = game.getPlayer(sourceControllerId);
if (sourceObject == null || player == null) {
return false;
}
int counter;
for (UUID oppId : game.getState().getPlayersInRange(player.getId(), game)) {
counter = 0;
Player opp = game.getPlayer(oppId);
if (opp != null && player.hasOpponent(opp.getId(), game)) {
for (Permanent perm : game.getBattlefield().getActivePermanents(opp.getId(), game)) {
if (!targets.containsKey(perm.getId())
&& filter.match(perm, sourceId, opp.getId(), game)
&& perm.canBeTargetedBy(sourceObject, sourceControllerId, game)) {
counter++;
if (counter >= minNumberOfTargets) {
return true;
}
}
}
}
}
return false;
}
@Override @Override
public TargetOpponentsChoicePermanent copy() { public TargetOpponentsChoicePermanent copy() {
return new TargetOpponentsChoicePermanent(this); return new TargetOpponentsChoicePermanent(this);

Some files were not shown because too many files have changed in this diff Show more