- Added Dusk Urchins, Hollowborn Barghest, and Hollowsage. Fixed Tormented Hero and added optional to BecomesTappedTriggered.

Mage.Sets/src/mage/sets/shadowmoor/DuskUrchins.java

@@ -0,0 +1,73 @@
+/*
+ *  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.shadowmoor;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.AttacksOrBlocksTriggeredAbility;
+import mage.abilities.common.DiesTriggeredAbility;
+import mage.abilities.dynamicvalue.common.CountersCount;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.counters.CounterType;
+
+/**
+ *
+ * @author jeffwadsworth
+ */
+public class DuskUrchins extends CardImpl {
+
+    public DuskUrchins(UUID ownerId) {
+        super(ownerId, 65, "Dusk Urchins", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{B}");
+        this.expansionSetCode = "SHM";
+        this.subtype.add("Ouphe");
+
+        this.color.setBlack(true);
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(3);
+
+        // Whenever Dusk Urchins attacks or blocks, put a -1/-1 counter on it.
+        this.addAbility(new AttacksOrBlocksTriggeredAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance()), false));
+
+        // When Dusk Urchins dies, draw a card for each -1/-1 counter on it.
+        this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(new CountersCount(CounterType.M1M1))));
+
+    }
+
+    public DuskUrchins(final DuskUrchins card) {
+        super(card);
+    }
+
+    @Override
+    public DuskUrchins copy() {
+        return new DuskUrchins(this);
+    }
+}

Mage.Sets/src/mage/sets/shadowmoor/HollowbornBarghest.java

@@ -0,0 +1,144 @@
+/*
+ *  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.shadowmoor;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbility;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
+import mage.abilities.condition.Condition;
+import mage.abilities.condition.common.CardsInHandCondition;
+import mage.abilities.decorator.ConditionalTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.TargetController;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.players.Player;
+
+/**
+ *
+ * @author jeffwadsworth
+ */
+public class HollowbornBarghest extends CardImpl {
+
+    private static final String rule = "At the beginning of your upkeep, if you have no cards in hand, each opponent loses 2 life.";
+
+    public HollowbornBarghest(UUID ownerId) {
+        super(ownerId, 68, "Hollowborn Barghest", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{B}{B}");
+        this.expansionSetCode = "SHM";
+        this.subtype.add("Demon");
+        this.subtype.add("Hound");
+
+        this.color.setBlack(true);
+        this.power = new MageInt(7);
+        this.toughness = new MageInt(6);
+
+        // At the beginning of your upkeep, if you have no cards in hand, each opponent loses 2 life.
+        Condition condition = new CardsInHandCondition(CardsInHandCondition.CountType.EQUAL_TO, 0);
+        TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new HollowbornBarghestEffect(), TargetController.YOU, false);
+        this.addAbility(new ConditionalTriggeredAbility(ability, condition, rule));
+
+        // At the beginning of each opponent's upkeep, if that player has no cards in hand, he or she loses 2 life.
+        this.addAbility(new HollowbornBarghestTriggeredAbility());
+    }
+
+    public HollowbornBarghest(final HollowbornBarghest card) {
+        super(card);
+    }
+
+    @Override
+    public HollowbornBarghest copy() {
+        return new HollowbornBarghest(this);
+    }
+}
+
+class HollowbornBarghestEffect extends OneShotEffect {
+
+    public HollowbornBarghestEffect() {
+        super(Outcome.Damage);
+        staticText = "Each opponent loses 2 life";
+    }
+
+    public HollowbornBarghestEffect(final HollowbornBarghestEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        for (UUID opponentId : game.getOpponents(source.getControllerId())) {
+            game.getPlayer(opponentId).loseLife(2, game);
+        }
+        return true;
+    }
+
+    @Override
+    public HollowbornBarghestEffect copy() {
+        return new HollowbornBarghestEffect(this);
+    }
+
+}
+
+class HollowbornBarghestTriggeredAbility extends TriggeredAbilityImpl {
+
+    public HollowbornBarghestTriggeredAbility() {
+        super(Zone.BATTLEFIELD, null);
+    }
+
+    public HollowbornBarghestTriggeredAbility(final HollowbornBarghestTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public HollowbornBarghestTriggeredAbility copy() {
+        return new HollowbornBarghestTriggeredAbility(this);
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        if (event.getType() == GameEvent.EventType.UPKEEP_STEP_PRE && game.getOpponents(controllerId).contains(event.getPlayerId())) {
+            Player opponent = game.getPlayer(event.getPlayerId());
+            if (opponent != null && opponent.getHand().size() == 0) {
+                opponent.loseLife(2, game);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return "At the beginning of each opponent's upkeep, if that player has no cards in hand, he or she loses 2 life.";
+    }
+}

Mage.Sets/src/mage/sets/shadowmoor/Hollowsage.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.shadowmoor;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.TriggeredAbility;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.discard.DiscardTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.target.TargetPlayer;
+
+/**
+ *
+ * @author jeffwadsworth
+ */
+public class Hollowsage extends CardImpl {
+    
+    public Hollowsage(UUID ownerId) {
+        super(ownerId, 69, "Hollowsage", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{B}");
+        this.expansionSetCode = "SHM";
+        this.subtype.add("Merfolk");
+        this.subtype.add("Wizard");
+        
+        this.color.setBlack(true);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // Whenever Hollowsage becomes untapped, you may have target player discard a card.
+        TriggeredAbility ability = new BecomesUntappedTriggeredAbility(new DiscardTargetEffect(1), true);
+        ability.addTarget(new TargetPlayer());
+        this.addAbility(ability);
+        
+    }
+    
+    public Hollowsage(final Hollowsage card) {
+        super(card);
+    }
+    
+    @Override
+    public Hollowsage copy() {
+        return new Hollowsage(this);
+    }
+}
+
+class BecomesUntappedTriggeredAbility extends TriggeredAbilityImpl {
+    
+    public BecomesUntappedTriggeredAbility(Effect effect, boolean isOptional) {
+        super(Zone.BATTLEFIELD, effect, isOptional);
+    }
+
+    public BecomesUntappedTriggeredAbility(Effect effect) {
+        super(Zone.BATTLEFIELD, effect);
+    }
+
+    public BecomesUntappedTriggeredAbility(final BecomesUntappedTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public BecomesUntappedTriggeredAbility copy() {
+        return new BecomesUntappedTriggeredAbility(this);
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        if (event.getType() == EventType.TAPPED && event.getTargetId().equals(sourceId)) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return "When {this} becomes untapped, " + super.getRule();
+    }
+}

Mage.Sets/src/mage/sets/theros/TormentedHero.java

@@ -84,11 +84,11 @@ class EachOpponentLosesYouGainSumLifeEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        int damage = 0;
-        for (UUID opponentId: game.getOpponents(source.getControllerId())) {
-            damage += game.getPlayer(opponentId).damage(1, source.getSourceId(), game, false, true);
+        int lostLife = 0;
+        for (UUID opponentId : game.getOpponents(source.getControllerId())) {
+            lostLife += game.getPlayer(opponentId).loseLife(1, game);
         }
-        game.getPlayer(source.getControllerId()).gainLife(damage, game);
+        game.getPlayer(source.getControllerId()).gainLife(lostLife, game);
         return true;
     }
 

Mage/src/mage/abilities/common/BecomesTappedTriggeredAbility.java

@@ -39,6 +39,10 @@ import mage.game.events.GameEvent.EventType;
  * @author nantuko
  */
 public class BecomesTappedTriggeredAbility extends TriggeredAbilityImpl {
+    
+    public BecomesTappedTriggeredAbility(Effect effect, boolean isOptional) {
+        super(Zone.BATTLEFIELD, effect, isOptional);
+    }
 
     public BecomesTappedTriggeredAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect);