[M12] Arbalest Elite

Mage.Sets/src/mage/sets/championsofkamigawa/CloudcrestLake.java

@@ -29,14 +29,12 @@ package mage.sets.championsofkamigawa;
 
 import java.util.UUID;
 
-import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
-import mage.abilities.effects.common.SkipUntapSourceEffect;
+import mage.abilities.effects.common.SkipNextUntapSourceEffect;
 import mage.abilities.mana.BlueManaAbility;
 import mage.abilities.mana.ColorlessManaAbility;
-import mage.abilities.mana.SimpleManaAbility;
 import mage.abilities.mana.WhiteManaAbility;
 import mage.cards.CardImpl;
 
@@ -50,10 +48,10 @@ public class CloudcrestLake extends CardImpl<CloudcrestLake> {
         this.expansionSetCode = "CHK";
         this.addAbility(new ColorlessManaAbility());
         Ability whiteManaAbility = new WhiteManaAbility();
-        whiteManaAbility.addEffect(new SkipUntapSourceEffect());
+        whiteManaAbility.addEffect(new SkipNextUntapSourceEffect());
         this.addAbility(whiteManaAbility);
         Ability blueManaAbility = new BlueManaAbility();
-        blueManaAbility.addEffect(new SkipUntapSourceEffect());
+        blueManaAbility.addEffect(new SkipNextUntapSourceEffect());
         this.addAbility(blueManaAbility);
     }
 

Mage.Sets/src/mage/sets/championsofkamigawa/LanternLitGraveyard.java

@@ -31,7 +31,7 @@ import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
-import mage.abilities.effects.common.SkipUntapSourceEffect;
+import mage.abilities.effects.common.SkipNextUntapSourceEffect;
 import mage.abilities.mana.BlueManaAbility;
 import mage.abilities.mana.ColorlessManaAbility;
 import mage.abilities.mana.RedManaAbility;
@@ -48,10 +48,10 @@ public class LanternLitGraveyard extends CardImpl<LanternLitGraveyard> {
         this.expansionSetCode = "CHK";
         this.addAbility(new ColorlessManaAbility());
         Ability blueManaAbility = new BlueManaAbility();
-        blueManaAbility.addEffect(new SkipUntapSourceEffect());
+        blueManaAbility.addEffect(new SkipNextUntapSourceEffect());
         this.addAbility(blueManaAbility);
         Ability redManaAbility = new RedManaAbility();
-        redManaAbility.addEffect(new SkipUntapSourceEffect());
+        redManaAbility.addEffect(new SkipNextUntapSourceEffect());
         this.addAbility(redManaAbility);
     }
 

Mage.Sets/src/mage/sets/magic2012/ArbalestElite.java

@@ -0,0 +1,78 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.magic2012;
+
+import java.util.UUID;
+
+import mage.Constants;
+import mage.Constants.CardType;
+import mage.Constants.Rarity;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.abilities.effects.common.SkipNextUntapSourceEffect;
+import mage.cards.CardImpl;
+import mage.target.common.TargetAttackingOrBlockingCreature;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author nantuko
+ */
+public class ArbalestElite extends CardImpl<ArbalestElite> {
+
+    public ArbalestElite(UUID ownerId) {
+        super(ownerId, 5, "Arbalest Elite", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{W}{W}");
+        this.expansionSetCode = "M12";
+        this.subtype.add("Human");
+        this.subtype.add("Archer");
+
+        this.color.setWhite(true);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(3);
+
+        // {2}{W}, {tap}: Arbalest Elite deals 3 damage to target attacking or blocking creature. Arbalest Elite doesn't untap during your next untap step.
+		Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl("{2}{W}"));
+		ability.addCost(new TapSourceCost());
+		ability.addTarget(new TargetAttackingOrBlockingCreature());
+		ability.addEffect(new SkipNextUntapSourceEffect());
+		this.addAbility(ability);
+	}
+
+    public ArbalestElite(final ArbalestElite card) {
+        super(card);
+    }
+
+    @Override
+    public ArbalestElite copy() {
+        return new ArbalestElite(this);
+    }
+}

Mage/src/mage/abilities/effects/common/SkipNextUntapSourceEffect.java

@@ -6,20 +6,20 @@ import mage.abilities.effects.ReplacementEffectImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 
-public class SkipUntapSourceEffect extends ReplacementEffectImpl<SkipUntapSourceEffect> {
+public class SkipNextUntapSourceEffect extends ReplacementEffectImpl<SkipNextUntapSourceEffect> {
 
-    public SkipUntapSourceEffect() {
+    public SkipNextUntapSourceEffect() {
-        super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Detriment);
+        super(Constants.Duration.OneUse, Constants.Outcome.Detriment);
         staticText = "{this} doesn't untap during your next untap step";
     }
 
-    public SkipUntapSourceEffect(final SkipUntapSourceEffect effect) {
+    public SkipNextUntapSourceEffect(final SkipNextUntapSourceEffect effect) {
         super(effect);
     }
 
     @Override
-    public SkipUntapSourceEffect copy() {
+    public SkipNextUntapSourceEffect copy() {
-        return new SkipUntapSourceEffect(this);
+        return new SkipNextUntapSourceEffect(this);
     }
 
     @Override
@@ -29,7 +29,8 @@ public class SkipUntapSourceEffect extends ReplacementEffectImpl<SkipUntapSource
 
     @Override
     public boolean replaceEvent(GameEvent event, Ability source, Game game) {
-        return true;
+        used = true;
+		return true;
     }
 
     @Override

Mage/src/mage/abilities/effects/common/UntapSourceEffect.java

@@ -52,11 +52,11 @@ public class UntapSourceEffect extends OneShotEffect<UntapSourceEffect> {
     @Override
     public boolean apply(Game game, Ability source) {
         Permanent permanent = game.getPermanent(source.getSourceId());
-	if (permanent != null) {
+		if (permanent != null) {
-            permanent.untap(game);
+				permanent.untap(game);
-            return true;
+				return true;
-	}
+		}
-	return false;
+		return false;
     }
 
     @Override