Added Needle Drop.

Mage.Sets/src/mage/sets/lorwyn/NeedleDrop.java

@@ -0,0 +1,101 @@
+/*
+ *  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.lorwyn;
+
+import java.util.UUID;
+
+import mage.MageItem;
+import mage.MageObject;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.filter.common.FilterCreatureOrPlayer;
+import mage.filter.predicate.Predicate;
+import mage.game.Game;
+import mage.players.Player;
+import mage.target.common.TargetCreatureOrPlayer;
+import mage.watchers.common.DamageDoneWatcher;
+
+/**
+ *
+ * @author Quercitron
+ */
+public class NeedleDrop extends CardImpl {
+
+    private static final FilterCreatureOrPlayer FILTER = new FilterCreatureOrPlayer();
+
+    static {
+        FILTER.getCreatureFilter().add(new DamagedThisTurnPredicate());
+        FILTER.getPlayerFilter().add(new DamagedThisTurnPredicate());
+    }
+
+    public NeedleDrop(UUID ownerId) {
+        super(ownerId, 186, "Needle Drop", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}");
+        this.expansionSetCode = "LRW";
+
+        // Needle Drop deals 1 damage to target creature or player that was dealt damage this turn.
+        Effect effect = new DamageTargetEffect(1);
+        effect.setText("{this} deals 1 damage to target creature or player that was dealt damage this turn");
+        this.getSpellAbility().addEffect(effect);
+        this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(1, 1, FILTER));
+
+        // Draw a card.
+        this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
+    }
+
+    public NeedleDrop(final NeedleDrop card) {
+        super(card);
+    }
+
+
+    @Override
+    public NeedleDrop copy() {
+        return new NeedleDrop(this);
+    }
+}
+
+class DamagedThisTurnPredicate implements Predicate<MageItem> {
+
+    @Override
+    public boolean apply(MageItem input, Game game) {
+        DamageDoneWatcher watcher = (DamageDoneWatcher) game.getState().getWatchers().get("DamageDone");
+        if (watcher != null) {
+            if (input instanceof MageObject) {
+                return watcher.isDamaged(input.getId(), ((MageObject) input).getZoneChangeCounter(game), game);
+            }
+            if (input instanceof Player) {
+                return watcher.isDamaged(input.getId(), 0, game);
+            }
+        }
+        return false;
+    }
+
+}

Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/NeedleDropTest.java

@@ -0,0 +1,91 @@
+/*
+ *  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 org.mage.test.cards.single.lrw;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author Quercitron
+ */
+public class NeedleDropTest extends CardTestPlayerBase {
+
+    @Test
+    public void testTargetShouldBeDamaged() {
+        // Needle Drop deals 1 damage to target creature or player that was dealt damage this turn.
+        addCard(Zone.HAND, playerA, "Needle Drop", 4);
+        addCard(Zone.HAND, playerA, "Shock", 4);
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 8);
+
+        addCard(Zone.BATTLEFIELD, playerB, "Hill Giant");
+        addCard(Zone.BATTLEFIELD, playerB, "Flying Men");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", playerA);
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", "Hill Giant");
+
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Needle Drop", playerA);
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Needle Drop", playerB);
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Needle Drop", "Hill Giant");
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Needle Drop", "Flying Men");
+
+        setStopAt(1, PhaseStep.END_TURN);
+        execute();
+
+        assertLife(playerA, 17);
+        assertLife(playerB, 20);
+        assertPermanentCount(playerB, "Hill Giant", 0);
+        assertPermanentCount(playerB, "Flying Men", 1);
+    }
+
+    @Test
+    public void testTargetIsNotConsideredDamagedNextTurn() {
+        // Needle Drop deals 1 damage to target creature or player that was dealt damage this turn.
+        addCard(Zone.HAND, playerA, "Needle Drop", 2);
+        addCard(Zone.HAND, playerA, "Shock", 2);
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4);
+
+        addCard(Zone.BATTLEFIELD, playerB, "Hill Giant");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", playerB);
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", "Hill Giant");
+
+        castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerA, "Needle Drop", playerB);
+        castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerA, "Needle Drop", "Hill Giant");
+
+        setStopAt(2, PhaseStep.POSTCOMBAT_MAIN);
+        execute();
+
+        assertLife(playerA, 20);
+        assertLife(playerB, 18);
+        assertPermanentCount(playerB, "Hill Giant", 1);
+    }
+
+}

Mage/src/main/java/mage/abilities/condition/common/SourceDealtDamageCondition.java

@@ -25,7 +25,7 @@ public class SourceDealtDamageCondition implements Condition {
     @Override
     public boolean apply(Game game, Ability source) {
         DamageDoneWatcher watcher = (DamageDoneWatcher) game.getState().getWatchers().get("DamageDone");
-        return watcher != null && watcher.damageDone(source.getSourceId(), source.getSourceObjectZoneChangeCounter(), game) >= value;
+        return watcher != null && watcher.damageDoneBy(source.getSourceId(), source.getSourceObjectZoneChangeCounter(), game) >= value;
     }
 
     @Override

Mage/src/main/java/mage/watchers/common/DamageDoneWatcher.java

@@ -21,15 +21,21 @@ import mage.watchers.Watcher;
 public class DamageDoneWatcher extends Watcher {
 
     // which object did how much damage during the turn
-    public Map<MageObjectReference, Integer> damagingObjects = new HashMap<>();
+    public final Map<MageObjectReference, Integer> damagingObjects;
+
+    // which object received how much damage during the turn
+    public final Map<MageObjectReference, Integer> damagedObjects;
 
     public DamageDoneWatcher() {
         super("DamageDone", WatcherScope.GAME);
+        this.damagingObjects = new HashMap<>();
+        this.damagedObjects = new HashMap<>();
     }
 
     public DamageDoneWatcher(final DamageDoneWatcher watcher) {
         super(watcher);
-        this.damagingObjects.putAll(damagingObjects);
+        this.damagingObjects = new HashMap<>(watcher.damagingObjects);
+        this.damagedObjects = new HashMap<>(watcher.damagedObjects);
     }
 
     @Override
@@ -43,9 +49,13 @@ public class DamageDoneWatcher extends Watcher {
             case DAMAGED_CREATURE:
             case DAMAGED_PLANESWALKER:
             case DAMAGED_PLAYER: {
-                MageObjectReference mor = new MageObjectReference(event.getSourceId(), game);
-                int count = damagingObjects.containsKey(mor) ? damagingObjects.get(mor) : 0;
-                damagingObjects.put(mor, count + event.getAmount());
+                MageObjectReference damageSourceRef = new MageObjectReference(event.getSourceId(), game);
+                int damageDone = damagingObjects.containsKey(damageSourceRef) ? damagingObjects.get(damageSourceRef) : 0;
+                damagingObjects.put(damageSourceRef, damageDone + event.getAmount());
+
+                MageObjectReference damageTargetRef = new MageObjectReference(event.getTargetId(), game);
+                int damageReceived = damagedObjects.containsKey(damageTargetRef) ? damagedObjects.get(damageTargetRef) : 0;
+                damagedObjects.put(damageTargetRef, damageReceived + event.getAmount());
             }
         }
     }
@@ -54,11 +64,22 @@ public class DamageDoneWatcher extends Watcher {
     public void reset() {
         super.reset();
         damagingObjects.clear();
+        damagedObjects.clear();
     }
 
-    public int damageDone(UUID objectId, int zoneChangeCounter, Game game) {
+    public int damageDoneBy(UUID objectId, int zoneChangeCounter, Game game) {
         MageObjectReference mor = new MageObjectReference(objectId, zoneChangeCounter, game);
         return damagingObjects.containsKey(mor) ? damagingObjects.get(mor) : 0;
     }
 
+    public int damageDoneTo(UUID objectId, int zoneChangeCounter, Game game) {
+        MageObjectReference mor = new MageObjectReference(objectId, zoneChangeCounter, game);
+        return damagedObjects.containsKey(mor) ? damagedObjects.get(mor) : 0;
+    }
+
+    public boolean isDamaged(UUID objectId, int zoneChangeCounter, Game game) {
+        MageObjectReference mor = new MageObjectReference(objectId, zoneChangeCounter, game);
+        return damagedObjects.containsKey(mor);
+    }
+
 }