Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reduce nesting using 'else if' and merging condition of nested if, for #1630

master
melvinzhang 2018-11-04 10:08:08 +08:00
parent 27b7024718
commit 3e02c92f3c
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/magic/model/MagicManaCost.java
View File

@ -454,17 +454,13 @@ public class MagicManaCost implements MagicCopyable {
if (reducedAmounts[idx] >= 1) {
reducedAmounts[idx] -= 1;
changed = true;
} else {
if (XCount > 0 && type == MagicCostManaType.Generic) {
// For Generic: if X present, store even negative
reducedAmounts[idx] -= 1;
changed = true;
} else {
// Try in second round
if (MagicCostManaType.MONO.contains(type)) {
remaining.add(type);
}
}
} else if (XCount > 0 && type == MagicCostManaType.Generic) {
// For Generic: if X present, store even negative
reducedAmounts[idx] -= 1;
changed = true;
} else if (MagicCostManaType.MONO.contains(type)) {
// Try in second round
remaining.add(type);
}
}
// Try to remove monocolored costs from hybrid costs
@ -472,13 +468,10 @@ public class MagicManaCost implements MagicCopyable {
MagicManaType thisColor = type.getTypes().get(0);
for (MagicCostManaType candidate : MagicCostManaType.CHOICE) {
final int idx = candidate.ordinal();
if (reducedAmounts[idx] >= 1) {
if (candidate.getTypes().contains(thisColor)) {
reducedAmounts[idx] -= 1;
changed = true;
break;
}
if (reducedAmounts[idx] >= 1 && candidate.getTypes().contains(thisColor)) {
reducedAmounts[idx] -= 1;
changed = true;
break;
}
}
}