Changeset 27533

Timestamp:

Feb 10, 2023, 8:19:34 AM (18 months ago)

Author:

Freagarach

Message:

Fix rally point cursor and capturing from spawn.

Introduced in r27399 / rP27399 (the default attack mode switch).

Differential revision: ​https://code.wildfiregames.com/D4933
Tested by: @Langbart, @phosit, @wowgetoffyourcellphone
Fixes: #6727
(Refs. #6733)

Location:

ps/trunk/binaries/data/mods/public

Files:

• gui/session/unit_actions.js (modified) (1 diff)
• simulation/helpers/RallyPointCommands.js (modified) (1 diff)

ps/trunk/binaries/data/mods/public/gui/session/unit_actions.js

@@ -1204 +1204 @@
                 data.target = targetState.id;
                 data.command = "attack";
-                cursor = "action-attack";
+                if (targetState.hitpoints)
+                    cursor = "action-attack";
+                else if (targetState.capturePoints)
+                {
+                    cursor = "action-capture";
+                    data.allowCapture = true;
+                }
+                else
+                    return false;
             }
 

ps/trunk/binaries/data/mods/public/simulation/helpers/RallyPointCommands.js

@@ -100 +100 @@
                 "entities": spawnedEnts,
                 "target": data[i].target,
+
                 "queued": true,
             });