paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Display all trainable/builable (by selected entities) entities.

Browse Source 
This was SVN commit r11606.
This commit is contained in:
leper 2012-04-21 20:10:11 +00:00
parent 6938ecf431
commit b25d7a4bab
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
binaries/data/mods/public/gui/common/functions_utility.js
View File

@ -226,3 +226,16 @@ function timeToString(time)
return hours + ':' + (minutes < 10 ? '0' + minutes : minutes) + ':' + (seconds < 10 ? '0' + seconds : seconds);
}
// ====================================================================
function removeDupes(array)
{
for (var i = 0; i < array.length; i++)
{
if (array.indexOf(array[i]) < i)
{
array.splice(i, 1);
i--;
}
}
}

25
binaries/data/mods/public/gui/session/unit_commands.js
View File

@ -607,18 +607,29 @@ function updateUnitCommands(entState, supplementalDetailsPanel, commandsPanel, s
setupUnitBarterPanel(entState);
}
if (entState.buildEntities && entState.buildEntities.length)
var buildableEnts = [];
var trainableEnts = [];
var state;
// Get all buildable and trainable entities
for (var i in selection)
{
setupUnitPanel(CONSTRUCTION, usedPanels, entState, entState.buildEntities, startBuildingPlacement);
if ((state = GetEntityState(selection[i])) && state.buildEntities && state.buildEntities.length)
buildableEnts = buildableEnts.concat(state.buildEntities);
if ((state = GetEntityState(selection[i])) && state.production && state.production.entities.length)
trainableEnts = trainableEnts.concat(state.production.entities);
}
if (entState.production && entState.production.entities.length)
{
setupUnitPanel(TRAINING, usedPanels, entState, entState.production.entities,
// Remove duplicates
removeDupes(buildableEnts);
removeDupes(trainableEnts);
if (buildableEnts.length && ((trainableEnts.length && hasClass(entState, "Unit")) || !trainableEnts.length))
setupUnitPanel(CONSTRUCTION, usedPanels, entState, buildableEnts, startBuildingPlacement);
else if (trainableEnts.length)
setupUnitPanel(TRAINING, usedPanels, entState, trainableEnts,
function (trainEntType) { addTrainingToQueue(selection, trainEntType); } );
}
if (entState.production && entState.production.technologies.length)
if (entState.production && entState.production.technologies.length && selection.length == 1)
{
setupUnitPanel(RESEARCH, usedPanels, entState, entState.production.technologies,
function (researchType) { addResearchToQueue(entState.id, researchType); } );