Fix anims (#113)

* fix switchMove usages -> among other things, the shitty housework animations play again
* fix unconscious handling  -> probably fix #95 and #98 again
* add missing transition unconscious -> death (was preventing unconsciously dying civs from getting despawned)
* remove a `switchMove ""` after death that I ... cannot see to be useful (leftover from ooold code)
* reduce time to find neighbor for chat from 90s to 60s

addons/activities/XEH_PREP.hpp

@@ -12,7 +12,6 @@ PREP(endCustomActivity);
 PREP(findPositionOfInterest);
 PREP(forceEmotionSpeed);
 PREP(forcePanicSpeed);
-PREP(handleAceUnconscious);
 PREP(initCommonEventhandlers);
 PREP(initConfig);
 PREP(isInHouse);

addons/activities/functions/fnc_initCommonEventhandlers.sqf

@@ -1,13 +1,5 @@
 #include "..\script_component.hpp"
 
-[QGVAR(switchMove), {
-        params ["_unit", "_animation"];
-        _unit switchMove _animation;
-    }
-] call CBA_fnc_addEventHandler;
-
-["ace_unconscious", FUNC(handleAceUnconscious)] call CBA_fnc_addEventHandler;
-
 [QGVAR(doStop), FUNC(doStop)] call CBA_fnc_addEventHandler;
 [QGVAR(doCarryOn), FUNC(doCarryOn)] call CBA_fnc_addEventHandler;
 [QGVAR(doReverse), FUNC(doReverse)] call CBA_fnc_addEventHandler;

addons/activities/functions/fnc_sm_activities.sqf

@@ -59,7 +59,7 @@ assert ([
     _act_panic, _act_business,
     ["grad_civs_panicking_end"],
     {true},
-    {[QGVAR(switchMove), [_this, ""]] call CBA_fnc_globalEvent;},
+    {[QEGVAR(common,switchMove), [_this, ""]] call CBA_fnc_globalEvent;},
     _act_panic + _act_business
 ] call CBA_statemachine_fnc_addEventTransition);
 

addons/activities/functions/fnc_sm_activities_state_panic_enter.sqf

@@ -1,5 +1,5 @@
 #include "..\script_component.hpp"
 
 _this enableDynamicSimulation false; // prevent from freezing mid-flight (?)
-[QGVAR(switchMove), [_this, ""]] call CBA_fnc_globalEvent; // leave everything
+[QEGVAR(common,switchMove), [_this, ""]] call CBA_fnc_globalEvent; // leave everything
 _this forceSpeed -1;

addons/common/XEH_postInit.sqf

@@ -1,3 +1,9 @@
 #include "script_component.hpp"
 
 if (!(EGVAR(main,enabled))) exitWith {};
+
+[QGVAR(switchMove), {
+        params ["_unit", "_animation"];
+        _unit switchMove _animation;
+    }
+] call CBA_fnc_addEventHandler;

addons/lifecycle/XEH_postInit.sqf

@@ -25,3 +25,15 @@ if (isServer || CBA_isHeadlessClient) then {
         };
     }
 ] call CBA_fnc_addEventHandler;
+
+
+["ace_unconscious", {
+    params [
+        ["_unit", objNull, [objNull]], 
+        ["_isUnconscious", true, [true]]
+    ];
+
+    private _eventName = if (_isUnconscious) then {QGVAR(unconscious)} else {QGVAR(conscious)};
+    [_eventName, [_unit], _unit] call CBA_fnc_targetEvent;
+
+}] call CBA_fnc_addEventHandler;

addons/lifecycle/functions/fnc_sm_lifecycle.sqf

@@ -90,6 +90,15 @@ assert ([
     _lifecycle_unconscious + _lifecycle_life
 ] call CBA_statemachine_fnc_addEventTransition);
 
+assert ([
+    _lifecycle,
+    _lifecycle_unconscious, _lifecycle_death,
+    ["killed"],
+    { true },
+    {},
+    _lifecycle_unconscious + _lifecycle_death
+] call CBA_statemachine_fnc_addEventTransition);
+
 EGVAR(common,stateMachines) setVariable ["lifecycle", _lifecycle];
 
 _lifecycle

addons/lifecycle/functions/fnc_sm_lifecycle_state_spawn_enter.sqf

@@ -30,7 +30,6 @@ _unit addEventHandler [
 
 		_unit removeAllEventHandlers "Killed";
 		_unit removeAllEventHandlers "FiredNear";
-		[QGVAR(switchMove), [_unit, ""]] call CBA_fnc_globalEvent; // TODO: is that really necessary?
     }
 ];
 

addons/residents/functions/fnc_sm_business_state_housework_enter.sqf

@@ -7,7 +7,7 @@ _this call EFUNC(activities,forceEmotionSpeed);
 if (isNull _house) exitWith {};
 
 if (random 4 > 1) then { // in 2 of 3 cases , do change position
-    [QGVAR(switchMove), [_this, ""]] call CBA_fnc_globalEvent;
+    [QEGVAR(common,switchMove), [_this, ""]] call CBA_fnc_globalEvent;
     doStop _this;
 
     // add one random really close position to house positions
@@ -19,7 +19,7 @@ if (random 4 > 1) then { // in 2 of 3 cases , do change position
     _this moveTo _pos;
 } else {
     private _anim = selectRandom ["Acts_B_M05_briefing", "Acts_JetsOfficerSpilling", "acts_miller_knockout", "InBaseMoves_HandsBehindBack1"];
-    [QGVAR(switchMove), [_this, _anim]] call CBA_fnc_globalEvent;
+    [QEGVAR(common,switchMove), [_this, _anim]] call CBA_fnc_globalEvent;
 };
 
 /*

addons/residents/functions/fnc_sm_business_state_housework_exit.sqf

@@ -1,3 +1,3 @@
 #include "..\script_component.hpp"
 
-[QGVAR(switchMove), [_this, ""]] call CBA_fnc_globalEvent;
+[QEGVAR(common,switchMove), [_this, ""]] call CBA_fnc_globalEvent;

addons/residents/functions/fnc_sm_business_state_meetNeighbor_enter.sqf

@@ -1,6 +1,6 @@
 #include "..\script_component.hpp"
 
-[QGVAR(switchMove), [_this, ""]] call CBA_fnc_globalEvent;
+[QEGVAR(common,switchMove), [_this, ""]] call CBA_fnc_globalEvent;
 doStop _this;
 _this setVariable ["grad_civs_stopDistance", random [3, 7, 20]];
 private _neighborToMeet = _this getVariable ["grad_civs_neighborToMeet", objNull];

addons/residents/functions/fnc_sm_business_trans_meetNeighbor_chat_condition.sqf

@@ -5,4 +5,4 @@ if (isNull _neighbor) exitWith {true}; // go to chat only so that chat can lead
 if (!(alive _neighbor)) exitWith {true};
 
 /*get closer than 2m to have a conversation*/
-(_this distance _neighbor) < 2 || ((_thisStateTime + 90) < CBA_missionTime)
+(_this distance _neighbor) < 2 || ((_thisStateTime + 60) < CBA_missionTime)

docs/states.gv

@@ -74,4 +74,5 @@ digraph lifecycle {
     cluster_life_node -> cyc_death [ltail=cluster_life color=blue];
     cluster_life_node -> cyc_unconscious [ltail=cluster_life color=blue];
     cyc_unconscious -> cluster_life_node [ltail=cluster_life color=blue];
+    cyc_unconscious -> cyc_death [ltail=cluster_life color=blue];
 }