Merge pull request #4237 from spjspj/master

Add 1 unstable card.  Fix dice roll (was only returning  '0-(n-1)')

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

@@ -0,0 +1,92 @@
+/*
+ *  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.b;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.game.Game;
+import mage.game.permanent.token.GoblinToken;
+import mage.players.Player;
+
+/**
+ *
+ * @author spjspj
+ */
+public class BoxOfFreerangeGoblins extends CardImpl {
+
+    public BoxOfFreerangeGoblins(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{R}{R}");
+
+        // Roll a six-sided die. Create a number of 1/1 red Goblin creature tokens equal to the result.
+        this.getSpellAbility().addEffect(new BoxOfFreerangeGoblinsEffect());
+    }
+
+    public BoxOfFreerangeGoblins(final BoxOfFreerangeGoblins card) {
+        super(card);
+    }
+
+    @Override
+    public BoxOfFreerangeGoblins copy() {
+        return new BoxOfFreerangeGoblins(this);
+    }
+}
+
+class BoxOfFreerangeGoblinsEffect extends OneShotEffect {
+
+    public BoxOfFreerangeGoblinsEffect() {
+        super(Outcome.PutCreatureInPlay);
+        this.staticText = "Roll a six-sided die. Create a number of 1/1 red Goblin creature tokens equal to the result";
+    }
+
+    public BoxOfFreerangeGoblinsEffect(final BoxOfFreerangeGoblinsEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public BoxOfFreerangeGoblinsEffect copy() {
+        return new BoxOfFreerangeGoblinsEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        if (controller != null) {
+            int amount = controller.rollDice(game, 6);
+            CreateTokenEffect effect = new CreateTokenEffect(new GoblinToken(), amount);
+            effect.apply(game, source);
+            return true;
+        }
+        return false;
+    }
+}

Mage.Sets/src/mage/cards/g/GroundPounder.java

@@ -65,7 +65,6 @@ public class GroundPounder extends CardImpl {
         this.toughness = new MageInt(2);
 
         // 3G: Roll a six-sided die. Ground Pounder gets +X/+X until end of turn, where X is the result.
-        //this.addAbility(new SimpleActivatedAbility(new RollDiceEffect(new CreateTokenEffect(new WireflyToken()), 6), new ManaCostsImpl("{3}{G}")));
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GroundPounderEffect(), new ManaCostsImpl("{3}{G}")));
 
         // Whenever you roll a 5 or higher on a die, Ground Pounder gains trample until end of turn.

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

@@ -50,6 +50,7 @@ public class Unstable extends ExpansionSet {
 
         cards.add(new SetCardInfo("Amateur Auteur", 3, Rarity.COMMON, mage.cards.a.AmateurAuteur.class));
         cards.add(new SetCardInfo("As Luck Would Have It", 102, Rarity.RARE, mage.cards.a.AsLuckWouldHaveIt.class));
+        cards.add(new SetCardInfo("Box of Free-Range Goblins", 77, Rarity.COMMON, mage.cards.b.BoxOfFreerangeGoblins.class));
         cards.add(new SetCardInfo("Crow Storm", 31, Rarity.UNCOMMON, mage.cards.c.CrowStorm.class));
         cards.add(new SetCardInfo("Forest", 216, Rarity.LAND, mage.cards.basiclands.Forest.class, new CardGraphicInfo(FrameStyle.UNH_FULL_ART_BASIC, false)));
         cards.add(new SetCardInfo("Ground Pounder", 110, Rarity.COMMON, mage.cards.g.GroundPounder.class));

Mage/src/main/java/mage/players/PlayerImpl.java

@@ -2344,7 +2344,7 @@ public abstract class PlayerImpl implements Player, Serializable {
      */
     @Override
     public int rollDice(Game game, ArrayList<UUID> appliedEffects, int numSides) {
-        int result = RandomUtil.nextInt(numSides);
+        int result = RandomUtil.nextInt(numSides) + 1;        
         if (!game.isSimulation()) {
             game.informPlayers("[Roll a dice] " + getLogName() + " rolled a " + result + " on a " + numSides + " sided dice");
         }

Utils/mtg-cards-data.txt

@@ -32747,6 +32747,7 @@ Snickering Squirrel|Unstable|68|C|{B}|Creature - Squirrel Advisor|1|1|You may ta
 Split Screen|Unstable|158|R|{4}|Artifact|||When Split Screen enters the battlefield, shuffle your library and deal it into four libraries. If anything refers to your library, choose one of your libraries for it.$Play with your libraries' top cards revealed.$When Split Screen leaves the battlefield, shuffle your libraries together.|
 Spy Eye|Unstable|46|U|{2}{U}{U}|Creature - Eye Spy|1|3|Flying$Whenever Spy Eye deals combat damage to a player, you may draw a card from that player's library.|
 Squirrel-Powered Scheme|Unstable|70|U|{2}{B}|Enchantment|||Increase the result of each die you roll by 2.|
+Box of Freerange Goblins|Unstable|77|C|{4}{R}{R}|Sorcery |||Roll a six-sided die. Create a number of 1/1 red Goblin creature tokens equal to the result.|
 Staff of the Letter Magus|Unstable|159|U|{3}|Artifact|||As Staff of the Letter Magus enters the battlefield, choose a consonant other than N, R, S, or T.$Whenever a player casts a spell, you gain 1 life for each time the chosen letter appears in that spell's name.|
 Steamflogger Boss|Unstable|93|R|{3}{R}|Creature - Goblin Rigger|3|3|Other Riggers you control get +1/+0 and have haste.$If a Rigger you control would assemble a Contraption, it assembles two Contraptions instead.|
 Steamflogger Service Rep|Unstable|124|U|{2}{G}|Creature - Goblin Rigger|1|1|Whenever another Goblin enters the battlefield under your control, you may pay 1. If you do, Steamflogger Service Rep assembles a Contraption.|