Client FSM update (#600)

* Client FSM update

* Macros

Author: DomT602

Altis_Life.Altis/config/Config_Master.hpp

@@ -214,7 +214,7 @@ class Life_Settings {
     };
 
     /* ! --- Do not change --- ! */
-    framework_version = "5.0.0";
+    framework_version = "6.0.0";
     /* ------------------------- */
 
 };

Altis_Life.Altis/core/fn_survival.sqf

@@ -46,9 +46,26 @@ _fnc_water = {
     };
 };
 
+private _fnc_paycheck = {
+    if (alive player) then {
+        private _paycheck = call life_paycheck;
+        if (player distance (getMarkerPos "fed_reserve") < 120 && playerSide isEqualTo west) then {
+            systemChat format [localize "STR_ReceivedPay",[_paycheck + 1500] call life_fnc_numberText];
+            BANK = BANK + _paycheck + 1500;
+        } else {
+            BANK = BANK + _paycheck;
+            systemChat format [localize "STR_ReceivedPay",[_paycheck] call life_fnc_numberText];
+        };
+    } else {
+        systemChat localize "STR_MissedPay";
+    };
+};
+
 //Setup the time-based variables.
 _foodTime = time;
 _waterTime = time;
+private _paycheckTime = time;
+private _paycheckPeriod = (getNumber(missionConfigFile >> "Life_Settings" >> "paycheck_period")) * 60;
 _walkDis = 0;
 _bp = "";
 _lastPos = visiblePosition player;
@@ -59,6 +76,7 @@ for "_i" from 0 to 1 step 0 do {
     /* Thirst / Hunger adjustment that is time based */
     if ((time - _waterTime) > 600 && {!life_god}) then {[] call _fnc_water; _waterTime = time;};
     if ((time - _foodTime) > 850 && {!life_god}) then {[] call _fnc_food; _foodTime = time;};
+    if ((time - _paycheckTime) > _paycheckPeriod) then {[] call _fnc_paycheck; _paycheckTime = time};
 
     /* Adjustment of carrying capacity based on backpack changes */
     if (backpack player isEqualTo "") then {

Altis_Life.Altis/core/fsm/client.fsm

@@ -67,8 +67,6 @@ player setVariable ["playerSurrender", false, true];
 player setVariable ["realname", profileName, true];
 
 diag_log "[Life Client] Past Settings Init";
-[] execFSM "core\fsm\client.fsm";
-diag_log "[Life Client] Executing client.fsm";
 
 (findDisplay 46) displayAddEventHandler ["KeyDown", "_this call life_fnc_keyHandler"];
 [player, life_settings_enableSidechannel, playerSide] remoteExecCall ["TON_fnc_manageSC", RSERV];

Altis_Life.Altis/core/fsm/timeModule.fsm

@@ -10221,8 +10221,8 @@
 			<Chinesesimp>你的库存</Chinesesimp>
         </Key>
     </Package>
-    <Package name="FSM_Strings">
-        <Key ID="STR_FSM_Paycheck">
+    <Package name="Pay_Strings">
+        <Key ID="STR_Paycheck">
             <Original>You will receive your next paycheck in %1 minutes.</Original>
             <Czech>Obdržíte svůj další výplatní pásku v %1 minut.</Czech>
             <Spanish>Recibiras tu siguiente pago en %1 minutos</Spanish>
@@ -10234,7 +10234,7 @@
             <Polish>Otrzymasz kolejną wypłatę w ciągu %1 minut.</Polish>
 			<Chinesesimp>你将在 %1 分钟后收到你的下一张薪水支票。</Chinesesimp>
         </Key>
-        <Key ID="STR_FSM_MissedPay">
+        <Key ID="STR_MissedPay">
             <Original>You have missed a paycheck because you were dead.</Original>
             <Czech>Jste vynechal výplatu, protože jste byli mrtví.</Czech>
             <Spanish>Te has perdido un pago por estar muerto.</Spanish>
@@ -10246,7 +10246,7 @@
             <Polish>Ominęła cię wypłata ponieważ byłeś martwy.</Polish>
 			<Chinesesimp>因为你死了，你错过了薪水。</Chinesesimp>
         </Key>
-        <Key ID="STR_FSM_ReceivedPay">
+        <Key ID="STR_ReceivedPay">
             <Original>You have received a paycheck of $%1.</Original>
             <Czech>Dostali jste výplatu ve výši $ %1.</Czech>
             <Spanish>Has recibido un pago de $%1</Spanish>