diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo index 587319a8..7fa7cd33 100644 Binary files a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo and b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index 7a1f6696..ec50e14e 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Altis.pbo and b/Server_Install_Pack/mpmissions/epoch.Altis.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo index a1ffb1e8..a2cadf53 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Australia.pbo and b/Server_Install_Pack/mpmissions/epoch.Australia.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo index 62746bbf..7081e073 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo and b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo index f7b104b9..c353e845 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo and b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index 25c21eb6..4eba012f 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo and b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index 7958b585..a28fd9d8 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo and b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo index a9249131..a0ab759b 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo and b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo index 00f9c82e..aadd13c1 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo and b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo index 05b103f9..be716b52 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo and b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Porto.pbo b/Server_Install_Pack/mpmissions/epoch.Porto.pbo index 8c3ce62f..a9e6327b 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Porto.pbo and b/Server_Install_Pack/mpmissions/epoch.Porto.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo index 0ef74dde..175e49cb 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo and b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Sara.pbo b/Server_Install_Pack/mpmissions/epoch.Sara.pbo index 0e09cb97..04ac89f7 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Sara.pbo and b/Server_Install_Pack/mpmissions/epoch.Sara.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo index 90588c7a..da9dfb36 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo and b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo index a82f4059..f832d703 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo and b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo index 0f7145ab..a7644b28 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo and b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index 136e2871..8676ae44 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo and b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo index 53af8db1..94e761ec 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo and b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo index 1c95de1a..670dfe72 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.VR.pbo and b/Server_Install_Pack/mpmissions/epoch.VR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo index aede22aa..cb94e9ee 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo and b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo index 380efbca..c945ac02 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo and b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index 3a5c0124..945270ea 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.utes.pbo and b/Server_Install_Pack/mpmissions/epoch.utes.pbo differ diff --git a/Sources/epoch_code/System/player_login.fsm b/Sources/epoch_code/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/epoch_code/System/player_login.fsm +++ b/Sources/epoch_code/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf index 8de17f0e..2bc674d4 100644 --- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf +++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf @@ -319,7 +319,7 @@ if (typename _this == "ARRAY") then { if (!_canBeRevived) then { _newPlyr setVariable["REVIVE", _canBeRevived] }; - [_plyrNetID, _plyrUID, [_newPlyr, _vars, _currWeap, count(magazines _newPlyr), _plyrGroup, _canBeRevived, _newPlyr call EPOCH_server_setPToken]] call EPOCH_server_pushPlayer; + [_plyrNetID, _plyrUID, [_newPlyr, _vars, _currWeap, loadAbs _newPlyr, _plyrGroup, _canBeRevived, _newPlyr call EPOCH_server_setPToken]] call EPOCH_server_pushPlayer; _newPlyr setVariable["SETUP", true, true]; }; diff --git a/Sources/mpmissions/epoch.Altis/System/player_login.fsm b/Sources/mpmissions/epoch.Altis/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Altis/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Altis/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Australia/System/player_login.fsm b/Sources/mpmissions/epoch.Australia/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Australia/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Australia/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm b/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm b/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm b/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm b/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Esseker/System/player_login.fsm b/Sources/mpmissions/epoch.Esseker/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Esseker/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Esseker/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Porto/System/player_login.fsm b/Sources/mpmissions/epoch.Porto/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Porto/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Porto/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm b/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm +++ b/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Sara/System/player_login.fsm b/Sources/mpmissions/epoch.Sara/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Sara/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Sara/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm b/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm +++ b/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm b/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm b/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Stratis/System/player_login.fsm b/Sources/mpmissions/epoch.Stratis/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Stratis/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Stratis/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Takistan/System/player_login.fsm b/Sources/mpmissions/epoch.Takistan/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Takistan/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Takistan/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.VR/System/player_login.fsm b/Sources/mpmissions/epoch.VR/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.VR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.VR/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm b/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.utes/System/player_login.fsm b/Sources/mpmissions/epoch.utes/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.utes/System/player_login.fsm +++ b/Sources/mpmissions/epoch.utes/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n