From 0a8d9adda62461f69709b3e73f9d6e6bb6326246 Mon Sep 17 00:00:00 2001 From: Andy Fries Date: Mon, 3 Aug 2015 21:42:34 -0700 Subject: [PATCH 1/2] implemented Urborg Justice --- .../mage/sets/weatherlight/UrborgJustice.java | 145 ++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/weatherlight/UrborgJustice.java diff --git a/Mage.Sets/src/mage/sets/weatherlight/UrborgJustice.java b/Mage.Sets/src/mage/sets/weatherlight/UrborgJustice.java new file mode 100644 index 00000000000..92b876666df --- /dev/null +++ b/Mage.Sets/src/mage/sets/weatherlight/UrborgJustice.java @@ -0,0 +1,145 @@ +/* + * 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.weatherlight; + +import java.util.UUID; + +import mage.abilities.Ability; +import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.SacrificeControllerEffect; +import mage.abilities.effects.common.SacrificeEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.WatcherScope; +import mage.constants.Zone; +import mage.filter.common.FilterCreaturePermanent; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.events.ZoneChangeEvent; +import mage.game.permanent.Permanent; +import mage.game.permanent.PermanentToken; +import mage.target.common.TargetCreaturePermanent; +import mage.target.common.TargetOpponent; +import mage.watchers.Watcher; + +/** + * + * @author andyfries + */ +public class UrborgJustice extends CardImpl { + + public UrborgJustice(UUID ownerId) { + super(ownerId, 26, "Urborg Justice", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{B}{B}"); + this.expansionSetCode = "WTH"; + + // Target opponent sacrifices a creature for each creature put into your graveyard from the battlefield this turn. + this.getSpellAbility().addWatcher(new UrborgJusticeWatcher()); + SacrificeEffect sacrificeEffect = new SacrificeEffect(new FilterCreaturePermanent(), new UrborgJusticeDynamicValue(), ""); + sacrificeEffect.setText("Target opponent sacrifices a creature for each creature put into your graveyard from the battlefield this turn"); + + this.getSpellAbility().addEffect(sacrificeEffect); + this.getSpellAbility().addTarget(new TargetOpponent()); + } + + public UrborgJustice(final UrborgJustice card) { + super(card); + } + + @Override + public UrborgJustice copy() { + return new UrborgJustice(this); + } +} + +class UrborgJusticeWatcher extends Watcher { + + private int creaturesCount = 0; + + public UrborgJusticeWatcher() { + super("YourCreaturesDied", WatcherScope.PLAYER); + condition = true; + } + + public UrborgJusticeWatcher(final UrborgJusticeWatcher watcher) { + super(watcher); + this.creaturesCount = watcher.creaturesCount; + } + + @Override + public UrborgJusticeWatcher copy() { + return new UrborgJusticeWatcher(this); + } + + public int getCreaturesCount() { + return creaturesCount; + } + + @Override + public void watch(GameEvent event, Game game) { + if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent) event).isDiesEvent()) { + Permanent card = (Permanent)game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD); + if (card != null && card.getOwnerId().equals(this.controllerId) && card.getCardType().contains(CardType.CREATURE)) { + creaturesCount++; + } + } + } + + @Override + public void reset() { + super.reset(); + creaturesCount = 0; + } +} + +class UrborgJusticeDynamicValue implements DynamicValue { + @Override + public UrborgJusticeDynamicValue copy() { + return new UrborgJusticeDynamicValue(); + } + + @Override + public String toString() { + return "1"; + } + + @Override + public String getMessage() { + return "creature put into your graveyard from the battlefield this turn"; + } + + @Override + public int calculate(Game game, Ability sourceAbility, Effect effect) { + UrborgJusticeWatcher watcher = (UrborgJusticeWatcher) game.getState().getWatchers().get("YourCreaturesDied", sourceAbility.getControllerId()); + if (watcher != null) { + return watcher.getCreaturesCount(); + } + return 0; + } +} From af7bb617468b4bb30e9f0172ee1bb57c9d855a83 Mon Sep 17 00:00:00 2001 From: Andy Fries Date: Thu, 6 Aug 2015 09:46:23 -0700 Subject: [PATCH 2/2] updated Urborg Justice to use CardsPutIntoGraveyardWatcher --- .../mage/sets/weatherlight/UrborgJustice.java | 68 +++++++------------ 1 file changed, 23 insertions(+), 45 deletions(-) diff --git a/Mage.Sets/src/mage/sets/weatherlight/UrborgJustice.java b/Mage.Sets/src/mage/sets/weatherlight/UrborgJustice.java index 92b876666df..0043300a17e 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/UrborgJustice.java +++ b/Mage.Sets/src/mage/sets/weatherlight/UrborgJustice.java @@ -27,14 +27,19 @@ */ package mage.sets.weatherlight; +import java.util.Set; import java.util.UUID; +import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.SacrificeControllerEffect; import mage.abilities.effects.common.SacrificeEffect; +import mage.cards.Card; import mage.cards.CardImpl; +import mage.cards.Cards; +import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Rarity; import mage.constants.WatcherScope; @@ -45,9 +50,11 @@ import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.game.permanent.PermanentToken; +import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetOpponent; import mage.watchers.Watcher; +import mage.watchers.common.CardsPutIntoGraveyardWatcher; /** * @@ -60,7 +67,7 @@ public class UrborgJustice extends CardImpl { this.expansionSetCode = "WTH"; // Target opponent sacrifices a creature for each creature put into your graveyard from the battlefield this turn. - this.getSpellAbility().addWatcher(new UrborgJusticeWatcher()); + this.getSpellAbility().addWatcher(new CardsPutIntoGraveyardWatcher()); SacrificeEffect sacrificeEffect = new SacrificeEffect(new FilterCreaturePermanent(), new UrborgJusticeDynamicValue(), ""); sacrificeEffect.setText("Target opponent sacrifices a creature for each creature put into your graveyard from the battlefield this turn"); @@ -78,46 +85,6 @@ public class UrborgJustice extends CardImpl { } } -class UrborgJusticeWatcher extends Watcher { - - private int creaturesCount = 0; - - public UrborgJusticeWatcher() { - super("YourCreaturesDied", WatcherScope.PLAYER); - condition = true; - } - - public UrborgJusticeWatcher(final UrborgJusticeWatcher watcher) { - super(watcher); - this.creaturesCount = watcher.creaturesCount; - } - - @Override - public UrborgJusticeWatcher copy() { - return new UrborgJusticeWatcher(this); - } - - public int getCreaturesCount() { - return creaturesCount; - } - - @Override - public void watch(GameEvent event, Game game) { - if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent) event).isDiesEvent()) { - Permanent card = (Permanent)game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD); - if (card != null && card.getOwnerId().equals(this.controllerId) && card.getCardType().contains(CardType.CREATURE)) { - creaturesCount++; - } - } - } - - @Override - public void reset() { - super.reset(); - creaturesCount = 0; - } -} - class UrborgJusticeDynamicValue implements DynamicValue { @Override public UrborgJusticeDynamicValue copy() { @@ -136,10 +103,21 @@ class UrborgJusticeDynamicValue implements DynamicValue { @Override public int calculate(Game game, Ability sourceAbility, Effect effect) { - UrborgJusticeWatcher watcher = (UrborgJusticeWatcher) game.getState().getWatchers().get("YourCreaturesDied", sourceAbility.getControllerId()); - if (watcher != null) { - return watcher.getCreaturesCount(); + CardsPutIntoGraveyardWatcher watcher = (CardsPutIntoGraveyardWatcher) game.getState().getWatchers().get("CardsPutIntoGraveyardWatcher"); + + int count = 0; + Player controller = game.getPlayer(sourceAbility.getControllerId()); + if (controller != null && watcher != null) { + Set cardsInGraveyard = watcher.getCardsPutToGraveyardFromBattlefield(); + for (MageObjectReference mor : cardsInGraveyard) { + if (game.getState().getZoneChangeCounter(mor.getSourceId()) == mor.getZoneChangeCounter()) { + Card card = game.getCard(mor.getSourceId()); + if (card != null && card.getOwnerId().equals(sourceAbility.getControllerId()) && card.getCardType().contains(CardType.CREATURE)) { + count++; + } + } + } } - return 0; + return count; } }