17th-Ranger-Battalion-ORG/MissionTemplate
6
0
Fork 0
Code Issues 1 Pull Requests Actions Projects 1 Releases 16 Wiki Activity

change milsim_respawn to milsim_reinsert

Browse Source
This commit is contained in:
IndigoFox
2024-01-30 15:37:04 -08:00
parent 9ec51a5e19
commit 53c1d3b18d
13 changed files with 97 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
functions/reinsert/server/fn_addToQueue.sqf
View File

@@ -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]

18
functions/reinsert/server/fn_globalShowQueue.sqf
View File

@@ -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;
};

26
functions/reinsert/server/fn_initServer.sqf
View File

@@ -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;

14
functions/reinsert/server/fn_removeFromQueue.sqf
View File

@@ -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]

8
functions/reinsert/server/fn_returnReinsertQueueNotification.sqf
View File

@@ -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 {

18
functions/reinsert/server/fn_validateQueue.sqf
View File

@@ -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";
milsim_reinsert_reinsertionQueue = _stillValid;
publicVariable "milsim_reinsert_reinsertionQueue";