change milsim_respawn to milsim_reinsert

This commit is contained in:
2024-01-30 15:37:04 -08:00
parent 9ec51a5e19
commit 53c1d3b18d
13 changed files with 97 additions and 97 deletions

View File

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

View File

@@ -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];
localNamespace setVariable ["milsim_reinsert_checkReinsertQueueClassesAdded", _classesActionsAddedTo];

View File

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

View File

@@ -1,3 +1,3 @@
if (!hasInterface) exitWith {};
[] remoteExec ["milsim_respawn_fnc_returnReinsertQueueNotification", 2];
[] remoteExec ["milsim_reinsert_fnc_returnReinsertQueueNotification", 2];