Update ArtilleryStateMachine (onState => onStateEntered)

ALiVEOS · Aug 6, 2016 · da5b4ab · da5b4ab
1 parent 7f842a4
commit da5b4ab
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/addons/sup_artillery/ArtilleryStateMachine.hpp b/addons/sup_artillery/ArtilleryStateMachine.hpp
@@ -1,5 +1,5 @@
 class ArtilleryStateMachine {
-    list = "";
+    list = "ALIVE_sup_artillery_stateMachine_list";
 
     class Idle {
         onState = "";
@@ -14,8 +14,8 @@ class ArtilleryStateMachine {
     };
 
     class Active {
-        onState = "[_this, 'onActive'] call ALIVE_fnc_artillery";
-        onStateEntered = "";
+        onState = "";
+        onStateEntered = "[_this, 'onActive'] call ALIVE_fnc_artillery";
         onStateLeaving = "";
 
         class InRange {
@@ -32,8 +32,8 @@ class ArtilleryStateMachine {
     };
 
     class Move {
-        onState = "[_this, 'onMove'] call ALIVE_fnc_artillery";
-        onStateEntered = "";
+        onState = "";
+        onStateEntered = "[_this, 'onMove'] call ALIVE_fnc_artillery";
         onStateLeaving = "";
 
         class InPosition {
@@ -50,10 +50,16 @@ class ArtilleryStateMachine {
     };
 
     class Execute {
-        onState = "[_this, 'onExecute'] call ALIVE_fnc_artillery";
-        onStateEntered = "";
+        onState = "";
+        onStateEntered = "[_this, 'onExecute'] call ALIVE_fnc_artillery";
         onStateLeaving = "";
 
+        class Fire {
+            targetState = "Fire";
+            condition = "[_this, 'fireNextRound'] call ALIVE_fnc_artillery";
+            onTransition = "";
+        };
+
         class Abort {
             targetState = "ReturnToBase";
             condition = "!([_this, 'hasFireMission'] call ALIVE_fnc_artillery)";
@@ -62,8 +68,8 @@ class ArtilleryStateMachine {
     };
 
     class Fire {
-        onState = "[_this, 'onFire'] call ALIVE_fnc_artillery";
-        onStateEntered = "";
+        onState = "";
+        onStateEntered = "[_this, 'onFire'] call ALIVE_fnc_artillery";
         onStateLeaving = "";
 
         class FireMissionComplete {
@@ -92,8 +98,8 @@ class ArtilleryStateMachine {
     };
 
     class ReturnToBase {
-        onState = "[_this, 'onReturnToBase'] call ALIVE_fnc_artillery";
-        onStateEntered = "";
+        onState = "";
+        onStateEntered = "[_this, 'onReturnToBase'] call ALIVE_fnc_artillery";
         onStateLeaving = "";
 
         class AtBase {