Merge branch 'master' into master

Mage/src/main/java/mage/abilities/common/DealtDamageAndDiedTriggeredAbility.java

@@ -3,8 +3,8 @@ package mage.abilities.common;
 import mage.MageObjectReference;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.effects.Effect;
-import mage.constants.CardType;
 import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.ZoneChangeEvent;
@@ -12,16 +12,24 @@ import mage.target.targetpointer.FixedTarget;
 
 public class DealtDamageAndDiedTriggeredAbility extends TriggeredAbilityImpl {
 
+    private final FilterCreaturePermanent filter;
+
     public DealtDamageAndDiedTriggeredAbility(Effect effect) {
         this(effect, false);
     }
 
     public DealtDamageAndDiedTriggeredAbility(Effect effect, boolean optional) {
+        this(effect, optional, new FilterCreaturePermanent());
+    }
+
+    public DealtDamageAndDiedTriggeredAbility(Effect effect, boolean optional, FilterCreaturePermanent filter) {
         super(Zone.ALL, effect, optional);
+        this.filter = filter;
     }
 
     public DealtDamageAndDiedTriggeredAbility(final DealtDamageAndDiedTriggeredAbility ability) {
         super(ability);
+        this.filter = ability.filter;
     }
 
     @Override
@@ -36,9 +44,9 @@ public class DealtDamageAndDiedTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (((ZoneChangeEvent)event).isDiesEvent()) {
+        if (((ZoneChangeEvent) event).isDiesEvent()) {
             ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
-            if (zEvent.getTarget().isCreature()) {
+            if (filter.match(zEvent.getTarget(), game)) {
                 boolean damageDealt = false;
                 for (MageObjectReference mor : zEvent.getTarget().getDealtDamageByThisTurn()) {
                     if (mor.refersTo(getSourceObject(game), game)) {
@@ -59,6 +67,6 @@ public class DealtDamageAndDiedTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever a creature dealt damage by {this} this turn dies, " + super.getRule();
+        return "Whenever a " + filter.getMessage() + " dealt damage by {this} this turn dies, " + super.getRule();
     }
-}
+}

Mage/src/main/java/mage/abilities/common/SimpleActivatedAbility.java

@@ -24,8 +24,7 @@
 * 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.abilities.common;
 
 import mage.constants.Zone;
@@ -41,6 +40,14 @@ import mage.abilities.effects.Effect;
  */
 public class SimpleActivatedAbility extends ActivatedAbilityImpl {
 
+    public SimpleActivatedAbility(Effect effect, ManaCosts cost) {
+        super(Zone.BATTLEFIELD, effect, cost);
+    }
+
+    public SimpleActivatedAbility(Effect effect, Cost cost) {
+        super(Zone.BATTLEFIELD, effect, cost);
+    }
+
     public SimpleActivatedAbility(Zone zone, Effect effect, ManaCosts cost) {
         super(zone, effect, cost);
     }

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

@@ -72,10 +72,16 @@ public class CreatureCountCondition implements Condition {
                 sb.append(" are on the battlefield");
                 return sb.toString();
         }
-        sb.append(" control exactly ");
-        sb.append(creatureCount);
-        sb.append(' ');
+        sb.append(" control");
+        if (creatureCount == 0) {
+            sb.append(" no ");
+        } else {
+            sb.append(" exactly ");
+            sb.append(creatureCount);
+            sb.append(' ');
+        }
         sb.append(filter.getMessage());
+        sb.append(creatureCount != 1 ? "s" : "");
 
         return sb.toString();
     }

Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerControlsPredicate.java

@@ -34,13 +34,13 @@ import mage.game.permanent.Permanent;
 
 /**
  *
- * @author North
+ * @author TheElk801
  */
 public class DefendingPlayerControlsPredicate implements ObjectSourcePlayerPredicate<ObjectSourcePlayer<Permanent>> {
 
     @Override
     public boolean apply(ObjectSourcePlayer<Permanent> input, Game game) {
-        return input.getObject().getControllerId().equals(game.getCombat().getDefendingPlayerId(input.getSourceId()));
+        return input.getObject().getControllerId().equals(game.getCombat().getDefendingPlayerId(input.getSourceId(), game));
     }
 
     @Override

Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerOwnsCardPredicate.java

@@ -34,13 +34,13 @@ import mage.game.Game;
 
 /**
  *
- * @author North
+ * @author TheElk801
  */
 public class DefendingPlayerOwnsCardPredicate implements ObjectSourcePlayerPredicate<ObjectSourcePlayer<Card>> {
 
     @Override
     public boolean apply(ObjectSourcePlayer<Card> input, Game game) {
-        return input.getObject().getOwnerId().equals(game.getCombat().getDefendingPlayerId(input.getSourceId()));
+        return input.getObject().getOwnerId().equals(game.getCombat().getDefendingPlayerId(input.getSourceId(), game));
     }
 
     @Override

Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java

@@ -0,0 +1,70 @@
+/*
+* 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.game.permanent.token;
+
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.MageInt;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.dynamicvalue.common.CardsInAllGraveyardsCount;
+import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.constants.Duration;
+import mage.constants.Zone;
+import mage.filter.FilterCard;
+import mage.filter.predicate.mageobject.NamePredicate;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class SoundTheCallToken extends Token {
+
+    private static final FilterCard filter = new FilterCard("card named Sound the Call");
+
+    static {
+        filter.add(new NamePredicate("Sound the Call"));
+    }
+
+    public SoundTheCallToken() {
+        super("Wolf", "1/1 green Wolf creature token. It has \"This creature gets +1/+1 for each card named Sound the Call in each graveyard.\"");
+        cardType.add(CardType.CREATURE);
+        color.setGreen(true);
+        subtype.add(SubType.WOLF);
+        power = new MageInt(1);
+        toughness = new MageInt(1);
+
+        DynamicValue value = new CardsInAllGraveyardsCount(filter);
+        this.addAbility(new SimpleStaticAbility(
+                Zone.BATTLEFIELD,
+                new BoostSourceEffect(value, value, Duration.WhileOnBattlefield)
+                        .setText("This creature gets +1/+1 for each card named Sound the Call in each graveyard.")
+        ));
+    }
+
+}