From b17b5c9e1a98fe4caab0f5d8825d2000c68c629e Mon Sep 17 00:00:00 2001
From: JOAC69 <joac69@gmail.com>
Date: Sat, 24 Sep 2016 23:50:08 -0500
Subject: [PATCH] Refactor - moved ZuberasDiedDynamicValue to shared area

---
 .../championsofkamigawa/AshenSkinZubera.java  |  1 +
 .../DrippingTongueZubera.java                 |  2 ++
 .../championsofkamigawa/EmberFistZubera.java  |  1 +
 .../FloatingDreamZubera.java                  | 28 +--------------
 .../common/ZuberasDiedDynamicValue.java       | 34 +++++++++++++++++++
 5 files changed, 39 insertions(+), 27 deletions(-)
 create mode 100644 Mage/src/main/java/mage/abilities/dynamicvalue/common/ZuberasDiedDynamicValue.java

diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java
index f76be45ee46..873fdb644a0 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java
@@ -30,6 +30,7 @@ package mage.sets.championsofkamigawa;
 
 import java.util.UUID;
 
+import mage.abilities.dynamicvalue.common.ZuberasDiedDynamicValue;
 import mage.constants.CardType;
 import mage.constants.Rarity;
 import mage.MageInt;
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java
index c6338bc0fd4..8b1e2b922a3 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java
@@ -29,6 +29,8 @@
 package mage.sets.championsofkamigawa;
 
 import java.util.UUID;
+
+import mage.abilities.dynamicvalue.common.ZuberasDiedDynamicValue;
 import mage.constants.CardType;
 import mage.constants.Rarity;
 import mage.MageInt;
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java
index 99e7494a2a3..6411377baf1 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java
@@ -30,6 +30,7 @@ package mage.sets.championsofkamigawa;
 
 import java.util.UUID;
 
+import mage.abilities.dynamicvalue.common.ZuberasDiedDynamicValue;
 import mage.constants.CardType;
 import mage.constants.Rarity;
 import mage.MageInt;
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java
index 3d76977d76b..e8d355e4de4 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java
@@ -29,15 +29,12 @@
 package mage.sets.championsofkamigawa;
 
 import mage.MageInt;
-import mage.abilities.Ability;
 import mage.abilities.common.DiesTriggeredAbility;
-import mage.abilities.dynamicvalue.DynamicValue;
-import mage.abilities.effects.Effect;
+import mage.abilities.dynamicvalue.common.ZuberasDiedDynamicValue;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Rarity;
-import mage.game.Game;
 import mage.watchers.common.ZuberasDiedWatcher;
 
 import java.util.UUID;
@@ -70,26 +67,3 @@ public class FloatingDreamZubera extends CardImpl {
 }
 
 
-class ZuberasDiedDynamicValue implements DynamicValue {
-
-    @Override
-    public int calculate(Game game, Ability sourceAbility, Effect effect) {
-        ZuberasDiedWatcher watcher = (ZuberasDiedWatcher) game.getState().getWatchers().get("ZuberasDied");
-        return watcher.zuberasDiedThisTurn;
-    }
-
-    @Override
-    public ZuberasDiedDynamicValue copy() {
-        return new ZuberasDiedDynamicValue();
-    }
-
-    @Override
-    public String toString() {
-        return "1";
-    }
-
-    @Override
-    public String getMessage() {
-        return "Zubera that died this turn";
-    }
-}
diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ZuberasDiedDynamicValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ZuberasDiedDynamicValue.java
new file mode 100644
index 00000000000..fa8562af72a
--- /dev/null
+++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ZuberasDiedDynamicValue.java
@@ -0,0 +1,34 @@
+package mage.abilities.dynamicvalue.common;
+
+import mage.abilities.Ability;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.effects.Effect;
+import mage.game.Game;
+import mage.watchers.common.ZuberasDiedWatcher;
+
+/**
+ * Created by Eric on 9/24/2016.
+ */
+public class ZuberasDiedDynamicValue implements DynamicValue {
+
+    @Override
+    public int calculate(Game game, Ability sourceAbility, Effect effect) {
+        ZuberasDiedWatcher watcher = (ZuberasDiedWatcher) game.getState().getWatchers().get("ZuberasDied");
+        return watcher.zuberasDiedThisTurn;
+    }
+
+    @Override
+    public ZuberasDiedDynamicValue copy() {
+        return new ZuberasDiedDynamicValue();
+    }
+
+    @Override
+    public String toString() {
+        return "1";
+    }
+
+    @Override
+    public String getMessage() {
+        return "Zubera that died this turn";
+    }
+}