Add Faerie Rogue token and use it for existing cards. Implement card: Notorious Throng

Mage.Sets/src/mage/sets/morningtide/Bitterblossom.java

@@ -28,17 +28,15 @@
 package mage.sets.morningtide;
 
 import java.util.UUID;
-import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.LoseLifeSourceControllerEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Rarity;
 import mage.constants.TargetController;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.FaerieRogueToken;
 
 /**
  *
@@ -51,10 +49,9 @@ public class Bitterblossom extends CardImpl {
         this.expansionSetCode = "MOR";
         this.subtype.add("Faerie");
 
-
         // At the beginning of your upkeep, you lose 1 life and put a 1/1 black Faerie Rogue creature token with flying onto the battlefield.
         Ability ability = new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceControllerEffect(1), TargetController.YOU, false);
-        ability.addEffect(new CreateTokenEffect(new FaerieToken(), 1));
+        ability.addEffect(new CreateTokenEffect(new FaerieRogueToken(), 1));
         this.addAbility(ability);
     }
 
@@ -67,16 +64,3 @@ public class Bitterblossom extends CardImpl {
         return new Bitterblossom(this);
     }
 }
-
-class FaerieToken extends Token {
-    FaerieToken() {
-        super("Faerie Rogue", "1/1 black Faerie Rogue creature token with flying");
-        cardType.add(CardType.CREATURE);
-        color.setBlack(true);
-        subtype.add("Faerie");
-        subtype.add("Rogue");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-        this.addAbility(FlyingAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/sets/morningtide/NotoriousThrong.java

@@ -0,0 +1,109 @@
+/*
+ *  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.morningtide;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.condition.common.ProwlCondition;
+import mage.abilities.decorator.ConditionalOneShotEffect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.turn.AddExtraTurnControllerEffect;
+import mage.abilities.keyword.ProwlAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.game.Game;
+import mage.game.permanent.token.FaerieRogueToken;
+import mage.players.Player;
+import mage.watchers.common.AmountOfDamageAPlayerReceivedThisTurnWatcher;
+
+/**
+ *
+ * @author LoneFox
+ */
+public class NotoriousThrong extends CardImpl {
+
+    public NotoriousThrong(UUID ownerId) {
+        super(ownerId, 45, "Notorious Throng", Rarity.RARE, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{3}{U}");
+        this.expansionSetCode = "MOR";
+        this.subtype.add("Rogue");
+
+        // Prowl {5}{U}
+        this.addAbility(new ProwlAbility(this, "{5}{U}"));
+        // Put X 1/1 black Faerie Rogue creature tokens with flying onto the battlefield, where X is the damage dealt to your opponents this turn.
+        this.getSpellAbility().addEffect(new NotoriousThrongEffect());
+        this.getSpellAbility().addWatcher(new AmountOfDamageAPlayerReceivedThisTurnWatcher());
+        // If Notorious Throng's prowl cost was paid, take an extra turn after this one.
+        this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new AddExtraTurnControllerEffect(), ProwlCondition.getInstance()));
+    }
+
+    public NotoriousThrong(final NotoriousThrong card) {
+        super(card);
+    }
+
+    @Override
+    public NotoriousThrong copy() {
+        return new NotoriousThrong(this);
+    }
+}
+
+class NotoriousThrongEffect extends OneShotEffect {
+
+    public NotoriousThrongEffect() {
+        super(Outcome.PutCreatureInPlay);
+        staticText = "Put X 1/1 black Faerie Rogue creature tokens with flying onto the battlefield, where X is the damage dealt to your opponents this turn.";
+    }
+
+    public NotoriousThrongEffect(NotoriousThrongEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public NotoriousThrongEffect copy() {
+        return new NotoriousThrongEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        AmountOfDamageAPlayerReceivedThisTurnWatcher watcher = (AmountOfDamageAPlayerReceivedThisTurnWatcher) game.getState().getWatchers().get("AmountOfDamageReceivedThisTurn");
+        if(controller != null && watcher != null) {
+            int numTokens = 0;
+            for(UUID opponentId: game.getOpponents(controller.getId())) {
+                numTokens += watcher.getAmountOfDamageReceivedThisTurn(opponentId);
+            }
+            if(numTokens > 0) {
+                new CreateTokenEffect(new FaerieRogueToken(), numTokens).apply(game, source);
+            }
+            return true;
+        }
+        return false;
+    }
+}

Mage.Sets/src/mage/sets/morningtide/VioletPall.java

@@ -28,18 +28,16 @@
 package mage.sets.morningtide;
 
 import java.util.UUID;
-import mage.MageInt;
-import mage.constants.CardType;
-import mage.constants.Rarity;
 import mage.ObjectColor;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.DestroyTargetEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.ColorPredicate;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.FaerieRogueToken;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
@@ -61,7 +59,7 @@ public class VioletPall extends CardImpl {
 
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
-        this.getSpellAbility().addEffect(new CreateTokenEffect(new VioletPallFaerieToken(), 1));
+        this.getSpellAbility().addEffect(new CreateTokenEffect(new FaerieRogueToken(), 1));
     }
 
     public VioletPall(final VioletPall card) {
@@ -73,17 +71,3 @@ public class VioletPall extends CardImpl {
         return new VioletPall(this);
     }
 }
-
-class VioletPallFaerieToken extends Token {
-
-    VioletPallFaerieToken() {
-        super("Faerie Rogue", "1/1 black Faerie Rogue creature token with flying");
-        cardType.add(CardType.CREATURE);
-        color.setBlack(true);
-        subtype.add("Faerie");
-        subtype.add("Rogue");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-        this.addAbility(FlyingAbility.getInstance());
-    }
-}

Mage/src/mage/game/permanent/token/FaerieRogueToken.java

@@ -0,0 +1,53 @@
+/*
+* 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 java.util.Arrays;
+import mage.constants.CardType;
+import mage.MageInt;
+import mage.abilities.keyword.FlyingAbility;
+
+/**
+ *
+ * @author LoneFox
+ */
+public class FaerieRogueToken extends Token {
+
+    public FaerieRogueToken() {
+        super("Faerie Rogue", "1/1 black Faerie Rogue creature token with flying");
+        cardType.add(CardType.CREATURE);
+        color.setBlack(true);
+        subtype.add("Faerie");
+        subtype.add("Rogue");
+        power = new MageInt(1);
+        toughness = new MageInt(1);
+        addAbility(FlyingAbility.getInstance());
+        availableImageSetCodes.addAll(Arrays.asList("SHM", "MOR", "MMA"));
+    }
+}