- Refactored DiesTriggeredAbility to DiesSourceTriggeredAbility

Mage/src/main/java/mage/abilities/common/DiesSourceTriggeredAbility.java

@@ -0,0 +1,79 @@
+package mage.abilities.common;
+
+import mage.MageObject;
+import mage.abilities.effects.Effect;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.ZoneChangeEvent;
+import mage.game.permanent.Permanent;
+import mage.game.permanent.PermanentToken;
+
+/**
+ * @author BetaSteward_at_googlemail.com
+ */
+public class DiesSourceTriggeredAbility extends ZoneChangeTriggeredAbility {
+
+    public DiesSourceTriggeredAbility(Effect effect, boolean optional) {
+        super(Zone.BATTLEFIELD, Zone.GRAVEYARD, effect, "When {this} dies, ", optional);
+    }
+
+    public DiesSourceTriggeredAbility(Effect effect) {
+        this(effect, false);
+    }
+
+    public DiesSourceTriggeredAbility(DiesSourceTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public boolean isInUseableZone(Game game, MageObject source, GameEvent event) {
+        // check it was previously on battlefield
+        Permanent before = ((ZoneChangeEvent) event).getTarget();
+        if (before == null) {
+            return false;
+        }
+        if (!this.hasSourceObjectAbility(game, before, event)) { // the permanent does not have the ability so no trigger
+            return false;
+        }
+        // check now it is in graveyard if it is no token
+        if (!(before instanceof PermanentToken) && before.getZoneChangeCounter(game) + 1 == game.getState().getZoneChangeCounter(sourceId)) {
+            Zone after = game.getState().getZone(sourceId);
+            return after != null && Zone.GRAVEYARD.match(after);
+        } else {
+            // Already moved to another zone, so guess it's ok
+            return true;
+        }
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        if (super.checkEventType(event, game)) {
+            return ((ZoneChangeEvent) event).getFromZone() == Zone.BATTLEFIELD && ((ZoneChangeEvent) event).getToZone() == Zone.GRAVEYARD;
+        }
+        return false;
+    }
+
+    @Override
+    public DiesSourceTriggeredAbility copy() {
+        return new DiesSourceTriggeredAbility(this);
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        if (super.checkTrigger(event, game)) {
+            ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
+            if (zEvent.getTarget().isTransformable()) {
+                if (!zEvent.getTarget().getAbilities().contains(this)) {
+                    return false;
+                }
+            }
+            for (Effect effect : getEffects()) {
+                effect.setValue("permanentLeftBattlefield", zEvent.getTarget());
+            }
+            return true;
+        }
+        return false;
+    }
+
+}