Add garrison zeus modules #4555

alganthe · 2016-10-16T18:36:17Z

When merged this pull request will:

Add garrison and un-garrison functions to common.
Add a garrison module.
Add an un-garrison module.

kymckay

A quick cursory review, looks as though you've figured out the right module structure for UI stuff 👍

kymckay · 2016-10-16T21:34:19Z

addons/common/stringtable.xml

+            <French>Aucune unité fourni</French>
+        </Key>
+        <Key ID="STR_ACE_Common_GarrisonNotEnoughPos">
+            <English>There isn't enough positions to place all units.</English>


kymckay · 2016-10-16T21:43:05Z

addons/zeus/functions/fnc_moduleGarrison.sqf

+private _unit = (attachedTo _logic);
+private _building = nearestBuilding (getPosASL _unit);
+
+// Handles errors


Validation of the module target should only be taking place in the ui function (it doesn't make sense to show zeus a UI and then tell them they placed the module wrong only after they close it).

Only true if the zeus interface updates in real time. I think it's fine to have the check in both

Actually, good point. The unit could be deleted between the UI opening and closing. Can safely ignore my initial comment 👍

kymckay · 2016-10-16T21:48:03Z

addons/zeus/CfgVehicles.hpp

+        curatorInfoType = QGVAR(RscGarrison);
+        icon = QPATHTOF(UI\Icon_Module_Zeus_Garrison_ca.paa);
+    };
+    class GVAR(moduleUnGarrison): GVAR(moduleBase) {


Not sure if I like having a separate module to undo the effects of another, could combine these into 1 by having a UI option to un-garrison - that way there's a single module that handles all things garrison.

Though that's just a thought, very much unsure what works better in terms of UX (if anyone else has thoughts on this please chime in).

We should decide with what and stick with it. Currently there is already add/remove Virtual Arsenal which is 2 modules. Can always streamline into 1 later if it would be better.

kymckay · 2016-10-16T21:49:09Z

addons/common/XEH_PREP.hpp

@@ -46,6 +46,7 @@ PREP(fixCollision);
 PREP(fixFloating);
 PREP(fixLoweredRifleAnimation);
 PREP(fixPosition);
+PREP(garrison);


Unsure if these functions belong in common or not 😝

I'd say ace_ai, despite it not having any sqf atm.

Doesn't CBA now have garrison functions that could be used instead? If not, then yeah, those should go into ace_ai component.

kymckay · 2016-10-16T21:52:34Z

addons/common/functions/fnc_unGarrison.sqf

+            if (local _x) then {
+                _x doMove ((nearestBuilding (getPos _x)) buildingExit 0);
+            } else {
+                [QGVAR(doMove), [_x, ((nearestBuilding (getPos _x)) buildingExit 0)], _x] call CBA_fnc_targetEvent;


Rather than sending an event for every unit from within this function, you should be running this whole function via an event from the module function.

👍

Also to the note above:

CBA_fnc_targetEvent will send the event to every machine where at least one element of the array is local. If there are object with different localities in the array, it will execute the commands on each of those machines for every object, even if remote. But I guess that would still work for these.

kymckay · 2016-10-16T21:55:19Z

addons/common/functions/fnc_unGarrison.sqf

+            _x enableAI "PATH";
+        } else {
+            [QGVAR(enableAI), [_placedUnits, "AUTOCOMBAT"], _placedUnits] call CBA_fnc_targetEvent;
+            [QGVAR(enableAI), [_placedUnits, "PATH"], _placedUnits] call CBA_fnc_targetEvent;


Not sure why this is being done inside this loop (also this variable doesn't exist).

commy2 · 2016-10-17T02:57:13Z

pushback should be pushBack, alganthe :)

alganthe · 2016-10-19T16:19:19Z

I made some changes related to the unGarrison function, it's called as an event via the module and should only run where the units are local thus I removed the disableAI, follow, and doMove events I had added.

Regarding moving it to the AI component just tell me if I should and i'll do it.

…_modules

jonpas · 2017-09-08T16:32:14Z

addons/ai/functions/fnc_garrison.sqf

+ * 0: The building(s) nearest this position are used <POSITION>
+ * 1: Limit the building search to those type of building <ARRAY>
+ * 2: Units that will be garrisoned <ARRAY>
+ * 3: Radius to fill building(s) <SCALAR> default: 50


> (default: 50)
In other places too.

jonpas · 2017-09-08T16:32:26Z

addons/ai/functions/fnc_garrison.sqf

+ * 5: True to fill building(s) from top to bottom <BOOL> default: false
+
+ * Return Value:
+ * Array of units not garrisoned


* Units not garrisoned <ARRAY>

jonpas · 2017-09-08T16:33:14Z

addons/ai/functions/fnc_unGarrison.sqf

@@ -0,0 +1,39 @@
+/*
+ * Author: alganthe
+ * Used to un-garrison units


Missing final dot.

jonpas · 2017-09-08T16:33:36Z

addons/zeus/functions/fnc_moduleGarrison.sqf

@@ -0,0 +1,62 @@
+/*
+ * Author: alganthe
+ * Module calling the garrison function


Missing final dot.

jonpas · 2017-09-08T16:33:46Z

addons/zeus/functions/fnc_moduleGarrison.sqf

+ * 1: Position of the module <POSITION>
+ * 2: Radius of the task <NUMBER>
+ * 3: Filling mode of the garrison function <NUMBER>
+ * 4: Enable or not top down filling <BOOLEAN>


jonpas · 2017-09-08T16:33:56Z

addons/zeus/functions/fnc_moduleUnGarrison.sqf

@@ -0,0 +1,50 @@
+/*
+ * Author: alganthe
+ * Un-garrison a garrisoned group


Missing final dot.

jonpas · 2017-09-08T16:34:04Z

addons/zeus/functions/fnc_ui_garrison.sqf

@@ -0,0 +1,103 @@
+/*
+ * Author: alganthe
+ * Initalises the `garrison` zeus module display


Missing final dot.

jonpas · 2017-09-08T16:34:09Z

addons/zeus/functions/fnc_ui_garrison.sqf

+ * Initalises the `garrison` zeus module display
+ *
+ * Arguments:
+ * 0: garrison controls group <CONTROL>


jonpas · 2017-09-08T16:34:16Z

addons/zeus/functions/fnc_ui_garrison.sqf

+ * 0: garrison controls group <CONTROL>
+ *
+ * Return Value:
+ * Nothing


jonpas · 2017-09-08T18:26:13Z

@SilentSpike ?

jonpas · 2017-09-21T18:46:13Z

addons/ai/functions/fnc_garrison.sqf

+} else {
+    _buildings = nearestObjects [_startingPos, _buildingTypes, _fillingRadius];
+    _buildings = _buildings call BIS_fnc_arrayShuffle;
+};


This whole thing would be neater as:

private _buildings = nearestObjects [_startingPos, _buildingTypes, _fillingRadius]; if (_fillingRadius >= 50) then { _buildings = _buildings call BIS_fnc_arrayShuffle; };

There is also CBA_fnc_shuffle that is probably faster than BI's function.

jonpas · 2017-09-21T18:47:24Z

addons/ai/functions/fnc_unGarrison.sqf

+        };
+    };
+} foreach _units;
+


A line too much.

jonpas · 2017-09-21T18:48:07Z

addons/zeus/functions/fnc_moduleGarrison.sqf

+};
+
+private _units = units _unit;
+// Make sure all units are disembarked.


No final dot.

jonpas · 2017-09-21T18:48:26Z

addons/zeus/functions/fnc_moduleGarrison.sqf

+ * Module calling the garrison function.
+ *
+ * Arguments:
+ * 0: The module logic <OBJECT>


The is superfluous.

jonpas · 2017-09-21T18:48:34Z

addons/zeus/functions/fnc_moduleUnGarrison.sqf

+ * Un-garrison a garrisoned group.
+ *
+ * Arguments:
+ * 0: The module logic <OBJECT>


The is superfluous.

jonpas · 2017-09-21T18:49:00Z

addons/zeus/functions/fnc_ui_garrison.sqf

@@ -0,0 +1,103 @@
+/*
+ * Author: alganthe
+ * Initalises the `Garrison` zeus module display.


"Garrison"

jonpas · 2017-09-21T18:49:04Z

addons/zeus/functions/fnc_ui_garrison.sqf

+ * Initalises the `Garrison` zeus module display.
+ *
+ * Arguments:
+ * 0: garrison controls group <CONTROL>


Garrison ...

Requested changes addressed.

alganthe · 2017-09-24T17:26:27Z

This is still very slightly WIP, I have an issue (units are sometimes stack ontop of eachothers when the function is called multiple time), thus I enabled some debug elements.

alganthe · 2017-09-25T01:28:17Z

AI stacking on rare occasion has been fixed, debug disabled this is now ready for review.

setPos is pretty imprecise, moving units can end up within 2m of the position if they are moving at full running speed, I cannot fix this without inducing some more network usage which I don't want.

Edit: apparently doStop is AG EG, it reduces setPos offset on fast moving units quite nicely, there is still a 1m radius when placed but it should do the trick.

alganthe · 2017-09-25T12:27:45Z

As @jonpas mentionned in PM zeus shouldn't teleport units by default, I'll add a "teleport" button like the top-down filling one in the dialog.

When ticked it will behave like it does right now, otherwise it will use CBA's garrison, my ungarrison module works on both (it's also needed because you have no other way of freeing units garrisoned via the defend module we already have.)

jonpas · 2017-09-26T14:37:52Z

addons/zeus/stringtable.xml

@@ -1112,6 +1112,10 @@
            <English>Random filling</English>
            <French>Remplir au hasard</French>
        </Key>
+        <Key ID="STR_ACE_Zeus_ModuleGarrison_TeleportText">


ACE3/addons/respawn/stringtable.xml

Lines 29 to 38 in 98da86b

<English>Teleport to Base</English>

<Czech>Teleportovat na Základnu</Czech>

<German>Zur Basis teleportieren</German>

<Spanish>Treletransportar a Base</Spanish>

<Polish>Teleport do bazy</Polish>

<Russian>Телепортироваться на базу</Russian>

<French>Téléportation à la base</French>

<Portuguese>Teletransportar para a Base</Portuguese>

<Hungarian>Bázisra teleportálás</Hungarian>

<Italian>Teleporta alla base</Italian>

What do you suggest?
That I take the first word of the string? It could be different on asian languages.

Just that we have some of them, I have no clue which are correct without the "base" part as well, might as well just leave it.

alganthe · 2017-09-28T00:06:08Z

Okay, this should be ready for review.

The player would make the enableAttack checks in ungarrison and garrisonMove fail, this is now fixed.

…ing to aware

alganthe · 2017-09-28T16:54:31Z

Outside of some situation where the AI completely refuses to path this should now work quite nicely now.

PabstMirror

Tested, works very good

Just fix the little locality issue (throws script error on other machines) and we can merge

PabstMirror · 2017-10-10T15:21:53Z

addons/zeus/functions/fnc_moduleUnGarrison.sqf

+#include "script_component.hpp"
+
+params ["_logic"];
+


if (!local _logic) exitWith {}; // Module is global

alganthe added 3 commits October 16, 2016 19:01

Add garrison and un-garrison modules

fa4d7f8

Remove unnecessary text from garrison header

328c78e

Add french translations to new strings

39a50ab

alganthe changed the title ~~Add garrison modules~~ Add garrison zeus modules Oct 16, 2016

jonpas added the kind/feature Release Notes: **ADDED:** label Oct 16, 2016

jonpas added this to the 3.9.0 milestone Oct 16, 2016

kymckay previously requested changes Oct 16, 2016

View reviewed changes

alganthe added 2 commits October 19, 2016 18:15

Add changes requested by review

538ae61

Change pushback to pushBack

56a14cc

654wak654 mentioned this pull request Nov 12, 2016

Add Zeus utility modules #4661

Merged

kymckay self-assigned this Nov 15, 2016

PabstMirror modified the milestones: 3.9.0, 3.10.0 Feb 11, 2017

PabstMirror modified the milestones: 3.11.0, 3.10.0 Jun 2, 2017

jonpas and others added 4 commits June 22, 2017 17:25

Merge branch 'master' into garrison_modules

9b26c8e

Merge branch 'master' of https://github.com/acemod/ACE3 into garrison…

ec0c684

…_modules

Move garrison funcs to ai, finish headers

7e9ee8d

Remove diag log debug

27dc72d

jonpas requested changes Sep 8, 2017

View reviewed changes

alganthe added 2 commits September 8, 2017 18:49

Fix typos and header issues

921944b

Add missing newlines

907fd90

jonpas approved these changes Sep 8, 2017

View reviewed changes

jonpas requested a review from kymckay September 17, 2017 22:29

jonpas requested changes Sep 21, 2017

View reviewed changes

alganthe added 2 commits September 24, 2017 19:23

Fix strings, Fix typos and headers

32ec046

Enable debug and disable compile cache, Add trace and comments

19a9d16

jonpas added the status/WIP label Sep 24, 2017

Merge branch 'master' into garrison_modules

315e50b

jonpas reviewed Sep 26, 2017

View reviewed changes

Rebase before review

adb2d65

alganthe force-pushed the garrison_modules branch from 1529717 to adb2d65 Compare September 27, 2017 20:26

Fix default case running instead of case 3

89dc380

alganthe added 3 commits September 28, 2017 17:46

Fix edge case related to players being in garrison group

15478f8

The player would make the enableAttack checks in ungarrison and garrisonMove fail, this is now fixed.

Fix some arrays in garrsionMove and garrison

186bf7f

Relax distance checks in garrisonMove, change AI behaviour while path…

6555a4b

…ing to aware

Vdauphin mentioned this pull request Sep 29, 2017

Add: Detect military building Vdauphin/HeartsAndMinds#383

Merged

2 tasks

alganthe added 5 commits September 29, 2017 23:53

Add debug view

d8dafa4

Remove unused var, fix unit pos using the wrong format

10d2321

Make debug more visually pleasing

343319c

Change garrison debug target to a waypoint icon

f0795e1

Change disableAI event to AISection, comment out doFollow in doMove EH

b5e1e3c

PabstMirror requested changes Oct 10, 2017

View reviewed changes

Fix locality issue

b23492a

PabstMirror removed the status/WIP label Oct 10, 2017

jonpas approved these changes Oct 10, 2017

View reviewed changes

PabstMirror approved these changes Oct 10, 2017

View reviewed changes

PabstMirror merged commit bb03f55 into acemod:master Oct 10, 2017

	<English>Teleport to Base</English>
	<Czech>Teleportovat na Základnu</Czech>
	<German>Zur Basis teleportieren</German>
	<Spanish>Treletransportar a Base</Spanish>
	<Polish>Teleport do bazy</Polish>
	<Russian>Телепортироваться на базу</Russian>
	<French>Téléportation à la base</French>
	<Portuguese>Teletransportar para a Base</Portuguese>
	<Hungarian>Bázisra teleportálás</Hungarian>
	<Italian>Teleporta alla base</Italian>

		#include "script_component.hpp"

		params ["_logic"];

Add garrison zeus modules #4555

Add garrison zeus modules #4555

Conversation

alganthe commented Oct 16, 2016

kymckay left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

commy2 commented Oct 17, 2016

alganthe commented Oct 19, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jonpas commented Sep 8, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alganthe commented Sep 24, 2017

alganthe commented Sep 25, 2017 • edited Loading

alganthe commented Sep 25, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alganthe commented Sep 28, 2017

alganthe commented Sep 28, 2017

PabstMirror left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alganthe commented Oct 19, 2016 •

edited

Loading

alganthe commented Sep 25, 2017 •

edited

Loading