[AER] Fixed some names and cards

Mage.Sets/src/mage/cards/i/ImplementOfMalice.java

@@ -45,9 +45,9 @@ import mage.target.TargetPlayer;
  *
  * @author fireshoes
  */
-public class ImplementOfMaliace extends CardImpl {
+public class ImplementOfMalice extends CardImpl {
 
-    public ImplementOfMaliace(UUID ownerId, CardSetInfo setInfo) {
+    public ImplementOfMalice(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}");
 
         // {B}, Sacrifice Implement of Malice: Target player discards a card. Activate this ability only any time you could cast a sorcery.
@@ -60,12 +60,12 @@ public class ImplementOfMaliace extends CardImpl {
         this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new DrawCardSourceControllerEffect(1)));
     }
 
-    public ImplementOfMaliace(final ImplementOfMaliace card) {
+    public ImplementOfMalice(final ImplementOfMalice card) {
         super(card);
     }
 
     @Override
-    public ImplementOfMaliace copy() {
+    public ImplementOfMalice copy() {
-        return new ImplementOfMaliace(this);
+        return new ImplementOfMalice(this);
     }
 }

Mage.Sets/src/mage/cards/l/LifecraftAwakening.java

@@ -40,7 +40,10 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Outcome;
+import mage.constants.TargetController;
 import mage.counters.CounterType;
+import mage.filter.common.FilterArtifactPermanent;
+import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.game.permanent.token.Token;
@@ -53,13 +56,19 @@ import mage.target.targetpointer.FixedTarget;
  */
 public class LifecraftAwakening extends CardImpl {
 
+    private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifact you control");
+
+    static {
+        filter.add(new ControllerPredicate(TargetController.YOU));
+    }
+
     public LifecraftAwakening(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{X}{G}");
 
         // Put X +1/+1 counters on target artifact you control. If it isn't a creature or Vehicle, it becomes a 0/0 Construct artifact creature.
         ManacostVariableValue manaX = new ManacostVariableValue();
         getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance(), manaX));
-        getSpellAbility().addTarget(new TargetArtifactPermanent());
+        getSpellAbility().addTarget(new TargetArtifactPermanent(filter));
         getSpellAbility().addEffect(new LifecraftAwakeningEffect());
     }
 
@@ -91,7 +100,7 @@ class LifecraftAwakeningEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Permanent permanent = (Permanent) game.getPermanent(source.getTargets().get(1).getFirstTarget());
+        Permanent permanent = (Permanent) game.getPermanent(source.getTargets().getFirstTarget());
         if (!permanent.getCardType().contains(CardType.CREATURE) && !permanent.getSubtype(game).contains("Vehicle")) {
             ContinuousEffect continuousEffect = new BecomesCreatureTargetEffect(new LifecraftAwakeningToken(), false, true, Duration.Custom);
             continuousEffect.setTargetPointer(new FixedTarget(permanent, game));

Mage.Sets/src/mage/cards/l/LifecraftCavalry.java

@@ -29,6 +29,7 @@ package mage.cards.l;
 
 import java.util.UUID;
 import mage.MageInt;
+import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldAbility;
 import mage.abilities.condition.common.RevoltCondition;
 import mage.abilities.decorator.ConditionalOneShotEffect;
@@ -38,6 +39,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.counters.CounterType;
+import mage.watchers.common.RevoltWatcher;
 
 /**
  *
@@ -57,9 +59,14 @@ public class LifecraftCavalry extends CardImpl {
         this.addAbility(TrampleAbility.getInstance());
 
         // <i>Revolt</i> &mdash; Lifecraft Cavalry enters the battlefield with two +1/+1 counters on it if a permanent you controlled left the battlefield this turn.
-        this.addAbility(new EntersBattlefieldAbility(
+        this.addAbility(
-                new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), RevoltCondition.getInstance(), ""),
+                new EntersBattlefieldAbility(
-                "with two +1/+1 counters on it if a permanent you controlled left the battlefield this turn"));
+                        new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)),
+                        false,
+                        RevoltCondition.getInstance(),
+                        "<i>Revolt</i> &mdash; {this} enters the battlefield with two +1/+1 counter on it if a permanent you controlled left the battlefield this turn", null),
+                new RevoltWatcher()
+        );
     }
 
     public LifecraftCavalry(final LifecraftCavalry card) {

Mage.Sets/src/mage/cards/n/NarnamRenegade.java

@@ -31,13 +31,13 @@ import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.EntersBattlefieldAbility;
 import mage.abilities.condition.common.RevoltCondition;
-import mage.abilities.decorator.ConditionalOneShotEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.keyword.DeathtouchAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.counters.CounterType;
+import mage.watchers.common.RevoltWatcher;
 
 /**
  *
@@ -57,9 +57,14 @@ public class NarnamRenegade extends CardImpl {
         this.addAbility(DeathtouchAbility.getInstance());
 
         // <i>Revolt</i> &mdash; Narnam Renegade enters the battlefield with a +1/+1 counter on it if a permanent you controlled left this battlefield this turn.
-        this.addAbility(new EntersBattlefieldAbility(
+        this.addAbility(
-                new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), RevoltCondition.getInstance(), ""),
+                new EntersBattlefieldAbility(
-                "with a +1/+1 counter on it if a permanent you controlled left the battlefield this turn"));
+                        new AddCountersSourceEffect(CounterType.P1P1.createInstance()),
+                        false,
+                        RevoltCondition.getInstance(),
+                        "<i>Revolt</i> &mdash; {this} enters the battlefield with a +1/+1 counter on it if a permanent you controlled left the battlefield this turn", null),
+                new RevoltWatcher()
+        );
     }
 
     public NarnamRenegade(final NarnamRenegade card) {

Mage.Sets/src/mage/cards/n/NaturalObsolescence.java

@@ -38,9 +38,9 @@ import mage.target.common.TargetArtifactPermanent;
  *
  * @author fireshoes
  */
-public class NaturalObsolesence extends CardImpl {
+public class NaturalObsolescence extends CardImpl {
 
-    public NaturalObsolesence(UUID ownerId, CardSetInfo setInfo) {
+    public NaturalObsolescence(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{G}");
 
         // Put target artifact on the bottom of its owner's library.
@@ -48,12 +48,12 @@ public class NaturalObsolesence extends CardImpl {
         this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(false));
     }
 
-    public NaturalObsolesence(final NaturalObsolesence card) {
+    public NaturalObsolescence(final NaturalObsolescence card) {
         super(card);
     }
 
     @Override
-    public NaturalObsolesence copy() {
+    public NaturalObsolescence copy() {
-        return new NaturalObsolesence(this);
+        return new NaturalObsolescence(this);
     }
 }

Mage.Sets/src/mage/cards/p/PeemaAetherSeer.java

@@ -102,7 +102,9 @@ class PeemaAetherSeerEffect extends OneShotEffect {
                     amount = p.getPower().getValue();
                 }
             }
+            if (amount > 0) {
                 new GetEnergyCountersControllerEffect(amount).apply(game, source);
+            }
             return true;
         }
         return false;

Mage.Sets/src/mage/cards/s/StasisSnare.java

@@ -82,31 +82,3 @@ public class StasisSnare extends CardImpl {
         return new StasisSnare(this);
     }
 }
-
-class StasisSnareExileEffect extends OneShotEffect {
-
-    public StasisSnareExileEffect() {
-        super(Outcome.Benefit);
-        this.staticText = "exile target creature an opponent controls until {this} leaves the battlefield";
-    }
-
-    public StasisSnareExileEffect(final StasisSnareExileEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public StasisSnareExileEffect copy() {
-        return new StasisSnareExileEffect(this);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        Permanent permanent = game.getPermanent(source.getSourceId());
-        // If Stasis Snare leaves the battlefield before its triggered ability resolves,
-        // the target won't be exiled.
-        if (permanent != null) {
-            return new ExileTargetEffect(CardUtil.getCardExileZoneId(game, source), permanent.getIdName()).apply(game, source);
-        }
-        return false;
-    }
-}

Mage.Sets/src/mage/sets/AetherRevolt.java

@@ -125,7 +125,7 @@ public class AetherRevolt extends ExpansionSet {
         cards.add(new SetCardInfo("Implement of Examination", 156, Rarity.COMMON, mage.cards.i.ImplementOfExamination.class));
         cards.add(new SetCardInfo("Implement of Ferocity", 157, Rarity.COMMON, mage.cards.i.ImplementOfFerocity.class));
         cards.add(new SetCardInfo("Implement of Improvement", 158, Rarity.COMMON, mage.cards.i.ImplementOfImprovement.class));
-        cards.add(new SetCardInfo("Implement of Maliace", 159, Rarity.COMMON, mage.cards.i.ImplementOfMaliace.class));
+        cards.add(new SetCardInfo("Implement of Malice", 159, Rarity.COMMON, mage.cards.i.ImplementOfMalice.class));
         cards.add(new SetCardInfo("Inspiring Roar", 186, Rarity.COMMON, mage.cards.i.InspiringRoar.class));
         cards.add(new SetCardInfo("Inspiring Statuary", 160, Rarity.RARE, mage.cards.i.InspiringStatuary.class));
         cards.add(new SetCardInfo("Kari Zev's Expertise", 88, Rarity.RARE, mage.cards.k.KariZevsExpertise.class));
@@ -141,7 +141,7 @@ public class AetherRevolt extends ExpansionSet {
         cards.add(new SetCardInfo("Metallic Rebuke", 39, Rarity.COMMON, mage.cards.m.MetallicRebuke.class));
         cards.add(new SetCardInfo("Midnight Entourage", 66, Rarity.RARE, mage.cards.m.MidnightEntourage.class));
         cards.add(new SetCardInfo("Narnam Renegade", 117, Rarity.UNCOMMON, mage.cards.n.NarnamRenegade.class));
-        cards.add(new SetCardInfo("Natural Obsolesence", 118, Rarity.COMMON, mage.cards.n.NaturalObsolesence.class));
+        cards.add(new SetCardInfo("Natural Obsolescence", 118, Rarity.COMMON, mage.cards.n.NaturalObsolescence.class));
         cards.add(new SetCardInfo("Negate", 40, Rarity.COMMON, mage.cards.n.Negate.class));
         cards.add(new SetCardInfo("Night Market Aeronaut", 67, Rarity.COMMON, mage.cards.n.NightMarketAeronaut.class));
         cards.add(new SetCardInfo("Oath of Ajani", 131, Rarity.RARE, mage.cards.o.OathOfAjani.class));

Utils/mtg-cards-data.txt

@@ -30468,7 +30468,7 @@ Lifecrafter's Gift|Aether Revolt|114|U|{3}{G}|Instant|||Put a +1/+1 counter on t
 Maulfist Revolutionary|Aether Revolt|115|U|{1}{G}{G}|Creature - Human Warrior|3|3|Trample$When Maulfist Revolutionary enters the battlefield or dies, for each kind of counter on target permanent or players, give that permanent or player another counter of that kind.|
 Monstrous Onslaught|Aether Revolt|116|U|{3}{G}{G}|Sorcery|||Monstrous Onslaught deals X damage divided as you choose among any number of target creatures, where X is the greater power among creatures you control as you cast Monstrous Onslaught.|
 Narnam Renegade|Aether Revolt|117|U|{G}|Creature - Elf Warrior|1|2|Deathtouch$<i>Revolt</i> &mdash; Narnam Renegade enters the battlefield with a +1/+1 counter on it if a permanent you controlled left this battlefield this turn.|
-Natural Obsolesence|Aether Revolt|118|C|{1}{G}|Instant|||Put target artifact on the bottom of its owner's library.|
+Natural Obsolescence|Aether Revolt|118|C|{1}{G}|Instant|||Put target artifact on the bottom of its owner's library.|
 Peema Aether-Seer|Aether Revolt|119|U|{3}{G}|Creature - Elf Druid|3|2|When Peema Aether-Seer enters the battlefield, you get an amount of {E} <i>(energy counters)</i> equal to the greatest power among creatures you control.$Pay {E}{E}{E}: Target creature blocks this turn if able.|
 Prey Upon|Aether Revolt|120|C|{G}|Sorcery|||Target creature you control fights target creature you don't control. <i>(Each deals damage equal to its power to the other.)</i>|
 Ridgescale Tusker|Aether Revolt|121|U|{3}{G}{G}|Creature - Beast|5|5|When Ridgescale Tusker enters the battlefield, put a +1/+1 counter on each other creature you control.|
@@ -30509,7 +30509,7 @@ Implement of Combustion|Aether Revolt|155|C|{1}|Artifact|||{R}, Sacrifice Implem
 Implement of Examination|Aether Revolt|156|C|{3}|Artifact|||{U}, Sacrifice Implement of Examination: Draw a card.$When Implement of Examination is put into a graveard from the battleifeld, draw a card.|
 Implement of Ferocity|Aether Revolt|157|C|{1}|Artifact|||{G}, Sacrifice Implement of Ferocity: Put a +1/+1 counter on target creature. Activate this ability only any time you could cast a sorcery.$When Implement of Ferocity is put into a graveyard from the battlefield, draw a card.|
 Implement of Improvement|Aether Revolt|158|C|{1}|Artifact|||{W}, Sacrifice Implement of Improvement: You gain 2 life.$When Implement of Improvement is put into a graveyard from the battlefield, draw a card.|
-Implement of Maliace|Aether Revolt|159|C|{2}|Artifact|||{B}, Sacrifice Implement of Malice: Target player discards a card. Activate this ability only any time you could cast a sorcery.$When Implement of Malice is put into a graveyard from the battlefield, draw a card.|
+Implement of Malice|Aether Revolt|159|C|{2}|Artifact|||{B}, Sacrifice Implement of Malice: Target player discards a card. Activate this ability only any time you could cast a sorcery.$When Implement of Malice is put into a graveyard from the battlefield, draw a card.|
 Inspiring Statuary|Aether Revolt|160|R|{3}|Artifact|||Nonartifact spells you cast have improvise. <i>(Your artifacts can help cast those spells. Each artifact you tap after you're done activating mana abilities pays for {1}.)</i>|
 Irontread Crusher|Aether Revolt|161|C|{4}|Artifact - Vehicle|6|6|Crew 3 <i>(Tap any number of creatures you control with total power 3 or more: This Vehicle becomes an artifact creature until end of turn.)</i>|
 Lifecrafter's Bestiary|Aether Revolt|162|R|{3}|Artifact|||At the beginning of your upkeep, scry 1.$Whenever you cast a creature spell, you may pay {G}. If you do, draw a card.|