Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Display the formations panel if and only if the selected units can enter a formation (instead of hiding it if any domestic animal is part of the selection).

Browse Source 
Differential Revision: https://code.wildfiregames.com/D191
Reviewed By: mimo
This was SVN commit r19311.
This commit is contained in:
elexis 2017-03-17 22:46:42 +00:00
parent 4bcae3190b
commit 33a0af2e57
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
binaries/data/mods/public/gui/session/selection_panels.js
View File

@ -387,11 +387,19 @@ g_SelectionPanels.Formation = {
"conflictsWith": ["Garrison"],
"getItems": function(unitEntStates)
{
if (unitEntStates.some(state => !hasClass(state, "Unit") || hasClass(state, "Animal")))
if (unitEntStates.some(state => !hasClass(state, "Unit")))
return [];
if (!g_AvailableFormations.has(unitEntStates[0].player))
g_AvailableFormations.set(unitEntStates[0].player, Engine.GuiInterfaceCall("GetAvailableFormations", unitEntStates[0].player));
return g_AvailableFormations.get(unitEntStates[0].player);
let availableFormations = g_AvailableFormations.get(unitEntStates[0].player);
// Hide the panel if all formations are disabled
if (availableFormations.some(formation => canMoveSelectionIntoFormation(formation)))
return availableFormations;
return [];
},
"setupButton": function(data)
{