diff --git a/Mage/src/main/java/mage/abilities/costs/common/PayEnergyCost.java b/Mage/src/main/java/mage/abilities/costs/common/PayEnergyCost.java index 75e11fa4214..7e363a1980f 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PayEnergyCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PayEnergyCost.java @@ -1,16 +1,17 @@ package mage.abilities.costs.common; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; import mage.counters.CounterType; import mage.game.Game; import mage.players.Player; +import mage.util.CardUtil; + +import java.util.UUID; /** - * * @author emerald000 */ public class PayEnergyCost extends CostImpl { @@ -19,7 +20,7 @@ public class PayEnergyCost extends CostImpl { public PayEnergyCost(int amount) { this.amount = amount; - setText(); + this.text = makeText(amount); } public PayEnergyCost(PayEnergyCost cost) { @@ -48,11 +49,16 @@ public class PayEnergyCost extends CostImpl { return new PayEnergyCost(this); } - private void setText() { + private static String makeText(int amount) { StringBuilder sb = new StringBuilder("pay "); - for (int i = 0; i < amount; i++) { - sb.append("{E}"); + if (amount < 6) { + for (int i = 0; i < amount; i++) { + sb.append("{E}"); + } + } else { + sb.append(CardUtil.numberToText(amount)); + sb.append(" {E}"); } - this.text = sb.toString(); + return sb.toString(); } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/GetEnergyCountersControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/GetEnergyCountersControllerEffect.java index 1fac77dd0ff..3a35e833faa 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/GetEnergyCountersControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/GetEnergyCountersControllerEffect.java @@ -49,17 +49,24 @@ public class GetEnergyCountersControllerEffect extends OneShotEffect { StringBuilder sb = new StringBuilder(); sb.append("you get "); - int val = 1; + int val; if (value instanceof StaticValue) { val = ((StaticValue) value).getValue(); + } else { + val = 1; } - for (int i = 0; i < val; i++) { - sb.append("{E}"); + if (val < 6) { + for (int i = 0; i < val; i++) { + sb.append("{E}"); + } + } else { + sb.append(CardUtil.numberToText(val)); + sb.append(" {E}"); } sb.append(" ("); - sb.append(CardUtil.getSimpleCountersText(val, "an", "energy")); + sb.append(CardUtil.getSimpleCountersText(val, "an", "energy")); sb.append(")"); - if ((value instanceof StaticValue)) { + if (value instanceof StaticValue) { sb.append('.'); } else { sb.append(" for each ");