Merge branch 'magefree/master'

Mage.Sets/src/mage/sets/kaladesh/EddytrailHawk.java

@@ -37,7 +37,6 @@ import mage.abilities.effects.common.DoIfCostPaid;
 import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
 import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect;
 import mage.abilities.keyword.FlyingAbility;
-import mage.abilities.keyword.IndestructibleAbility;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Duration;
@@ -70,9 +69,9 @@ public class EddytrailHawk extends CardImpl {
         // When Eddytail Hawk enters the battlefield, you get {E}{E}.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(2)));
         // When Eddytail Hawk attacks you pay {E}. If you do, another target attacking creature gains flying until end of turn.
-        DoIfCostPaid doIfCostPaidEffect = new DoIfCostPaid(new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new PayEnergyCost(1), null, false);
+        DoIfCostPaid doIfCostPaidEffect = new DoIfCostPaid(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new PayEnergyCost(1), null, true);
         Ability ability = new AttacksTriggeredAbility(doIfCostPaidEffect, false,
-                "Whenever {this} attacks you pay {E}. If you do, another target attacking creature gets indestructible until end of turn.");
+                "Whenever {this} attacks you pay {E}. If you do, another target attacking creature gains flying until end of turn.");
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
     }

Mage.Sets/src/mage/sets/kaladesh/JanjeetSentry.java

@@ -63,8 +63,8 @@ public class JanjeetSentry extends CardImpl {
         // Tap, Pay {E}{E}: You may tap or untap target artifact or creature.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new TapSourceCost());
         ability.addCost(new PayEnergyCost(2));
+        ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE));
         this.addAbility(ability);
-        this.getSpellAbility().addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE));
     }
 
     public JanjeetSentry(final JanjeetSentry card) {

Mage.Sets/src/mage/sets/kaladesh/NaturesWay.java

@@ -28,7 +28,7 @@
 package mage.sets.kaladesh;
 
 import java.util.UUID;
-import mage.abilities.dynamicvalue.common.SourcePermanentPowerCount;
+import mage.abilities.dynamicvalue.common.TargetPermanentPowerCount;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
@@ -68,7 +68,7 @@ public class NaturesWay extends CardImpl {
         effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn);
         effect.setText("and trample until end of turn");
         this.getSpellAbility().addEffect(effect);
-        effect = new DamageTargetEffect(new SourcePermanentPowerCount(), true, null, true);
+        effect = new DamageTargetEffect(new TargetPermanentPowerCount(), true, null, true);
         effect.setTargetPointer(new SecondTargetPointer());
         effect.setText("It deals damage equal to its power to target creature you don't control");
         this.getSpellAbility().addEffect(effect);

Mage.Sets/src/mage/sets/kaladesh/RevolutionaryRebuff.java

@@ -35,7 +35,7 @@ import mage.constants.CardType;
 import mage.constants.Rarity;
 import mage.filter.FilterSpell;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetSpell;
 
 /**
@@ -50,8 +50,7 @@ public class RevolutionaryRebuff extends CardImpl {
 
         // Counter target nonartifact spell unless its controller pays 2.
         FilterSpell filter = new FilterSpell();
-        filter.add(Predicates.not(new SubtypePredicate("Artifact")));
+        filter.add(Predicates.not(new CardTypePredicate(CardType.ARTIFACT)));
-
         this.getSpellAbility().addTarget(new TargetSpell(filter));
         this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(new GenericManaCost(2)));
     }

Mage.Sets/src/mage/sets/kaladesh/StartYourEngines.java

@@ -30,6 +30,7 @@ package mage.sets.kaladesh;
 import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.effects.ContinuousEffectImpl;
+import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.continuous.BoostControlledEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
@@ -52,7 +53,10 @@ public class StartYourEngines extends CardImpl {
         this.expansionSetCode = "KLD";
 
         // Vehicles you control becomes artifact creatures until end of turn.
-        this.getSpellAbility().addEffect(new StartYourEnginesEffect());
+        Effect effect = new StartYourEnginesEffect();
+        effect.setApplyEffectsAfter(); // needed to recognize vehicle as creatures by the next effect
+        this.getSpellAbility().addEffect(effect);
+
         // Creatures you control get +2/+0 until end of turn.
         this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn));
     }

Mage.Sets/src/mage/sets/kaladesh/TakeDown.java

@@ -58,7 +58,7 @@ public class TakeDown extends CardImpl {
         // Choose one —
         // • Take Down deals 4 damage to target creature with flying.
         this.getSpellAbility().addEffect(new DamageTargetEffect(4));
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent());
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
 
         // • Take Down deals 1 damage to each creature with flying
         Mode mode = new Mode();