diff --git a/functions/CfgFunctions.hpp b/functions/CfgFunctions.hpp index 7951b16..cd622c8 100644 --- a/functions/CfgFunctions.hpp +++ b/functions/CfgFunctions.hpp @@ -78,7 +78,7 @@ class milsim }; }; -class milsim_respawn { +class milsim_reinsert { class functions { file = "functions\reinsert"; class getBaseName {}; diff --git a/functions/reinsert/client/fn_addAceSelfActions.sqf b/functions/reinsert/client/fn_addAceSelfActions.sqf index fe4091a..7734e1b 100644 --- a/functions/reinsert/client/fn_addAceSelfActions.sqf +++ b/functions/reinsert/client/fn_addAceSelfActions.sqf @@ -2,36 +2,36 @@ params ["_type"]; // string of the object's classname if (!(_type isKindOf "CAManBase")) exitWith {}; if ( - (localNamespace getVariable ["milsim_respawn_fileForReinsertClassesAdded", []]) + (localNamespace getVariable ["milsim_reinsert_fileForReinsertClassesAdded", []]) find _type != -1 ) exitWith {}; private _fileForReinsertAction = [ - "milsim_respawn_fileReinsertRequest", + "milsim_reinsert_fileReinsertRequest", "File Re-insert Request", "\A3\ui_f\data\igui\cfg\simpleTasks\types\takeoff_ca.paa", { // statement params ["_target", "_player", "_params"]; // find nearest base or location - private _base = [_player] call milsim_respawn_fnc_getNearestBase; - private _baseName = [_base] call milsim_respawn_fnc_getBaseName; + private _base = [_player] call milsim_reinsert_fnc_getNearestBase; + private _baseName = [_base] call milsim_reinsert_fnc_getBaseName; // send event to server - ["milsim_respawn_fileReinsertRequest", [_player, _base]] call CBA_fnc_serverEvent; + ["milsim_reinsert_fileReinsertRequest", [_player, _base]] call CBA_fnc_serverEvent; // notify player their request was filed [["Re-insert Request Filed"], [format["Location: %1", _baseName]]] call CBA_fnc_notify; }, { // condition params ["_target", "_player", "_params"]; // find nearest base or location - private _base = [_player] call milsim_respawn_fnc_getNearestBase; + private _base = [_player] call milsim_reinsert_fnc_getNearestBase; private _baseDistance = _player distance _base; - private _maxRangeToReady = missionNamespace getVariable ["milsim_respawn_setting_reinsertion_maxRangeToReady", 400]; - private _existingQueue = missionNamespace getVariable ["milsim_respawn_reinsertionQueue", []]; + private _maxRangeToReady = missionNamespace getVariable ["milsim_reinsert_setting_reinsertion_maxRangeToReady", 400]; + private _existingQueue = missionNamespace getVariable ["milsim_reinsert_reinsertionQueue", []]; // check if module is enabled, player is near a base, and player is not already in the queue - // (serverTime - milsim_respawn_missionStartServerTime) > 60*5 && // only allow after 15 minutes - missionNamespace getVariable ["milsim_respawn_setting_reinsertion_enabled", true] && + // (serverTime - milsim_reinsert_missionStartServerTime) > 60*5 && // only allow after 15 minutes + missionNamespace getVariable ["milsim_reinsert_setting_reinsertion_enabled", true] && (_baseDistance < _maxRangeToReady) && not (_player in (_existingQueue apply {_x#0})) } @@ -39,29 +39,29 @@ private _fileForReinsertAction = [ [_type, 1, ["ACE_SelfActions"], _fileForReinsertAction, true] call ace_interact_menu_fnc_addActionToClass; private _removeFileForReinsertAction = [ - "milsim_respawn_removeReinsertRequest", + "milsim_reinsert_removeReinsertRequest", "Remove Re-insert Request", "\A3\ui_f\data\igui\cfg\simpleTasks\types\land_ca.paa", { // statement params ["_target", "_player", "_params"]; // send event to server - ["milsim_respawn_removeReinsertRequest", [_player]] call CBA_fnc_serverEvent; + ["milsim_reinsert_removeReinsertRequest", [_player]] call CBA_fnc_serverEvent; // notify player their request was rescinded "Re-insert Request Rescinded" call CBA_fnc_notify; }, { // condition params ["_target", "_player", "_params"]; - private _existingQueue = missionNamespace getVariable ["milsim_respawn_reinsertionQueue", []]; + private _existingQueue = missionNamespace getVariable ["milsim_reinsert_reinsertionQueue", []]; // check if module is enabled, player is in the queue - // (serverTime - milsim_respawn_missionStartServerTime) > 60*5 && // only allow after 15 minutes - missionNamespace getVariable ["milsim_respawn_setting_reinsertion_enabled", true] && + // (serverTime - milsim_reinsert_missionStartServerTime) > 60*5 && // only allow after 15 minutes + missionNamespace getVariable ["milsim_reinsert_setting_reinsertion_enabled", true] && (_player in (_existingQueue apply {_x#0})) } ] call ace_interact_menu_fnc_createAction; [_type, 1, ["ACE_SelfActions"], _removeFileForReinsertAction, true] call ace_interact_menu_fnc_addActionToClass; -private _classesActionsAddedTo = (localNamespace getVariable ["milsim_respawn_fileForReinsertClassesAdded", []]); +private _classesActionsAddedTo = (localNamespace getVariable ["milsim_reinsert_fileForReinsertClassesAdded", []]); _classesActionsAddedTo pushBackUnique _type; -localNamespace setVariable ["milsim_respawn_fileForReinsertClassesAdded", _classesActionsAddedTo]; +localNamespace setVariable ["milsim_reinsert_fileForReinsertClassesAdded", _classesActionsAddedTo]; diff --git a/functions/reinsert/client/fn_addCheckQueueSelfAction.sqf b/functions/reinsert/client/fn_addCheckQueueSelfAction.sqf index 87f0746..5897b53 100644 --- a/functions/reinsert/client/fn_addCheckQueueSelfAction.sqf +++ b/functions/reinsert/client/fn_addCheckQueueSelfAction.sqf @@ -2,27 +2,27 @@ params ["_type"]; // string of the object's classname if (!(_type isKindOf "CAManBase")) exitWith {}; if ( - (localNamespace getVariable ["milsim_respawn_checkReinsertQueueClassesAdded", []]) + (localNamespace getVariable ["milsim_reinsert_checkReinsertQueueClassesAdded", []]) find _type != -1 ) exitWith {}; private _checkReinsertQueueAction = [ - "milsim_respawn_checkReinsertQueue", + "milsim_reinsert_checkReinsertQueue", "[PILOT] Check Re-insert Queue", "\A3\ui_f\data\igui\cfg\simpleTasks\types\land_ca.paa", { params ["_target", "_player", "_params"]; // request notification from the server - call milsim_respawn_fnc_requestShowQueue; + call milsim_reinsert_fnc_requestShowQueue; // reset last check time - localNamespace setVariable ["milsim_respawn_lastReinsertQueueCheck", diag_tickTime]; + localNamespace setVariable ["milsim_reinsert_lastReinsertQueueCheck", diag_tickTime]; }, { - missionNamespace getVariable ["milsim_respawn_setting_reinsertion_enabled", true] + missionNamespace getVariable ["milsim_reinsert_setting_reinsertion_enabled", true] } // always allow ] call ace_interact_menu_fnc_createAction; [_type, 1, ["ACE_SelfActions"], _checkReinsertQueueAction, true] call ace_interact_menu_fnc_addActionToClass; -private _classesActionsAddedTo = (localNamespace getVariable ["milsim_respawn_checkReinsertQueueClassesAdded", []]); +private _classesActionsAddedTo = (localNamespace getVariable ["milsim_reinsert_checkReinsertQueueClassesAdded", []]); _classesActionsAddedTo pushBackUnique _type; -localNamespace setVariable ["milsim_respawn_checkReinsertQueueClassesAdded", _classesActionsAddedTo]; \ No newline at end of file +localNamespace setVariable ["milsim_reinsert_checkReinsertQueueClassesAdded", _classesActionsAddedTo]; \ No newline at end of file diff --git a/functions/reinsert/client/fn_initClient.sqf b/functions/reinsert/client/fn_initClient.sqf index 8a96f23..cdee922 100644 --- a/functions/reinsert/client/fn_initClient.sqf +++ b/functions/reinsert/client/fn_initClient.sqf @@ -1,26 +1,26 @@ if (!hasInterface) exitWith {}; // ACE SELF-INTERACTIONS FOR FILING AND RESCINDING REINSERT REQUESTS NEAR BASE - ALL PLAYERS -localNamespace setVariable ["milsim_respawn_fileForReinsertClassesAdded", []]; +localNamespace setVariable ["milsim_reinsert_fileForReinsertClassesAdded", []]; // add actions to current class -[typeOf player] call milsim_respawn_fnc_addAceSelfActions; +[typeOf player] call milsim_reinsert_fnc_addAceSelfActions; // add actions to future classes ["ace_interact_menu_newControllableObject", { - _this call milsim_respawn_fnc_addAceSelfActions; + _this call milsim_reinsert_fnc_addAceSelfActions; }] call CBA_fnc_addEventHandler; ///////////////////////////////////////////////////// // PILOTS ONLY // ACE SELF-INTERACTIONS FOR CHECKING REINSERT QUEUE - ONLY FOR PILOTS if ((typeOf player) in ["B_Helipilot_F", "B_helicrew_F"]) then { - localNamespace setVariable ["milsim_respawn_checkReinsertQueueClassesAdded", []]; - localNamespace setVariable ["milsim_respawn_lastReinsertQueueCheck", diag_tickTime]; + localNamespace setVariable ["milsim_reinsert_checkReinsertQueueClassesAdded", []]; + localNamespace setVariable ["milsim_reinsert_lastReinsertQueueCheck", diag_tickTime]; // add actions to current class - [typeOf player] call milsim_respawn_fnc_addCheckQueueSelfAction; + [typeOf player] call milsim_reinsert_fnc_addCheckQueueSelfAction; // add actions to future classes ["ace_interact_menu_newControllableObject", { - _this call milsim_respawn_fnc_addCheckQueueSelfAction; + _this call milsim_reinsert_fnc_addCheckQueueSelfAction; }] call CBA_fnc_addEventHandler; }; ///////////////////////////////////////////////////// @@ -31,13 +31,13 @@ if ((typeOf player) in ["B_Helipilot_F", "B_helicrew_F"]) then { [{ // if module not enabled and pilot forced check not enabled, exit if (not ( - missionNamespace getVariable ["milsim_respawn_setting_reinsertion_enabled", true] && - missionNamespace getVariable ["milsim_respawn_setting_reinsertion_pilotForcedCheckEnabled", true] + missionNamespace getVariable ["milsim_reinsert_setting_reinsertion_enabled", true] && + missionNamespace getVariable ["milsim_reinsert_setting_reinsertion_pilotForcedCheckEnabled", true] )) exitWith {}; // if last check was less than X minutes ago, skip - private _lastCheck = localNamespace getVariable ["milsim_respawn_lastReinsertQueueCheck", diag_tickTime]; - private _requiredCheckInterval = missionNamespace getVariable ["milsim_respawn_setting_reinsertion_pilotForcedCheckInterval", 60*20]; + private _lastCheck = localNamespace getVariable ["milsim_reinsert_lastReinsertQueueCheck", diag_tickTime]; + private _requiredCheckInterval = missionNamespace getVariable ["milsim_reinsert_setting_reinsertion_pilotForcedCheckInterval", 60*20]; if ( diag_tickTime - _lastCheck < _requiredCheckInterval @@ -45,9 +45,9 @@ if ((typeOf player) in ["B_Helipilot_F", "B_helicrew_F"]) then { // last check was greater than X minutes ago // reset last check time - localNamespace setVariable ["milsim_respawn_lastReinsertQueueCheck", diag_tickTime]; + localNamespace setVariable ["milsim_reinsert_lastReinsertQueueCheck", diag_tickTime]; // request notification from the server - call milsim_respawn_fnc_requestShowQueue; + call milsim_reinsert_fnc_requestShowQueue; }, 30] call CBA_fnc_addPerFrameHandler; }; ///////////////////////////////////////////////////// \ No newline at end of file diff --git a/functions/reinsert/client/fn_requestShowQueue.sqf b/functions/reinsert/client/fn_requestShowQueue.sqf index 11a8d03..1afed4e 100644 --- a/functions/reinsert/client/fn_requestShowQueue.sqf +++ b/functions/reinsert/client/fn_requestShowQueue.sqf @@ -1,3 +1,3 @@ if (!hasInterface) exitWith {}; -[] remoteExec ["milsim_respawn_fnc_returnReinsertQueueNotification", 2]; \ No newline at end of file +[] remoteExec ["milsim_reinsert_fnc_returnReinsertQueueNotification", 2]; \ No newline at end of file diff --git a/functions/reinsert/fn_getNearestBase.sqf b/functions/reinsert/fn_getNearestBase.sqf index 3d955ba..049cc04 100644 --- a/functions/reinsert/fn_getNearestBase.sqf +++ b/functions/reinsert/fn_getNearestBase.sqf @@ -1,7 +1,7 @@ params [["_player", objNull, [objNull]]]; if (isNull _player) exitWith {objNull}; -private _bases = missionNamespace getVariable ["milsim_respawn_bases", []]; +private _bases = missionNamespace getVariable ["milsim_reinsert_bases", []]; if (count _bases == 0) exitWith {objNull}; // get nearest base (Module_Respawn_F) diff --git a/functions/reinsert/server/fn_addToQueue.sqf b/functions/reinsert/server/fn_addToQueue.sqf index 24f63ad..ce662d1 100644 --- a/functions/reinsert/server/fn_addToQueue.sqf +++ b/functions/reinsert/server/fn_addToQueue.sqf @@ -29,21 +29,21 @@ if ( }; -private _maxRangeToReady = missionNamespace getVariable ["milsim_respawn_setting_reinsertion_maxRangeToReady", 400]; +private _maxRangeToReady = missionNamespace getVariable ["milsim_reinsert_setting_reinsertion_maxRangeToReady", 400]; // nearest base here is the same as the base sent private _nearestBase = _base; -milsim_respawn_reinsertionQueue pushBackUnique [ +milsim_reinsert_reinsertionQueue pushBackUnique [ _player, _base, _timeFiled ]; // broadcast new list to all machines -publicVariable "milsim_respawn_reinsertionQueue"; +publicVariable "milsim_reinsert_reinsertionQueue"; // log to rpt private _logParams = [ - ["filedAtBase", [_base] call milsim_respawn_fnc_getBaseName], + ["filedAtBase", [_base] call milsim_reinsert_fnc_getBaseName], ["filedAtBaseDistance", _player distance _base], - ["closestBase", [_nearestBase] call milsim_respawn_fnc_getBaseName], + ["closestBase", [_nearestBase] call milsim_reinsert_fnc_getBaseName], ["closestBaseDistance", _player distance _nearestBase], ["maxDistanceSetting", _maxRangeToReady], ["inQueueDuration", diag_tickTime - _timeFiled] diff --git a/functions/reinsert/server/fn_globalShowQueue.sqf b/functions/reinsert/server/fn_globalShowQueue.sqf index 566a780..a85462e 100644 --- a/functions/reinsert/server/fn_globalShowQueue.sqf +++ b/functions/reinsert/server/fn_globalShowQueue.sqf @@ -1,8 +1,8 @@ if (!isServer) exitWith {}; // if at least 1 player in the queue has been waiting longer than the configured timeout, notify all players -private _timeout = missionNamespace getVariable ["milsim_respawn_setting_reinsertion_max_wait", 60*20]; // default 20 minutes -private _timeoutPlayers = milsim_respawn_reinsertionQueue select { +private _timeout = missionNamespace getVariable ["milsim_reinsert_setting_reinsertion_max_wait", 60*20]; // default 20 minutes +private _timeoutPlayers = milsim_reinsert_reinsertionQueue select { _x params ["_player", "_base", "_timeFiled"]; alive (_player) && (diag_tickTime - (_timeFiled)) > _timeout @@ -10,10 +10,10 @@ private _timeoutPlayers = milsim_respawn_reinsertionQueue select { if (count _timeoutPlayers > 0) then { // GLOBAL CBA NOTIFY private _playerLines = [["Players are still waiting for Re-insert!", 1.2, [1, 0.64, 0, 1]]]; - private _maxRangeToReady = missionNamespace getVariable ["milsim_respawn_setting_reinsertion_maxRangeToReady", 400]; + private _maxRangeToReady = missionNamespace getVariable ["milsim_reinsert_setting_reinsertion_maxRangeToReady", 400]; // get base objects from queue - private _basesWithPeople = (missionNamespace getVariable ["milsim_respawn_reinsertionQueue", []]) apply {_x#1}; + private _basesWithPeople = (missionNamespace getVariable ["milsim_reinsert_reinsertionQueue", []]) apply {_x#1}; // get unique base objects private _basesWithPeople = _basesWithPeople arrayIntersect _basesWithPeople; @@ -21,7 +21,7 @@ if (count _timeoutPlayers > 0) then { private _thisBase = _x; // Add line for base name - _playerLines pushBack ([[_thisBase] call milsim_respawn_fnc_getBaseName, 1, [0,1,0,1]]); + _playerLines pushBack ([[_thisBase] call milsim_reinsert_fnc_getBaseName, 1, [0,1,0,1]]); // Get players under this base private _thisBasePlayers = _timeoutPlayers select {_x#1 isEqualTo _thisBase}; @@ -35,7 +35,7 @@ if (count _timeoutPlayers > 0) then { { // for each player under this base, add a line _x params ["_player", "_base", "_timeFiled"]; // get the closest base to the player - private _nearestBase = [_player] call milsim_respawn_fnc_getNearestBase; + private _nearestBase = [_player] call milsim_reinsert_fnc_getNearestBase; // add player to array of players under bases _playerLines pushBack ([format [ @@ -47,9 +47,9 @@ if (count _timeoutPlayers > 0) then { // log to rpt private _logParams = [ - ["filedAtBase", [_base] call milsim_respawn_fnc_getBaseName], + ["filedAtBase", [_base] call milsim_reinsert_fnc_getBaseName], ["filedAtBaseDistance", _player distance _base], - ["closestBase", [_nearestBase] call milsim_respawn_fnc_getBaseName], + ["closestBase", [_nearestBase] call milsim_reinsert_fnc_getBaseName], ["closestBaseDistance", _player distance _nearestBase], ["maxDistanceSetting", _maxRangeToReady], ["inQueueDuration", diag_tickTime - _timeFiled] @@ -66,5 +66,5 @@ if (count _timeoutPlayers > 0) then { // SEND NOTIFY _playerLines remoteExec ["CBA_fnc_notify", [0, -2] select isDedicated]; // RESET NOTIFICATION TIMER - milsim_respawn_reinsertionOverTimeoutLastNotificationTime = diag_tickTime; + milsim_reinsert_reinsertionOverTimeoutLastNotificationTime = diag_tickTime; }; \ No newline at end of file diff --git a/functions/reinsert/server/fn_initServer.sqf b/functions/reinsert/server/fn_initServer.sqf index a93a91a..9dd329f 100644 --- a/functions/reinsert/server/fn_initServer.sqf +++ b/functions/reinsert/server/fn_initServer.sqf @@ -6,44 +6,44 @@ if (!isServer) exitWith {}; // array of all respawn modules in the mission, used as 'base' locations for reinsertion -milsim_respawn_bases = allMissionObjects "ModuleRespawnPosition_F"; -publicVariable "milsim_respawn_bases"; +milsim_reinsert_bases = allMissionObjects "ModuleRespawnPosition_F"; +publicVariable "milsim_reinsert_bases"; // register queue -milsim_respawn_reinsertionQueue = []; -publicVariable "milsim_respawn_reinsertionQueue"; +milsim_reinsert_reinsertionQueue = []; +publicVariable "milsim_reinsert_reinsertionQueue"; // server mission start time -milsim_respawn_missionStartServerTime = serverTime; +milsim_reinsert_missionStartServerTime = serverTime; // FILE REQUEST CBA HANDLER -["milsim_respawn_fileReinsertRequest", { +["milsim_reinsert_fileReinsertRequest", { params ["_player", "_base"]; - [_player, _base] call milsim_respawn_fnc_addToQueue; + [_player, _base] call milsim_reinsert_fnc_addToQueue; }] call CBA_fnc_addEventHandler; // REMOVE REQUEST CBA HANDLER -["milsim_respawn_removeReinsertRequest", { +["milsim_reinsert_removeReinsertRequest", { params ["_player"]; - [_player] call milsim_respawn_fnc_removeFromQueue; + [_player] call milsim_reinsert_fnc_removeFromQueue; }] call CBA_fnc_addEventHandler; // automated wait threshold timer -milsim_respawn_reinsertionOverTimeoutLastNotificationTime = 0; +milsim_reinsert_reinsertionOverTimeoutLastNotificationTime = 0; [{ // every 60 seconds // validate queue - call milsim_respawn_fnc_validateQueue; + call milsim_reinsert_fnc_validateQueue; // check if last overTimeout notification was sent more than X minutes ago if ( - diag_tickTime - milsim_respawn_reinsertionOverTimeoutLastNotificationTime > 60*5 + diag_tickTime - milsim_reinsert_reinsertionOverTimeoutLastNotificationTime > 60*5 ) then { // show global queue notification with any players that are over timeout - call milsim_respawn_fnc_globalShowQueue; + call milsim_reinsert_fnc_globalShowQueue; }; }, 60] call CBA_fnc_addPerFrameHandler; diff --git a/functions/reinsert/server/fn_removeFromQueue.sqf b/functions/reinsert/server/fn_removeFromQueue.sqf index f230c63..0e24679 100644 --- a/functions/reinsert/server/fn_removeFromQueue.sqf +++ b/functions/reinsert/server/fn_removeFromQueue.sqf @@ -20,16 +20,16 @@ if (isNull _player) exitWith { }; // get entries for this player from queue -private _unitArrs = milsim_respawn_reinsertionQueue select {_x#0 isEqualTo _player}; +private _unitArrs = milsim_reinsert_reinsertionQueue select {_x#0 isEqualTo _player}; // if player not in queue, skip if (count _unitArrs isEqualTo 0) exitWith {}; -private _maxRangeToReady = missionNamespace getVariable ["milsim_respawn_setting_reinsertion_maxRangeToReady", 400]; +private _maxRangeToReady = missionNamespace getVariable ["milsim_reinsert_setting_reinsertion_maxRangeToReady", 400]; // remove player from queue -milsim_respawn_reinsertionQueue = milsim_respawn_reinsertionQueue - _unitArrs; +milsim_reinsert_reinsertionQueue = milsim_reinsert_reinsertionQueue - _unitArrs; // broadcast new list to all machines -publicVariable "milsim_respawn_reinsertionQueue"; +publicVariable "milsim_reinsert_reinsertionQueue"; // sort _unitArrs by time in queue, descending, to get longest wait (if for some reason there's a duplicate) [_unitArrs, [], { @@ -39,12 +39,12 @@ publicVariable "milsim_respawn_reinsertionQueue"; // get first entry (longest wait) (_unitArrs#0) params ["_player", "_base", "_timeFiled"]; // _unitArr = [unit, base, timeInQueue] // get the closest base to the player -private _nearestBase = [_player] call milsim_respawn_fnc_getNearestBase; +private _nearestBase = [_player] call milsim_reinsert_fnc_getNearestBase; // log to rpt private _logParams = [ - ["filedAtBase", [_base] call milsim_respawn_fnc_getBaseName], + ["filedAtBase", [_base] call milsim_reinsert_fnc_getBaseName], ["filedAtBaseDistance", _player distance _base], - ["closestBase", [_nearestBase] call milsim_respawn_fnc_getBaseName], + ["closestBase", [_nearestBase] call milsim_reinsert_fnc_getBaseName], ["closestBaseDistance", _player distance _nearestBase], ["maxDistanceSetting", _maxRangeToReady], ["inQueueDuration", diag_tickTime - _timeFiled] diff --git a/functions/reinsert/server/fn_returnReinsertQueueNotification.sqf b/functions/reinsert/server/fn_returnReinsertQueueNotification.sqf index e7eaf0a..d114ad2 100644 --- a/functions/reinsert/server/fn_returnReinsertQueueNotification.sqf +++ b/functions/reinsert/server/fn_returnReinsertQueueNotification.sqf @@ -1,5 +1,5 @@ /* - Function: milsim_respawn_fnc_showReinsertQueueNotification + Function: milsim_reinsert_fnc_showReinsertQueueNotification Description: Designed to be remoteExecuted on the server. Will show a CBA notification on the remoteExecutedOwner's screen with the current reinsertion queue and log this occurrence in the server RPT. @@ -32,9 +32,9 @@ private _logParams = [_userObject, []] call milsim_fnc_addPlayerInfoToArray; _logParams ] call milsim_fnc_log; -private _queue = missionNamespace getVariable ["milsim_respawn_reinsertionQueue", []]; +private _queue = missionNamespace getVariable ["milsim_reinsert_reinsertionQueue", []]; // get base objects from queue -private _basesWithPeople = (missionNamespace getVariable ["milsim_respawn_reinsertionQueue", []]) apply {_x#1}; +private _basesWithPeople = (missionNamespace getVariable ["milsim_reinsert_reinsertionQueue", []]) apply {_x#1}; // get unique base objects private _basesWithPeople = _basesWithPeople arrayIntersect _basesWithPeople; @@ -48,7 +48,7 @@ if (count _basesWithPeople isEqualTo 0) then { // forEach _basesWithPeople { private _thisBase = _x; - private _baseName = [_thisBase] call milsim_respawn_fnc_getBaseName; + private _baseName = [_thisBase] call milsim_reinsert_fnc_getBaseName; // generate player lines for this base private _playerLines = _queue select { diff --git a/functions/reinsert/server/fn_validateQueue.sqf b/functions/reinsert/server/fn_validateQueue.sqf index cce9bac..9c59209 100644 --- a/functions/reinsert/server/fn_validateQueue.sqf +++ b/functions/reinsert/server/fn_validateQueue.sqf @@ -1,22 +1,22 @@ // revalidate any players in the queue // compare their distance to the nearest base, and remove them if they're too far away (or dead) private _stillValid = []; -private _maxRangeToReady = missionNamespace getVariable ["milsim_respawn_setting_reinsertion_maxRangeToReady", 400]; +private _maxRangeToReady = missionNamespace getVariable ["milsim_reinsert_setting_reinsertion_maxRangeToReady", 400]; { _x params ["_player", "_base", "_timeFiled"]; // _unitArr = [unit, baseName, timeInQueue] private _distanceToOriginalBase = _player distance _base; // get the closest base to the player - private _nearestBase = [_player] call milsim_respawn_fnc_getNearestBase; + private _nearestBase = [_player] call milsim_reinsert_fnc_getNearestBase; private _isCloseEnoughToAnyBase = (_player distance _nearestBase) < _maxRangeToReady; if (not _isCloseEnoughToAnyBase || not (alive _player)) then { // don't include player in updated queue // log to rpt private _logParams = [ - ["filedAtBase", [_base] call milsim_respawn_fnc_getBaseName], + ["filedAtBase", [_base] call milsim_reinsert_fnc_getBaseName], ["filedAtBaseDistance", _player distance _base], - ["closestBase", [_nearestBase] call milsim_respawn_fnc_getBaseName], + ["closestBase", [_nearestBase] call milsim_reinsert_fnc_getBaseName], ["closestBaseDistance", _player distance _nearestBase], ["maxDistanceSetting", _maxRangeToReady], ["inQueueDuration", diag_tickTime - _timeFiled] @@ -36,9 +36,9 @@ private _maxRangeToReady = missionNamespace getVariable ["milsim_respawn_setting // if player's base has changed, log to rpt if (_base != _nearestBase) then { private _logParams = [ - ["filedAtBase", [_base] call milsim_respawn_fnc_getBaseName], + ["filedAtBase", [_base] call milsim_reinsert_fnc_getBaseName], ["filedAtBaseDistance", _player distance _base], - ["closestBase", [_nearestBase] call milsim_respawn_fnc_getBaseName], + ["closestBase", [_nearestBase] call milsim_reinsert_fnc_getBaseName], ["closestBaseDistance", _player distance _nearestBase], ["maxDistanceSetting", _maxRangeToReady], ["inQueueDuration", diag_tickTime - _timeFiled] @@ -50,8 +50,8 @@ private _maxRangeToReady = missionNamespace getVariable ["milsim_respawn_setting _logParams ] call milsim_fnc_log; }; -} forEach milsim_respawn_reinsertionQueue; +} forEach milsim_reinsert_reinsertionQueue; // broadcast new list to all machines -milsim_respawn_reinsertionQueue = _stillValid; -publicVariable "milsim_respawn_reinsertionQueue"; \ No newline at end of file +milsim_reinsert_reinsertionQueue = _stillValid; +publicVariable "milsim_reinsert_reinsertionQueue"; \ No newline at end of file diff --git a/functions/settings/fn_addCBASettings.sqf b/functions/settings/fn_addCBASettings.sqf index fc786f5..2f22ebf 100644 --- a/functions/settings/fn_addCBASettings.sqf +++ b/functions/settings/fn_addCBASettings.sqf @@ -128,7 +128,7 @@ //--------------------- // Respawn Settings [ - "milsim_respawn_setting_reinsertion_enabled", // variable + "milsim_reinsert_setting_reinsertion_enabled", // variable "CHECKBOX", // type ["Enabled", "Whether or not players can file for reinsert and pilots can check the reinsert queue"], // title ["17th Battalion", "Re-insert Queue"], // category @@ -142,7 +142,7 @@ [ [ "setting", - "milsim_respawn_setting_reinsertion_enabled" + "milsim_reinsert_setting_reinsertion_enabled" ], ["newValue", _value] ] @@ -151,7 +151,7 @@ ] call CBA_fnc_addSetting; [ - "milsim_respawn_setting_reinsertion_maxRangeToReady", // variable + "milsim_reinsert_setting_reinsertion_maxRangeToReady", // variable "SLIDER", // type ["Max Request Filing Range", "Maximum distance from a respawn point a player can be to ready up"], // title ["17th Battalion", "Re-insert Queue"], // category @@ -165,7 +165,7 @@ [ [ "setting", - "milsim_respawn_setting_reinsertion_maxRangeToReady" + "milsim_reinsert_setting_reinsertion_maxRangeToReady" ], ["newValue", _value] ] @@ -174,7 +174,7 @@ ] call CBA_fnc_addSetting; [ - "milsim_respawn_setting_reinsertion_pilotForcedCheckEnabled", // variable + "milsim_reinsert_setting_reinsertion_pilotForcedCheckEnabled", // variable "CHECKBOX", // type ["Enabled", "Whether or not pilots are forced to view the contents of the reinsertion queue per interval"], // title ["17th Battalion", "Re-insert Queue"], // category @@ -188,7 +188,7 @@ [ [ "setting", - "milsim_respawn_setting_reinsertion_pilotForcedCheckEnabled" + "milsim_reinsert_setting_reinsertion_pilotForcedCheckEnabled" ], ["newValue", _value] ] @@ -197,7 +197,7 @@ ] call CBA_fnc_addSetting; [ - "milsim_respawn_setting_reinsertion_pilotForcedCheckInterval", // variable + "milsim_reinsert_setting_reinsertion_pilotForcedCheckInterval", // variable "TIME", // type ["Pilot Forced Check Interval", "Pilots will be force shown the queue if they haven't checked it in X seconds"], // title ["17th Battalion", "Re-insert Queue"], // category @@ -211,7 +211,7 @@ [ [ "setting", - "milsim_respawn_setting_reinsertion_pilotForcedCheckInterval" + "milsim_reinsert_setting_reinsertion_pilotForcedCheckInterval" ], ["newValue", _value] ] @@ -220,7 +220,7 @@ ] call CBA_fnc_addSetting; [ - "milsim_respawn_setting_reinsertion_max_wait", // variable + "milsim_reinsert_setting_reinsertion_max_wait", // variable "TIME", // type ["Max Wait Threshold", "How long should at least one person be waiting before prompting a global notification."], // title ["17th Battalion", "Re-insert Queue"], // category @@ -234,7 +234,7 @@ [ [ "setting", - "milsim_respawn_setting_reinsertion_max_wait" + "milsim_reinsert_setting_reinsertion_max_wait" ], ["newValue", _value] ]