Merge origin/master

Mage.Sets/src/mage/cards/m/Malfegor.java

@@ -32,6 +32,8 @@ import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.SacrificeOpponentsEffect;
+import mage.abilities.effects.common.discard.DiscardHandControllerEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -39,12 +41,9 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Outcome;
 import mage.constants.SuperType;
-import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.StaticFilters;
 import mage.game.Game;
-import mage.game.permanent.Permanent;
 import mage.players.Player;
-import mage.target.Target;
-import mage.target.common.TargetControlledPermanent;
 
 /**
  *
@@ -54,10 +53,10 @@ public class Malfegor extends CardImpl {
 
     public Malfegor(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{B}{R}{R}");
+
         addSuperType(SuperType.LEGENDARY);
         this.subtype.add(SubType.DEMON);
         this.subtype.add(SubType.DRAGON);
-
         this.power = new MageInt(6);
         this.toughness = new MageInt(6);
 
@@ -93,31 +92,15 @@ class MalfegorEffect extends OneShotEffect {
     @Override
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
-        if (controller != null) {
+        if (controller == null) {
+            return false;
+        }
         int sacrificeNumber = controller.getHand().size();
-            if (sacrificeNumber > 0) {
-                controller.discard(sacrificeNumber, source, game);
-                for (UUID opponentId : game.getOpponents(controller.getId())) {
-                    Player opponent = game.getPlayer(opponentId);
-                    if (opponent != null) {
-                        for (int i = 0; i < sacrificeNumber; i++) {
-                            Target target = new TargetControlledPermanent(new FilterControlledCreaturePermanent());
-                            if (target.canChoose(opponentId, game)) {
-                                if (opponent.choose(Outcome.Sacrifice, target, source.getSourceId(), game)) {
-                                    Permanent permanent = game.getPermanent(target.getFirstTarget());
-                                    if (permanent != null) {
-                                        permanent.sacrifice(source.getSourceId(), game);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
+        if (sacrificeNumber == 0) {
             return true;
         }
-        return false;
-
+        new DiscardHandControllerEffect().apply(game, source);
+        return new SacrificeOpponentsEffect(sacrificeNumber, StaticFilters.FILTER_PERMANENT_CREATURE).apply(game, source);
     }
 
     @Override

Mage.Sets/src/mage/cards/s/StadiumVendors.java

@@ -0,0 +1,111 @@
+/*
+ *  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.s;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.mana.AddManaToManaPoolTargetControllerEffect;
+import mage.constants.SubType;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.choices.ChoiceColor;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.game.Game;
+import mage.players.Player;
+import mage.target.TargetPlayer;
+import mage.target.targetpointer.FixedTarget;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class StadiumVendors extends CardImpl {
+
+    public StadiumVendors(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}");
+
+        this.subtype.add(SubType.GOBLIN);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(3);
+
+        // When Stadium Vendors enters the battlefield, choose a player. That player adds two mana of any one color they choose.
+        Ability ability = new EntersBattlefieldTriggeredAbility(new StadiumVendorsEffect(), false);
+        this.addAbility(ability);
+    }
+
+    public StadiumVendors(final StadiumVendors card) {
+        super(card);
+    }
+
+    @Override
+    public StadiumVendors copy() {
+        return new StadiumVendors(this);
+    }
+}
+
+class StadiumVendorsEffect extends OneShotEffect {
+
+    StadiumVendorsEffect() {
+        super(Outcome.Benefit);
+        this.staticText = "choose a player. That player adds two mana of any one color they choose";
+    }
+
+    StadiumVendorsEffect(final StadiumVendorsEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public StadiumVendorsEffect copy() {
+        return new StadiumVendorsEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getSourceId());
+        if (controller == null) {
+            return false;
+        }
+        TargetPlayer target = new TargetPlayer(1, 1, true);
+        if (!controller.choose(Outcome.Benefit, target, source.getSourceId(), game)) {
+            return false;
+        }
+        Player player = game.getPlayer(target.getFirstTarget());
+        ChoiceColor colorChoice = new ChoiceColor(true);
+        if (player == null || !player.choose(Outcome.Benefit, colorChoice, game)) {
+            return false;
+        }
+        Effect effect = new AddManaToManaPoolTargetControllerEffect(colorChoice.getMana(2), "that player's");
+        effect.setTargetPointer(new FixedTarget(player.getId(), game));
+        return effect.apply(game, source);
+    }
+}

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

@@ -258,6 +258,7 @@ public class Battlebond extends ExpansionSet {
         cards.add(new SetCardInfo("Spellseeker", 41, Rarity.RARE, mage.cards.s.Spellseeker.class));
         cards.add(new SetCardInfo("Spellweaver Duo", 42, Rarity.COMMON, mage.cards.s.SpellweaverDuo.class));
         cards.add(new SetCardInfo("Spire Garden", 85, Rarity.RARE, mage.cards.s.SpireGarden.class));
+        cards.add(new SetCardInfo("Stadium Vendors", 63, Rarity.COMMON, mage.cards.s.StadiumVendors.class));
         cards.add(new SetCardInfo("Steppe Glider", 109, Rarity.UNCOMMON, mage.cards.s.SteppeGlider.class));
         cards.add(new SetCardInfo("Stone Golem", 247, Rarity.COMMON, mage.cards.s.StoneGolem.class));
         cards.add(new SetCardInfo("Stunning Reversal", 51, Rarity.MYTHIC, mage.cards.s.StunningReversal.class));