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

- Added an option to preselect the last known order of simultaneous abilities to simplify confirming the previous order (which is by far the most common thing you'd want).

Browse Source 
- Fixed an issue where the wrapped abilities triggered by different objects counted as different abilities for the purpose of remembering simultaneous ability order.
- Updated CHANGES.txt.
This commit is contained in:
Agetian
2017-01-18 12:23:13 +00:00
parent ee65ad43a1
commit c31d1bae80
6 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1198,12 +1198,17 @@ public class PlayerControllerHuman
List<SpellAbility> orderedSAs = activePlayerSAs;
if (activePlayerSAs.size() > 1) {
final String firstStr = activePlayerSAs.get(0).toString();
Integer idxAdditionalInfo = firstStr.indexOf(" ["); // no need for extra granularity based on a specific zone changer object etc.
boolean needPrompt = false;
String saLookupKey = firstStr;
String saLookupKey = idxAdditionalInfo != -1 ? firstStr.substring(0, idxAdditionalInfo - 1) : firstStr;
char delim = (char)5;
for (int i = 1; i < activePlayerSAs.size(); i++) {
SpellAbility currentSa = activePlayerSAs.get(i);
String saStr = currentSa.toString();
idxAdditionalInfo = saStr.indexOf(" [");
if (idxAdditionalInfo != -1) {
saStr = saStr.substring(0, idxAdditionalInfo - 1);
}
if (!needPrompt && !saStr.equals(firstStr)) {
needPrompt = true; //prompt by default unless all abilities are the same
}
@@ -1218,8 +1223,13 @@ public class PlayerControllerHuman
orderedSAs.add(activePlayerSAs.get(index));
}
}
orderedSAs = getGui().order(((savedOrder==null)?"Select order for":"Reorder") + " simultaneous abilities",
"Resolve first", orderedSAs, null);
if (savedOrder != null) {
boolean preselect = FModel.getPreferences().getPrefBoolean(FPref.UI_PRESELECT_PREVIOUS_ABILITY_ORDER);
orderedSAs = getGui().order("Reorder simultaneous abilities", "Resolve first", 0, 0,
preselect ? new ArrayList<SpellAbility>() : orderedSAs, preselect ? orderedSAs : new ArrayList<SpellAbility>(), null, false);
} else {
orderedSAs = getGui().order("Select order for simultaneous abilities", "Resolve first", orderedSAs, null);
}
//save order to avoid needing to prompt a second time to order the same abilities
savedOrder = new ArrayList<Integer>(activePlayerSAs.size());
for (SpellAbility sa : orderedSAs) {

1
forge-gui/src/main/java/forge/properties/ForgePreferences.java
View File

@@ -84,6 +84,7 @@ public class ForgePreferences extends PreferencesStore<ForgePreferences.FPref> {
UI_DISPLAY_CURRENT_COLORS("Never"),
UI_FILTER_LANDS_BY_COLOR_IDENTITY("true"),
UI_ALLOW_ESC_TO_END_TURN ("false"),
UI_PRESELECT_PREVIOUS_ABILITY_ORDER ("false"),
UI_FOR_TOUCHSCREN("false"),