Rally point relics

[Langbart]

to reproduce

• start a map with some relics

  # command line
  pyrogenesis -autostart-size=128 -autostart="random/mainland" -autostart-victory=capture_the_relic -autostart-reliccount=14
  

• train a horse in your CivicCenter
• set the rally point from the CivicCenter to a relic
• notice the horse will not move to the relic after it has been trained

bisect

• when reverting [27506] and [27399] the issue cleanly resolves.

[Freagarach]

Hmm, this one is annoying. Previously it was allowed to capture, so it did. Now the default is to not capture. Since the catafalque has no cmpHealth, the entity cannot attack and will therefore not walk towards it.

I'll have to think about a fix (maybe some check in unit_actions.js:set-rally-point).

[Langbart]

possible solution ?

binaries/data/mods/public/simulation/components/UnitAI.js

@@ -5502 +5502 @@
             this.WalkToTarget(target, queued, pushFront);
         return;
     }
+    let cmpHealth = Engine.QueryInterface(target, IID_Health);
+    if(!cmpHealth)
+        allowCapture = true
     let order = {
         "target": target,
         "force": true,

---

Alternative via unit_actions.js:set-rally-point

• Phabricator ​diff/21540/

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

  @@ -1199 +1199 @@
                   data.target = targetState.id;
                   cursor = "action-repair";
               }
  +            else if (targetState && !targetState.identity.canDelete)
  +            {
  +                data.target = targetState.id;
  +                data.command = "capture";
  +                cursor = "action-capture";
  +            }
               else if (targetState && playerCheck(entState, targetState, ["Enemy"]))
               {
                   data.target = targetState.id;

  binaries/data/mods/public/simulation/helpers/Commands.js

  @@ -203 +203 @@
           });
       },
   
  +    "capture": function(player, cmd, data)
  +    {
  +        GetFormationUnitAIs(data.entities, player, cmd, data.formation).forEach(cmpUnitAI => {
  +            cmpUnitAI.Attack(cmd.target, true, cmd.queued, cmd.pushFront);
  +        });
  +    },
  +
       "patrol": function(player, cmd, data)
       {
           GetFormationUnitAIs(data.entities, player, cmd, data.formation).forEach(cmpUnitAI =>

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

  @@ -102 +102 @@
                   "queued": true,
               });
               break;
  +        case "capture":
  +            ret.push({
  +                "type": "capture",
  +                "entities": spawnedEnts,
  +                "target": data[i].target,
  +                "queued": true,
  +            });
  +            break;
           case "trade":
               ret.push({
                   "type": "setup-trade-route",

[Freagarach]

In 27533:

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)