Added SetPowerSourceEffect. Some changes to SetPTSourceEffect calsses.

Mage/src/mage/abilities/effects/common/continious/SetPowerSourceEffect.java

@@ -0,0 +1,77 @@
+/*
+ *  Copyright 2012 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.continious;
+
+import mage.MageObject;
+import mage.abilities.Ability;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.constants.Duration;
+import mage.constants.Layer;
+import mage.constants.Outcome;
+import mage.constants.SubLayer;
+import mage.game.Game;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+public class SetPowerSourceEffect extends ContinuousEffectImpl<SetPowerSourceEffect> {
+
+    private final DynamicValue amount;
+
+    public SetPowerSourceEffect(DynamicValue amount, Duration duration) {
+        super(duration, Layer.PTChangingEffects_7, SubLayer.SetPT_7b, Outcome.BoostCreature);
+        this.amount = amount;
+        staticText = "{this}'s power is equal to the number of " + amount.getMessage();
+    }
+
+    public SetPowerSourceEffect(final SetPowerSourceEffect effect) {
+        super(effect);
+        this.amount = effect.amount;
+    }
+
+    @Override
+    public SetPowerSourceEffect copy() {
+        return new SetPowerSourceEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        MageObject mageObject = game.getObject(source.getSourceId());
+        if (mageObject != null) {
+            int value = amount.calculate(game, source);
+            mageObject.getPower().setValue(value);
+            return true;
+        }
+        return false;
+    }
+
+}

Mage/src/mage/abilities/effects/common/continious/SetPowerToughnessSourceEffect.java

@@ -28,16 +28,15 @@
 
 package mage.abilities.effects.common.continious;
 
+import mage.MageObject;
+import mage.abilities.Ability;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.effects.ContinuousEffectImpl;
 import mage.constants.Duration;
 import mage.constants.Layer;
 import mage.constants.Outcome;
 import mage.constants.SubLayer;
-import mage.abilities.Ability;
-import mage.abilities.dynamicvalue.DynamicValue;
-import mage.abilities.effects.ContinuousEffectImpl;
-import mage.cards.Card;
 import mage.game.Game;
-import mage.game.permanent.Permanent;
 
 /**
  *
@@ -76,42 +75,23 @@ public class SetPowerToughnessSourceEffect extends ContinuousEffectImpl<SetPower
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Card targetCard = game.getCard(source.getSourceId()); // there are character definig abilities (e.g. P/T Nightmare) that have to work also for P/T of cards
+        MageObject mageObject = game.getObject(source.getSourceId()); // there are character definig abilities (e.g. P/T Nightmare) that have to work also for P/T of cards
-        Permanent targetPermanent = game.getPermanent(source.getSourceId());
+        if (mageObject == null) {
-        if (targetCard == null && targetPermanent == null) {
             return false;
         }
         if (amount != null) {
             int value = amount.calculate(game, source);
-            if (targetPermanent != null) {
+            mageObject.getPower().setValue(value);
-                targetPermanent.getPower().setValue(value);
+            mageObject.getToughness().setValue(value);
-                targetPermanent.getToughness().setValue(value);
-            } else if (targetCard != null) {
-                targetCard.getPower().setValue(value);
-                targetCard.getToughness().setValue(value);
-            }
             return true;
-        }
+        } else {
-        else {
             if (power != Integer.MIN_VALUE) {
-                if (targetCard != null) {
+                mageObject.getPower().setValue(power);
-                    targetCard.getPower().setValue(power);
-                }
-                if (targetPermanent != null) {
-                    targetPermanent.getPower().setValue(power);
-                }
             }
             if (toughness != Integer.MIN_VALUE) {
-                if (targetCard != null) {
+                mageObject.getToughness().setValue(toughness);
-                    targetCard.getToughness().setValue(toughness);
-                }
-                if (targetPermanent != null) {
-                    targetPermanent.getToughness().setValue(toughness);
-                }
-
             }
         }
         return true;
     }
-
 }

Mage/src/mage/abilities/effects/common/continious/SetToughnessSourceEffect.java

@@ -28,24 +28,22 @@
 
 package mage.abilities.effects.common.continious;
 
-
+import mage.MageObject;
+import mage.abilities.Ability;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.effects.ContinuousEffectImpl;
 import mage.constants.Duration;
 import mage.constants.Layer;
 import mage.constants.Outcome;
 import mage.constants.SubLayer;
-import mage.abilities.Ability;
-import mage.abilities.dynamicvalue.DynamicValue;
-import mage.abilities.effects.ContinuousEffectImpl;
 import mage.game.Game;
-import mage.game.permanent.Permanent;
 
 /**
  * @author Backfir3, noxx
  */
 public class SetToughnessSourceEffect extends ContinuousEffectImpl<SetToughnessSourceEffect> {
 
-    private DynamicValue amount;
+    private final DynamicValue amount;
-    private int toughness;
 
     public SetToughnessSourceEffect(DynamicValue amount, Duration duration) {
         super(duration, Layer.PTChangingEffects_7, SubLayer.SetPT_7b, Outcome.BoostCreature);
@@ -53,16 +51,9 @@ public class SetToughnessSourceEffect extends ContinuousEffectImpl<SetToughnessS
         staticText = "{this}'s toughness is equal to the number of " + amount.getMessage();
     }
 
-    public SetToughnessSourceEffect(int power, int toughness, Duration duration) {
-        super(duration, Layer.PTChangingEffects_7, SubLayer.SetPT_7b, Outcome.BoostCreature);
-        this.toughness = toughness;
-        staticText = "{this}'s toughness is " + toughness;
-    }
-
     public SetToughnessSourceEffect(final SetToughnessSourceEffect effect) {
         super(effect);
         this.amount = effect.amount;
-        this.toughness = effect.toughness;
     }
 
     @Override
@@ -72,16 +63,11 @@ public class SetToughnessSourceEffect extends ContinuousEffectImpl<SetToughnessS
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Permanent target = game.getPermanent(source.getSourceId());
+        MageObject mageObject = game.getObject(source.getSourceId());
-        if (target != null) {
+        if (mageObject != null) {
-            if (amount != null) {
+            int value = amount.calculate(game, source);
-                int value = amount.calculate(game, source);
+            mageObject.getToughness().setValue(value);
-                target.getToughness().setValue(value);
+            return true;
-                return true;
-            } else {
-                if (toughness != Integer.MIN_VALUE)
-                    target.getToughness().setValue(toughness);
-            }
         }
         return false;
     }