Animal becomes idle for queued garrison

[Langbart]

to reproduce

• build and select two corrals
• press ctrl while keeping shift pressed, right-click on the first corral and then on the second corral
• make animals, note that the animal from the first corral does not go into the second corral once the first corral is full

expected behavior

• animal goes into the second corral and does not become idle

[Stan]

Hey thanks for the report :) Is this a new bug? I don't we follow chained orders for anything if one of the orders fails. It's hard to know when it makes sense to proceed after a failure.

[Langbart]

Its reproducible till [14386] after which I stopped testing.

the workaround is adding an outside flag, shall i close it?

[Stan]

I suppose move orders don't get cancelled. I'll wait for Freagarach's input.

[Langbart]

Can't the autoGarrison check just be removed?

Ref: [14144] and [14146]

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

@@ -293 +293 @@
         createdEnts.push(ent);
     }
 
-    if (spawnedEnts.length && !autoGarrison && cmpRallyPoint)
+    if (spawnedEnts.length && cmpRallyPoint)
         for (const com of GetRallyPointCommands(cmpRallyPoint, spawnedEnts))
             ProcessCommand(this.player, com);

OR

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

@@ -254 +254 @@
                 // Temporary owner affectation needed for GarrisonHolder checks.
                 cmpNewOwnership.SetOwnerQuiet(this.player);
                 garrisoned = cmpGarrisonable.Garrison(this.trainer);
+                if (!garrisoned)
+                    autoGarrison = false
                 cmpNewOwnership.SetOwnerQuiet(INVALID_PLAYER);
             }
         }

[Freagarach]

Very nice! I was annoyed many times by this already. :)

The first fix would lead to the garrison command being given twice, which should not be too bad. This also means that one can task entities to do actions when garrisoned (e.g. mining).

The second fix may be unexpected, since it may be just one that fails to garrison (in the future). (E.g. if some autoresearched tech increases the garrison limit, and the tech is researched the moment the requirements are met, which can be entity requirements met by spawning the entity.)

[Freagarach]

In 27560:

Fix units idling after unable to garrison while there are rally points.

When unable to garrison and that is the first rally point, the rest of the rally point queue is not handled.
The check was introduced in r14146 / rP14146 because UnitAI didn't guard garrisoning properly.

Patch by: @Langbart
Differential revision: ​https://code.wildfiregames.com/D4954
Fixes #6746