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

adds getNearestBase, rework logging, use server diag_tickTime

Browse Source
This commit is contained in:
IndigoFox
2024-01-30 10:39:45 -08:00
parent 2951e9cda9
commit f52011cbc4
3 changed files with 79 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
functions/CfgFunctions.hpp
View File

@@ -81,5 +81,6 @@ class milsim_respawn {
file = "functions\respawn"; file = "functions\respawn";
class init { postInit = 1; }; class init { postInit = 1; };
class showReinsertQueueNotification {}; class showReinsertQueueNotification {};
class getNearestBase {};
}; };
}; };

15
functions/respawn/fn_getNearestBase.sqf Normal file
View File

@@ -0,0 +1,15 @@
params [["_player", objNull, [objNull]]];
if (isNull _player) exitWith {[99999, ""]};
private _bases = missionNamespace getVariable ["milsim_respawn_bases", []];
if (count _bases == 0) exitWith {[99999, ""]};
// get nearest base (Module_Respawn_F)
private _closestBase = [_bases, _player] call BIS_fnc_nearestPosition;
// get distance
private _nearestDistance = _closestBase distance _player;
// get base name
private _baseName = _closestBase getVariable ["name", ""];
if (_baseName == "") then {_baseName = format["near %1", text (nearestLocation [_closestBase, ""])]};
[_nearestDistance, _baseName];

107
functions/respawn/fn_init.sqf
View File

@@ -22,14 +22,14 @@ if (isServer) then {
// register event handlers // register event handlers
["milsim_respawn_fileReinsertRequest", { ["milsim_respawn_fileReinsertRequest", {
params ["_unit", "_closestBaseName", "_time"]; params ["_unit", "_closestBaseName"];
milsim_respawn_reinsertionQueue pushBackUnique [_unit, _closestBaseName, _time]; milsim_respawn_reinsertionQueue pushBackUnique [
_unit, _closestBaseName, diag_tickTime
];
diag_log text format [ diag_log text format [
"[milsim] (respawn_reinsertion) ADDED name=%1 playerUID=%2 group=%3 filedAtBase=%4", "[milsim] (respawn_reinsertion) PLAYER FILED REQUEST :: filedAtBase=""%1"" %2",
name _unit, _closestBaseName,
getPlayerUID _unit, [_unit] call milsim_fnc_getPlayerLogString
groupId (group _unit),
_closestBaseName
]; ];
publicVariable "milsim_respawn_reinsertionQueue"; publicVariable "milsim_respawn_reinsertionQueue";
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;
@@ -45,12 +45,10 @@ if (isServer) then {
}, "DESCEND"] call BIS_fnc_sortBy; }, "DESCEND"] call BIS_fnc_sortBy;
(_unitArrs#0) params ["_unit", "_baseName", "_timeFiled"]; // _unitArr = [unit, baseName, timeInQueue] (_unitArrs#0) params ["_unit", "_baseName", "_timeFiled"]; // _unitArr = [unit, baseName, timeInQueue]
private _timeInQueue = diag_tickTime - (_timeFiled); private _timeInQueue = diag_tickTime - (_timeFiled);
diag_log text format ["[milsim] (respawn_reinsertion) REMOVED BY REQUEST name=%1 playerUID=%2 group=%3 filedAtBase=%4 inQueue=%5s", diag_log text format ["[milsim] (respawn_reinsertion) PLAYER RESCINDED REQUEST :: filedAtBase=""%1"" inQueueDuration=""%2s"" %3",
name _unit,
getPlayerUID _unit,
groupId (group _unit),
_baseName, _baseName,
_timeInQueue _timeInQueue,
[_unit] call milsim_fnc_getPlayerLogString
]; ];
publicVariable "milsim_respawn_reinsertionQueue"; publicVariable "milsim_respawn_reinsertionQueue";
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;
@@ -61,30 +59,23 @@ if (isServer) then {
// every 60 seconds, revalidate any players in the queue // every 60 seconds, revalidate any players in the queue
// compare their distance to the nearest base, and remove them if they're too far away (or dead) // compare their distance to the nearest base, and remove them if they're too far away (or dead)
private _stillValid = []; private _stillValid = [];
private _maxRangeToReady = missionNamespace getVariable ["milsim_respawn_setting_reinsertion_maxRangeToReady", 400];
{ {
_x params ["_player", "_baseName", "_timeFiled"]; // _unitArr = [unit, baseName, timeInQueue] _x params ["_player", "_baseName", "_timeFiled"]; // _unitArr = [unit, baseName, timeInQueue]
private _nearestDistance = 99999;
{
private _baseLocation = _x;
private _distanceFromBase = _player distance _baseLocation;
if (_distanceFromBase < _nearestDistance) then {
_nearestDistance = _distanceFromBase;
};
} forEach milsim_respawn_bases;
private _nearBase = _nearestDistance < milsim_respawn_setting_reinsertion_maxRangeToReady;
private _nearBase = _nearestDistance < _maxRangeToReady;
if (_nearBase && alive _player) then { if (_nearBase && alive _player) then {
_stillValid pushBackUnique _x; _stillValid pushBackUnique _x;
} else { } else {
diag_log text format [ diag_log text format [
"[milsim] (respawn_reinsertion) REMOVED AUTOMATICALLY name=%1 playerUID=%2 group=%3 filedAtBase=%4 nearestBaseDistance=%5m inQueue=%6s", "[milsim] (respawn_reinsertion) PLAYER DEQUEUED AUTOMATICALLY :: filedAtBase=""%1"" nearestBaseDistance=""%2m"" maxDistanceSetting=""%3m"" inQueueDuration=""%4s"" %5",
name _player,
getPlayerUID _player,
groupId (group _player),
_baseName, _baseName,
_nearestDistance, _nearestDistance,
diag_tickTime - _timeFiled _maxRangeToReady,
diag_tickTime - _timeFiled,
[_player] call milsim_fnc_getPlayerLogString
]; ];
}; };
} forEach milsim_respawn_reinsertionQueue; } forEach milsim_respawn_reinsertionQueue;
@@ -109,34 +100,31 @@ if (isServer) then {
_timeoutPlayers = [_timeoutPlayers, [], { _timeoutPlayers = [_timeoutPlayers, [], {
_x#2 _x#2
}, "DESCEND"] call BIS_fnc_sortBy; }, "DESCEND"] call BIS_fnc_sortBy;
// GLOBAL CBA NOTIFY
private _playerLines = [["Players are still waiting for Re-insert!"]]; private _playerLines = [["Players are still waiting for Re-insert!"]];
{ {
private _timeInQueue = diag_tickTime - (_x#2);
private _groupId = groupID (group (_x#0));
_playerLines pushBack ([format [ _playerLines pushBack ([format [
"%1: %2 [%3]", "%1: %2 [%3]",
_groupId, groupID (group (_x#0)),
name (_x#0), name (_x#0),
[_timeInQueue, "MM:SS"] call BIS_fnc_secondsToString [diag_tickTime - (_x#2), "MM:SS"] call BIS_fnc_secondsToString
], 0.8, [0.8, 0.8, 0.8, 1]]); ], 0.8, [0.8, 0.8, 0.8, 1]]);
} forEach _timeoutPlayers; } forEach _timeoutPlayers;
_playerLines remoteExec ["CBA_fnc_notify", [0, -2] select isDedicated]; _playerLines remoteExec ["CBA_fnc_notify", [0, -2] select isDedicated];
// RESET NOTIFICATION TIMER
milsim_respawn_reinsertionOverTimeoutLastNotificationTime = diag_tickTime; milsim_respawn_reinsertionOverTimeoutLastNotificationTime = diag_tickTime;
diag_log text format [ // LOG TO RPT
"[milsim] (respawn_reinsertion) PLAYERS WAITING LONGER THAN %1s: %2", {
_timeout, diag_log text format [
_timeoutPlayers apply { "[milsim] (respawn_reinsertion) PLAYER WAITING OVER TIMEOUT :: timeout=""%1s"" inQueueDuration=""%2s"" %3",
format[ _timeout,
"%1: %2 [%3]", diag_tickTime - (_x#2),
groupId (group (_x#0)), [_x#0] call milsim_fnc_getPlayerLogString
name (_x#0), ];
diag_tickTime - (_x#2) } forEach _timeoutPlayers;
]
}
];
}; };
}; };
}, 60] call CBA_fnc_addPerFrameHandler; }, 60] call CBA_fnc_addPerFrameHandler;
@@ -164,19 +152,29 @@ if (hasInterface) then {
"\A3\ui_f\data\igui\cfg\simpleTasks\types\takeoff_ca.paa", "\A3\ui_f\data\igui\cfg\simpleTasks\types\takeoff_ca.paa",
{ {
params ["_target", "_player", "_params"]; params ["_target", "_player", "_params"];
private _closestBase = [milsim_respawn_bases, _player] call BIS_fnc_nearestPosition; // find nearest base or location
private _closestBaseName = _closestBase getVariable ["name", ""]; ([_player] call milsim_respawn_fnc_getNearestBase) params [
if (_closestBaseName == "") then {_closestBaseName = format["near %1", text (nearestLocation [_closestBase, ""])]}; "_baseDistance", "_baseName"
["milsim_respawn_fileReinsertRequest", [_player, _closestBaseName, diag_tickTime]] call CBA_fnc_serverEvent; ];
[["Re-insert Request Filed"], [format["Pickup at %1", _closestBaseName]]] call CBA_fnc_notify; // send event to server
["milsim_respawn_fileReinsertRequest", [_player, _baseName]] call CBA_fnc_serverEvent;
// notify player their request was filed
[["Re-insert Request Filed"], [format["Location: %1", _baseName]]] call CBA_fnc_notify;
}, },
{ {
params ["_target", "_player", "_params"]; params ["_target", "_player", "_params"];
private _closestBase = [milsim_respawn_bases, _player] call BIS_fnc_nearestPosition; // find nearest base or location
([_player] call milsim_respawn_fnc_getNearestBase) params [
"_baseDistance", "_baseName"
];
private _maxRangeToReady = missionNamespace getVariable ["milsim_respawn_setting_reinsertion_maxRangeToReady", 400];
private _existingQueue = missionNamespace getVariable ["milsim_respawn_reinsertionQueue", []];
// check if module is enabled, player is near a base, and player is not already in the queue
missionNamespace getVariable ["milsim_respawn_setting_reinsertion_enabled", true] && missionNamespace getVariable ["milsim_respawn_setting_reinsertion_enabled", true] &&
(_player distance _closestBase < milsim_respawn_setting_reinsertion_maxRangeToReady) && (_baseDistance < _maxRangeToReady) &&
not (_player in ((missionNamespace getVariable ["milsim_respawn_reinsertionQueue", []]) apply {_x#0})) not (_player in (_existingQueue apply {_x#0}))
} }
] call ace_interact_menu_fnc_createAction; ] call ace_interact_menu_fnc_createAction;
[_type, 1, ["ACE_SelfActions"], _fileForReinsertAction, true] call ace_interact_menu_fnc_addActionToClass; [_type, 1, ["ACE_SelfActions"], _fileForReinsertAction, true] call ace_interact_menu_fnc_addActionToClass;
@@ -187,14 +185,19 @@ if (hasInterface) then {
"\A3\ui_f\data\igui\cfg\simpleTasks\types\land_ca.paa", "\A3\ui_f\data\igui\cfg\simpleTasks\types\land_ca.paa",
{ {
params ["_target", "_player", "_params"]; params ["_target", "_player", "_params"];
// send event to server
["milsim_respawn_removeReinsertRequest", [_player]] call CBA_fnc_serverEvent; ["milsim_respawn_removeReinsertRequest", [_player]] call CBA_fnc_serverEvent;
// notify player their request was rescinded
"Re-insert Request Rescinded" call CBA_fnc_notify; "Re-insert Request Rescinded" call CBA_fnc_notify;
}, },
{ {
params ["_target", "_player", "_params"]; params ["_target", "_player", "_params"];
private _existingQueue = missionNamespace getVariable ["milsim_respawn_reinsertionQueue", []];
// check if module is enabled, player is in the queue
missionNamespace getVariable ["milsim_respawn_setting_reinsertion_enabled", true] && missionNamespace getVariable ["milsim_respawn_setting_reinsertion_enabled", true] &&
(_player in ((missionNamespace getVariable ["milsim_respawn_reinsertionQueue", []]) apply {_x#0})) (_player in (_existingQueue apply {_x#0}))
} }
] call ace_interact_menu_fnc_createAction; ] call ace_interact_menu_fnc_createAction;
[_type, 1, ["ACE_SelfActions"], _removeFileForReinsertAction, true] call ace_interact_menu_fnc_addActionToClass; [_type, 1, ["ACE_SelfActions"], _removeFileForReinsertAction, true] call ace_interact_menu_fnc_addActionToClass;