diff --git a/Mage/src/mage/abilities/AbilityImpl.java b/Mage/src/mage/abilities/AbilityImpl.java index abdbd398514..119c951ec7a 100644 --- a/Mage/src/mage/abilities/AbilityImpl.java +++ b/Mage/src/mage/abilities/AbilityImpl.java @@ -415,7 +415,10 @@ public abstract class AbilityImpl> implements Ability { sbRule.append(": "); } } - sbRule.append(modes.getText()); + String text = modes.getText(); + if (!text.isEmpty()) { + sbRule.append(Character.toUpperCase(text.charAt(0))).append(text.substring(1)); + } return sbRule.toString(); } diff --git a/Mage/src/mage/abilities/costs/CostsImpl.java b/Mage/src/mage/abilities/costs/CostsImpl.java index a38a14bbea0..f98317e3eb5 100644 --- a/Mage/src/mage/abilities/costs/CostsImpl.java +++ b/Mage/src/mage/abilities/costs/CostsImpl.java @@ -58,12 +58,14 @@ public class CostsImpl extends ArrayList implements Costs @Override public String getText() { - if (this.size() == 0) + if (this.size() == 0) { return ""; + } StringBuilder sbText = new StringBuilder(); for (T cost: this) { - sbText.append(cost.getText()).append(", "); + String text = cost.getText(); + sbText.append(Character.toUpperCase(text.charAt(0))).append(text.substring(1)).append(", "); } sbText.setLength(sbText.length() - 2); return sbText.toString(); @@ -72,8 +74,9 @@ public class CostsImpl extends ArrayList implements Costs @Override public boolean canPay(UUID sourceId, UUID controllerId, Game game) { for (T cost: this) { - if (!cost.canPay(sourceId, controllerId, game)) + if (!cost.canPay(sourceId, controllerId, game)) { return false; + } } return true; } @@ -83,8 +86,9 @@ public class CostsImpl extends ArrayList implements Costs if (this.size() > 0) { while (!isPaid()) { T cost = getFirstUnpaid(); - if (!cost.pay(ability, game, sourceId, controllerId, noMana)) + if (!cost.pay(ability, game, sourceId, controllerId, noMana)) { return false; + } } } return true; @@ -93,8 +97,9 @@ public class CostsImpl extends ArrayList implements Costs @Override public boolean isPaid() { for (T cost: this) { - if (!((T)cost instanceof VariableManaCost) && !cost.isPaid()) + if (!((T)cost instanceof VariableManaCost) && !cost.isPaid()) { return false; + } } return true; } @@ -117,8 +122,9 @@ public class CostsImpl extends ArrayList implements Costs public Costs getUnpaid() { Costs unpaid = new CostsImpl(); for (T cost: this) { - if (!cost.isPaid()) + if (!cost.isPaid()) { unpaid.add(cost); + } } return unpaid; } @@ -135,8 +141,9 @@ public class CostsImpl extends ArrayList implements Costs public List getVariableCosts() { List variableCosts = new ArrayList(); for (T cost: this) { - if (cost instanceof VariableCost) + if (cost instanceof VariableCost) { variableCosts.add((VariableCost) cost); + } if (cost instanceof ManaCosts) { variableCosts.addAll(((ManaCosts)cost).getVariableCosts()); }