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

Observer mode cleanup, refs #3168.

Browse Source 
For consistency remove grayout from unit action commands (unload all,
delete, ...) as suggested by sanderd17 some time ago.
Remove unneeded grayout from unittype specific ungarrison buttons (as
the grayout is added automatically in this case).
Allow focusing on rallypoints for observers (should be added to the
allied commands too).
Add newlines and inline some variables.

This was SVN commit r18347.
This commit is contained in:
elexis 2016-06-09 15:32:41 +00:00
parent 4bb9c80001
commit f92447f88b
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
binaries/data/mods/public/gui/session/input.js
View File

@ -1522,7 +1522,8 @@ function performCommand(entity, commandName)
return;
var entState = GetExtendedEntityState(entity);
if (!controlsPlayer(entState.player))
if (!controlsPlayer(entState.player) &&
!(g_IsObserver && commandName == "focus-rally"))
return;
if (g_EntityCommands[commandName])

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

@ -197,9 +197,11 @@ g_SelectionPanels.Command = {
data.countDisplay.caption = data.item.count || "";
data.button.enabled = controlsPlayer(data.unitEntState.player);
let grayscale = data.button.enabled ? "" : "grayscale:";
data.icon.sprite = "stretched:" + grayscale + "session/icons/" + data.item.icon;
data.button.enabled =
controlsPlayer(data.unitEntState.player) ||
(g_IsObserver && data.item.name == "focus-rally");
data.icon.sprite = "stretched:session/icons/" + data.item.icon;
let size = data.button.size;
// count on square buttons, so size.bottom is the width too
@ -246,7 +248,8 @@ g_SelectionPanels.AllyCommand = {
data.countDisplay.caption = data.item.count || "";
data.button.enabled = data.item.count != undefined && data.item.count > 0;
data.button.enabled = !!data.item.count;
let grayscale = data.button.enabled ? "" : "grayscale:";
data.icon.sprite = "stretched:" + grayscale + "session/icons/" + data.item.icon;
@ -398,13 +401,16 @@ g_SelectionPanels.Garrison = {
{
if (!unitEntState.garrisonHolder)
return [];
let groups = new EntityGroups();
for (let ent of selection)
{
let state = GetEntityState(ent);
if (state.garrisonHolder)
groups.add(state.garrisonHolder.entities);
}
return groups.getEntsGrouped();
},
"setupButton": function(data)
@ -413,26 +419,25 @@ g_SelectionPanels.Garrison = {
if (!template)
return false;
data.button.onPress = function() { unloadTemplate(data.item.template); };
data.button.onPress = function() {
unloadTemplate(data.item.template);
};
let tooltip = sprintf(translate("Unload %(name)s"), { "name": getEntityNames(template) }) + "\n";
tooltip += translate("Single-click to unload 1. Shift-click to unload all of this type.");
data.button.tooltip = tooltip;
data.button.tooltip = sprintf(
translate("Unload %(name)s"),
{ "name": getEntityNames(template) }) + "\n" +
translate("Single-click to unload 1. Shift-click to unload all of this type.");
data.countDisplay.caption = data.item.ents.length || "";
let grayscale = "";
let ents = data.item.ents;
let entplayer = GetEntityState(ents[0]).player;
data.button.sprite = "color:" + rgbToGuiColor(g_Players[entplayer].color) +":";
let garrisonedUnitOwner = GetEntityState(data.item.ents[0]).player;
if (!controlsPlayer(data.unitEntState.player) && !controlsPlayer(entplayer))
{
data.button.enabled = false;
grayscale = "grayscale:";
}
data.button.sprite = "color:" + rgbToGuiColor(g_Players[garrisonedUnitOwner].color) + ":";
data.button.enabled =
controlsPlayer(data.unitEntState.player) ||
controlsPlayer(garrisonedUnitOwner);
data.icon.sprite = "stretched:" + grayscale + "session/portraits/" + template.icon;
data.icon.sprite = "stretched:session/portraits/" + template.icon;
setPanelObjectPosition(data.button, data.i, data.rowLength);
return true;