Reworked PreventAllDamageToControllerEffect to be more generic.

Mage/src/main/java/mage/abilities/effects/PreventionEffectImpl.java

@@ -1,16 +1,16 @@
 /*
  *  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
@@ -20,29 +20,29 @@
  *  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;
 
+import mage.abilities.Ability;
+import mage.abilities.dynamicvalue.DynamicValue;
 import mage.constants.Duration;
 import mage.constants.EffectType;
 import mage.constants.Outcome;
-import mage.abilities.Ability;
 import mage.game.Game;
 import mage.game.events.DamageEvent;
 import mage.game.events.GameEvent;
 
-
 /**
  *
  * @author BetaSteward_at_googlemail.com
  */
 public abstract class PreventionEffectImpl extends ReplacementEffectImpl implements PreventionEffect {
-   
+
+    protected DynamicValue amountToPreventDynamic;
     protected int amountToPrevent;
     protected final boolean onlyCombat;
     protected boolean consumable;
@@ -54,10 +54,25 @@ public abstract class PreventionEffectImpl extends ReplacementEffectImpl impleme
     public PreventionEffectImpl(Duration duration, int amountToPrevent, boolean onlyCombat) {
         this(duration, amountToPrevent, onlyCombat, true);
     }
+
     public PreventionEffectImpl(Duration duration, int amountToPrevent, boolean onlyCombat, boolean consumable) {
+        this(duration, amountToPrevent, onlyCombat, consumable, null);
+    }
+
+    /**
+     *
+     * @param duration
+     * @param amountToPrevent
+     * @param onlyCombat
+     * @param consumable
+     * @param amountToPreventDynamic if set, on init amountToPrevent is set to
+     * calculated value of amountToPreventDynamic
+     */
+    public PreventionEffectImpl(Duration duration, int amountToPrevent, boolean onlyCombat, boolean consumable, DynamicValue amountToPreventDynamic) {
         super(duration, Outcome.PreventDamage);
         this.effectType = EffectType.PREVENTION;
         this.amountToPrevent = amountToPrevent;
+        this.amountToPreventDynamic = amountToPreventDynamic;
         this.onlyCombat = onlyCombat;
         this.consumable = consumable;
     }
@@ -65,10 +80,18 @@ public abstract class PreventionEffectImpl extends ReplacementEffectImpl impleme
     public PreventionEffectImpl(final PreventionEffectImpl effect) {
         super(effect);
         this.amountToPrevent = effect.amountToPrevent;
+        this.amountToPreventDynamic = effect.amountToPreventDynamic;
         this.onlyCombat = effect.onlyCombat;
         this.consumable = effect.consumable;
     }
 
+    @Override
+    public void init(Ability source, Game game) {
+        super.init(source, game);
+        if (amountToPreventDynamic != null) {
+            amountToPrevent = amountToPreventDynamic.calculate(game, source, this);
+        }
+    }
 
     @Override
     public boolean apply(Game game, Ability source) {
@@ -84,11 +107,11 @@ public abstract class PreventionEffectImpl extends ReplacementEffectImpl impleme
             }
             if (amountToPrevent == 0) {
                 this.discard();
-            }            
+            }
         }
         return preventionData;
     }
-    
+
     @Override
     public boolean replaceEvent(GameEvent event, Ability source, Game game) {
         preventDamageAction(event, source, game);
@@ -109,7 +132,7 @@ public abstract class PreventionEffectImpl extends ReplacementEffectImpl impleme
 
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        return event.getFlag() && (!onlyCombat || ((DamageEvent)event).isCombatDamage());
+        return event.getFlag() && (!onlyCombat || ((DamageEvent) event).isCombatDamage());
     }
 
 }

Mage/src/main/java/mage/abilities/effects/common/PreventDamageToControllerEffect.java

@@ -25,41 +25,48 @@
  *  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.Duration;
 import mage.abilities.Ability;
+import mage.abilities.dynamicvalue.DynamicValue;
 import mage.abilities.effects.PreventionEffectImpl;
+import mage.constants.Duration;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 
-/**
- *
- * @author LevelX2
- */
+public class PreventDamageToControllerEffect extends PreventionEffectImpl {
 
+    public PreventDamageToControllerEffect(Duration duration) {
+        this(duration, false, false, Integer.MAX_VALUE);
+    }
 
-public class PreventAllDamageToControllerEffect extends PreventionEffectImpl {
+    public PreventDamageToControllerEffect(Duration duration, int amountToPrevent) {
+        this(duration, false, true, amountToPrevent);
+    }
 
-    public PreventAllDamageToControllerEffect(Duration duration) {
-        super(duration, Integer.MAX_VALUE, false);
+    public PreventDamageToControllerEffect(Duration duration, boolean onlyCombat, boolean consumable, int amountToPrevent) {
+        super(duration, amountToPrevent, onlyCombat, consumable, null);
+    }
+
+    public PreventDamageToControllerEffect(Duration duration, boolean onlyCombat, boolean consumable, DynamicValue amountToPreventDynamic) {
+        super(duration, 0, onlyCombat, consumable, amountToPreventDynamic);
         staticText = setText();
     }
 
-    public PreventAllDamageToControllerEffect(final PreventAllDamageToControllerEffect effect) {
+    public PreventDamageToControllerEffect(final PreventDamageToControllerEffect effect) {
         super(effect);
+        staticText = setText();
     }
 
     @Override
-    public PreventAllDamageToControllerEffect copy() {
-        return new PreventAllDamageToControllerEffect(this);
+    public PreventDamageToControllerEffect copy() {
+        return new PreventDamageToControllerEffect(this);
     }
 
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         if (super.applies(event, source, game)) {
-            if (event.getTargetId().equals(source.getControllerId())){
+            if (event.getTargetId().equals(source.getControllerId())) {
                 return true;
             }
 
@@ -68,9 +75,21 @@ public class PreventAllDamageToControllerEffect extends PreventionEffectImpl {
     }
 
     private String setText() {
-        StringBuilder sb = new StringBuilder("Prevent all damage that would be dealt to you");
+        // Prevent the next X damage that would be dealt to you this turn
+        StringBuilder sb = new StringBuilder("Prevent ");
+        if (amountToPrevent == Integer.MAX_VALUE) {
+            sb.append("all ");
+        } else if (amountToPreventDynamic != null) {
+            sb.append("the next ").append(amountToPreventDynamic.toString()).append(" ");
+        } else {
+            sb.append("the next ").append(amountToPrevent).append(" ");
+        }
+        if (onlyCombat) {
+            sb.append("combat ");
+        }
+        sb.append("damage that would be dealt to you");
         if (duration.equals(Duration.EndOfTurn)) {
-            sb.append("  this turn");
+            sb.append(" this turn");
         }
         return sb.toString();
     }