[WIP] Improve arty combat support

addons/sup_artillery/ArtilleryStateMachine.hpp

@@ -0,0 +1,141 @@
+class ArtilleryStateMachine {
+    list = "ALIVE_sup_artillery_stateMachine_list";
+
+    class Idle {
+        onState = "";
+        onStateEntered = "";
+        onStateLeaving = "";
+
+        class HasFireMission {
+            targetState = "Active";
+            condition = "[_this, 'hasFireMission'] call ALIVE_fnc_artillery";
+            onTransition = "";
+        };
+    };
+
+    class Active {
+        onState = "";
+        onStateEntered = "[_this, 'activate'] call ALIVE_fnc_artillery";
+        onStateLeaving = "";
+
+        class InRange {
+            targetState = "Execute";
+            condition = "[_this, 'inRange'] call ALIVE_fnc_artillery";
+            onTransition = "";
+        };
+
+        class NotInRange {
+            targetState = "Pack";
+            condition = "!([_this, 'inRange'] call ALIVE_fnc_artillery)";
+            onTransition = "";
+        };
+    };
+
+    class Pack {
+        onState = "";
+        onStateEntered = "[_this, 'pack'] call ALIVE_fnc_artillery";
+        onStateLeaving = "";
+
+        class Packed {
+            targetState = "Move";
+            condition = "[_this, 'hasPacked'] call ALIVE_fnc_artillery";
+            onTransition = "";
+        };
+    };
+
+    class Move {
+        onState = "";
+        onStateEntered = "[_this, 'move'] call ALIVE_fnc_artillery";
+        onStateLeaving = "";
+
+        class InPosition {
+            targetState = "Unpack";
+            condition = "[_this, 'inPosition'] call ALIVE_fnc_artillery";
+            onTransition = "";
+        };
+
+        class Abort {
+            targetState = "ReturnToBase";
+            condition = "!([_this, 'hasFireMission'] call ALIVE_fnc_artillery)";
+            onTransition = "";
+        };
+    };
+
+    class Unpack {
+        onState = "";
+        onStateEntered = "[_this, 'unpack'] call ALIVE_fnc_artillery";
+        onStateLeaving = "";
+
+        class Unpacked {
+            targetState = "Execute";
+            condition = "[_this, 'hasUnpacked'] call ALIVE_fnc_artillery";
+            onTransition = "";
+        };
+    };
+
+    class Execute {
+        onState = "";
+        onStateEntered = "[_this, 'execute'] call ALIVE_fnc_artillery";
+        onStateLeaving = "";
+
+        class Fire {
+            targetState = "Fire";
+            condition = "[_this, 'canFireRound'] call ALIVE_fnc_artillery";
+            onTransition = "";
+        };
+
+        class Abort {
+            targetState = "ReturnToBase";
+            condition = "!([_this, 'hasFireMission'] call ALIVE_fnc_artillery)";
+            onTransition = "";
+        };
+    };
+
+    class Fire {
+        onState = "";
+        onStateEntered = "[_this, 'fire'] call ALIVE_fnc_artillery";
+        onStateLeaving = "";
+
+        class FireMissionComplete {
+            targetState = "ReturnToBase";
+            condition = "[_this, 'isFireMissionComplete'] call ALIVE_fnc_artillery";
+            onTransition = "";
+        };
+
+        class Fired {
+            targetState = "FireDelay";
+            condition = "[_this, 'isFireMissionDelayed'] call ALIVE_fnc_artillery";
+            onTransition = "";
+        };
+    };
+
+    class FireDelay {
+        onState = "";
+        onStateEntered = "";
+        onStateLeaving = "";
+
+        class FireMissionComplete {
+            targetState = "ReturnToBase";
+            condition = "[_this, 'isFireMissionComplete'] call ALIVE_fnc_artillery";
+            onTransition = "";
+        };
+
+        class Continue {
+            targetState = "Fire";
+            condition = "[_this, 'canFireRound'] call ALIVE_fnc_artillery";
+            onTransition = "";
+        };
+    };
+
+    class ReturnToBase {
+        onState = "";
+        onStateEntered = "[_this, 'returnToBase'] call ALIVE_fnc_artillery";
+        onStateLeaving = "";
+
+        class AtBase {
+            targetState = "Idle";
+            condition = "[_this, 'inPosition'] call ALIVE_fnc_artillery";
+            onTransition = "";
+        };
+    };
+};

addons/sup_artillery/CfgFunctions.hpp

@@ -1,16 +1,31 @@
 class cfgFunctions {
-        class PREFIX {
-                class COMPONENT {
-                        class ARTILLERY {
-                                description = "The main class";
-                                file = "\x\alive\addons\sup_artillery\fnc_artillery.sqf";
+    class PREFIX {
+        class COMPONENT {
+            class ARTILLERY {
+                description = "The main class";
+                file = "\x\alive\addons\sup_artillery\fnc_artillery.sqf";
                 RECOMPILE;
-                        };
-                        class artilleryInit {
-                                description = "The module initialisation function";
-                                file = "\x\alive\addons\sup_artillery\fnc_artilleryInit.sqf";
+            };
+            class artilleryInit {
+                description = "The module initialisation function";
+                file = "\x\alive\addons\sup_artillery\fnc_artilleryInit.sqf";
                 RECOMPILE;
-                        };
-                   };
+            };
+            class artillerySpawn {
+                description = "Spawns artillery assets";
+                file = "\x\alive\addons\sup_artillery\fnc_artillerySpawn.sqf";
+                RECOMPILE;
+            };
+            class artilleryFiredEH {
+                description = "Handles artillery fired events";
+                file = "\x\alive\addons\sup_artillery\fnc_artilleryFiredEH.sqf";
+                RECOMPILE;
+            };
+            class artilleryGetRange {
+                description = "Gets range of artillery asset";
+                file = "\x\alive\addons\sup_artillery\fnc_artilleryGetRange.sqf";
+                RECOMPILE;
+            };
         };
+    };
 };

addons/sup_artillery/CfgVehicles.hpp

@@ -4,7 +4,7 @@ class CfgVehicles {
         {
                 scope = 2;
                 displayName = "$STR_ALIVE_ARTILLERY";
-                function = "ALIVE_fnc_ARTILLERYInit";
+                function = "ALIVE_fnc_artilleryInit";
                 author = MODULE_AUTHOR;
                 functionPriority = 161;
                 isGlobal = 2;
@@ -97,4 +97,4 @@ class CfgVehicles {
                     };
                 };
         };
-};
+};

addons/sup_artillery/config.cpp

@@ -3,3 +3,5 @@
 #include <CfgPatches.hpp>
 #include <CfgVehicles.hpp>
 #include <CfgFunctions.hpp>
+
+#include <ArtilleryStateMachine.hpp>