Implement Riptide Entrancer, fix Blind Zealot

Mage.Sets/src/mage/cards/b/BlindZealot.java

@@ -29,9 +29,12 @@ package mage.cards.b;
 
 import java.util.UUID;
 import mage.MageInt;
+import mage.MageObject;
 import mage.abilities.Ability;
 import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
 import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.DestroyTargetEffect;
 import mage.abilities.keyword.IntimidateAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -42,12 +45,13 @@ import mage.constants.Zone;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.permanent.ControllerIdPredicate;
 import mage.game.Game;
-import mage.game.events.DamagedPlayerEvent;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
 import mage.game.permanent.Permanent;
+import mage.game.stack.Spell;
 import mage.players.Player;
 import mage.target.common.TargetCreaturePermanent;
+import mage.target.targetpointer.FixedTarget;
 
 /**
  *
@@ -56,7 +60,7 @@ import mage.target.common.TargetCreaturePermanent;
 public class BlindZealot extends CardImpl {
 
     public BlindZealot(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}{B}");
         this.subtype.add(SubType.HUMAN, SubType.CLERIC);
 
         this.power = new MageInt(2);
@@ -64,7 +68,9 @@ public class BlindZealot extends CardImpl {
 
         this.addAbility(IntimidateAbility.getInstance());
         // Whenever Blind Zealot deals combat damage to a player, you may sacrifice it. If you do, destroy target creature that player controls.
-        this.addAbility(new BlindZealotTriggeredAbility());
+        Ability ability = new BlindZealotTriggeredAbility();
+        ability.addTarget(new TargetCreaturePermanent());
+        this.addAbility(ability);
     }
 
     public BlindZealot(final BlindZealot card) {
@@ -80,7 +86,7 @@ public class BlindZealot extends CardImpl {
 class BlindZealotTriggeredAbility extends TriggeredAbilityImpl {
 
     public BlindZealotTriggeredAbility() {
-        super(Zone.BATTLEFIELD, new BlindZealotEffect(), false);
+        super(Zone.BATTLEFIELD, new BlindZealotEffect(), true);
     }
 
     public BlindZealotTriggeredAbility(final BlindZealotTriggeredAbility ability) {
@@ -99,34 +105,20 @@ class BlindZealotTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (event.getSourceId().equals(this.sourceId)
+        Player opponent = game.getPlayer(event.getPlayerId());
-                && ((DamagedPlayerEvent) event).isCombatDamage()) {
+        if (opponent != null && event.getSourceId().equals(this.sourceId)) {
-
+            FilterCreaturePermanent filter = new FilterCreaturePermanent("creature " + opponent.getLogName() + " controls");
-            Player player = game.getPlayer(this.getControllerId());
+            filter.add(new ControllerIdPredicate(opponent.getId()));
-            Permanent sourcePermanent = game.getPermanent(this.getSourceId());
+            this.getTargets().clear();
-
+            this.addTarget(new TargetCreaturePermanent(filter));
-            if (player != null && sourcePermanent != null) {
+            return true;
-                StringBuilder sb = new StringBuilder();
-                sb.append("Do you wish to sacrifice ").append(sourcePermanent.getIdName());
-                sb.append(" to destroy target creature controlled by ");
-                sb.append(game.getPlayer(event.getTargetId()).getLogName()).append('?');
-                if (player.chooseUse(Outcome.DestroyPermanent, sb.toString(), this, game)) {
-                    FilterCreaturePermanent filter = new FilterCreaturePermanent();
-                    filter.add(new ControllerIdPredicate(event.getTargetId()));
-                    filter.setMessage("creature controlled by " + game.getPlayer(event.getTargetId()).getLogName());
-
-                    this.getTargets().clear();
-                    this.addTarget(new TargetCreaturePermanent(filter));
-                    return true;
-                }
-            }
         }
         return false;
     }
 
     @Override
     public String getRule() {
-        return "Whenever Blind Zealot deals combat damage to a player, you may sacrifice it. If you do, destroy target creature that player controls.";
+        return "Whenever {this} deals combat damage to a player, you may sacrifice it. If you do, destroy target creature that player controls";
     }
 }
 
@@ -134,6 +126,7 @@ class BlindZealotEffect extends OneShotEffect {
 
     public BlindZealotEffect() {
         super(Outcome.DestroyPermanent);
+        staticText = "sacrifice {this}";
     }
 
     public BlindZealotEffect(final BlindZealotEffect effect) {
@@ -147,15 +140,26 @@ class BlindZealotEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Permanent sourcePermanent = game.getPermanent(source.getSourceId());
         Permanent targetPermanent = game.getPermanent(source.getFirstTarget());
-
+        MageObject sourceObject = source.getSourceObjectIfItStillExists(game);
-        if (sourcePermanent != null && targetPermanent != null) {
+        if (sourceObject == null) {
-            if (sourcePermanent.sacrifice(source.getSourceId(), game)) {
+            if (source.getSourceObject(game) instanceof Spell) {
-                targetPermanent.destroy(source.getSourceId(), game, false);
+                sourceObject = game.getPermanent(source.getSourceId());
+                if (sourceObject != null && sourceObject.getZoneChangeCounter(game) > source.getSourceObjectZoneChangeCounter() + 1) {
+                    return false;
+                }
             }
         }
-
+        if (sourceObject instanceof Permanent) {
+            Permanent permanent = (Permanent) sourceObject;
+            if (source.getControllerId().equals(permanent.getControllerId())) {
+                Effect effect = new DestroyTargetEffect();
+                effect.setTargetPointer(new FixedTarget(targetPermanent.getId()));
+                effect.apply(game, source);
+                return permanent.sacrifice(source.getSourceId(), game);
+            }
+            return true;
+        }
         return false;
     }
 }

Mage.Sets/src/mage/cards/r/RiptideEntrancer.java

@@ -0,0 +1,167 @@
+/*
+ *  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.cards.r;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.MageObject;
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.ContinuousEffect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.continuous.GainControlTargetEffect;
+import mage.abilities.keyword.MorphAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.ControllerIdPredicate;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.game.stack.Spell;
+import mage.players.Player;
+import mage.target.common.TargetCreaturePermanent;
+import mage.target.targetpointer.FixedTarget;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class RiptideEntrancer extends CardImpl {
+
+    public RiptideEntrancer(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{U}");
+
+        this.subtype.add("Human");
+        this.subtype.add("Wizard");
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(1);
+
+        // Whenever Riptide Entrancer deals combat damage to a player, you may sacrifice it. If you do, gain control of target creature that player controls.
+        this.addAbility(new RiptideEntrancerTriggeredAbility());
+
+        // Morph {U}{U}
+        this.addAbility(new MorphAbility(this, new ManaCostsImpl("{U}{U}")));
+
+    }
+
+    public RiptideEntrancer(final RiptideEntrancer card) {
+        super(card);
+    }
+
+    @Override
+    public RiptideEntrancer copy() {
+        return new RiptideEntrancer(this);
+    }
+}
+
+class RiptideEntrancerTriggeredAbility extends TriggeredAbilityImpl {
+
+    public RiptideEntrancerTriggeredAbility() {
+        super(Zone.BATTLEFIELD, new RiptideEntrancerEffect(), true);
+    }
+
+    public RiptideEntrancerTriggeredAbility(final RiptideEntrancerTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public RiptideEntrancerTriggeredAbility copy() {
+        return new RiptideEntrancerTriggeredAbility(this);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.DAMAGED_PLAYER;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        Player opponent = game.getPlayer(event.getPlayerId());
+        if (opponent != null && event.getSourceId().equals(this.sourceId)) {
+            FilterCreaturePermanent filter = new FilterCreaturePermanent("creature " + opponent.getLogName() + " controls");
+            filter.add(new ControllerIdPredicate(opponent.getId()));
+            this.getTargets().clear();
+            this.addTarget(new TargetCreaturePermanent(filter));
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return "Whenever {this} deals combat damage to a player, you may sacrifice it. If you do, gain control of target creature that player controls";
+    }
+}
+
+class RiptideEntrancerEffect extends OneShotEffect {
+
+    public RiptideEntrancerEffect() {
+        super(Outcome.DestroyPermanent);
+        staticText = "sacrifice {this}";
+    }
+
+    public RiptideEntrancerEffect(final RiptideEntrancerEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public RiptideEntrancerEffect copy() {
+        return new RiptideEntrancerEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent targetPermanent = game.getPermanent(source.getFirstTarget());
+        MageObject sourceObject = source.getSourceObjectIfItStillExists(game);
+        if (sourceObject == null) {
+            if (source.getSourceObject(game) instanceof Spell) {
+                sourceObject = game.getPermanent(source.getSourceId());
+                if (sourceObject != null && sourceObject.getZoneChangeCounter(game) > source.getSourceObjectZoneChangeCounter() + 1) {
+                    return false;
+                }
+            }
+        }
+        if (sourceObject instanceof Permanent) {
+            Permanent permanent = (Permanent) sourceObject;
+            if (source.getControllerId().equals(permanent.getControllerId())) {
+                ContinuousEffect effect = new GainControlTargetEffect(Duration.Custom);
+                effect.setTargetPointer(new FixedTarget(targetPermanent.getId()));
+                game.addEffect(effect, source);
+                return permanent.sacrifice(source.getSourceId(), game);
+            }
+            return true;
+        }
+        return false;
+    }
+}

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

@@ -225,6 +225,7 @@ public class Onslaught extends ExpansionSet {
         cards.add(new SetCardInfo("Righteous Cause", 51, Rarity.UNCOMMON, mage.cards.r.RighteousCause.class));
         cards.add(new SetCardInfo("Riptide Biologist", 106, Rarity.COMMON, mage.cards.r.RiptideBiologist.class));
         cards.add(new SetCardInfo("Riptide Chronologist", 107, Rarity.UNCOMMON, mage.cards.r.RiptideChronologist.class));
+        cards.add(new SetCardInfo("Riptide Entrancer", 108, Rarity.RARE, mage.cards.r.RiptideEntrancer.class));
         cards.add(new SetCardInfo("Riptide Laboratory", 322, Rarity.RARE, mage.cards.r.RiptideLaboratory.class));
         cards.add(new SetCardInfo("Riptide Replicator", 309, Rarity.RARE, mage.cards.r.RiptideReplicator.class));
         cards.add(new SetCardInfo("Riptide Shapeshifter", 109, Rarity.UNCOMMON, mage.cards.r.RiptideShapeshifter.class));