Changeset View
Changeset View
Standalone View
Standalone View
binaries/data/mods/public/gui/session/selection_panels.js
| Show First 20 Lines • Show All 445 Lines • ▼ Show 20 Lines | "getItems": function(unitEntStates) | ||||
| for (let state of unitEntStates) | for (let state of unitEntStates) | ||||
| if (state.garrisonHolder) | if (state.garrisonHolder) | ||||
| groups.add(state.garrisonHolder.entities); | groups.add(state.garrisonHolder.entities); | ||||
| return groups.getEntsGrouped(); | return groups.getEntsGrouped(); | ||||
| }, | }, | ||||
| "setupButton": function(data) | "setupButton": function(data) | ||||
| { | { | ||||
| let template = GetTemplateData(data.item.template); | let entState = GetEntityState(data.item.ents[0]); | ||||
| let template = GetTemplateData(entState.template); | |||||
| if (!template) | if (!template) | ||||
| return false; | return false; | ||||
mimo: I think you should do add
templateName = GetTemplateData(entState.template).selectionGroupName… | |||||
ImarokAuthorUnsubmitted Not Done Inline ActionsYou are right. Imarok: You are right. | |||||
| data.button.onPress = function() { | data.button.onPress = function() { | ||||
| unloadTemplate(data.item.template); | unloadTemplate(entState.template, entState.player); | ||||
| }; | }; | ||||
| data.countDisplay.caption = data.item.ents.length || ""; | data.countDisplay.caption = data.item.ents.length || ""; | ||||
| let garrisonedUnitOwner = GetEntityState(data.item.ents[0]).player; | let garrisonedUnitOwner = entState.player; | ||||
| let canUngarrison = | let canUngarrison = | ||||
| g_ViewedPlayer == data.player || | g_ViewedPlayer == data.player || | ||||
| g_ViewedPlayer == garrisonedUnitOwner; | g_ViewedPlayer == garrisonedUnitOwner; | ||||
| data.button.enabled = canUngarrison && controlsPlayer(g_ViewedPlayer); | data.button.enabled = canUngarrison && controlsPlayer(g_ViewedPlayer); | ||||
| let tooltip = canUngarrison || g_IsObserver ? | let tooltip = canUngarrison || g_IsObserver ? | ||||
| ▲ Show 20 Lines • Show All 457 Lines • ▼ Show 20 Lines | g_SelectionPanels.Selection = { | ||||
| "getItems": function(unitEntStates) | "getItems": function(unitEntStates) | ||||
| { | { | ||||
| if (unitEntStates.length < 2) | if (unitEntStates.length < 2) | ||||
| return []; | return []; | ||||
| return g_Selection.groups.getEntsGrouped(); | return g_Selection.groups.getEntsGrouped(); | ||||
| }, | }, | ||||
| "setupButton": function(data) | "setupButton": function(data) | ||||
| { | { | ||||
| let template = GetTemplateData(data.item.template); | let entState = GetEntityState(data.item.ents[0]) | ||||
| let template = GetTemplateData(entState.template); | |||||
Not Done Inline Actionsmissing semicolon mimo: missing semicolon | |||||
| if (!template) | if (!template) | ||||
| return false; | return false; | ||||
| for (let ent of data.item.ents) | for (let ent of data.item.ents) | ||||
| { | { | ||||
| let state = GetEntityState(ent); | let state = GetEntityState(ent); | ||||
| if (state.resourceCarrying && state.resourceCarrying.length !== 0) | if (state.resourceCarrying && state.resourceCarrying.length !== 0) | ||||
| Show All 37 Lines | if (g_IsObserver) | ||||
| }); | }); | ||||
| data.button.tooltip = tooltip; | data.button.tooltip = tooltip; | ||||
| data.guiSelection.sprite = getPlayerHighlightColor(unitOwner); | data.guiSelection.sprite = getPlayerHighlightColor(unitOwner); | ||||
| data.guiSelection.hidden = !g_IsObserver; | data.guiSelection.hidden = !g_IsObserver; | ||||
| data.countDisplay.caption = data.item.ents.length || ""; | data.countDisplay.caption = data.item.ents.length || ""; | ||||
| data.button.onPress = function() { changePrimarySelectionGroup(data.item.template, false); }; | data.button.onPress = function() { changePrimarySelectionGroup(data.item.key, false); }; | ||||
| data.button.onPressRight = function() { changePrimarySelectionGroup(data.item.template, true); }; | data.button.onPressRight = function() { changePrimarySelectionGroup(data.item.key, true); }; | ||||
| if (template.icon) | if (template.icon) | ||||
| data.icon.sprite = "stretched:session/portraits/" + template.icon; | data.icon.sprite = "stretched:session/portraits/" + template.icon; | ||||
| setPanelObjectPosition(data.button, data.i, data.rowLength); | setPanelObjectPosition(data.button, data.i, data.rowLength); | ||||
| return true; | return true; | ||||
| } | } | ||||
| }; | }; | ||||
| ▲ Show 20 Lines • Show All 274 Lines • Show Last 20 Lines | |||||
Wildfire Games · Phabricator
I think you should do add
templateName = GetTemplateData(entState.template).selectionGroupName || entState.template;
and use that in 461