dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make g_EntityCommands use all entities but not only the first

Browse source 
Reviewed by: bb. Fixes #4273.
Differential Revision: https://code.wildfiregames.com/D45
This was SVN commit r19537.
This commit is contained in:
Imarok 2017-05-08 18:04:43 +00:00
parent 6826a1355e
commit 30823d8988
5 changed files with 105 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
binaries/data/mods/public/gui/session/hotkeys/camera.xml
View file

@ -6,7 +6,7 @@
</object>
<object hotkey="camera.rallypointfocus">
<action on="Press">performCommand(GetExtendedEntityState(g_Selection.getFirstSelected()), "focus-rally");</action>
<action on="Press">performCommand(g_Selection.toList().map(ent => GetEntityState(ent)), "focus-rally");</action>
</object>
<!-- Camera jumping - press a hotkey to mark a position and another hotkey to jump back there -->

6
binaries/data/mods/public/gui/session/hotkeys/misc.xml
View file

@ -51,11 +51,7 @@
</object>
<object hotkey="session.kill">
<action on="Press">
let ent = g_Selection.getFirstSelected();
if (ent)
performCommand(GetExtendedEntityState(ent), "delete");
</action>
<action on="Press">performCommand(g_Selection.toList().map(ent => GetExtendedEntityState(ent)), "delete");</action>
</object>
<object hotkey="session.unload">

10
binaries/data/mods/public/gui/session/input.js
View file

@ -1475,17 +1475,19 @@ function changePrimarySelectionGroup(templateName, deselectGroup)
g_Selection.makePrimarySelection(templateName, Engine.HotkeyIsPressed("session.deselectgroup") || deselectGroup);
}
function performCommand(entState, commandName)
function performCommand(entStates, commandName)
{
if (!entState)
if (!entStates.length)
return;
if (!controlsPlayer(entState.player) &&
// Don't check all entities, because we assume a player cannot
// select entities from more than one player
if (!controlsPlayer(entStates[0].player) &&
!(g_IsObserver && commandName == "focus-rally"))
return;
if (g_EntityCommands[commandName])
g_EntityCommands[commandName].execute(entState);
g_EntityCommands[commandName].execute(entStates);
}
function performAllyCommand(entity, commandName)

14
binaries/data/mods/public/gui/session/selection_panels.js
View file

@ -133,15 +133,11 @@ g_SelectionPanels.Command = {
for (let command in g_EntityCommands)
{
for (let state of unitEntStates)
let info = g_EntityCommands[command].getInfo(unitEntStates);
if (info)
{
let info = g_EntityCommands[command].getInfo(state);
if (info)
{
info.name = command;
commands.push(info);
break;
}
info.name = command;
commands.push(info);
}
}
return commands;
@ -154,7 +150,7 @@ g_SelectionPanels.Command = {
if (data.item.callback)
data.item.callback(data.item);
else
performCommand(data.unitEntStates[0], data.item.name);
performCommand(data.unitEntStates, data.item.name);
};
data.countDisplay.caption = data.item.count || "";

174
binaries/data/mods/public/gui/session/unit_actions.js
View file

@ -1036,18 +1036,15 @@ var unitActions =
var g_EntityCommands =
{
"unload-all": {
"getInfo": function(entState)
"getInfo": function(entStates)
{
if (!entState.garrisonHolder)
return false;
let count = 0;
for (let ent in g_Selection.selected)
{
let state = GetEntityState(+ent);
if (state.garrisonHolder)
count += state.garrisonHolder.entities.length;
}
for (let entState of entStates)
if (entState.garrisonHolder)
count += entState.garrisonHolder.entities.length;
if (!count)
return false;
return {
"tooltip": colorizeHotkey("%(hotkey)s" + " ", "session.unload") +
@ -1056,21 +1053,16 @@ var g_EntityCommands =
"count": count,
};
},
"execute": function(entState)
"execute": function()
{
unloadAll();
},
},
"delete": {
"getInfo": function(entState)
"getInfo": function(entStates)
{
let deleteReason = isUndeletable(entState);
return deleteReason ?
{
"tooltip": deleteReason,
"icon": "kill_small_disabled.png"
} :
return entStates.some(entState => !isUndeletable(entState)) ?
{
"tooltip":
colorizeHotkey("%(hotkey)s" + " ", "session.kill") +
@ -1080,31 +1072,35 @@ var g_EntityCommands =
"session.noconfirmation"
),
"icon": "kill_small.png"
} :
{
// Get all delete reasons and remove duplications
"tooltip": entStates.map(entState => isUndeletable(entState))
.filter((reason, pos, self) =>
self.indexOf(reason) == pos && reason
).join("\n"),
"icon": "kill_small_disabled.png"
};
},
"execute": function(entState)
"execute": function(entStates)
{
if (isUndeletable(entState))
return;
let selection = g_Selection.toList();
if (!selection.length)
if (!entStates.length || entStates.every(entState => isUndeletable(entState)))
return;
if (Engine.HotkeyIsPressed("session.noconfirmation"))
Engine.PostNetworkCommand({
"type": "delete-entities",
"entities": selection
"entities": entStates.map(entState => entState.id)
});
else
openDeleteDialog(selection);
openDeleteDialog(entStates.map(entState => entState.id));
},
},
"stop": {
"getInfo": function(entState)
"getInfo": function(entStates)
{
if (!entState.unitAI)
if (entStates.every(entState => !entState.unitAI))
return false;
return {
@ -1113,18 +1109,17 @@ var g_EntityCommands =
"icon": "stop.png"
};
},
"execute": function(entState)
"execute": function(entStates)
{
let selection = g_Selection.toList();
if (selection.length)
stopUnits(selection);
if (entStates.length)
stopUnits(entStates.map(entState => entState.id));
},
},
"garrison": {
"getInfo": function(entState)
"getInfo": function(entStates)
{
if (!entState.unitAI || entState.turretParent)
if (entStates.every(entState => !entState.unitAI || entState.turretParent))
return false;
return {
@ -1133,7 +1128,7 @@ var g_EntityCommands =
"icon": "garrison.png"
};
},
"execute": function(entState)
"execute": function()
{
inputState = INPUT_PRESELECTEDACTION;
preSelectedAction = ACTION_GARRISON;
@ -1141,13 +1136,14 @@ var g_EntityCommands =
},
"unload": {
"getInfo": function(entState)
"getInfo": function(entStates)
{
if (!entState.unitAI || !entState.turretParent)
return false;
let p = GetEntityState(entState.turretParent);
if (!p.garrisonHolder || p.garrisonHolder.entities.indexOf(entState.id) == -1)
if (entStates.every(entState => {
if (!entState.unitAI || !entState.turretParent)
return true;
let parent = GetEntityState(entState.turretParent);
return !parent || !parent.garrisonHolder || parent.garrisonHolder.entities.indexOf(entState.id) == -1;
}))
return false;
return {
@ -1155,16 +1151,16 @@ var g_EntityCommands =
"icon": "garrison-out.png"
};
},
"execute": function(entState)
"execute": function()
{
unloadSelection();
},
},
"repair": {
"getInfo": function(entState)
"getInfo": function(entStates)
{
if (!entState.builder)
if (entStates.every(entState => !entState.builder))
return false;
return {
@ -1173,7 +1169,7 @@ var g_EntityCommands =
"icon": "repair.png"
};
},
"execute": function(entState)
"execute": function()
{
inputState = INPUT_PRESELECTEDACTION;
preSelectedAction = ACTION_REPAIR;
@ -1181,9 +1177,9 @@ var g_EntityCommands =
},
"focus-rally": {
"getInfo": function(entState)
"getInfo": function(entStates)
{
if (!entState.rallyPoint)
if (entStates.every(entState => !entState.rallyPoint))
return false;
return {
@ -1192,13 +1188,23 @@ var g_EntityCommands =
"icon": "focus-rally.png"
};
},
"execute": function(entState)
"execute": function(entStates)
{
// TODO: Would be nicer to cycle between the rallypoints of multiple entities instead of just using the first
let focusTarget;
if (entState.rallyPoint && entState.rallyPoint.position)
focusTarget = entState.rallyPoint.position;
else if (entState.position)
focusTarget = entState.position;
for (let entState of entStates)
if (entState.rallyPoint && entState.rallyPoint.position)
{
focusTarget = entState.rallyPoint.position;
break;
}
if (!focusTarget)
for (let entState of entStates)
if (entState.position)
{
focusTarget = entState.position;
break;
}
if (focusTarget)
Engine.CameraMoveTo(focusTarget.x, focusTarget.z);
@ -1206,9 +1212,9 @@ var g_EntityCommands =
},
"back-to-work": {
"getInfo": function(entState)
"getInfo": function(entStates)
{
if (!entState.unitAI || !entState.unitAI.hasWorkOrders)
if (entStates.every(entState => !entState.unitAI || !entState.unitAI.hasWorkOrders))
return false;
return {
@ -1217,17 +1223,17 @@ var g_EntityCommands =
"icon": "production.png"
};
},
"execute": function(entState)
"execute": function()
{
backToWork();
},
},
"add-guard": {
"getInfo": function(entState)
"getInfo": function(entStates)
{
if (!entState.unitAI || !entState.unitAI.canGuard ||
entState.unitAI.isGuarding)
if (entStates.every(entState =>
!entState.unitAI || !entState.unitAI.canGuard || entState.unitAI.isGuarding))
return false;
return {
@ -1236,7 +1242,7 @@ var g_EntityCommands =
"icon": "add-guard.png"
};
},
"execute": function(entState)
"execute": function()
{
inputState = INPUT_PRESELECTEDACTION;
preSelectedAction = ACTION_GUARD;
@ -1244,9 +1250,9 @@ var g_EntityCommands =
},
"remove-guard": {
"getInfo": function(entState)
"getInfo": function(entStates)
{
if (!entState.unitAI || !entState.unitAI.isGuarding)
if (entStates.every(entState => !entState.unitAI || !entState.unitAI.isGuarding))
return false;
return {
@ -1254,16 +1260,16 @@ var g_EntityCommands =
"icon": "remove-guard.png"
};
},
"execute": function(entState)
"execute": function()
{
removeGuard();
},
},
"select-trading-goods": {
"getInfo": function(entState)
"getInfo": function(entStates)
{
if (!entState.market)
if (entStates.every(entState => !entState.market))
return false;
return {
@ -1271,16 +1277,16 @@ var g_EntityCommands =
"icon": "economics.png"
};
},
"execute": function(entState)
"execute": function()
{
toggleTrade();
},
},
"patrol": {
"getInfo": function(entState)
"getInfo": function(entStates)
{
if (!someCanPatrol(g_Selection.toList()))
if (!entStates.some(entState => entState.unitAI && entState.unitAI.canPatrol))
return false;
return {
@ -1290,7 +1296,7 @@ var g_EntityCommands =
"icon": "patrol.png"
};
},
"execute": function(entState)
"execute": function()
{
inputState = INPUT_PRESELECTEDACTION;
preSelectedAction = ACTION_PATROL;
@ -1298,32 +1304,36 @@ var g_EntityCommands =
},
"share-dropsite": {
"getInfo": function(entState)
"getInfo": function(entStates)
{
if (!entState.resourceDropsite || !entState.resourceDropsite.sharable)
let sharableEntities = entStates.filter(
entState => entState.resourceDropsite && entState.resourceDropsite.sharable);
if (!sharableEntities.length)
return false;
let playerState = GetSimState().players[entState.player];
if (!playerState.isMutualAlly.some((e, i) => e && i != entState.player))
// Returns if none of the entities belong to a player with a mutual ally
if (entStates.every(entState => !GetSimState().players[entState.player].isMutualAlly.some(
(isAlly, playerId) => isAlly && playerId != entState.player)))
return false;
if (entState.resourceDropsite.shared)
return {
return sharableEntities.some(entState => !entState.resourceDropsite.shared) ?
{
"tooltip": translate("Press to allow allies to use this dropsite"),
"icon": "locked_small.png"
} :
{
"tooltip": translate("Press to prevent allies from using this dropsite"),
"icon": "unlocked_small.png"
};
return {
"tooltip": translate("Press to allow allies to use this dropsite"),
"icon": "locked_small.png"
};
},
"execute": function(entState)
"execute": function(entStates)
{
let sharableEntities = entStates.filter(
entState => entState.resourceDropsite && entState.resourceDropsite.sharable);
Engine.PostNetworkCommand({
"type": "set-dropsite-sharing",
"entities": g_Selection.toList(),
"shared": !entState.resourceDropsite.shared
"entities": sharableEntities.map(entState => entState.id),
"shared": sharableEntities.some(entState => !entState.resourceDropsite.shared)
});
},
}