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

- Improve Colorless Mana Payment when amount in ManaPool is <= to amount of Colorless Mana, or only one type of Mana in the pool.

Browse Source
This commit is contained in:
jendave
2011-08-06 10:22:02 +00:00
parent 8c4d08d95c
commit 6fb2792ae6
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/forge/ManaPool.java
View File

@@ -261,8 +261,11 @@ public class ManaPool extends Card {
normalMana[map.get(m.getColor())] += m.getAmount();
}
int totalMana = 0;
ArrayList<String> alChoice = new ArrayList<String>();
for(int i = 0; i < normalMana.length; i++){
totalMana += normalMana[i];
totalMana += snowMana[i];
if (normalMana[i] > 0){
alChoice.add(manaStrings[i]+"("+normalMana[i]+")");
}
@@ -271,7 +274,17 @@ public class ManaPool extends Card {
}
}
if (alChoice.size() == 1){
choice = manaChoices.get(0);
return choice;
}
int numColorless = Integer.parseInt(manaStr);
if (numColorless >= totalMana){
choice = manaChoices.get(0);
return choice;
}
Object o = AllZone.Display.getChoiceOptional("Pay Mana from Mana Pool", alChoice.toArray());
if (o != null){
String ch = o.toString();