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

Merge branch 'master' into BrawlFormat

Browse Source
This commit is contained in:
maustin
2018-03-30 08:06:39 +01:00
parent 9082a89c59 70eec78416
commit 021c133db3
5 changed files with 81 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1537,23 +1537,38 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
}
if (needPrompt) {
List<Integer> savedOrder = orderedSALookup.get(saLookupKey);
List<SpellAbilityView> orderedSAVs = Lists.newArrayList();
// create a mapping between a spell's view and the spell itself
HashMap<SpellAbilityView, SpellAbility> spellViewCache = new HashMap<>();
for (SpellAbility spellAbility : orderedSAs) {
spellViewCache.put(spellAbility.getView(), spellAbility);
}
if (savedOrder != null) {
orderedSAs = Lists.newArrayList();
orderedSAVs = Lists.newArrayList();
for (Integer index : savedOrder) {
orderedSAs.add(activePlayerSAs.get(index));
orderedSAVs.add(activePlayerSAs.get(index).getView());
}
} else {
for (SpellAbility spellAbility : orderedSAs) {
orderedSAVs.add(spellAbility.getView());
}
}
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 ? Lists.<SpellAbility>newArrayList() : orderedSAs,
preselect ? orderedSAs : Lists.<SpellAbility>newArrayList(), null, false);
orderedSAVs = getGui().order("Reorder simultaneous abilities", "Resolve first", 0, 0,
preselect ? Lists.<SpellAbilityView>newArrayList() : orderedSAVs,
preselect ? orderedSAVs : Lists.<SpellAbilityView>newArrayList(), null, false);
} else {
orderedSAs = getGui().order("Select order for simultaneous abilities", "Resolve first", orderedSAs,
orderedSAVs = getGui().order("Select order for simultaneous abilities", "Resolve first", orderedSAVs,
null);
}
orderedSAs = Lists.newArrayList();
for (SpellAbilityView spellAbilityView : orderedSAVs) {
orderedSAs.add(spellViewCache.get(spellAbilityView));
}
// save order to avoid needing to prompt a second time to order
// the same abilities
savedOrder = Lists.newArrayListWithCapacity(activePlayerSAs.size());