- Temporarily reverting a change to the way ordering SAs is handled (breaks auto-yield) and improved my original change a bit to fix its logic, feel free to revert this to continue work on this project.

This commit is contained in:
Agetian
2017-01-06 18:53:05 +00:00
parent 4500f236f9
commit 15c631be72
3 changed files with 12 additions and 17 deletions

View File

@@ -1200,9 +1200,16 @@ public class PlayerControllerHuman
final String firstStr = orderedSAs.get(0).toString();
boolean needPrompt = false;
String saLookupKey = firstStr;
if (orderedSAs.get(0).getHostCard() != null) {
saLookupKey += " - " + orderedSAs.get(0).getHostCard().getId();
}
char delim = (char)5;
for (int i = 1; i < orderedSAs.size(); i++) {
final String saStr = orderedSAs.get(i).toString();
SpellAbility currentSa = orderedSAs.get(i);
String saStr = currentSa.toString();
if (currentSa.getHostCard() != null) {
saStr += " - " + currentSa.getHostCard().getId();
}
if (!needPrompt && !saStr.equals(firstStr)) {
needPrompt = true; //prompt by default unless all abilities are the same
}