Move DamageSelfEffect to framework

Mage.Sets/src/mage/sets/timespiral/StuffyDoll.java

@@ -39,6 +39,7 @@ import mage.abilities.common.AsEntersBattlefieldAbility;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.DamageSelfEffect;
 import mage.abilities.keyword.IndestructibleAbility;
 import mage.cards.CardImpl;
 import mage.game.Game;
@@ -68,7 +69,7 @@ public class StuffyDoll extends CardImpl<StuffyDoll> {
         // Whenever Stuffy Doll is dealt damage, it deals that much damage to the chosen player.
         this.addAbility(new StuffyDollTriggeredAbility());
         // {tap}: Stuffy Doll deals 1 damage to itself.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageSelfEffect(), new TapSourceCost()));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageSelfEffect(1), new TapSourceCost()));
     }
 
     public StuffyDoll(final StuffyDoll card) {
@@ -174,29 +175,3 @@ class StuffyDollGainLifeEffect extends OneShotEffect<StuffyDollGainLifeEffect> {
     }
 }
 
-class DamageSelfEffect extends OneShotEffect<DamageSelfEffect> {
-
-    public DamageSelfEffect() {
-        super(Outcome.Damage);
-        this.staticText = "Stuffy Doll deals 1 damage to itself";
-    }
-
-    public DamageSelfEffect(final DamageSelfEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public DamageSelfEffect copy() {
-        return new DamageSelfEffect(this);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        Permanent permanent = game.getPermanent(source.getSourceId());
-        if (permanent != null) {
-            permanent.damage(1, source.getId(), game, true, false);
-            return true;
-        }
-        return false;
-    }
-}

Mage/src/mage/abilities/effects/common/DamageSelfEffect.java

@@ -0,0 +1,79 @@
+/*
+ *  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.abilities.effects.common;
+
+import mage.constants.Outcome;
+import mage.abilities.Ability;
+import mage.abilities.Mode;
+import mage.abilities.effects.OneShotEffect;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author North, Quercitron
+ */
+public class DamageSelfEffect extends OneShotEffect<DamageSelfEffect> {
+    
+    protected int amount;
+
+    public DamageSelfEffect(int amount) {
+        super(Outcome.Damage);
+        this.amount = amount;
+    }
+
+    public DamageSelfEffect(final DamageSelfEffect effect) {
+        super(effect);
+        this.amount = effect.amount;
+    }
+
+    @Override
+    public DamageSelfEffect copy() {
+        return new DamageSelfEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent permanent = game.getPermanent(source.getSourceId());
+        if (permanent != null) {
+            permanent.damage(amount, source.getId(), game, true, false);
+            return true;
+        }
+        return false;
+    }
+    
+    @Override
+    public String getText(Mode mode) {
+        if (staticText != null && !staticText.isEmpty()) {
+            return staticText;
+        }
+        StringBuilder sb = new StringBuilder();
+        sb.append("{source} deals ").append(amount).append(" damage to itself");
+        return sb.toString();
+    }
+}