external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing CostChange issue where required mana is reduced to 0.

Browse Source
This commit is contained in:
Sol
2011-09-13 03:13:06 +00:00
parent de59f0d4ce
commit 3a45c6ad23
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/card/cost/Cost.java
View File

@@ -18,7 +18,7 @@ import forge.card.spellability.SpellAbility;
*/ */
public class Cost { public class Cost {
private boolean isAbility = true; private boolean isAbility = true;
ArrayList<CostPart> costParts = new ArrayList<CostPart>(); private ArrayList<CostPart> costParts = new ArrayList<CostPart>();
public ArrayList<CostPart> getCostParts(){ return costParts; } public ArrayList<CostPart> getCostParts(){ return costParts; }

9
src/main/java/forge/card/cost/CostMana.java
View File

@@ -103,10 +103,15 @@ public class CostMana extends CostPart {
manaToAdd = AbilityFactory.calculateAmount(source, "X", ability) * getXMana(); manaToAdd = AbilityFactory.calculateAmount(source, "X", ability) * getXMana();
} }
} }
if (!getManaToPay().equals("0") || manaToAdd > 0) if (!getManaToPay().equals("0") || manaToAdd > 0){
CostUtil.setInput(CostMana.input_payMana(ability, payment, this, manaToAdd)); CostUtil.setInput(CostMana.input_payMana(ability, payment, this, manaToAdd));
else if (getXMana() > 0) }
else if (getXMana() > 0){
CostUtil.setInput(CostMana.input_payXMana(ability, payment, this, getXMana())); CostUtil.setInput(CostMana.input_payXMana(ability, payment, this, getXMana()));
}
else{
payment.paidCost(this);
}
// We return false here because the Inputs set above should recall payment.payCosts() // We return false here because the Inputs set above should recall payment.payCosts()
return false; return false;

8
src/main/java/forge/card/mana/ManaCost.java
View File

@@ -352,7 +352,13 @@ public class ManaCost {
sb.append(list.get(i).toString()); sb.append(list.get(i).toString());
} }
return sb.toString().trim(); String str = sb.toString().trim();
if (str.equals("")){
return "0";
}
return str;
} }
/** /**