Fix #9441

Mage/src/main/java/mage/abilities/keyword/RampageAbility.java

@@ -3,11 +3,10 @@ package mage.abilities.keyword;
 import mage.abilities.Ability;
 import mage.abilities.common.BecomesBlockedSourceTriggeredAbility;
 import mage.abilities.dynamicvalue.DynamicValue;
-import mage.abilities.effects.Effect;
+import mage.abilities.dynamicvalue.MultipliedValue;
+import mage.abilities.dynamicvalue.common.BlockingCreatureCount;
 import mage.abilities.effects.common.continuous.BoostSourceEffect;
 import mage.constants.Duration;
-import mage.game.Game;
-import mage.game.combat.CombatGroup;
 
 /**
  *
@@ -27,7 +26,7 @@ public class RampageAbility extends BecomesBlockedSourceTriggeredAbility {
                 + (shortRuleText ? ""
                         : " <i>(Whenever this creature becomes blocked, it gets +"
                         + amount + "/+" + amount + " until end of turn for each creature blocking it beyond the first.)</i>");
-        RampageValue rv = new RampageValue(amount);
+        DynamicValue rv = (amount == 1 ? BlockingCreatureCount.BEYOND_FIRST : new MultipliedValue(BlockingCreatureCount.BEYOND_FIRST, amount));
         this.addEffect(new BoostSourceEffect(rv, rv, Duration.EndOfTurn, true));
     }
 
@@ -46,38 +45,3 @@ public class RampageAbility extends BecomesBlockedSourceTriggeredAbility {
         return rule;
     }
 }
-
-class RampageValue implements DynamicValue {
-
-    private final int amount;
-
-    public RampageValue(int amount) {
-        this.amount = amount;
-    }
-
-    public RampageValue(final RampageValue value) {
-        this.amount = value.amount;
-    }
-
-    @Override
-    public RampageValue copy() {
-        return new RampageValue(this);
-    }
-
-    @Override
-    public int calculate(Game game, Ability sourceAbility, Effect effect) {
-        for (CombatGroup combatGroup : game.getCombat().getGroups()) {
-            if (combatGroup.getAttackers().contains(sourceAbility.getSourceId())) {
-                int blockers = combatGroup.getBlockers().size();
-                return blockers > 1 ? (blockers - 1) * amount : 0;
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    public String getMessage() {
-        return "rampage " + amount + "(Whenever this creature becomes blocked, it gets +"
-                + amount + "/+" + amount + " until end of turn for each creature blocking it beyond the first.)";
-    }
-}