Reimplemented Vines Of Vastwood (new way for implementing spells with kicker)

Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java

@@ -29,15 +29,21 @@
 package mage.sets.zendikar;
 
 import java.util.UUID;
+
 import mage.Constants.CardType;
 import mage.Constants.Duration;
 import mage.Constants.Outcome;
 import mage.Constants.Rarity;
 import mage.Constants.TargetController;
 import mage.abilities.Ability;
+import mage.abilities.condition.common.KickedCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.decorator.ConditionalContinousEffect;
+import mage.abilities.decorator.ConditionalOneShotEffect;
 import mage.abilities.effects.ReplacementEffectImpl;
 import mage.abilities.effects.common.continious.BoostTargetEffect;
+import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
+import mage.abilities.keyword.HexproofAbility;
 import mage.abilities.keyword.KickerAbility;
 import mage.cards.CardImpl;
 import mage.filter.FilterStackObject;
@@ -48,16 +54,11 @@ import mage.game.stack.StackObject;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
- *
+ * @author nantuko
- * @author Viserion
  */
 public class VinesOfVastwood extends CardImpl<VinesOfVastwood> {
 
-	private static final FilterStackObject filter = new FilterStackObject("spells or abilities your opponents control");
+    private static final String staticText = "If Vines of Vastwood was kicked, that creature gets +4/+4 until end of turn.";
-
-	static {
-		filter.setTargetController(TargetController.OPPONENT);
-	}
 
     public VinesOfVastwood(UUID ownerId) {
         super(ownerId, 193, "Vines of Vastwood", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}");
@@ -65,12 +66,11 @@ public class VinesOfVastwood extends CardImpl<VinesOfVastwood> {
         this.color.setGreen(true);
         TargetCreaturePermanent target = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(target);
-		this.getSpellAbility().addEffect(new VinesOfVastwoodEffect(filter, Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(new HexproofAbility(), Duration.EndOfTurn));
 
-		KickerAbility ability = new KickerAbility(new BoostTargetEffect(4, 4, Duration.EndOfTurn), false);
+        this.getSpellAbility().addOptionalCost(new ManaCostsImpl("{G}"));
-		ability.addTarget(target);
+        this.getSpellAbility().addEffect(new ConditionalContinousEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn),
-		ability.addCost(new ManaCostsImpl("{G}"));
+                KickedCondition.getInstance(), staticText));
-		this.addAbility(ability);
     }
 
     public VinesOfVastwood(final VinesOfVastwood card) {
@@ -83,45 +83,3 @@ public class VinesOfVastwood extends CardImpl<VinesOfVastwood> {
     }
 }
 
-class VinesOfVastwoodEffect extends ReplacementEffectImpl<VinesOfVastwoodEffect> {
-
-	private FilterStackObject filterSource;
-
-	public VinesOfVastwoodEffect(FilterStackObject filterSource, Duration duration) {
-		super(duration, Outcome.Benefit);
-		this.filterSource = filterSource;
-		staticText = "Target creature can't be the target of spells or abilities your opponents control this turn. If {this} was kicked, that creature gets +4/+4 until end of turn.";
-	}
-
-	public VinesOfVastwoodEffect(final VinesOfVastwoodEffect effect) {
-		super(effect);
-		this.filterSource = effect.filterSource.copy();
-	}
-
-	@Override
-	public VinesOfVastwoodEffect copy() {
-		return new VinesOfVastwoodEffect(this);
-	}
-
-	@Override
-	public boolean apply(Game game, Ability source) {
-		return true;
-	}
-
-	@Override
-	public boolean replaceEvent(GameEvent event, Ability source, Game game) {
-		return true;
-	}
-
-	@Override
-	public boolean applies(GameEvent event, Ability source, Game game) {
-		if (event.getType() == EventType.TARGET && event.getTargetId().equals(source.getFirstTarget())) {
-			StackObject sourceObject = game.getStack().getStackObject(event.getSourceId());
-			if (sourceObject != null && filterSource.match(sourceObject, source.getControllerId(), game)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-}

Mage/src/mage/abilities/condition/common/KickedCondition.java

@@ -0,0 +1,41 @@
+package mage.abilities.condition.common;
+
+import mage.Constants;
+import mage.abilities.Ability;
+import mage.abilities.condition.Condition;
+import mage.abilities.costs.mana.ManaCost;
+import mage.cards.Card;
+import mage.filter.FilterPermanent;
+import mage.game.Game;
+
+/**
+ * Describes condition when spell was kicked.
+ *
+ * @author nantuko
+ */
+public class KickedCondition implements Condition {
+
+    private static KickedCondition fInstance = new KickedCondition();
+
+    public static Condition getInstance() {
+        return fInstance;
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Card p = game.getCard(source.getSourceId());
+
+        boolean kicked = false;
+        if (p != null) {
+            for (Object cost : p.getSpellAbility().getOptionalCosts()) {
+                if (cost instanceof ManaCost) {
+                    if (((ManaCost) cost).isPaid()) {
+                        kicked = true;
+                    }
+                }
+            }
+        }
+
+        return kicked;
+    }
+}