From 07e5fa8229f8810e2e357460b82a2eebf7ea30d2 Mon Sep 17 00:00:00 2001
From: Jason Wall <javajo@gmail.com>
Date: Sun, 15 Mar 2015 01:50:48 -0600
Subject: [PATCH 1/4] Implement Scythe of the Wretched
---
.../sets/mirrodin/ScytheOfTheWretched.java | 166 ++++++++++++++++++
1 file changed, 166 insertions(+)
create mode 100644 Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java b/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java
new file mode 100644
index 0000000000..17dac9ad33
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java
@@ -0,0 +1,166 @@
+/*
+ * 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.mirrodin;
+
+import java.util.HashSet;
+import java.util.UUID;
+
+import mage.MageObjectReference;
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbility;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.common.DiesAndDealtDamageThisTurnTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.common.SpellCastAllTriggeredAbility;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlAttachedEffect;
+import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlSourceEffect;
+import mage.abilities.effects.common.continuous.BoostEquippedEffect;
+import mage.abilities.keyword.EquipAbility;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.constants.*;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.ZoneChangeEvent;
+import mage.game.permanent.Permanent;
+import mage.target.targetpointer.FixedTarget;
+import mage.target.targetpointer.TargetPointer;
+import mage.watchers.common.CreaturesDiedWatcher;
+
+/**
+ *
+ * @author Jason E. Wall
+
+ */
+public class ScytheOfTheWretched extends CardImpl {
+
+ public ScytheOfTheWretched(UUID ownerId) {
+ super(ownerId, 239, "Scythe of the Wretched", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{2}");
+ this.expansionSetCode = "MRD";
+ this.subtype.add("Equipment");
+
+ // Equipped creature gets +2/+2.
+ this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2, Duration.WhileOnBattlefield)));
+ // Whenever a creature dealt damage by equipped creature this turn dies, return that card to the battlefield under your control. Attach Scythe of the Wretched to that creature.
+ this.addAbility(new ScytheOfTheWretchedAbility());
+ // Equip {4}
+ this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(4)));
+ }
+
+ public ScytheOfTheWretched(final ScytheOfTheWretched card) {
+ super(card);
+ }
+
+ @Override
+ public ScytheOfTheWretched copy() {
+ return new ScytheOfTheWretched(this);
+ }
+}
+
+class ScytheOfTheWretchedAbility extends DiesAndDealtDamageThisTurnTriggeredAbility {
+ public ScytheOfTheWretchedAbility() {
+ super(new ScytheOfTheWretchedReanimateEffect());
+ Effect attachToThatCreature = new AttachEffect(Outcome.AddAbility);
+ attachToThatCreature.setText("Attach {this} to that creature.");
+ addEffect(attachToThatCreature);
+ }
+
+ public ScytheOfTheWretchedAbility(final ScytheOfTheWretchedAbility ability) {
+ super(ability);
+ }
+
+ @Override
+ public DiesAndDealtDamageThisTurnTriggeredAbility copy() {
+ return new ScytheOfTheWretchedAbility(this);
+ }
+
+ @Override
+ public boolean checkTrigger(GameEvent event, Game game) {
+ Permanent equippedCreature = getEquippedCreature(game);
+ if(equippedCreature == null) return false;
+
+ ZoneChangeEvent zoneChange = (ZoneChangeEvent) event;
+ if(zoneChange.isDiesEvent() && zoneChange.getTarget().getCardType().contains(CardType.CREATURE)) {
+ for(MageObjectReference mor : zoneChange.getTarget().getDealtDamageByThisTurn()) {
+ if(mor.refersTo(equippedCreature)) {
+ setTarget(new FixedTarget(event.getTargetId()));
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ private void setTarget(TargetPointer target) {
+ for(Effect effect : getEffects()) {
+ effect.setTargetPointer(target);
+ }
+ }
+
+ private Permanent getEquippedCreature(Game game) {
+ Permanent equipment = game.getPermanent(getSourceId());
+ if(equipment != null && equipment.getAttachedTo() != null) {
+ return game.getPermanent(equipment.getAttachedTo());
+ }
+ return null;
+ }
+}
+
+class ScytheOfTheWretchedReanimateEffect extends OneShotEffect {
+ public ScytheOfTheWretchedReanimateEffect() {
+ super(Outcome.PutCreatureInPlay);
+ this.staticText = "Whenever a creature dealt damage by equipped creature this turn dies, return that card to the battlefield under your control.";
+ }
+
+ public ScytheOfTheWretchedReanimateEffect(final ScytheOfTheWretchedReanimateEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Card card = game.getCard(getTargetPointer().getFirst(game, source));
+ if(card != null) {
+ Zone currentZone = game.getState().getZone(card.getId());
+ if (card.putOntoBattlefield(game, currentZone, source.getSourceId(), source.getControllerId())) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ @Override
+ public Effect copy() {
+ return new ScytheOfTheWretchedReanimateEffect(this);
+ }
+}
From 69b81eb28cbfcc289ceefa7245a4e41796508bcb Mon Sep 17 00:00:00 2001
From: Jason Wall <javajo@gmail.com>
Date: Sun, 15 Mar 2015 10:15:54 -0600
Subject: [PATCH 2/4] braces
---
Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java b/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java
index 17dac9ad33..b55f8fdd5a 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java
@@ -106,7 +106,7 @@ class ScytheOfTheWretchedAbility extends DiesAndDealtDamageThisTurnTriggeredAbil
@Override
public boolean checkTrigger(GameEvent event, Game game) {
Permanent equippedCreature = getEquippedCreature(game);
- if(equippedCreature == null) return false;
+ if(equippedCreature == null) { return false; }
ZoneChangeEvent zoneChange = (ZoneChangeEvent) event;
if(zoneChange.isDiesEvent() && zoneChange.getTarget().getCardType().contains(CardType.CREATURE)) {
From d7e4f9d69a5b0f57c7222dc0f6f1e45e05deacf0 Mon Sep 17 00:00:00 2001
From: Jason Wall <javajo@gmail.com>
Date: Sun, 15 Mar 2015 11:48:16 -0600
Subject: [PATCH 3/4] use player methods for putting cards into play
---
Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java b/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java
index b55f8fdd5a..ddfbf5ef89 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java
@@ -52,6 +52,7 @@ import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.Permanent;
+import mage.players.Player;
import mage.target.targetpointer.FixedTarget;
import mage.target.targetpointer.TargetPointer;
import mage.watchers.common.CreaturesDiedWatcher;
@@ -151,7 +152,8 @@ class ScytheOfTheWretchedReanimateEffect extends OneShotEffect {
Card card = game.getCard(getTargetPointer().getFirst(game, source));
if(card != null) {
Zone currentZone = game.getState().getZone(card.getId());
- if (card.putOntoBattlefield(game, currentZone, source.getSourceId(), source.getControllerId())) {
+ Player player = game.getPlayer(source.getControllerId());
+ if(player != null && player.putOntoBattlefieldWithInfo(card, game, currentZone, source.getSourceId())) {
return true;
}
}
From 2d076e13402ea3093d69e1bcf56c53b985d408a7 Mon Sep 17 00:00:00 2001
From: Jason Wall <javajo@gmail.com>
Date: Sun, 15 Mar 2015 11:49:01 -0600
Subject: [PATCH 4/4] don't use wrong base class for trigger
---
.../sets/mirrodin/ScytheOfTheWretched.java | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java b/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java
index ddfbf5ef89..eeaccf0dcc 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java
@@ -87,9 +87,10 @@ public class ScytheOfTheWretched extends CardImpl {
}
}
-class ScytheOfTheWretchedAbility extends DiesAndDealtDamageThisTurnTriggeredAbility {
+class ScytheOfTheWretchedAbility extends TriggeredAbilityImpl {
+
public ScytheOfTheWretchedAbility() {
- super(new ScytheOfTheWretchedReanimateEffect());
+ super(Zone.ALL, new ScytheOfTheWretchedReanimateEffect(), false);
Effect attachToThatCreature = new AttachEffect(Outcome.AddAbility);
attachToThatCreature.setText("Attach {this} to that creature.");
addEffect(attachToThatCreature);
@@ -100,10 +101,15 @@ class ScytheOfTheWretchedAbility extends DiesAndDealtDamageThisTurnTriggeredAbil
}
@Override
- public DiesAndDealtDamageThisTurnTriggeredAbility copy() {
+ public ScytheOfTheWretchedAbility copy() {
return new ScytheOfTheWretchedAbility(this);
}
+ @Override
+ public boolean checkEventType(GameEvent event, Game game) {
+ return event.getType() == GameEvent.EventType.ZONE_CHANGE;
+ }
+
@Override
public boolean checkTrigger(GameEvent event, Game game) {
Permanent equippedCreature = getEquippedCreature(game);
@@ -122,6 +128,11 @@ class ScytheOfTheWretchedAbility extends DiesAndDealtDamageThisTurnTriggeredAbil
return false;
}
+ @Override
+ public String getRule() {
+ return "Whenever a creature dealt damage by equipped creature this turn dies, " + super.getRule();
+ }
+
private void setTarget(TargetPointer target) {
for(Effect effect : getEffects()) {
effect.setTargetPointer(target);
@@ -140,7 +151,7 @@ class ScytheOfTheWretchedAbility extends DiesAndDealtDamageThisTurnTriggeredAbil
class ScytheOfTheWretchedReanimateEffect extends OneShotEffect {
public ScytheOfTheWretchedReanimateEffect() {
super(Outcome.PutCreatureInPlay);
- this.staticText = "Whenever a creature dealt damage by equipped creature this turn dies, return that card to the battlefield under your control.";
+ this.staticText = "return that card to the battlefield under your control";
}
public ScytheOfTheWretchedReanimateEffect(final ScytheOfTheWretchedReanimateEffect effect) {