diff --git a/Mage.Sets/src/mage/cards/a/AsLuckWouldHaveIt.java b/Mage.Sets/src/mage/cards/a/AsLuckWouldHaveIt.java
new file mode 100644
index 0000000000..1a5c89a8c7
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/a/AsLuckWouldHaveIt.java
@@ -0,0 +1,150 @@
+/*
+ * 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.a;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.keyword.HexproofAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.counters.Counter;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+
+/**
+ *
+ * @author spjspj
+ */
+public class AsLuckWouldHaveIt extends CardImpl {
+
+ static final String rule = "put a number of luck counters on {this} equal to the result. Then if there are 100 or more luck counters on {this}, you win the game.";
+
+ public AsLuckWouldHaveIt(UUID ownerId, CardSetInfo setInfo) {
+ super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{G}");
+
+ // Hexproof
+ this.addAbility(HexproofAbility.getInstance());
+
+ // Whenever you roll a die, put a number of luck counters on As Luck Would Have It equal to the result. Then if there are 100 or more luck counters on As Luck Would Have It, you win the game.
+ this.addAbility(new AsLuckWouldHaveItTriggeredAbility());
+ }
+
+ public AsLuckWouldHaveIt(final AsLuckWouldHaveIt card) {
+ super(card);
+ }
+
+ @Override
+ public AsLuckWouldHaveIt copy() {
+ return new AsLuckWouldHaveIt(this);
+ }
+}
+
+class AsLuckWouldHaveItTriggeredAbility extends TriggeredAbilityImpl {
+
+ public AsLuckWouldHaveItTriggeredAbility() {
+ super(Zone.BATTLEFIELD, new AsLuckWouldHaveItEffect(), false);
+ }
+
+ public AsLuckWouldHaveItTriggeredAbility(final AsLuckWouldHaveItTriggeredAbility ability) {
+ super(ability);
+ }
+
+ @Override
+ public AsLuckWouldHaveItTriggeredAbility copy() {
+ return new AsLuckWouldHaveItTriggeredAbility(this);
+ }
+
+ @Override
+ public boolean checkEventType(GameEvent event, Game game) {
+ return event.getType() == GameEvent.EventType.DICE_ROLLED;
+ }
+
+ @Override
+ public boolean checkTrigger(GameEvent event, Game game) {
+ if (this.getControllerId().equals(event.getPlayerId()) && event.getFlag()) {
+ for (Effect effect : this.getEffects()) {
+ effect.setValue("rolled", event.getAmount());
+ }
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public String getRule() {
+ return "Whenever you roll a die, " + super.getRule();
+ }
+}
+
+class AsLuckWouldHaveItEffect extends OneShotEffect {
+
+ public AsLuckWouldHaveItEffect() {
+ super(Outcome.Benefit);
+ this.staticText = "put a number of luck counters on {this} equal to the result. Then if there are 100 or more luck counters on {this}, you win the game.";
+ }
+
+ public AsLuckWouldHaveItEffect(final AsLuckWouldHaveItEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public AsLuckWouldHaveItEffect copy() {
+ return new AsLuckWouldHaveItEffect(this);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Player controller = game.getPlayer(source.getControllerId());
+ Permanent permanent = game.getPermanent(source.getSourceId());
+ if (controller != null && permanent != null) {
+ if (getValue("rolled") != null) {
+ int amount = (Integer) getValue("rolled");
+ permanent.addCounters(new Counter("luck", amount), source, game);
+
+ if (permanent.getCounters(game).getCount("luck") >= 100) {
+ Player player = game.getPlayer(permanent.getControllerId());
+ if (player != null) {
+ player.won(game);
+ }
+ }
+
+ return true;
+ }
+ }
+ return false;
+
+ }
+}
diff --git a/Mage.Sets/src/mage/cards/c/CrowStorm.java b/Mage.Sets/src/mage/cards/c/CrowStorm.java
new file mode 100644
index 0000000000..8ba10dcf88
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/c/CrowStorm.java
@@ -0,0 +1,62 @@
+/*
+ * 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.c;
+
+import java.util.UUID;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.keyword.StormAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.game.permanent.token.StormCrowToken;
+
+/**
+ *
+ * @author spjspj
+ */
+public class CrowStorm extends CardImpl {
+
+ public CrowStorm(UUID ownerId, CardSetInfo setInfo) {
+ super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{U}");
+
+ // Create a 1/2 blue Bird creature token with flying named Storm Crow.
+ this.getSpellAbility().addEffect(new CreateTokenEffect(new StormCrowToken(), 1));
+
+ // Storm (When you cast this spell, copy it for each spell cast before it this turn.)
+ this.addAbility(new StormAbility());
+ }
+
+ public CrowStorm(final CrowStorm card) {
+ super(card);
+ }
+
+ @Override
+ public CrowStorm copy() {
+ return new CrowStorm(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/cards/g/GroundPounder.java b/Mage.Sets/src/mage/cards/g/GroundPounder.java
new file mode 100644
index 0000000000..e199342741
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/g/GroundPounder.java
@@ -0,0 +1,148 @@
+/*
+ * 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.g;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.abilities.effects.common.continuous.BoostTargetEffect;
+import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
+import mage.abilities.keyword.TrampleAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.SubType;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+
+/**
+ *
+ * @author spjspj
+ */
+public class GroundPounder extends CardImpl {
+
+ public GroundPounder(UUID ownerId, CardSetInfo setInfo) {
+ super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}");
+
+ this.subtype.add(SubType.HUMAN);
+ this.subtype.add(SubType.WARRIOR);
+ this.power = new MageInt(2);
+ 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.
+ this.addAbility(new GroundPounderTriggeredAbility());
+ }
+
+ public GroundPounder(final GroundPounder card) {
+ super(card);
+ }
+
+ @Override
+ public GroundPounder copy() {
+ return new GroundPounder(this);
+ }
+}
+
+class GroundPounderEffect extends OneShotEffect {
+
+ public GroundPounderEffect() {
+ super(Outcome.Benefit);
+ this.staticText = "Roll a six-sided die. {this} gets +X/+X until end of turn, where X is the result";
+ }
+
+ public GroundPounderEffect(final GroundPounderEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public GroundPounderEffect copy() {
+ return new GroundPounderEffect(this);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Player controller = game.getPlayer(source.getControllerId());
+ Permanent permanent = game.getPermanent(source.getSourceId());
+ if (controller != null && permanent != null) {
+ int amount = controller.rollDice(game, 6);
+ game.addEffect(new BoostSourceEffect(amount, amount, Duration.EndOfTurn), source);
+ return true;
+ }
+ return false;
+ }
+}
+
+class GroundPounderTriggeredAbility extends TriggeredAbilityImpl {
+
+ public GroundPounderTriggeredAbility() {
+ super(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), false);
+ }
+
+ public GroundPounderTriggeredAbility(final GroundPounderTriggeredAbility ability) {
+ super(ability);
+ }
+
+ @Override
+ public GroundPounderTriggeredAbility copy() {
+ return new GroundPounderTriggeredAbility(this);
+ }
+
+ @Override
+ public boolean checkEventType(GameEvent event, Game game) {
+ return event.getType() == GameEvent.EventType.DICE_ROLLED;
+ }
+
+ @Override
+ public boolean checkTrigger(GameEvent event, Game game) {
+ if (this.getControllerId().equals(event.getPlayerId()) && event.getFlag()) {
+ if (event.getAmount() >= 5) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public String getRule() {
+ return "Whenever you roll a 5 or higher on a die, {this} gains trample until end of turn";
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/Unstable.java b/Mage.Sets/src/mage/sets/Unstable.java
index 338e9e4d38..465a7fa991 100644
--- a/Mage.Sets/src/mage/sets/Unstable.java
+++ b/Mage.Sets/src/mage/sets/Unstable.java
@@ -27,7 +27,9 @@
*/
package mage.sets;
+import mage.cards.CardGraphicInfo;
import mage.cards.ExpansionSet;
+import mage.cards.FrameStyle;
import mage.constants.Rarity;
import mage.constants.SetType;
@@ -45,6 +47,15 @@ public class Unstable extends ExpansionSet {
private Unstable() {
super("Unstable", "UST", ExpansionSet.buildDate(2017, 12, 8), SetType.JOKESET);
+ cards.add(new SetCardInfo("As Luck Would Have It", 102, Rarity.RARE, mage.cards.a.AsLuckWouldHaveIt.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));
+ cards.add(new SetCardInfo("Island", 213, Rarity.LAND, mage.cards.basiclands.Island.class, new CardGraphicInfo(FrameStyle.UNH_FULL_ART_BASIC, false)));
+ cards.add(new SetCardInfo("Mountain", 215, Rarity.LAND, mage.cards.basiclands.Mountain.class, new CardGraphicInfo(FrameStyle.UNH_FULL_ART_BASIC, false)));
+ cards.add(new SetCardInfo("Plains", 212, Rarity.LAND, mage.cards.basiclands.Plains.class, new CardGraphicInfo(FrameStyle.UNH_FULL_ART_BASIC, false)));
+ cards.add(new SetCardInfo("Swamp", 214, Rarity.LAND, mage.cards.basiclands.Swamp.class, new CardGraphicInfo(FrameStyle.UNH_FULL_ART_BASIC, false)));
cards.add(new SetCardInfo("Sword of Dungeons and Dragons", 1, Rarity.MYTHIC, mage.cards.s.SwordOfDungeonsAndDragons.class));
+
}
}
diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
index 595a54d6e6..68b35334ca 100644
--- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
+++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
@@ -1825,6 +1825,17 @@ public class TestPlayer implements Player {
return computerPlayer.flipCoin(game, appliedEffects);
}
+ @Override
+ public int rollDice(Game game, int numSides) {
+ return computerPlayer.rollDice(game, numSides);
+ }
+
+ @Override
+ public int rollDice(Game game, ArrayList<UUID> appliedEffects, int numSides) {
+ return computerPlayer.rollDice(game, appliedEffects, numSides);
+ }
+
+
@Override
public List<Permanent> getAvailableAttackers(Game game) {
return computerPlayer.getAvailableAttackers(game);
diff --git a/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java b/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java
index e082f0a0b9..fd469eb8fc 100644
--- a/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java
+++ b/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java
@@ -646,6 +646,17 @@ public class PlayerStub implements Player {
return false;
}
+ @Override
+ public int rollDice(Game game, int numSides) {
+ return 1;
+ }
+
+ @Override
+ public int rollDice(Game game, ArrayList<UUID> appliedEffects, int numSides) {
+ return 1;
+ }
+
+
@Override
public void discard(int amount, Ability source, Game game) {
diff --git a/Mage/src/main/java/mage/game/events/GameEvent.java b/Mage/src/main/java/mage/game/events/GameEvent.java
index b6b65c4847..34c8357a0d 100644
--- a/Mage/src/main/java/mage/game/events/GameEvent.java
+++ b/Mage/src/main/java/mage/game/events/GameEvent.java
@@ -229,6 +229,7 @@ public class GameEvent implements Serializable {
ENCHANT_PLAYER, ENCHANTED_PLAYER,
CAN_TAKE_MULLIGAN,
FLIP_COIN, COIN_FLIPPED, SCRY, FATESEAL,
+ ROLL_DICE, DICE_ROLLED,
PAID_CUMULATIVE_UPKEEP,
DIDNT_PAY_CUMULATIVE_UPKEEP,
//permanent events
diff --git a/Mage/src/main/java/mage/players/Player.java b/Mage/src/main/java/mage/players/Player.java
index 71478eb2f9..eb72ad1fac 100644
--- a/Mage/src/main/java/mage/players/Player.java
+++ b/Mage/src/main/java/mage/players/Player.java
@@ -417,6 +417,10 @@ public interface Player extends MageItem, Copyable<Player> {
boolean flipCoin(Game game, ArrayList<UUID> appliedEffects);
+ int rollDice(Game game, int numSides);
+
+ int rollDice(Game game, ArrayList<UUID> appliedEffects, int numSides);
+
@Deprecated
void discard(int amount, Ability source, Game game);
diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java
index 7168fcbcd6..57775dc82a 100644
--- a/Mage/src/main/java/mage/players/PlayerImpl.java
+++ b/Mage/src/main/java/mage/players/PlayerImpl.java
@@ -2312,7 +2312,7 @@ public abstract class PlayerImpl implements Player, Serializable {
public boolean flipCoin(Game game) {
return this.flipCoin(game, null);
}
-
+
/**
* @param game
* @param appliedEffects
@@ -2331,6 +2331,31 @@ public abstract class PlayerImpl implements Player, Serializable {
}
return event.getFlag();
}
+
+ @Override
+ public int rollDice(Game game, int numSides) {
+ return this.rollDice(game, null, numSides);
+ }
+
+ /**
+ * @param game
+ * @param appliedEffects
+ * @return the number that the player rolled
+ */
+ @Override
+ public int rollDice(Game game, ArrayList<UUID> appliedEffects, int numSides) {
+ int result = RandomUtil.nextInt(numSides);
+ if (!game.isSimulation()) {
+ game.informPlayers("[Roll a dice] " + getLogName() + " rolled a " + result + " on a " + numSides + " sided dice");
+ }
+ GameEvent event = new GameEvent(GameEvent.EventType.ROLL_DICE, playerId, null, playerId, result, true);
+ event.setAppliedEffects(appliedEffects);
+ event.setAmount(result);
+ if (!game.replaceEvent(event)) {
+ game.fireEvent(new GameEvent(GameEvent.EventType.DICE_ROLLED, playerId, null, playerId, result, event.getFlag()));
+ }
+ return result;
+ }
@Override
public List<Permanent> getAvailableAttackers(Game game) {