From 82d26ef50581dcfca00c46dfe4a56513903665f2 Mon Sep 17 00:00:00 2001 From: Sami Laine Date: Sun, 21 Feb 2021 03:18:33 +0200 Subject: [PATCH 01/18] Make module functions editable in game --- .../addons/zeusops_addon/XEH_postInit.sqf | 7 ++++ .../@zeusops/addons/zeusops_addon/config.cpp | 7 ++++ .../functions/fn_define_bodybag_player.sqf | 36 ++++++++++++++++ .../functions/fn_define_bodybag_respawn.sqf | 39 +++++++++++++++++ .../functions/fn_define_force_respawn.sqf | 24 +++++++++++ .../functions/fn_define_move_respawn.sqf | 35 ++++++++++++++++ .../functions/fn_define_spawn_arsenal.sqf | 42 +++++++++++++++++++ .../functions/fn_define_spawn_rearm.sqf | 42 +++++++++++++++++++ .../functions/fn_define_toggle_respawn.sqf | 31 ++++++++++++++ .../functions/fn_getUnitUnderCursor.sqf | 4 +- .../fn_moduleBodybagAndRespawnPlayer.sqf | 31 +------------- .../functions/fn_moduleBodybagPlayer.sqf | 30 +------------ .../functions/fn_moduleForceRespawnWave.sqf | 16 +------ .../fn_moduleMoveRespawnPosition.sqf | 27 +----------- .../functions/fn_moduleSpawnArsenalBox.sqf | 34 +-------------- .../functions/fn_moduleSpawnRearmBox.sqf | 34 +-------------- .../functions/fn_moduleToggleRespawn.sqf | 23 +--------- 17 files changed, 273 insertions(+), 189 deletions(-) create mode 100644 source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf create mode 100644 source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf create mode 100644 source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf create mode 100644 source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf create mode 100644 source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf create mode 100644 source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf create mode 100644 source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf diff --git a/source/@zeusops/addons/zeusops_addon/XEH_postInit.sqf b/source/@zeusops/addons/zeusops_addon/XEH_postInit.sqf index 9ec4ca3..0170b71 100644 --- a/source/@zeusops/addons/zeusops_addon/XEH_postInit.sqf +++ b/source/@zeusops/addons/zeusops_addon/XEH_postInit.sqf @@ -1 +1,8 @@ [] spawn zeusops_fnc_earplugs; +[] spawn zeusops_fnc_define_bodybag_player; +[] spawn zeusops_fnc_define_bodybag_respawn; +[] spawn zeusops_fnc_define_force_respawn; +[] spawn zeusops_fnc_define_move_respawn; +[] spawn zeusops_fnc_define_spawn_arsenal; +[] spawn zeusops_fnc_define_spawn_rearm; +[] spawn zeusops_fnc_define_toggle_respawn; diff --git a/source/@zeusops/addons/zeusops_addon/config.cpp b/source/@zeusops/addons/zeusops_addon/config.cpp index 8e8d7cb..47bc6ba 100644 --- a/source/@zeusops/addons/zeusops_addon/config.cpp +++ b/source/@zeusops/addons/zeusops_addon/config.cpp @@ -50,6 +50,13 @@ class CfgFunctions class moduleToggleRespawn; class respawnPlayer; class showCuratorMessage; + class define_bodybag_player; + class define_bodybag_respawn; + class define_force_respawn; + class define_move_respawn; + class define_spawn_arsenal; + class define_spawn_rearm; + class define_toggle_respawn; }; }; }; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf new file mode 100644 index 0000000..76d2554 --- /dev/null +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf @@ -0,0 +1,36 @@ +fn_bodybag_player = { + diag_log format ["[fn_bodybag_player] params: %1", _this joinString ", "]; + _logic = _this param [0,objNull]; + + // Exit if module wasn't created by this instance + if (!local _logic) exitWith { + diag_log "[fn_bodybag_player] exiting: not local"; + }; + if (!(_this select 2)) then { + diag_log "[fn_bodybag_player] DEBUG NOT ACTIVE: module not active, continuing"; + }; + diag_log "[fn_bodybag_player] passed checks"; + + // Find player + _player = objNull; + _object = _logic call zeusops_fnc_getUnitUnderCursor; + if (_object in allPlayers) then { + _player = _object; + }; + + // Bodybag if player is found + if (!(isNull _player)) then { + _player setDamage 1; + [objNull, _player] call ace_medical_fnc_actionPlaceInBodyBag; + "Bodybagged player" call zeusops_fnc_showCuratorMessage; + } else { + "Module needs to be placed on player" call zeusops_fnc_showCuratorMessage; + }; + + // Delete module + if (count objectcurators _logic > 0) then { + deletevehicle _logic; + }; + + true; +}; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf new file mode 100644 index 0000000..ce6de2e --- /dev/null +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf @@ -0,0 +1,39 @@ +fn_bodybag_respawn = { + diag_log format ["[fn_bodybag_respawn] params: %1", _this joinString ", "]; + _logic = _this param [0,objNull]; + + // Exit if module wasn't created by this instance + if (!local _logic) exitWith { + diag_log "[fn_bodybag_respawn] exiting: not local"; + }; + if (!(_this select 2)) then { + diag_log "[fn_bodybag_respawn] DEBUG NOT ACTIVE: module not active, continuing"; + }; + diag_log "[fn_bodybag_respawn] passed checks"; + + _pos = position _logic; + + // Find player + _player = objNull; + _object = _logic call zeusops_fnc_getUnitUnderCursor; + if (_object in allPlayers) then { + _player = _object; + }; + + // Bodybag and respawn if player found + if (!(isNull _player)) then { + _player setDamage 1; + [objNull, _player] call ace_medical_fnc_actionPlaceInBodyBag; + [] remoteExec ["zeusops_fnc_respawnPlayer", _player]; + "Bodybagged and respawned player" call zeusops_fnc_showCuratorMessage; + } else { + "Module needs to be placed on player" call zeusops_fnc_showCuratorMessage; + }; + + // Delete module + if (count objectcurators _logic > 0) then { + deletevehicle _logic; + }; + + true; +}; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf new file mode 100644 index 0000000..2790233 --- /dev/null +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf @@ -0,0 +1,24 @@ +fn_force_respawn = { + diag_log format ["[fn_force_respawn] params: %1", _this joinString ", "]; + _logic = _this param [0,objNull]; + + // Exit if module wasn't created by this instance + if (!local _logic) exitWith { + diag_log "[fn_force_respawn] exiting: not local"; + }; + if (!(_this select 2)) then { + diag_log "[fn_force_respawn] DEBUG NOT ACTIVE: module not active, continuing"; + }; + diag_log "[fn_force_respawn] passed checks"; + + // Force respawn wave + missionNameSpace setVariable ["respawnNextWaveTime", 1, true]; + "Forced respawn wave" call zeusops_fnc_showCuratorMessage; + + // Delete module + if (count objectcurators _logic > 0) then { + deletevehicle _logic; + }; + + true; +}; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf new file mode 100644 index 0000000..2ba9b83 --- /dev/null +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf @@ -0,0 +1,35 @@ +fn_move_respawn = { + diag_log format ["[fn_move_respawn] params: %1", _this joinString ", "]; + _logic = _this param [0,objNull]; + + // Exit if module wasn't created by this instance + if (!local _logic) exitWith { + diag_log "[fn_move_respawn] exiting: not local"; + }; + if (!(_this select 2)) then { + diag_log "[fn_move_respawn] DEBUG NOT ACTIVE: module not active, continuing"; + }; + diag_log "[fn_move_respawn] passed checks"; + + _pos = getPosASL _logic; + + // Find object + _object = _logic call zeusops_fnc_getUnitUnderCursor; + + if (isNull _object) then { + // Move spawn + missionNameSpace setVariable ["RESPAWN_POSITION", _pos, true]; + "Moved Respawn position" call zeusops_fnc_showCuratorMessage; + } else { + // Move spawn to object + missionNameSpace setVariable ["RESPAWN_POSITION", getPosASL _object, true]; + "Moved Respawn position to object" call zeusops_fnc_showCuratorMessage; + }; + + // Delete module + if (count objectcurators _logic > 0) then { + deletevehicle _logic; + }; + + true; +}; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf new file mode 100644 index 0000000..749f8be --- /dev/null +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf @@ -0,0 +1,42 @@ +fn_spawn_arsenal = { + diag_log format ["[fn_spawn_arsenal] params: %1", _this joinString ", "]; + _logic = _this param [0,objNull]; + + // Exit if module wasn't created by this instance + if (!local _logic) exitWith { + diag_log "[fn_spawn_arsenal] exiting: not local"; + }; + if (!(_this select 2)) then { + diag_log "[fn_spawn_arsenal] DEBUG NOT ACTIVE: module not active, continuing"; + }; + diag_log "[fn_spawn_arsenal] passed checks"; + + _pos = position _logic; + + // Find object + _object = _logic call zeusops_fnc_getUnitUnderCursor; + + // Spawn arsenal box + if (isNull _object) then { + // Spawn ammobox + _object = createVehicle ["B_supplyCrate_F", _pos, [], 0, "CAN_COLLIDE"]; + _object setDir (round random 360); + + // Allow zeuses to move the ammobox + [(getAssignedCuratorLogic player),[[_object],true]] remoteExec ["addCuratorEditableObjects", allCurators, true]; + + [2, _object] spawn ZO_fnc_gearBox; + "Spawned arsenal box" call zeusops_fnc_showCuratorMessage; + } else { + // Make existing object an arsenal box + [2, _object] spawn ZO_fnc_gearBox; + "Made object an arsenal box" call zeusops_fnc_showCuratorMessage; + }; + + // Delete module + if (count objectcurators _logic > 0) then { + deletevehicle _logic; + }; + + true; +}; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf new file mode 100644 index 0000000..a0b5c6d --- /dev/null +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf @@ -0,0 +1,42 @@ +fn_spawn_rearm = { + diag_log format ["[fn_spawn_rearm] params: %1", _this joinString ", "]; + _logic = _this param [0,objNull]; + + // Exit if module wasn't created by this instance + if (!local _logic) exitWith { + diag_log "[fn_spawn_rearm] exiting: not local"; + }; + if (!(_this select 2)) then { + diag_log "[fn_spawn_rearm] DEBUG NOT ACTIVE: module not active, continuing"; + }; + diag_log "[fn_spawn_rearm] passed checks"; + + _pos = position _logic; + + // Find object + _object = _logic call zeusops_fnc_getUnitUnderCursor; + + // Spawn rearm box + if (isNull _object) then { + // Spawn ammobox + _object = createVehicle ["B_supplyCrate_F", _pos, [], 0, "CAN_COLLIDE"]; + _object setDir (round random 360); + + // Allow zeuses to move the ammobox + [(getAssignedCuratorLogic player),[[_object],true]] remoteExec ["addCuratorEditableObjects", allCurators, true]; + + [3, _object] spawn ZO_fnc_gearBox; + "Spawned rearm box" call zeusops_fnc_showCuratorMessage; + } else { + // Make existing object an rearm box + [3, _object] spawn ZO_fnc_gearBox; + "Made object an rearm box" call zeusops_fnc_showCuratorMessage; + }; + + // Delete module + if (count objectcurators _logic > 0) then { + deletevehicle _logic; + }; + + true; +}; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf new file mode 100644 index 0000000..d188466 --- /dev/null +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf @@ -0,0 +1,31 @@ +fn_toggle_respawn = { + diag_log format ["[fn_toggle_respawn] params: %1", _this joinString ", "]; + _logic = _this param [0,objNull]; + + // Exit if module wasn't created by this instance + if (!local _logic) exitWith { + diag_log "[fn_toggle_respawn] exiting: not local"; + }; + if (!(_this select 2)) then { + diag_log "[fn_toggle_respawn] DEBUG NOT ACTIVE: module not active, continuing"; + }; + diag_log "[fn_toggle_respawn] passed checks"; + + // Toggle respawn + if (missionNameSpace getVariable "respawnAllow") then { + missionNameSpace setVariable ["respawnAllow", false, true]; + [999999] remoteExec ["setPlayerRespawnTime", allPlayers]; + "Respawn disabled" call zeusops_fnc_showCuratorMessage; + } else { + missionNameSpace setVariable ["respawnAllow", true, true]; + [900] remoteExec ["setPlayerRespawnTime", allPlayers]; + "Respawn enabled" call zeusops_fnc_showCuratorMessage; + }; + + // Delete module + if (count objectcurators _logic > 0) then { + deletevehicle _logic; + }; + + true; +}; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_getUnitUnderCursor.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_getUnitUnderCursor.sqf index dd5bc20..70564d1 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_getUnitUnderCursor.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_getUnitUnderCursor.sqf @@ -5,7 +5,9 @@ params ["_logic"]; -if !(local _logic) exitWith {}; +if !(local _logic) exitWith { + diag_log "[fn_getUnitUnderCursor] exiting: not local"; +}; private _unit = attachedTo _logic; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_moduleBodybagAndRespawnPlayer.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_moduleBodybagAndRespawnPlayer.sqf index 49c111c..17ceba3 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_moduleBodybagAndRespawnPlayer.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_moduleBodybagAndRespawnPlayer.sqf @@ -3,33 +3,4 @@ @file_author: Dyzalonius */ -_logic = _this param [0,objNull]; - -// Exit if module wasn't created by this instance -if (!local _logic) exitWith {}; - -_pos = position _logic; - -// Find player -_player = objNull; -_object = _logic call zeusops_fnc_getUnitUnderCursor; -if (_object in allPlayers) then { - _player = _object; -}; - -// Bodybag and respawn if player found -if (!(isNull _player)) then { - _player setDamage 1; - [objNull, _player] call ace_medical_fnc_actionPlaceInBodyBag; - [] remoteExec ["zeusops_fnc_respawnPlayer", _player]; - "Bodybagged and respawned player" call zeusops_fnc_showCuratorMessage; -} else { - "Module needs to be placed on player" call zeusops_fnc_showCuratorMessage; -}; - -// Delete module -if (count objectcurators _logic > 0) then { - deletevehicle _logic; -}; - -true; +_this call fn_bodybag_respawn; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_moduleBodybagPlayer.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_moduleBodybagPlayer.sqf index 0b1b890..abf703d 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_moduleBodybagPlayer.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_moduleBodybagPlayer.sqf @@ -3,32 +3,4 @@ @file_author: Dyzalonius */ -_logic = _this param [0,objNull]; - -// Exit if module wasn't created by this instance -if (!local _logic) exitWith {}; - -_pos = position _logic; - -// Find player -_player = objNull; -_object = _logic call zeusops_fnc_getUnitUnderCursor; -if (_object in allPlayers) then { - _player = _object; -}; - -// Bodybag if player is found -if (!(isNull _player)) then { - _player setDamage 1; - [objNull, _player] call ace_medical_fnc_actionPlaceInBodyBag; - "Bodybagged player" call zeusops_fnc_showCuratorMessage; -} else { - "Module needs to be placed on player" call zeusops_fnc_showCuratorMessage; -}; - -// Delete module -if (count objectcurators _logic > 0) then { - deletevehicle _logic; -}; - -true; +_this call fn_bodybag_player; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_moduleForceRespawnWave.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_moduleForceRespawnWave.sqf index e86e7fe..2f0ea9c 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_moduleForceRespawnWave.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_moduleForceRespawnWave.sqf @@ -3,18 +3,4 @@ @file_author: Dyzalonius */ -_logic = _this param [0,objNull]; - -// Exit if module wasn't created by this instance -if (!local _logic) exitWith {}; - -// Force respawn wave -missionNameSpace setVariable ["respawnNextWaveTime", 1, true]; -"Forced respawn wave" call zeusops_fnc_showCuratorMessage; - -// Delete module -if (count objectcurators _logic > 0) then { - deletevehicle _logic; -}; - -true; +_this call fn_force_respawn; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_moduleMoveRespawnPosition.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_moduleMoveRespawnPosition.sqf index 74e4b6d..decdfdb 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_moduleMoveRespawnPosition.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_moduleMoveRespawnPosition.sqf @@ -3,29 +3,4 @@ @file_author: Dyzalonius */ -_logic = _this param [0,objNull]; - -// Exit if module wasn't created by this instance -if (!local _logic) exitWith {}; - -_pos = getPosASL _logic; - -// Find object -_object = _logic call zeusops_fnc_getUnitUnderCursor; - -if (isNull _object) then { - // Move spawn - missionNameSpace setVariable ["RESPAWN_POSITION", _pos, true]; - "Moved Respawn position" call zeusops_fnc_showCuratorMessage; -} else { - // Move spawn to object - missionNameSpace setVariable ["RESPAWN_POSITION", getPosASL _object, true]; - "Moved Respawn position to object" call zeusops_fnc_showCuratorMessage; -}; - -// Delete module -if (count objectcurators _logic > 0) then { - deletevehicle _logic; -}; - -true; +_this call fn_move_respawn; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_moduleSpawnArsenalBox.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_moduleSpawnArsenalBox.sqf index 4119cd5..6d8234b 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_moduleSpawnArsenalBox.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_moduleSpawnArsenalBox.sqf @@ -3,36 +3,4 @@ @file_author: Dyzalonius */ -_logic = _this param [0,objNull]; - -// Exit if module wasn't created by this instance -if (!local _logic) exitWith {}; - -_pos = position _logic; - -// Find object -_object = _logic call zeusops_fnc_getUnitUnderCursor; - -// Spawn arsenal box -if (isNull _object) then { - // Spawn ammobox - _object = createVehicle ["B_supplyCrate_F", _pos, [], 0, "CAN_COLLIDE"]; - _object setDir (round random 360); - - // Allow zeuses to move the ammobox - [(getAssignedCuratorLogic player),[[_object],true]] remoteExec ["addCuratorEditableObjects", allCurators, true]; - - [2, _object] spawn ZO_fnc_gearBox; - "Spawned arsenal box" call zeusops_fnc_showCuratorMessage; -} else { - // Make existing object an arsenal box - [2, _object] spawn ZO_fnc_gearBox; - "Made object an arsenal box" call zeusops_fnc_showCuratorMessage; -}; - -// Delete module -if (count objectcurators _logic > 0) then { - deletevehicle _logic; -}; - -true; +_this call fn_spawn_arsenal; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_moduleSpawnRearmBox.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_moduleSpawnRearmBox.sqf index 1914a96..72436f5 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_moduleSpawnRearmBox.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_moduleSpawnRearmBox.sqf @@ -3,36 +3,4 @@ @file_author: Dyzalonius */ -_logic = _this param [0,objNull]; - -// Exit if module wasn't created by this instance, or if it's not activated -if (!local _logic) exitWith {}; - -_pos = position _logic; - -// Find object -_object = _logic call zeusops_fnc_getUnitUnderCursor; - -// Spawn rearm box -if (isNull _object) then { - // Spawn ammobox - _object = createVehicle ["B_supplyCrate_F", _pos, [], 0, "CAN_COLLIDE"]; - _object setDir (round random 360); - - // Allow zeuses to move the ammobox - [(getAssignedCuratorLogic player),[[_object],true]] remoteExec ["addCuratorEditableObjects", allCurators, true]; - - [3, _object] spawn ZO_fnc_gearBox; - "Spawned rearm box" call zeusops_fnc_showCuratorMessage; -} else { - // Make existing object an rearm box - [3, _object] spawn ZO_fnc_gearBox; - "Made object an rearm box" call zeusops_fnc_showCuratorMessage; -}; - -// Delete module -if (count objectcurators _logic > 0) then { - deletevehicle _logic; -}; - -true; +_this call fn_spawn_rearm; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_moduleToggleRespawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_moduleToggleRespawn.sqf index cc28e74..78fe1c6 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_moduleToggleRespawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_moduleToggleRespawn.sqf @@ -3,25 +3,4 @@ @file_author: Dyzalonius */ -_logic = _this param [0,objNull]; - -// Exit if module wasn't created by this instance, or if it's not activated -if (!local _logic || !(_this select 2)) exitWith {}; - -// Toggle respawn -if (missionNameSpace getVariable "respawnAllow") then { - missionNameSpace setVariable ["respawnAllow", false, true]; - [999999] remoteExec ["setPlayerRespawnTime", allPlayers]; - "Respawn disabled" call zeusops_fnc_showCuratorMessage; -} else { - missionNameSpace setVariable ["respawnAllow", true, true]; - [900] remoteExec ["setPlayerRespawnTime", allPlayers]; - "Respawn enabled" call zeusops_fnc_showCuratorMessage; -}; - -// Delete module -if (count objectcurators _logic > 0) then { - deletevehicle _logic; -}; - -true; +_this call fn_toggle_respawn; From 02babd63a371ae435846d909601dcb98bc0575ea Mon Sep 17 00:00:00 2001 From: Sami Laine Date: Sun, 21 Feb 2021 03:37:28 +0200 Subject: [PATCH 02/18] Remote execute diag_log --- .../zeusops_addon/functions/fn_define_bodybag_player.sqf | 8 ++++---- .../zeusops_addon/functions/fn_define_bodybag_respawn.sqf | 8 ++++---- .../zeusops_addon/functions/fn_define_force_respawn.sqf | 8 ++++---- .../zeusops_addon/functions/fn_define_move_respawn.sqf | 8 ++++---- .../zeusops_addon/functions/fn_define_spawn_arsenal.sqf | 8 ++++---- .../zeusops_addon/functions/fn_define_spawn_rearm.sqf | 8 ++++---- .../zeusops_addon/functions/fn_define_toggle_respawn.sqf | 8 ++++---- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf index 76d2554..92a4f88 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf @@ -1,15 +1,15 @@ fn_bodybag_player = { - diag_log format ["[fn_bodybag_player] params: %1", _this joinString ", "]; + format ["[fn_bodybag_player] params: %1", _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { - diag_log "[fn_bodybag_player] exiting: not local"; + "[fn_bodybag_player] exiting: not local" remoteExec ["diag_log", 2]; }; if (!(_this select 2)) then { - diag_log "[fn_bodybag_player] DEBUG NOT ACTIVE: module not active, continuing"; + "[fn_bodybag_player] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; }; - diag_log "[fn_bodybag_player] passed checks"; + "[fn_bodybag_player] passed checks" remoteExec ["diag_log", 2]; // Find player _player = objNull; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf index ce6de2e..b28c894 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf @@ -1,15 +1,15 @@ fn_bodybag_respawn = { - diag_log format ["[fn_bodybag_respawn] params: %1", _this joinString ", "]; + format ["[fn_bodybag_respawn] params: %1", _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { - diag_log "[fn_bodybag_respawn] exiting: not local"; + "[fn_bodybag_respawn] exiting: not local" remoteExec ["diag_log", 2]; }; if (!(_this select 2)) then { - diag_log "[fn_bodybag_respawn] DEBUG NOT ACTIVE: module not active, continuing"; + "[fn_bodybag_respawn] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; }; - diag_log "[fn_bodybag_respawn] passed checks"; + "[fn_bodybag_respawn] passed checks" remoteExec ["diag_log", 2]; _pos = position _logic; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf index 2790233..f800fa9 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf @@ -1,15 +1,15 @@ fn_force_respawn = { - diag_log format ["[fn_force_respawn] params: %1", _this joinString ", "]; + format ["[fn_force_respawn] params: %1", _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { - diag_log "[fn_force_respawn] exiting: not local"; + "[fn_force_respawn] exiting: not local" remoteExec ["diag_log", 2]; }; if (!(_this select 2)) then { - diag_log "[fn_force_respawn] DEBUG NOT ACTIVE: module not active, continuing"; + "[fn_force_respawn] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; }; - diag_log "[fn_force_respawn] passed checks"; + "[fn_force_respawn] passed checks" remoteExec ["diag_log", 2]; // Force respawn wave missionNameSpace setVariable ["respawnNextWaveTime", 1, true]; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf index 2ba9b83..e4e4a77 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf @@ -1,15 +1,15 @@ fn_move_respawn = { - diag_log format ["[fn_move_respawn] params: %1", _this joinString ", "]; + format ["[fn_move_respawn] params: %1", _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { - diag_log "[fn_move_respawn] exiting: not local"; + "[fn_move_respawn] exiting: not local" remoteExec ["diag_log", 2]; }; if (!(_this select 2)) then { - diag_log "[fn_move_respawn] DEBUG NOT ACTIVE: module not active, continuing"; + "[fn_move_respawn] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; }; - diag_log "[fn_move_respawn] passed checks"; + "[fn_move_respawn] passed checks" remoteExec ["diag_log", 2]; _pos = getPosASL _logic; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf index 749f8be..703221d 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf @@ -1,15 +1,15 @@ fn_spawn_arsenal = { - diag_log format ["[fn_spawn_arsenal] params: %1", _this joinString ", "]; + format ["[fn_spawn_arsenal] params: %1", _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { - diag_log "[fn_spawn_arsenal] exiting: not local"; + "[fn_spawn_arsenal] exiting: not local" remoteExec ["diag_log", 2]; }; if (!(_this select 2)) then { - diag_log "[fn_spawn_arsenal] DEBUG NOT ACTIVE: module not active, continuing"; + "[fn_spawn_arsenal] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; }; - diag_log "[fn_spawn_arsenal] passed checks"; + "[fn_spawn_arsenal] passed checks" remoteExec ["diag_log", 2]; _pos = position _logic; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf index a0b5c6d..680e95b 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf @@ -1,15 +1,15 @@ fn_spawn_rearm = { - diag_log format ["[fn_spawn_rearm] params: %1", _this joinString ", "]; + format ["[fn_spawn_rearm] params: %1", _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { - diag_log "[fn_spawn_rearm] exiting: not local"; + "[fn_spawn_rearm] exiting: not local" remoteExec ["diag_log", 2]; }; if (!(_this select 2)) then { - diag_log "[fn_spawn_rearm] DEBUG NOT ACTIVE: module not active, continuing"; + "[fn_spawn_rearm] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; }; - diag_log "[fn_spawn_rearm] passed checks"; + "[fn_spawn_rearm] passed checks" remoteExec ["diag_log", 2]; _pos = position _logic; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf index d188466..0ee0fff 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf @@ -1,15 +1,15 @@ fn_toggle_respawn = { - diag_log format ["[fn_toggle_respawn] params: %1", _this joinString ", "]; + format ["[fn_toggle_respawn] params: %1", _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { - diag_log "[fn_toggle_respawn] exiting: not local"; + "[fn_toggle_respawn] exiting: not local" remoteExec ["diag_log", 2]; }; if (!(_this select 2)) then { - diag_log "[fn_toggle_respawn] DEBUG NOT ACTIVE: module not active, continuing"; + "[fn_toggle_respawn] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; }; - diag_log "[fn_toggle_respawn] passed checks"; + "[fn_toggle_respawn] passed checks" remoteExec ["diag_log", 2]; // Toggle respawn if (missionNameSpace getVariable "respawnAllow") then { From 3e8e78f57208d0a32ccf0d43152c7cfb42ee4927 Mon Sep 17 00:00:00 2001 From: Sami Laine Date: Sun, 21 Feb 2021 04:04:01 +0200 Subject: [PATCH 03/18] Show target type and player name --- .../zeusops_addon/functions/fn_define_bodybag_player.sqf | 3 ++- .../zeusops_addon/functions/fn_define_bodybag_respawn.sqf | 3 ++- .../addons/zeusops_addon/functions/fn_define_force_respawn.sqf | 3 ++- .../addons/zeusops_addon/functions/fn_define_move_respawn.sqf | 3 ++- .../addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf | 3 ++- .../addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf | 3 ++- .../zeusops_addon/functions/fn_define_toggle_respawn.sqf | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf index 92a4f88..1391d21 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf @@ -1,5 +1,6 @@ fn_bodybag_player = { - format ["[fn_bodybag_player] params: %1", _this joinString ", "] remoteExec ["diag_log", 2]; + _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; + format ["[fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf index b28c894..9fe3d16 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf @@ -1,5 +1,6 @@ fn_bodybag_respawn = { - format ["[fn_bodybag_respawn] params: %1", _this joinString ", "] remoteExec ["diag_log", 2]; + _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; + format ["[fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf index f800fa9..9732183 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf @@ -1,5 +1,6 @@ fn_force_respawn = { - format ["[fn_force_respawn] params: %1", _this joinString ", "] remoteExec ["diag_log", 2]; + _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; + format ["[fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf index e4e4a77..05bc421 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf @@ -1,5 +1,6 @@ fn_move_respawn = { - format ["[fn_move_respawn] params: %1", _this joinString ", "] remoteExec ["diag_log", 2]; + _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; + format ["[fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf index 703221d..66a34a9 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf @@ -1,5 +1,6 @@ fn_spawn_arsenal = { - format ["[fn_spawn_arsenal] params: %1", _this joinString ", "] remoteExec ["diag_log", 2]; + _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; + format ["[fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf index 680e95b..fd85f03 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf @@ -1,5 +1,6 @@ fn_spawn_rearm = { - format ["[fn_spawn_rearm] params: %1", _this joinString ", "] remoteExec ["diag_log", 2]; + _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; + format ["[fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf index 0ee0fff..2e20944 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf @@ -1,5 +1,6 @@ fn_toggle_respawn = { - format ["[fn_toggle_respawn] params: %1", _this joinString ", "] remoteExec ["diag_log", 2]; + _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; + format ["[fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance From 040f737c9c27f0a68d5f9031626a5b0b832068a7 Mon Sep 17 00:00:00 2001 From: Sami Laine Date: Sun, 21 Feb 2021 04:09:49 +0200 Subject: [PATCH 04/18] Test release v1.12.0-a2 --- ...0mm_smokefix_zops.pbo.zeusops-1.12.0-a2.bisign | Bin 0 -> 570 bytes ...nb40mm_smokefix_zops.pbo.zeusops-1.12.0.bisign | Bin 567 -> 0 bytes .../addons/stui_core.pbo.zeusops-1.12.0-a2.bisign | Bin 0 -> 570 bytes .../addons/stui_core.pbo.zeusops-1.12.0.bisign | Bin 567 -> 0 bytes .../stui_grouphud.pbo.zeusops-1.12.0-a2.bisign | Bin 0 -> 570 bytes .../stui_grouphud.pbo.zeusops-1.12.0.bisign | Bin 567 -> 0 bytes .../stui_nametags.pbo.zeusops-1.12.0-a2.bisign | Bin 0 -> 570 bytes .../stui_nametags.pbo.zeusops-1.12.0.bisign | Bin 567 -> 0 bytes .../zeusops_addon.pbo.zeusops-1.12.0-a2.bisign | Bin 0 -> 570 bytes .../zeusops_addon.pbo.zeusops-1.12.0.bisign | Bin 567 -> 0 bytes .../addons/zops_kit.pbo.zeusops-1.12.0-a2.bisign | Bin 0 -> 570 bytes .../addons/zops_kit.pbo.zeusops-1.12.0.bisign | Bin 567 -> 0 bytes release/@zeusops/keys/zeusops-1.12.0-a2.bikey | Bin 0 -> 170 bytes release/@zeusops/keys/zeusops-1.12.0.bikey | Bin 167 -> 0 bytes 14 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a2.bisign delete mode 100644 release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0.bisign create mode 100644 release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a2.bisign delete mode 100644 release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0.bisign create mode 100644 release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a2.bisign delete mode 100644 release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0.bisign create mode 100644 release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a2.bisign delete mode 100644 release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0.bisign create mode 100644 release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0-a2.bisign delete mode 100644 release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0.bisign create mode 100644 release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a2.bisign delete mode 100644 release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0.bisign create mode 100644 release/@zeusops/keys/zeusops-1.12.0-a2.bikey delete mode 100644 release/@zeusops/keys/zeusops-1.12.0.bikey diff --git a/release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a2.bisign b/release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a2.bisign new file mode 100644 index 0000000000000000000000000000000000000000..f534886e6095379825802ae66516ce788acb44f4 GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy+0F(d#00sg8001Na08&#yF#rSr009620G+nZ zb0c4m_P5Bx$%&Uy<+$)*9teptW0C%V$og=I8_5h*^65t&!SFfC70J2>N}Lhe|8^p11YN|9tJm)+3btdJ zJFS>^ZLnsmz}XWN$9iet+gk(q$$$U=03TyN!Wp+XNIt3P!qBUbUeCStbJV~jMo*W; zsE^2|)g+l6Xul*x7-l;Ad**=&{6eL_=@mw~7Rmro##(kY{eX=NkvX>O+36#vqM&fv zR}c~FV-~BBR4Eg;R(Sphg^;OLn(~%tvSq7-B5nvtb%?<6IOCqxv|g;FtY-LVi~|4w z0Du4h01^xm0Isvi1d{T7+Ub2^HD& zab{&Y7Fd_(zfUUN8(Xm%J)IX(I%vx*2P^xvQ-A;f0Du#z0V$!=en^arpjs!p`$)>J zHOPKMWz+O?qk1R0}KRI;Z16F17#xecN1r@$R-qS|C`Ix(%!of3l-QAC4Nb~ z^5N|c|6ToBxFXy4<%dQgNh!uKNI6Ky%rO`J9q=YVAUn9G{!0sb01X&*xxXMqmnrd8B0@bBc}@Y&oK@u=76&{aM9%n4Kw;) FJ+|}p{c`{S diff --git a/release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a2.bisign b/release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a2.bisign new file mode 100644 index 0000000000000000000000000000000000000000..5443f59549751e5e9d9d0fe303fb86776cad6839 GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy+0F(d#00sg8001Na08&#yF#rSr009620G+nZ zb0c4m_P5Bx$%&Uy<+$)*9teptW0C%V$og=I8_5h*^65t&!SFfC70J2>N}Lhe|8^p11YN|9tJm)+3btdJ zJFS>^ZLnsmz}XWN$9iet+gk(q$$$U=0HdDESuwW<-{9kComYvCU(gD+Q=@mJ#}KeT zamU<9AlHT+6Ren5`;eVpic2exN3rZ!$lZi^q|7+$GKNwZex@w)wR=j`JDo^4@u0M3 zD3RZmS(wDtcKUcrZb+b68$UrM-4?mxH0W97_X)_(c4+&bWumrs1@mL?s4w! zM7S{IY{T~oXiB-=($EH=<@RN~9qi%kHBvXfu26$_tlIOjl{5_2Rpsl+R7vAkmR6yA1q{N) z$7$jj(>U|j1QrkZ(sJ2_)I@zGq5)|O)e)&`HJ}^&gpwbj6>EcbVTT%`FUZwC?Nkco I(20nZV(#w=KmY&$ literal 0 HcmV?d00001 diff --git a/release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0.bisign b/release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0.bisign deleted file mode 100644 index b949217e911b5ebc085222e9e70979467bb49bcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 567 zcmV-70?7S(Wp#6JaC0p&E-^ALFaVSQ000I80000a002@`K`{UX000310RU}_M6KW| z0&52+c^z7%O-*j&M7Tts^r9m!9=US$ zNB6Gl*A#g|eOu6SS`g%_H>aO$mq|b6vJv>KXkLTbN`Fmqlf_p&bd%Co8|FyL1-oBx zUX}uflhVzu;qIp|kGZdo?gnKPpIC7ao=}E{JC5R2 zwPV2vhix#z$x^u?uajX1cx-9`oI8)hG`v5Y>T&eh^=#CbFW`mLC&%L7H8(*Q>aAXy zD?f$%(ia@#!&00lj@S5RRV5d@K zN|o1iz9;xFM%H)~28rr`EW&1ouc3>+)dNyaqCD${Gei`t^FU|%CWK@u*nN}6@MGpF FN|#-f2iyPv diff --git a/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a2.bisign b/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a2.bisign new file mode 100644 index 0000000000000000000000000000000000000000..09c3d3f2d05da40ba02583a63e73140c6ed1dc9a GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy+0F(d#00sg8001Na08&#yF#rSr009620G+nZ zb0c4m_P5Bx$%&Uy<+$)*9teptW0C%V$og=I8_5h*^65t&!SFfC70J2>N}Lhe|8^p11YN|9tJm)+3btdJ zJFS>^ZLnsmz}XWN$9iet+gk(q$$$U=0M^DOlrjNa-CROneQ`uKccFAKjUY8p)T->% zj%JL;`K~5b^tTZ#OZMxQtUjQTef85V_W0O)V?0|xSQ7w$s#>)+pER{9eWcL6R83Jk zWe=Y1U0?Lr$N03!oMX;h75eo|d&NO7bxx8RIiafNgswvd*3HGyfbTW8nRk>%fU z8TLM+(w_VdEh=6rs%3R&_61~H=N^~mmq=eh4}wVQ%>MELr|Bj9^euVN(Eh8Lu5wT!acRtB zNZPh~l@7Rc%FM*}&6ZTKu?pEO@O?cI1=P+ZJ{s-XOl6mH;(~A0 z8U7>jsk~1vfV3q2P^%Yo{rR58S_O`9V!X!CybtS>!E9eab8DRFu;;}2(pL+bJ7i91 Iy1o~oh#4gfO8@`> literal 0 HcmV?d00001 diff --git a/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0.bisign b/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0.bisign deleted file mode 100644 index c33e76cc1db31e9f4aaa57cfe8c6e109a6884179..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 567 zcmV-70?7S(Wp#6JaC0p&E-^ALFaVSQ000I80000a002@`K`{UX000310RU}_M6KW| z0&5z>cHdRyV(Zzm^*{BJ?`w?ys15-H6l)U8`Cy$Nw9in=|knQ*&+jWA?%dod^bk}p}$Xm35UDqy#_b$NIt0joWhX1cErs4zT!QFtxQ} F@{Ao}2X6oX diff --git a/release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a2.bisign b/release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a2.bisign new file mode 100644 index 0000000000000000000000000000000000000000..497bc7ae28de1c95241b81c006578edec9c83e94 GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy+0F(d#00sg8001Na08&#yF#rSr009620G+nZ zb0c4m_P5Bx$%&Uy<+$)*9teptW0C%V$og=I8_5h*^65t&!SFfC70J2>N}Lhe|8^p11YN|9tJm)+3btdJ zJFS>^ZLnsmz}XWN$9iet+gk(q$$$U=0I{@Xd^%uFb{^e$jq5hHq+VAN&$(rUS@kPE zk4?wPbH|*I*e4sk9eJV2Mc!hp19hZZHG2UGDqn706j%4{bubQnIl{qMk@Olv#{Qa=7$5wVdwah@MMb zPb-KLnlSTnvh4rkV|MnhY}4bD1v=G&ExoEh#ZOJqB1>UL%cE1Aa|LR_tr!Cn_AWy? zTraRZDHfilpCik|YCPETLdq39$-3Wk#@`S?H{VrDDnqqb*tqzC*8?R}gp{ ILUiNfN4wQz;^1&h233kV2zp$>Y5?wI>~-ER_Q&^`_OY#Eycd%nhp_PF8wg8{kFM0||b;yS!rQtM|~y z9{L+&EW8#qW}Z$_;so`hOQM_QUXij-8kc|o002Y!F4QT-GGSCl)wslQ7STOVDkcin z#_-44OSz$fv#Iv+!4#{Y4yW{0AbjJ`aCanAmQ1ty+u`?PWI!7>#ceKr&H+Hw{E_^TkdiO$CDhpA FDRRy66HWjC diff --git a/release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0-a2.bisign b/release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0-a2.bisign new file mode 100644 index 0000000000000000000000000000000000000000..624c990cc711bfb04f7628de48b60644482a7a16 GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy+0F(d#00sg8001Na08&#yF#rSr009620G+nZ zb0c4m_P5Bx$%&Uy<+$)*9teptW0C%V$og=I8_5h*^65t&!SFfC70J2>N}Lhe|8^p11YN|9tJm)+3btdJ zJFS>^ZLnsmz}XWN$9iet+gk(q$$$U=05Klk%RKyb`OQ<5NjNoEnA^{ zk5^QT9w;Gt-HRB0sY(d>;oYf_-R1kr1vmI6k!1TPziHcT;#@#QNqI*(ExvXB;8u_q zWP^;49mV^|;~!ZefXhjSzy#}>6f|H8f<&=IzkmP$01=l}jZN+wm@g-bFBJVDt#Ovk zridY+WvUv7l4|jxh}`_AB^p9ZcddQ5WVXNr<snENz=xZl9xV1&vKPK-G#v(c%+%qwD}_I% z5-I;pE2;W6gAQ|NkKS;RCxg@7*-kGM4Re|^sMO}o@a*z3z3JlwMgQz+cRg^mP$rfv zwy&9!&jahwC;FT8fe`^(0y>x}mO;L>UYRFb*d$zoO1Q;0Giv<3;Ha7$EO}LBe z#|3l0tWL(T?@Fc+7#G19w6CdS<$U_W`v)(=_ehBf+AA!FSk}mKzQb(y8Ot}FXrYju zw_7jJWuG>R9(nYHzorqztX~srFJBtZl!Jf(001(fmbc-yFr@Dv%w3rY4CoDgKUG|9 z<7{XSo?MQFr?-G+%?CkmDstV@h{XS}v@?8LU)Eq&w&3FvJD7s0WHSMT2=_Ji7P+M1 zurhRu2QP9{(_*;-!Al*X7+2{nQZFdUjiizqoN=e6Cb)D3JchQ5*4r0BnV9BtJ`?BB FjT)~{24MgI diff --git a/release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a2.bisign b/release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a2.bisign new file mode 100644 index 0000000000000000000000000000000000000000..264cff2c668cc0a7b8f63221ec8ac7827331feaa GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy+0F(d#00sg8001Na08&#yF#rSr009620G+nZ zb0c4m_P5Bx$%&Uy<+$)*9teptW0C%V$og=I8_5h*^65t&!SFfC70J2>N}Lhe|8^p11YN|9tJm)+3btdJ zJFS>^ZLnsmz}XWN$9iet+gk(q$$$U=0LVrSK+0-A7*XZ{sm6{*U{lg`JKgvQHH7Bz zwWSAxY!CY41ubf=&Wt-Q-;_r!X{S|!XafmYu`36}NkGM7$M=Y2j8sP1Jb zUlYzqKoMSqkbju9!&>-(#+S;WZ{u3wCmZ&+or}`%%p9vZ(eX*F$c*(78AQRxtpfl6 z0Du4h0Etdpp69V_jvdacNz0SHnX1@Ly$TV5@U2Lh0h=}o0M&d6=t#YVt^>U#UUwzowH>2Ga0EXR$)BUWa`Ct zfjo$g@PQ$X!!L-W`VZH?B`vWgHSC*A3fGgvW`F#}$E z!wn3e6X5mFy~*z9zZlCVGFB6N=eQqzK=5I@OQt{=WRpeC?$X-MNKT~QJT-b9t2*4` zu0jIw!WL8~zT(L&k_rA_pv#)>3Vz(UL&(3%E+DVn@*5|4&# zJda?#YTDOjv$~z|iRSmm^MDR_>mRIylD{mlpQ@Ty_Iv2kn&c?ywq$`1(W!s+1KkuI Fs+x=25<~z1 diff --git a/release/@zeusops/keys/zeusops-1.12.0-a2.bikey b/release/@zeusops/keys/zeusops-1.12.0-a2.bikey new file mode 100644 index 0000000000000000000000000000000000000000..3d1262dbe293d14b41f49bcc2eb9ec67511f461a GIT binary patch literal 170 zcmV;b09F5bWp#6JaC0p&E-^ALFfCy+0F(d#00sg8001Na08&#yF#rSr009620G+nZ zb0c4m_P5Bx$%&Uy<+$)*9teptW0C%V$og=I8_5h*^65t&!SFfC70J2>N}Lhe|8^p11YN|9tJm)+3btdJ YJFS>^ZLnsmz}XWN$9iet+gk(q$;{eC-v9sr literal 0 HcmV?d00001 diff --git a/release/@zeusops/keys/zeusops-1.12.0.bikey b/release/@zeusops/keys/zeusops-1.12.0.bikey deleted file mode 100644 index fcaf77c52321bcd8a63f2f3435995f13be3fbe7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmV;Y09gNeWp#6JaC0p&E-^ALFaVSQ000I80000a002@`K`{UX000310RU}_M6KW| z0&5 Date: Mon, 22 Feb 2021 19:35:39 +0200 Subject: [PATCH 05/18] Move module debug to preInit --- source/@zeusops/addons/zeusops_addon/XEH_postInit.sqf | 7 ------- source/@zeusops/addons/zeusops_addon/XEH_preInit.sqf | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/source/@zeusops/addons/zeusops_addon/XEH_postInit.sqf b/source/@zeusops/addons/zeusops_addon/XEH_postInit.sqf index 0170b71..9ec4ca3 100644 --- a/source/@zeusops/addons/zeusops_addon/XEH_postInit.sqf +++ b/source/@zeusops/addons/zeusops_addon/XEH_postInit.sqf @@ -1,8 +1 @@ [] spawn zeusops_fnc_earplugs; -[] spawn zeusops_fnc_define_bodybag_player; -[] spawn zeusops_fnc_define_bodybag_respawn; -[] spawn zeusops_fnc_define_force_respawn; -[] spawn zeusops_fnc_define_move_respawn; -[] spawn zeusops_fnc_define_spawn_arsenal; -[] spawn zeusops_fnc_define_spawn_rearm; -[] spawn zeusops_fnc_define_toggle_respawn; diff --git a/source/@zeusops/addons/zeusops_addon/XEH_preInit.sqf b/source/@zeusops/addons/zeusops_addon/XEH_preInit.sqf index fdbb1dd..c208bfe 100644 --- a/source/@zeusops/addons/zeusops_addon/XEH_preInit.sqf +++ b/source/@zeusops/addons/zeusops_addon/XEH_preInit.sqf @@ -4,3 +4,11 @@ fnc_gatherGroups = compileFinal preprocessFileLineNumbers "\zeusops_addon\athena\gatherGroups.sqf"; fnc_gatherUnits = compileFinal preprocessFileLineNumbers "\zeusops_addon\athena\gatherUnits.sqf"; fnc_gatherVehicles = compileFinal preprocessFileLineNumbers "\zeusops_addon\athena\gatherVehicles.sqf"; + +[] call zeusops_fnc_define_bodybag_player; +[] call zeusops_fnc_define_bodybag_respawn; +[] call zeusops_fnc_define_force_respawn; +[] call zeusops_fnc_define_move_respawn; +[] call zeusops_fnc_define_spawn_arsenal; +[] call zeusops_fnc_define_spawn_rearm; +[] call zeusops_fnc_define_toggle_respawn; From 431f9750165a5e8e3411816771fa3cb080195152 Mon Sep 17 00:00:00 2001 From: Sami Laine Date: Mon, 22 Feb 2021 19:52:25 +0200 Subject: [PATCH 06/18] Test release v1.12.0-a3 --- ...smokefix_zops.pbo.zeusops-1.12.0-a2.bisign | Bin 570 -> 0 bytes ...smokefix_zops.pbo.zeusops-1.12.0-a3.bisign | Bin 0 -> 570 bytes .../stui_core.pbo.zeusops-1.12.0-a2.bisign | Bin 570 -> 0 bytes .../stui_core.pbo.zeusops-1.12.0-a3.bisign | Bin 0 -> 570 bytes ...stui_grouphud.pbo.zeusops-1.12.0-a2.bisign | Bin 570 -> 0 bytes ...stui_grouphud.pbo.zeusops-1.12.0-a3.bisign | Bin 0 -> 570 bytes ...stui_nametags.pbo.zeusops-1.12.0-a2.bisign | Bin 570 -> 0 bytes ...stui_nametags.pbo.zeusops-1.12.0-a3.bisign | Bin 0 -> 570 bytes release/@zeusops/addons/zeusops_addon.pbo | Bin 278185 -> 274707 bytes ...zeusops_addon.pbo.zeusops-1.12.0-a2.bisign | Bin 570 -> 0 bytes ...zeusops_addon.pbo.zeusops-1.12.0-a3.bisign | Bin 0 -> 570 bytes .../zops_kit.pbo.zeusops-1.12.0-a2.bisign | Bin 570 -> 0 bytes .../zops_kit.pbo.zeusops-1.12.0-a3.bisign | Bin 0 -> 570 bytes release/@zeusops/keys/zeusops-1.12.0-a2.bikey | Bin 170 -> 0 bytes release/@zeusops/keys/zeusops-1.12.0-a3.bikey | Bin 0 -> 170 bytes 15 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a2.bisign create mode 100644 release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a3.bisign delete mode 100644 release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a2.bisign create mode 100644 release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a3.bisign delete mode 100644 release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a2.bisign create mode 100644 release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a3.bisign delete mode 100644 release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a2.bisign create mode 100644 release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a3.bisign delete mode 100644 release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0-a2.bisign create mode 100644 release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0-a3.bisign delete mode 100644 release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a2.bisign create mode 100644 release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a3.bisign delete mode 100644 release/@zeusops/keys/zeusops-1.12.0-a2.bikey create mode 100644 release/@zeusops/keys/zeusops-1.12.0-a3.bikey diff --git a/release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a2.bisign b/release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a2.bisign deleted file mode 100644 index f534886e6095379825802ae66516ce788acb44f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy+0F(d#00sg8001Na08&#yF#rSr009620G+nZ zb0c4m_P5Bx$%&Uy<+$)*9teptW0C%V$og=I8_5h*^65t&!SFfC70J2>N}Lhe|8^p11YN|9tJm)+3btdJ zJFS>^ZLnsmz}XWN$9iet+gk(q$$$U=03TyN!Wp+XNIt3P!qBUbUeCStbJV~jMo*W; zsE^2|)g+l6Xul*x7-l;Ad**=&{6eL_=@mw~7Rmro##(kY{eX=NkvX>O+36#vqM&fv zR}c~FV-~BBR4Eg;R(Sphg^;OLn(~%tvSq7-B5nvtb%?<6IOCqxv|g;FtY-LVi~|4w z0Du4h01^xm0Isvi1d{T7+Ub2^HD& zab{&Y7Fd_(zfUUN8(Xm%J)IX(I%vx*2P^xvQ-A;f0Du#z0V$!=en^arpjs!p`$)>J zHOPKMWz+O?qk1%A$Wp#6JaC0p&E-^ALFfCy-0F(d#00sg8001Na08&#yF#rSr0096209nJ| zO6yPZ0*D5LF!W(iz`OWV1=Viq&sS_BU?*sd{ENcIsTm>rhV^kRYg>ECDTy~GR3Hp{ z^_edC&yrw@%ZE>rl2_y%M@cpMtBU@xo2{wS&o;Y4uLHJktHXI0v8Pfd9hVn2vv6DF zi_0xFXS!_>L5o->0TqKh1Xz4<&wu~`04tt|bX)1^9nc@b4CvOm6yfMul{a4Gj#(l# zgI9%m?G4G}7iT~ndgxl>yR{y+_ZF6$TfqUU=wAQY&v&j>Gzxy)*eV56nO4r^@u|Mp z-QCs$>X?vqS2o-)jZi~{D8;EuET2Y5n|I%3pYpXxmOIR`hJvuA>JwhD+>qu+SuqhubNH?`N&$& zXD&l7PEdFZ0GsoaE)UD9rT?^4YE9@8RY~=U%f>63wXP5&#!}gXZxZ7ftPeZAN!f3( zU}?-C0(j3rV}jVfTgW{kHU5+WKVvpqFQAp3K7arK05P^riw_>>zO$6q`a_EGxEqYK ziULk2S#Xvb9x_)|9j;j6p(K`!@vaeL&IF4ZHU_$Ne!Qv8mq$ehJZsoiHJZIua@UUJ zhpmGva8M&Swu9R71P~;XwR`=1`xCSX(?bv%)P2ETbCWb&TQ9nZjGiSYgb5#0!jz95 IfVOr(1rUS$O8@`> literal 0 HcmV?d00001 diff --git a/release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a2.bisign b/release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a2.bisign deleted file mode 100644 index 5443f59549751e5e9d9d0fe303fb86776cad6839..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy+0F(d#00sg8001Na08&#yF#rSr009620G+nZ zb0c4m_P5Bx$%&Uy<+$)*9teptW0C%V$og=I8_5h*^65t&!SFfC70J2>N}Lhe|8^p11YN|9tJm)+3btdJ zJFS>^ZLnsmz}XWN$9iet+gk(q$$$U=0HdDESuwW<-{9kComYvCU(gD+Q=@mJ#}KeT zamU<9AlHT+6Ren5`;eVpic2exN3rZ!$lZi^q|7+$GKNwZex@w)wR=j`JDo^4@u0M3 zD3RZmS(wDtcKUcrZb+b68$UrM-4?mxH0W97_X)_(c4+&bWumrs1@mL?s4w! zM7S{IY{T~oXiB-=($EH=<@RN~9qi%kHBvXfu26$_tlIOjl{5_2Rpsl+R7vAkmR6yA1q{N) z$7$jj(>U|j1QrkZ(sJ2_)I@zGq5)|O)e)&`HJ}^&gpwbj6>EcbVTT%`FUZwC?Nkco I(20nZV(#w=KmY&$ diff --git a/release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a3.bisign b/release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a3.bisign new file mode 100644 index 0000000000000000000000000000000000000000..4b3443dc33f443ff07a6da1734308a1c52d8eff5 GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy-0F(d#00sg8001Na08&#yF#rSr0096209nJ| zO6yPZ0*D5LF!W(iz`OWV1=Viq&sS_BU?*sd{ENcIsTm>rhV^kRYg>ECDTy~GR3Hp{ z^_edC&yrw@%ZE>rl2_y%M@cpMtBU@xo2{wS&o;Y4uLHJktHXI0v8Pfd9hVn2vv6DF zi_0xFXS!_>L5o->0TqKh1Xz4<&wu~`0BSf*#{n|FhL#uqhGCMjsy7-7>zLg3R1fu+ z4@T0Nb8_S%CuSFX?A;@tz0nxj=8}e-gd(c?0PuHxBVFGq}qhA>8n}ZKV^tQ2}9mp>^x^L+~I|4JXZ_%p(wmW-7F02 zY0w@UH5hXW{6Kx+#5V7NegFWoGNbJt_{X(kh{V$2x%!5|WiC5_e&sm2M~1MkRh#H` z3OK4-w*-)n(dK_+T}K_Tm-NGE&jg7trO|+sXMg|z0Bntal9*XBehA)@_@RZ)(lJ}T zJWFjT1}y*_SO8Sp(kVfnK$cr^upqkTF)Kdr_iOTqie}sBy)9@su|A*`N{)2DD)eC+ zb2S_nP&D1I6rdCj>a;FVle0C>`w6}QMl>B{+xdLA1EvlkQDc7n!|(e=6L*KPx3+}M I7i)!29S|7;J^%m! literal 0 HcmV?d00001 diff --git a/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a2.bisign b/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a2.bisign deleted file mode 100644 index 09c3d3f2d05da40ba02583a63e73140c6ed1dc9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy+0F(d#00sg8001Na08&#yF#rSr009620G+nZ zb0c4m_P5Bx$%&Uy<+$)*9teptW0C%V$og=I8_5h*^65t&!SFfC70J2>N}Lhe|8^p11YN|9tJm)+3btdJ zJFS>^ZLnsmz}XWN$9iet+gk(q$$$U=0M^DOlrjNa-CROneQ`uKccFAKjUY8p)T->% zj%JL;`K~5b^tTZ#OZMxQtUjQTef85V_W0O)V?0|xSQ7w$s#>)+pER{9eWcL6R83Jk zWe=Y1U0?Lr$N03!oMX;h75eo|d&NO7bxx8RIiafNgswvd*3HGyfbTW8nRk>%fU z8TLM+(w_VdEh=6rs%3R&_61~H=N^~mmq=eh4}wVQ%>MELr|Bj9^euVN(Eh8Lu5wT!acRtB zNZPh~l@7Rc%FM*}&6ZTKu?pEO@O?cI1=P+ZJ{s-XOl6mH;(~A0 z8U7>jsk~1vfV3q2P^%Yo{rR58S_O`9V!X!CybtS>!E9eab8DRFu;;}2(pL+bJ7i91 Iy1o~oh#4gfO8@`> diff --git a/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a3.bisign b/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a3.bisign new file mode 100644 index 0000000000000000000000000000000000000000..b184dafa71135264cdc531d66d4ee012e7e49799 GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy-0F(d#00sg8001Na08&#yF#rSr0096209nJ| zO6yPZ0*D5LF!W(iz`OWV1=Viq&sS_BU?*sd{ENcIsTm>rhV^kRYg>ECDTy~GR3Hp{ z^_edC&yrw@%ZE>rl2_y%M@cpMtBU@xo2{wS&o;Y4uLHJktHXI0v8Pfd9hVn2vv6DF zi_0xFXS!_>L5o->0TqKh1Xz4<&wu~`09?R^y*ntW8S-t^ff4b2a<5+LZZSd!@~U`g zOGu;;^S((xfP4M)_OuBI0vp(Ta<{x0pg0$W;Io!TD;3cvbWcf6%M!bU8lOZ5x*E|2 z2`(gcU4ftCJT{u$HII(dpyhSBv^X?dO~vEIqKE)-2H0k2gA0O%KM_X{&PASCi30!t z0Du4h01p#+wOl6sDzh1z4mrh}Go<;)PU9V+Sd%-_c_dB@P%Ez;yfT_`a?-)<=PGD_ z{oCgW-mByiK(IhoSyZO}#pSFc$34Y9F=mP6R81~ZF*l#Zi3X$uP*1S_gMa`40N6l{w6McGZwE2kWt9cMg@$E( zJTidJ*z|-TlP?+744hz2N0`fr-nHLEr(!p{y3L0!{Zh%E{Q`_2& zYV+Bt$vFl{koAsq^B|p?Z`Ygl%A$Wp#6JaC0p&E-^ALFfCy+0F(d#00sg8001Na08&#yF#rSr009620G+nZ zb0c4m_P5Bx$%&Uy<+$)*9teptW0C%V$og=I8_5h*^65t&!SFfC70J2>N}Lhe|8^p11YN|9tJm)+3btdJ zJFS>^ZLnsmz}XWN$9iet+gk(q$$$U=0I{@Xd^%uFb{^e$jq5hHq+VAN&$(rUS@kPE zk4?wPbH|*I*e4sk9eJV2Mc!hp19hZZHG2UGDqn706j%4{bubQnIl{qMk@Olv#{Qa=7$5wVdwah@MMb zPb-KLnlSTnvh4rkV|MnhY}4bD1v=G&ExoEh#ZOJqB1>UL%cE1Aa|LR_tr!Cn_AWy? zTraRZDHfilpCik|YCPETLdq39$-3Wk#@`S?H{VrDDnqqb*tqzC*8?R}gp{ ILUiNfN4w%A$Wp#6JaC0p&E-^ALFfCy-0F(d#00sg8001Na08&#yF#rSr0096209nJ| zO6yPZ0*D5LF!W(iz`OWV1=Viq&sS_BU?*sd{ENcIsTm>rhV^kRYg>ECDTy~GR3Hp{ z^_edC&yrw@%ZE>rl2_y%M@cpMtBU@xo2{wS&o;Y4uLHJktHXI0v8Pfd9hVn2vv6DF zi_0xFXS!_>L5o->0TqKh1Xz4<&wu~`0B?{7n8AT}g~>=~0plw8HhcyO!DciiV#gc? zP3UftDtwQ`RZ_#I8SU%aYD5Ku(#4eDGuV;6f@1qtR?e3iTSc&Fm0%{eeLuwus|S9g z->wAnpr^t2BgntX!go9kV+v23CCl6*6FbU0Z#AAOc%e<{jv-pxg7s1^(H!pra{~YX z0Du4h06OB2s^$^2?TfjjxMa9W6+<+uJW3!69)^|yFgd;;NHhsTi7d==q!0U@qwuBV zJldrG(5dLf^W9S?&Vr|rfyFmH8m4581C9YS&Qo(cX}Vm#27-KIr}OB2rJ&%b^3j*4 zhbJyPhfncOZ6DWznNo9KrP8G2{eKERAwPMeX@CF#0AidR{#2)55gC;(PPQ|&$T%TC z!~&qZXpd2#ZmxGkij4FMGcShTJp?oKHo+~dd9~;o8X|YNk6Zu{$Y@%p?H<%4=}myV`7>*ry5R9P39;IL2{$#8VMd9FGk#5hFsf<3Tw*B9YQ Io6`-BHoM3J7XSbN literal 0 HcmV?d00001 diff --git a/release/@zeusops/addons/zeusops_addon.pbo b/release/@zeusops/addons/zeusops_addon.pbo index 931ca71b0de1098344ff8c6d580aa117ef0915e4..87d7e37848cd7d9811542f04466d72e7ef5d3869 100644 GIT binary patch delta 7405 zcmd5>e{dAl9p9I`Q|~nVXiNh6Aa6{7#*j@xFb7u=nr-H!;V_$r35PIpf!~Qhw(pkbUIWWEuCp8)6S%f#eU!J?cHu} zFUF9R?#|x6_r5>g_kG{z``!26z51V7%AaRFx1?qM<}K?U+^}OlW4>ZLFYYXch6gsZ z1zN&kf#1MK1YazfG&3=;{IxOI#`M=z-eWZXvbQ1l8Df}_z(=^KFJvQdcBb+Ss!bUZ zw5Mw5D$>n|WKQ6v$0B?nOd=dl0-Zv5ZzmfKB;)K}BKoARh#{rDk3H28?01eYDiSHl zKF;UKrl|0>0>TkN43R(~Q7YNtu=|E>&j_Z*j#V==z={&#*?6A0?n{lq11|eM zbxD!1Vj@qD+REF>Eduw-LNpp5-`r=N%D+)nNuJ)=PUT;y&SOjmRBMaoXRFVjR62@$ zGYo3~frj8kMrn1FDsL2FOS5P+->i%l&9soBI%%rNBzMVHsGk($VC@9!$l z2G8>+R|I+iQ8MXSPuMUKC0{4UTWqH>8UdCa>(&R7f+TO?IXTZAzyG)~I1j`$CXv|k zT>DF7a1Deu@brIC;oJySmA!!G27gStB_SyVSehq7aaNMBC2bUY_7!{FY_}W}#3t{f zz>PO0iO6aZ;PnGd<`N{yhIW&1lehl9`XAOcG~B!VUP|hPC%y2duTY6aCCxxZSI#))ja`y>}_**#yCQO9$=+3$twP(5+_tb|Xb~fXGsuWJNY1fp`Om zYc|kVjFa##f#cg`k>jHnNZt-Cl7t|Wbv+~m-G(_x>v16pq=pXYNNs%!-G$uhyfms; zUmHf1P;O15>QQW>H%~Iu=xkjyz(rYMC7$>f{hYfPgMy6s9Aku z0Ij&yZD0dh|1p3z&e64iL2F5z$OP*i0qTcm(LHMIASzGkEV9^5{1B-g(==tmYkIL6 z$zV7O&i^eow~Pf*X3$d(&V0Ssjn1q}8+h(06r~i7f&_C4zYu)_k7)>VA&R!C1n%d@ z(837;xA!=@UmZA()=v?7ExCVsu`4FRTK>I3*xhVk*D~ZOLvA6hlg8~Bg*K?Ape?ie zwm`;WPoOfj`4qzH;S&f0v`(BrD@!P5zfW#6fBL5z9PrJ7ujCB^$0h?D<`GXBHVP=6 zG&HRG3Lt}omgcWI3g$E0gJg`t0w`&= z&mZ6Y)zepAkZE9Pwyc~cmNt6ofHT{9+$r<`G4UpBrA@>{LeL2>y^AW<3x7m)>V>z_ z-KzUE{IvW5$?8j|(E|0o(`cpT1Lrw|YIM@}Gic4^7HYafv_pgG1}ZCe-nd-$h>^=o z1D;}-YECriyiSm2)D?gzMd-@0+o!^bEVnSTK(sW6LLCB=1!&7zK<>k5kVpN~`(ri{ zfYK^;)j4#lnq!KeLoJiTt95fc&5$Mf-uMQ6ezSXC>zGXlyS_bdLA8?x?pTes*j+Nt zo_DKu5(yi4ElMF(&KyDa!#Yh{v+Wu|cc^_M$Y11kt3yDrBtwm5@p)A3aPH-N zEFGG%tF8vlN$agcw1R|kmG=2QK=2d|`aW<(y3${k^*SD?Tf2TMoH8(; zf3@+bhYzo!ZQsIWyb)s1O;Dkys0b-%Toox=eFAQ1bkN^sxM{f$UKnm#{^@3hnFTj3 zzp#~IZh@PYk8EQYC)~9BIh2|0IaB_5MOS1uaudH~sub)#_JXe%aQnawKEW|Ph$J^0Sp^%ECPY3JbDROogw zMR0?SuLprIW3T&Z(3+WP^=CPIfALAq-lLat_P+MFoW1G4=j^=-3vWaon9^pgw|C0GV6JX6G+HrX;i6%8Jt2y0_ v%V^0r6X4VqCzNkh!O>gOir>Q=+vI-X-TB`>*>`Yw_SMnh&tBj3^@0Ba;A+`0 delta 10333 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 IgT|Q?sV-yr&Hw-a literal 0 HcmV?d00001 diff --git a/release/@zeusops/keys/zeusops-1.12.0-a2.bikey b/release/@zeusops/keys/zeusops-1.12.0-a2.bikey deleted file mode 100644 index 3d1262dbe293d14b41f49bcc2eb9ec67511f461a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmV;b09F5bWp#6JaC0p&E-^ALFfCy+0F(d#00sg8001Na08&#yF#rSr009620G+nZ zb0c4m_P5Bx$%&Uy<+$)*9teptW0C%V$og=I8_5h*^65t&!SFfC70J2>N}Lhe|8^p11YN|9tJm)+3btdJ YJFS>^ZLnsmz}XWN$9iet+gk(q$;{eC-v9sr diff --git a/release/@zeusops/keys/zeusops-1.12.0-a3.bikey b/release/@zeusops/keys/zeusops-1.12.0-a3.bikey new file mode 100644 index 0000000000000000000000000000000000000000..c07ca90a59d976b929d13ba16a44b5f79c772fc9 GIT binary patch literal 170 zcmV;b09F5bWp#6JaC0p&E-^ALFfCy-0F(d#00sg8001Na08&#yF#rSr0096209nJ| zO6yPZ0*D5LF!W(iz`OWV1=Viq&sS_BU?*sd{ENcIsTm>rhV^kRYg>ECDTy~GR3Hp{ z^_edC&yrw@%ZE>rl2_y%M@cpMtBU@xo2{wS&o;Y4uLHJktHXI0v8Pfd9hVn2vv6DF Yi_0xFXS!_>L5o->0TqKh1Xz4<&!-zix&QzG literal 0 HcmV?d00001 From 48e1cb623f62499e7b21a0665a08851ffd6717d8 Mon Sep 17 00:00:00 2001 From: Sami Laine Date: Tue, 23 Feb 2021 11:38:44 +0200 Subject: [PATCH 07/18] Print before and after preInit --- source/@zeusops/addons/zeusops_addon/XEH_preInit.sqf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/@zeusops/addons/zeusops_addon/XEH_preInit.sqf b/source/@zeusops/addons/zeusops_addon/XEH_preInit.sqf index c208bfe..990fa42 100644 --- a/source/@zeusops/addons/zeusops_addon/XEH_preInit.sqf +++ b/source/@zeusops/addons/zeusops_addon/XEH_preInit.sqf @@ -1,3 +1,4 @@ +diag_log "[ZOPS] preInit start"; #include "initSettings.sqf" // Define functions here early before Athena has a chance to define them @@ -12,3 +13,4 @@ fnc_gatherVehicles = compileFinal preprocessFileLineNumbers "\zeusops_addon\at [] call zeusops_fnc_define_spawn_arsenal; [] call zeusops_fnc_define_spawn_rearm; [] call zeusops_fnc_define_toggle_respawn; +diag_log "[ZOPS] preInit done"; From 19a02eea60fef223cbfdb0ced2a03c4fb2149a85 Mon Sep 17 00:00:00 2001 From: Sami Laine Date: Tue, 23 Feb 2021 16:10:12 +0200 Subject: [PATCH 08/18] Prefix debug log messages with [ZOPS] --- .../zeusops_addon/functions/fn_define_bodybag_respawn.sqf | 8 ++++---- .../zeusops_addon/functions/fn_define_force_respawn.sqf | 8 ++++---- .../zeusops_addon/functions/fn_define_move_respawn.sqf | 8 ++++---- .../zeusops_addon/functions/fn_define_spawn_arsenal.sqf | 8 ++++---- .../zeusops_addon/functions/fn_define_spawn_rearm.sqf | 8 ++++---- .../zeusops_addon/functions/fn_define_toggle_respawn.sqf | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf index 9fe3d16..8a3fcc8 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf @@ -1,16 +1,16 @@ fn_bodybag_respawn = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; + format ["[ZOPS] [fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { - "[fn_bodybag_respawn] exiting: not local" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_bodybag_respawn] exiting: not local" remoteExec ["diag_log", 2]; }; if (!(_this select 2)) then { - "[fn_bodybag_respawn] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_bodybag_respawn] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; }; - "[fn_bodybag_respawn] passed checks" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_bodybag_respawn] passed checks" remoteExec ["diag_log", 2]; _pos = position _logic; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf index 9732183..e709b40 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf @@ -1,16 +1,16 @@ fn_force_respawn = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; + format ["[ZOPS] [fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { - "[fn_force_respawn] exiting: not local" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_force_respawn] exiting: not local" remoteExec ["diag_log", 2]; }; if (!(_this select 2)) then { - "[fn_force_respawn] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_force_respawn] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; }; - "[fn_force_respawn] passed checks" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_force_respawn] passed checks" remoteExec ["diag_log", 2]; // Force respawn wave missionNameSpace setVariable ["respawnNextWaveTime", 1, true]; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf index 05bc421..473d369 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf @@ -1,16 +1,16 @@ fn_move_respawn = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; + format ["[ZOPS] [fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { - "[fn_move_respawn] exiting: not local" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_move_respawn] exiting: not local" remoteExec ["diag_log", 2]; }; if (!(_this select 2)) then { - "[fn_move_respawn] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_move_respawn] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; }; - "[fn_move_respawn] passed checks" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_move_respawn] passed checks" remoteExec ["diag_log", 2]; _pos = getPosASL _logic; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf index 66a34a9..86f18f4 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf @@ -1,16 +1,16 @@ fn_spawn_arsenal = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; + format ["[ZOPS] [fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { - "[fn_spawn_arsenal] exiting: not local" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_spawn_arsenal] exiting: not local" remoteExec ["diag_log", 2]; }; if (!(_this select 2)) then { - "[fn_spawn_arsenal] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_spawn_arsenal] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; }; - "[fn_spawn_arsenal] passed checks" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_spawn_arsenal] passed checks" remoteExec ["diag_log", 2]; _pos = position _logic; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf index fd85f03..460986e 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf @@ -1,16 +1,16 @@ fn_spawn_rearm = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; + format ["[ZOPS] [fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { - "[fn_spawn_rearm] exiting: not local" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_spawn_rearm] exiting: not local" remoteExec ["diag_log", 2]; }; if (!(_this select 2)) then { - "[fn_spawn_rearm] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_spawn_rearm] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; }; - "[fn_spawn_rearm] passed checks" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_spawn_rearm] passed checks" remoteExec ["diag_log", 2]; _pos = position _logic; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf index 2e20944..067d6d6 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf @@ -1,16 +1,16 @@ fn_toggle_respawn = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; + format ["[ZOPS] [fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { - "[fn_toggle_respawn] exiting: not local" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_toggle_respawn] exiting: not local" remoteExec ["diag_log", 2]; }; if (!(_this select 2)) then { - "[fn_toggle_respawn] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_toggle_respawn] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; }; - "[fn_toggle_respawn] passed checks" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_toggle_respawn] passed checks" remoteExec ["diag_log", 2]; // Toggle respawn if (missionNameSpace getVariable "respawnAllow") then { From 1b8ae1254a9b0b881ee39b0321027960500b92fa Mon Sep 17 00:00:00 2001 From: Sami Laine Date: Tue, 23 Feb 2021 20:36:40 +0200 Subject: [PATCH 09/18] Release test version v1.12.0-a4 --- ...0mm_smokefix_zops.pbo.zeusops-1.12.0-a3.bisign | Bin 570 -> 0 bytes ...0mm_smokefix_zops.pbo.zeusops-1.12.0-a4.bisign | Bin 0 -> 570 bytes .../addons/stui_core.pbo.zeusops-1.12.0-a3.bisign | Bin 570 -> 0 bytes .../addons/stui_core.pbo.zeusops-1.12.0-a4.bisign | Bin 0 -> 570 bytes .../stui_grouphud.pbo.zeusops-1.12.0-a3.bisign | Bin 570 -> 0 bytes .../stui_grouphud.pbo.zeusops-1.12.0-a4.bisign | Bin 0 -> 570 bytes .../stui_nametags.pbo.zeusops-1.12.0-a3.bisign | Bin 570 -> 0 bytes .../stui_nametags.pbo.zeusops-1.12.0-a4.bisign | Bin 0 -> 570 bytes .../zeusops_addon.pbo.zeusops-1.12.0-a3.bisign | Bin 570 -> 0 bytes .../zeusops_addon.pbo.zeusops-1.12.0-a4.bisign | Bin 0 -> 570 bytes .../addons/zops_kit.pbo.zeusops-1.12.0-a3.bisign | Bin 570 -> 0 bytes .../addons/zops_kit.pbo.zeusops-1.12.0-a4.bisign | Bin 0 -> 570 bytes release/@zeusops/keys/zeusops-1.12.0-a3.bikey | Bin 170 -> 0 bytes release/@zeusops/keys/zeusops-1.12.0-a4.bikey | Bin 0 -> 170 bytes 14 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a3.bisign create mode 100644 release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a4.bisign delete mode 100644 release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a3.bisign create mode 100644 release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a4.bisign delete mode 100644 release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a3.bisign create mode 100644 release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a4.bisign delete mode 100644 release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a3.bisign create mode 100644 release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a4.bisign delete mode 100644 release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0-a3.bisign create mode 100644 release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0-a4.bisign delete mode 100644 release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a3.bisign create mode 100644 release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a4.bisign delete mode 100644 release/@zeusops/keys/zeusops-1.12.0-a3.bikey create mode 100644 release/@zeusops/keys/zeusops-1.12.0-a4.bikey diff --git a/release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a3.bisign b/release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a3.bisign deleted file mode 100644 index 1dc8aefd272a43f8fb01353c00dcadfe6861cd8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy-0F(d#00sg8001Na08&#yF#rSr0096209nJ| zO6yPZ0*D5LF!W(iz`OWV1=Viq&sS_BU?*sd{ENcIsTm>rhV^kRYg>ECDTy~GR3Hp{ z^_edC&yrw@%ZE>rl2_y%M@cpMtBU@xo2{wS&o;Y4uLHJktHXI0v8Pfd9hVn2vv6DF zi_0xFXS!_>L5o->0TqKh1Xz4<&wu~`04tt|bX)1^9nc@b4CvOm6yfMul{a4Gj#(l# zgI9%m?G4G}7iT~ndgxl>yR{y+_ZF6$TfqUU=wAQY&v&j>Gzxy)*eV56nO4r^@u|Mp z-QCs$>X?vqS2o-)jZi~{D8;EuET2Y5n|I%3pYpXxmOIR`hJvuA>JwhD+>qu+SuqhubNH?`N&$& zXD&l7PEdFZ0GsoaE)UD9rT?^4YE9@8RY~=U%f>63wXP5&#!}gXZxZ7ftPeZAN!f3( zU}?-C0(j3rV}jVfTgW{kHU5+WKVvpqFQAp3K7arK05P^riw_>>zO$6q`a_EGxEqYK ziULk2S#Xvb9x_)|9j;j6p(K`!@vaeL&IF4ZHU_$Ne!Qv8mq$ehJZsoiHJZIua@UUJ zhpmGva8M&Swu9R71P~;XwR`=1`xCSX(?bv%)P2ETbCWb&TQ9nZjGiSYgb5#0!jz95 IfVOr(1rUS$O8@`> diff --git a/release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a4.bisign b/release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a4.bisign new file mode 100644 index 0000000000000000000000000000000000000000..a6b5f6645a126b63b7e8ca9c61ca9f6a030e12c2 GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy;0F(d#00sg8001Na08&#yF#rSr009620O>o5 z`#l1_qAzj8%1@!2XGGY!rV;1EmHb9x_dyAqP~>vn&#ZDM;=hy!IbPS|j$HXRv0tNW zMmfUD@cSTu4V;C5g3V&X0mPd*{(Q9Ebm1Q1`G!^TER(R5}ma;f!$1pmEp zXLCjtbBQXpR(LcMcSA&o<`c zn>^$s_G#9qp_>kpbtD%AnQ@?lh(Aw_$d>Ll=Ut}opUme{1l4+8y)JyMe< zU#g#U^f3w?WJZ^gP)}q=(7pXpi{p}7H7Obc-2U=r(oKJplilgn^&@_Ks&|-4V*>yH z0Du4h0O>-N-cwe>so$Ypdj`RuS7$%8jMNNuZ+p8avoF;d-)J%Sbp+|&?Qz>W=L?K! zP$w}g$sUQGMI1+2Pyktd&tQb|fglIc`+K{^MZvuc5ka%A$Wp#6JaC0p&E-^ALFfCy-0F(d#00sg8001Na08&#yF#rSr0096209nJ| zO6yPZ0*D5LF!W(iz`OWV1=Viq&sS_BU?*sd{ENcIsTm>rhV^kRYg>ECDTy~GR3Hp{ z^_edC&yrw@%ZE>rl2_y%M@cpMtBU@xo2{wS&o;Y4uLHJktHXI0v8Pfd9hVn2vv6DF zi_0xFXS!_>L5o->0TqKh1Xz4<&wu~`0BSf*#{n|FhL#uqhGCMjsy7-7>zLg3R1fu+ z4@T0Nb8_S%CuSFX?A;@tz0nxj=8}e-gd(c?0PuHxBVFGq}qhA>8n}ZKV^tQ2}9mp>^x^L+~I|4JXZ_%p(wmW-7F02 zY0w@UH5hXW{6Kx+#5V7NegFWoGNbJt_{X(kh{V$2x%!5|WiC5_e&sm2M~1MkRh#H` z3OK4-w*-)n(dK_+T}K_Tm-NGE&jg7trO|+sXMg|z0Bntal9*XBehA)@_@RZ)(lJ}T zJWFjT1}y*_SO8Sp(kVfnK$cr^upqkTF)Kdr_iOTqie}sBy)9@su|A*`N{)2DD)eC+ zb2S_nP&D1I6rdCj>a;FVle0C>`w6}QMl>B{+xdLA1EvlkQDc7n!|(e=6L*KPx3+}M I7i)!29S|7;J^%m! diff --git a/release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a4.bisign b/release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a4.bisign new file mode 100644 index 0000000000000000000000000000000000000000..39f906064f0543771e09750d30e898da0e814714 GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy;0F(d#00sg8001Na08&#yF#rSr009620O>o5 z`#l1_qAzj8%1@!2XGGY!rV;1EmHb9x_dyAqP~>vn&#ZDM;=hy!IbPS|j$HXRv0tNW zMmfUD@cSTu4V;C5g3V&X0mPd*{(Q9Ebm1Q1`G!^TER(R5}ma;f!$1pmEp zXLCjtbBQXpR(Lc0bfO+8{g$5Q!^(br7CUX@MhIGjlScTE6q6DW3NmRSc%wd(FyCTswb}|!* ze)Nvz?;F+>%Ml@65!Qg~5{4E2Q(d#hcSSvq_7w_Q44>M`0VPGqdZWFi07$UfI|Bd! z0Du4h0Pv86Z#8&;#y)|oLV15o)j|w!PQP27eN=Ho4Fdi5^Mo$G;*AgWL_`;q<+aV* zn3*Ho$sx@FFQe)73yW5T|16jR0kre`qR-DJ;ctYGZf3~5&;vsPAB_rx@`QILXcNI` zSeeNu3N=&wY|&MW(+B?#!> z=|daPNI%Kd24FCWD literal 0 HcmV?d00001 diff --git a/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a3.bisign b/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a3.bisign deleted file mode 100644 index b184dafa71135264cdc531d66d4ee012e7e49799..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy-0F(d#00sg8001Na08&#yF#rSr0096209nJ| zO6yPZ0*D5LF!W(iz`OWV1=Viq&sS_BU?*sd{ENcIsTm>rhV^kRYg>ECDTy~GR3Hp{ z^_edC&yrw@%ZE>rl2_y%M@cpMtBU@xo2{wS&o;Y4uLHJktHXI0v8Pfd9hVn2vv6DF zi_0xFXS!_>L5o->0TqKh1Xz4<&wu~`09?R^y*ntW8S-t^ff4b2a<5+LZZSd!@~U`g zOGu;;^S((xfP4M)_OuBI0vp(Ta<{x0pg0$W;Io!TD;3cvbWcf6%M!bU8lOZ5x*E|2 z2`(gcU4ftCJT{u$HII(dpyhSBv^X?dO~vEIqKE)-2H0k2gA0O%KM_X{&PASCi30!t z0Du4h01p#+wOl6sDzh1z4mrh}Go<;)PU9V+Sd%-_c_dB@P%Ez;yfT_`a?-)<=PGD_ z{oCgW-mByiK(IhoSyZO}#pSFc$34Y9F=mP6R81~ZF*l#Zi3X$uP*1S_gMa`40N6l{w6McGZwE2kWt9cMg@$E( zJTidJ*z|-TlP?+744hz2N0`fr-nHLEr(!p{y3L0!{Zh%E{Q`_2& zYV+Bt$vFl{koAsq^B|p?Z`Ygl%A$Wp#6JaC0p&E-^ALFfCy;0F(d#00sg8001Na08&#yF#rSr009620O>o5 z`#l1_qAzj8%1@!2XGGY!rV;1EmHb9x_dyAqP~>vn&#ZDM;=hy!IbPS|j$HXRv0tNW zMmfUD@cSTu4V;C5g3V&X0mPd*{(Q9Ebm1Q1`G!^TER(R5}ma;f!$1pmEp zXLCjtbBQXpR(LcB_f3h^q&|7R#6$Ui38sWa}Aa!m<~M#@{AGkO2D9zF2;QZ;TtS>w+)pyM(T zTe-MXvsGys&n&{$NN~Ek!O$bvql;t90JFPStUz`0vk+p=HwYr}#gKwVeKo^GHv<3w z0Du4h0A6(|J<6g3-Ehw~qDq#r3vYbrcmLrL&#wnx(L61V z(7%+W8oJN$!i?Rr#JoBEVPcplxu6O5QkbnrM}PnT0Q4H1JN^mHkixluDY5Wp)d-kgV8m(}JUC~kD!DSURjOtjdTLW>hS}E0+(bl(3!=a%OTH#TrH43|5 z=NJ2fv-9=uzn2dY^AtDl#vSjDo3Tz#c%LM`nlcUCXD_Shmvk%Z#Z87mKxcyr>AuGe I>0DPWjO2X}umAu6 literal 0 HcmV?d00001 diff --git a/release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a3.bisign b/release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a3.bisign deleted file mode 100644 index 344a5b87d768f50bff5138e4cd4b2a012bc35f48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy-0F(d#00sg8001Na08&#yF#rSr0096209nJ| zO6yPZ0*D5LF!W(iz`OWV1=Viq&sS_BU?*sd{ENcIsTm>rhV^kRYg>ECDTy~GR3Hp{ z^_edC&yrw@%ZE>rl2_y%M@cpMtBU@xo2{wS&o;Y4uLHJktHXI0v8Pfd9hVn2vv6DF zi_0xFXS!_>L5o->0TqKh1Xz4<&wu~`0B?{7n8AT}g~>=~0plw8HhcyO!DciiV#gc? zP3UftDtwQ`RZ_#I8SU%aYD5Ku(#4eDGuV;6f@1qtR?e3iTSc&Fm0%{eeLuwus|S9g z->wAnpr^t2BgntX!go9kV+v23CCl6*6FbU0Z#AAOc%e<{jv-pxg7s1^(H!pra{~YX z0Du4h06OB2s^$^2?TfjjxMa9W6+<+uJW3!69)^|yFgd;;NHhsTi7d==q!0U@qwuBV zJldrG(5dLf^W9S?&Vr|rfyFmH8m4581C9YS&Qo(cX}Vm#27-KIr}OB2rJ&%b^3j*4 zhbJyPhfncOZ6DWznNo9KrP8G2{eKERAwPMeX@CF#0AidR{#2)55gC;(PPQ|&$T%TC z!~&qZXpd2#ZmxGkij4FMGcShTJp?oKHo+~dd9~;o8X|YNk6Zu{$Y@%p?H<%4=}myV`7>*ry5R9P39;IL2{$#8VMd9FGk#5hFsf<3Tw*B9YQ Io6`-BHoM3J7XSbN diff --git a/release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a4.bisign b/release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a4.bisign new file mode 100644 index 0000000000000000000000000000000000000000..26620e712fabec6d1e33ce7ca10e5cd4421a42b9 GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy;0F(d#00sg8001Na08&#yF#rSr009620O>o5 z`#l1_qAzj8%1@!2XGGY!rV;1EmHb9x_dyAqP~>vn&#ZDM;=hy!IbPS|j$HXRv0tNW zMmfUD@cSTu4V;C5g3V&X0mPd*{(Q9Ebm1Q1`G!^TER(R5}ma;f!$1pmEp zXLCjtbBQXpR(Lcp|5=kHYhDX**aK`9V>FQQO$@l zo6~|>9Lq#s*ONY^_wcKJSfj`y*yHPE@?K;!8&zCTUybod5Nrj8;`OjMmWOaU$mTk3H6El1bbl_7BMh z+nmUGzHQ|!I1wej)0m%{0p4*%!!6%SjynS4*1s9(PRML`&wwX>>5_6a+>hgsTLkj* zc!&O<0yQCUP{}UOj5TS`DIQ8Kl=%A$Wp#6JaC0p&E-^ALFfCy-0F(d#00sg8001Na08&#yF#rSr0096209nJ| zO6yPZ0*D5LF!W(iz`OWV1=Viq&sS_BU?*sd{ENcIsTm>rhV^kRYg>ECDTy~GR3Hp{ z^_edC&yrw@%ZE>rl2_y%M@cpMtBU@xo2{wS&o;Y4uLHJktHXI0v8Pfd9hVn2vv6DF zi_0xFXS!_>L5o->0TqKh1Xz4<&wu~`08->#B20n%7H(ooD=>nVlAdjGYE*9~3SB(^ zK=*7WCYOYJ_--2af{zR0>v~KKx0e1R0I8W%fHsx!1QKb6VodJ6iPK&oaBJ+p{u?Cg zs1U(e?Ptz38Ga_#-#gg(TvJW?l}@xLhW0n=g?}w+HcV)4q)^_BB}nmk11WlK3j+WE z0Du4h0EW@ZrOxKN5o2(fCow8w^Vtyr;2nx_l4p63PvH<6M{8Fh(xYyZGI`}z9%&h6 ztn`T?D*ez4eF<0#$AAC;0HdK%I4q|%*V~8KKHWR8sKJn{ z$HSmpnEDP7503K$%A$Wp#6JaC0p&E-^ALFfCy;0F(d#00sg8001Na08&#yF#rSr009620O>o5 z`#l1_qAzj8%1@!2XGGY!rV;1EmHb9x_dyAqP~>vn&#ZDM;=hy!IbPS|j$HXRv0tNW zMmfUD@cSTu4V;C5g3V&X0mPd*{(Q9Ebm1Q1`G!^TER(R5}ma;f!$1pmEp zXLCjtbBQXpR(Lc~Wx-=c>Cdr~rB_pzY_&w+C|*0w&^wyW}O6epsNk~zxtbjG+j%mY&h-a|NUbkY_( zsPV4OiqNAwgZwj5*b$A%8sDy>clgv9nZQ zIok2r)-h>xa&U0LlK8@!V!jOfHEPHTrY$%tYk&X%0Kdx&j4J!+Ix*c(oOk8@l7%kx z1_QJzE-hf`SQNy@(SAL}X7}m`2>&|ca-}|_!L9>iqSS>CTU~-$4S;rLkiS&nl`w<# z`y8Styo0W@2Dz1~QOT~VEU@_OIhKzxwp)K2RU~S(d%A$Wp#6JaC0p&E-^ALFfCy-0F(d#00sg8001Na08&#yF#rSr0096209nJ| zO6yPZ0*D5LF!W(iz`OWV1=Viq&sS_BU?*sd{ENcIsTm>rhV^kRYg>ECDTy~GR3Hp{ z^_edC&yrw@%ZE>rl2_y%M@cpMtBU@xo2{wS&o;Y4uLHJktHXI0v8Pfd9hVn2vv6DF zi_0xFXS!_>L5o->0TqKh1Xz4<&wu~`02N3JOV$uNJC4Fo!U^Bz+j`4j3|DaWuFwjH z1}R7QMKvVYgQdzIGdXJCB3U}mQtKujzToy6#-o+MO4x*-AR1+&W7ud#qzT>W>6G#U zK97t)*bWn$fph*r16RQ>QuJ?U1)r~DmCRE;JW{K+c?w`!&c)dGouo!CEb4-Xe**vj z0Du4h0CjOvnvvj1d#~5b6Bhu2oL$2Inv3i` zojU>&igq|($rTFn=2uhNW>4r$@5vov)%no%;jY@4b%$USc$K4S|GZZQtV98qkT7^{H1pH)FIIuGi6 IgT|Q?sV-yr&Hw-a diff --git a/release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a4.bisign b/release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a4.bisign new file mode 100644 index 0000000000000000000000000000000000000000..54338513f961ffa26f9b18ae621e86856dba396c GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy;0F(d#00sg8001Na08&#yF#rSr009620O>o5 z`#l1_qAzj8%1@!2XGGY!rV;1EmHb9x_dyAqP~>vn&#ZDM;=hy!IbPS|j$HXRv0tNW zMmfUD@cSTu4V;C5g3V&X0mPd*{(Q9Ebm1Q1`G!^TER(R5}ma;f!$1pmEp zXLCjtbBQXpR(Lcyda zJ_s80EKXb7O;d>N{yXZ;tRX7VHtets2zyf-Vy?0J`FSF)bvB9iH#P|c_?wj^)NfJ@OzFLJ3FOZL^m=$4*V>H3^&)k=a z^#YNBpV$GK;s0ZNW5vyJ0l|f6Za>0V^CU57gn$4500H+bSSne5GlQ!-@!uYtORZ~} z$)YcH^sqX+nj6CIgUPr&ThSZ!T~~IPlCov^i=On+uo}BlW|I)suQ-hcR|Ua!>jz0w zy%MWpKXA05k-*c1MT@`3tU(M~Zt0qMcR=ZI^{%A^X|ABJNRxl;2U8DG{^U9!L5=_T Il`=#BuCPB0l>h($ literal 0 HcmV?d00001 diff --git a/release/@zeusops/keys/zeusops-1.12.0-a3.bikey b/release/@zeusops/keys/zeusops-1.12.0-a3.bikey deleted file mode 100644 index c07ca90a59d976b929d13ba16a44b5f79c772fc9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmV;b09F5bWp#6JaC0p&E-^ALFfCy-0F(d#00sg8001Na08&#yF#rSr0096209nJ| zO6yPZ0*D5LF!W(iz`OWV1=Viq&sS_BU?*sd{ENcIsTm>rhV^kRYg>ECDTy~GR3Hp{ z^_edC&yrw@%ZE>rl2_y%M@cpMtBU@xo2{wS&o;Y4uLHJktHXI0v8Pfd9hVn2vv6DF Yi_0xFXS!_>L5o->0TqKh1Xz4<&!-zix&QzG diff --git a/release/@zeusops/keys/zeusops-1.12.0-a4.bikey b/release/@zeusops/keys/zeusops-1.12.0-a4.bikey new file mode 100644 index 0000000000000000000000000000000000000000..0146523344e3c365694a517315110c390549a273 GIT binary patch literal 170 zcmV;b09F5bWp#6JaC0p&E-^ALFfCy;0F(d#00sg8001Na08&#yF#rSr009620O>o5 z`#l1_qAzj8%1@!2XGGY!rV;1EmHb9x_dyAqP~>vn&#ZDM;=hy!IbPS|j$HXRv0tNW zMmfUD@cSTu4V;C5g3V&X0mPd*{(Q9Ebm1Q1`G!^TER(R5}ma;f!$1pmEp YXLCjtbBQXpR(Lc Date: Tue, 23 Feb 2021 20:42:51 +0200 Subject: [PATCH 10/18] Fix debug log messages --- .../zeusops_addon/functions/fn_define_bodybag_player.sqf | 8 ++++---- .../zeusops_addon/functions/fn_define_bodybag_respawn.sqf | 2 +- .../zeusops_addon/functions/fn_define_force_respawn.sqf | 2 +- .../zeusops_addon/functions/fn_define_move_respawn.sqf | 2 +- .../zeusops_addon/functions/fn_define_spawn_rearm.sqf | 2 +- .../zeusops_addon/functions/fn_define_toggle_respawn.sqf | 2 +- .../zeusops_addon/functions/fn_getUnitUnderCursor.sqf | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf index 1391d21..fe64d24 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf @@ -1,16 +1,16 @@ fn_bodybag_player = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; + format ["[ZOPS] [fn_bodybag_player] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { - "[fn_bodybag_player] exiting: not local" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_bodybag_player] exiting: not local" remoteExec ["diag_log", 2]; }; if (!(_this select 2)) then { - "[fn_bodybag_player] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_bodybag_player] DEBUG NOT ACTIVE: module not active, continuing" remoteExec ["diag_log", 2]; }; - "[fn_bodybag_player] passed checks" remoteExec ["diag_log", 2]; + "[ZOPS] [fn_bodybag_player] passed checks" remoteExec ["diag_log", 2]; // Find player _player = objNull; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf index 8a3fcc8..d989372 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf @@ -1,6 +1,6 @@ fn_bodybag_respawn = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[ZOPS] [fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; + format ["[ZOPS] [fn_bodybag_respawn] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf index e709b40..8981e95 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf @@ -1,6 +1,6 @@ fn_force_respawn = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[ZOPS] [fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; + format ["[ZOPS] [fn_force_respawn] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf index 473d369..f5fd8ad 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf @@ -1,6 +1,6 @@ fn_move_respawn = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[ZOPS] [fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; + format ["[ZOPS] [fn_move_respawn] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf index 460986e..4686a16 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf @@ -1,6 +1,6 @@ fn_spawn_rearm = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[ZOPS] [fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; + format ["[ZOPS] [fn_spawn_rearm] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf index 067d6d6..46ca7bb 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf @@ -1,6 +1,6 @@ fn_toggle_respawn = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[ZOPS] [fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; + format ["[ZOPS] [fn_toggle_respawn] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; // Exit if module wasn't created by this instance diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_getUnitUnderCursor.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_getUnitUnderCursor.sqf index 70564d1..768ff50 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_getUnitUnderCursor.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_getUnitUnderCursor.sqf @@ -6,7 +6,7 @@ params ["_logic"]; if !(local _logic) exitWith { - diag_log "[fn_getUnitUnderCursor] exiting: not local"; + diag_log "[ZOPS] [fn_getUnitUnderCursor] exiting: not local"; }; private _unit = attachedTo _logic; From 48aa9400a44b9c095c094d8675574bb524276ee5 Mon Sep 17 00:00:00 2001 From: Sami Laine Date: Tue, 23 Feb 2021 22:15:50 +0200 Subject: [PATCH 11/18] Fix bodybagging --- CHANGELOG.md | 4 ++++ .../zeusops_addon/functions/fn_define_bodybag_player.sqf | 2 +- .../zeusops_addon/functions/fn_define_bodybag_respawn.sqf | 4 +++- source/@zeusops/mod.cpp | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 source/@zeusops/mod.cpp diff --git a/CHANGELOG.md b/CHANGELOG.md index 92998c6..1d3335f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [Unreleased] +### Fixed +- Make bodybagging work properly again. + ## [1.12.0] - 2021-03-30 ### Added - Athena hack to hide other players diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf index fe64d24..5571f64 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf @@ -22,7 +22,7 @@ fn_bodybag_player = { // Bodybag if player is found if (!(isNull _player)) then { _player setDamage 1; - [objNull, _player] call ace_medical_fnc_actionPlaceInBodyBag; + [objNull, _player] call ace_medical_treatment_fnc_placeInBodyBag; "Bodybagged player" call zeusops_fnc_showCuratorMessage; } else { "Module needs to be placed on player" call zeusops_fnc_showCuratorMessage; diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf index d989372..a220017 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf @@ -24,7 +24,9 @@ fn_bodybag_respawn = { // Bodybag and respawn if player found if (!(isNull _player)) then { _player setDamage 1; - [objNull, _player] call ace_medical_fnc_actionPlaceInBodyBag; + // Wait a bit for the death to register before bagging + sleep 0.1; + [objNull, _player] call ace_medical_treatment_fnc_placeInBodyBag; [] remoteExec ["zeusops_fnc_respawnPlayer", _player]; "Bodybagged and respawned player" call zeusops_fnc_showCuratorMessage; } else { diff --git a/source/@zeusops/mod.cpp b/source/@zeusops/mod.cpp new file mode 100644 index 0000000..c162bfa --- /dev/null +++ b/source/@zeusops/mod.cpp @@ -0,0 +1 @@ +name = "zeusops source"; From 0cb2a510c9c78db0847cc8a22233c4e70f76a1da Mon Sep 17 00:00:00 2001 From: Sami Laine Date: Tue, 23 Feb 2021 22:33:04 +0200 Subject: [PATCH 12/18] Release test version v1.12.0-a5 --- ...0mm_smokefix_zops.pbo.zeusops-1.12.0-a4.bisign | Bin 570 -> 0 bytes ...0mm_smokefix_zops.pbo.zeusops-1.12.0-a5.bisign | Bin 0 -> 570 bytes .../addons/stui_core.pbo.zeusops-1.12.0-a4.bisign | Bin 570 -> 0 bytes .../addons/stui_core.pbo.zeusops-1.12.0-a5.bisign | Bin 0 -> 570 bytes .../stui_grouphud.pbo.zeusops-1.12.0-a4.bisign | Bin 570 -> 0 bytes .../stui_grouphud.pbo.zeusops-1.12.0-a5.bisign | Bin 0 -> 570 bytes .../stui_nametags.pbo.zeusops-1.12.0-a4.bisign | Bin 570 -> 0 bytes .../stui_nametags.pbo.zeusops-1.12.0-a5.bisign | Bin 0 -> 570 bytes .../zeusops_addon.pbo.zeusops-1.12.0-a4.bisign | Bin 570 -> 0 bytes .../zeusops_addon.pbo.zeusops-1.12.0-a5.bisign | Bin 0 -> 570 bytes .../addons/zops_kit.pbo.zeusops-1.12.0-a4.bisign | Bin 570 -> 0 bytes .../addons/zops_kit.pbo.zeusops-1.12.0-a5.bisign | Bin 0 -> 570 bytes release/@zeusops/keys/zeusops-1.12.0-a4.bikey | Bin 170 -> 0 bytes release/@zeusops/keys/zeusops-1.12.0-a5.bikey | Bin 0 -> 170 bytes 14 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a4.bisign create mode 100644 release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a5.bisign delete mode 100644 release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a4.bisign create mode 100644 release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a5.bisign delete mode 100644 release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a4.bisign create mode 100644 release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a5.bisign delete mode 100644 release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a4.bisign create mode 100644 release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a5.bisign delete mode 100644 release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0-a4.bisign create mode 100644 release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0-a5.bisign delete mode 100644 release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a4.bisign create mode 100644 release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a5.bisign delete mode 100644 release/@zeusops/keys/zeusops-1.12.0-a4.bikey create mode 100644 release/@zeusops/keys/zeusops-1.12.0-a5.bikey diff --git a/release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a4.bisign b/release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a4.bisign deleted file mode 100644 index a6b5f6645a126b63b7e8ca9c61ca9f6a030e12c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy;0F(d#00sg8001Na08&#yF#rSr009620O>o5 z`#l1_qAzj8%1@!2XGGY!rV;1EmHb9x_dyAqP~>vn&#ZDM;=hy!IbPS|j$HXRv0tNW zMmfUD@cSTu4V;C5g3V&X0mPd*{(Q9Ebm1Q1`G!^TER(R5}ma;f!$1pmEp zXLCjtbBQXpR(LcMcSA&o<`c zn>^$s_G#9qp_>kpbtD%AnQ@?lh(Aw_$d>Ll=Ut}opUme{1l4+8y)JyMe< zU#g#U^f3w?WJZ^gP)}q=(7pXpi{p}7H7Obc-2U=r(oKJplilgn^&@_Ks&|-4V*>yH z0Du4h0O>-N-cwe>so$Ypdj`RuS7$%8jMNNuZ+p8avoF;d-)J%Sbp+|&?Qz>W=L?K! zP$w}g$sUQGMI1+2Pyktd&tQb|fglIc`+K{^MZvuc5ka%A$Wp#6JaC0p&E-^ALFfCy<0F(d#00sg8001Na08&#yF#rSr009620I6(h z7_K~Ohk#hbn!4E7FF0X(JAIo!BMXQ%Zr0Xl42MF1UzSgdE>%y$jb=O{+8iW61ZN)3 zINKs#q6A9BDUMcWEG6`jbLFv42Li0>HpfV;I>tgk-;*e)tK~j=@1~Ea+md9^PQn}@ z7cVH+sCbUyC>5UX0i&!s9;luwsek|g04%*4%81U#ifQI|%o-hc&Goj9T(o1Slqn`I zr`_mKs=RG(uff@F7`kM)K5|ZML8#LK9>edXRCyb`_E5EeYcLRDgTO3_5b#$LI3~& literal 0 HcmV?d00001 diff --git a/release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a4.bisign b/release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a4.bisign deleted file mode 100644 index 39f906064f0543771e09750d30e898da0e814714..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy;0F(d#00sg8001Na08&#yF#rSr009620O>o5 z`#l1_qAzj8%1@!2XGGY!rV;1EmHb9x_dyAqP~>vn&#ZDM;=hy!IbPS|j$HXRv0tNW zMmfUD@cSTu4V;C5g3V&X0mPd*{(Q9Ebm1Q1`G!^TER(R5}ma;f!$1pmEp zXLCjtbBQXpR(Lc0bfO+8{g$5Q!^(br7CUX@MhIGjlScTE6q6DW3NmRSc%wd(FyCTswb}|!* ze)Nvz?;F+>%Ml@65!Qg~5{4E2Q(d#hcSSvq_7w_Q44>M`0VPGqdZWFi07$UfI|Bd! z0Du4h0Pv86Z#8&;#y)|oLV15o)j|w!PQP27eN=Ho4Fdi5^Mo$G;*AgWL_`;q<+aV* zn3*Ho$sx@FFQe)73yW5T|16jR0kre`qR-DJ;ctYGZf3~5&;vsPAB_rx@`QILXcNI` zSeeNu3N=&wY|&MW(+B?#!> z=|daPNI%Kd24FCWD diff --git a/release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a5.bisign b/release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a5.bisign new file mode 100644 index 0000000000000000000000000000000000000000..72d38d83ae0e3f8e35ffb5aaef44f361ed66b813 GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy<0F(d#00sg8001Na08&#yF#rSr009620I6(h z7_K~Ohk#hbn!4E7FF0X(JAIo!BMXQ%Zr0Xl42MF1UzSgdE>%y$jb=O{+8iW61ZN)3 zINKs#q6A9BDUMcWEG6`jbLFv42Li0>HpfV;I>tgk-;*e)tK~j=@1~Ea+md9^PQn}@ z7cVH+sCbUyC>5UX0i&!s9;luwsek|g0Mi=OZ${iDJA2a9H!unLpkaD|?KvRe(<9H5 zJf3JuovYDBzPQtRg+0>Qpu%dm88uMEqLGkrTz$M&AgU_m7|2JG|Uil>j`l|YfqjPP}ptVzcyGb}lu_OzGtxni-tNQeTgAmu+3IhND z0Du4h0F9p^-;$E|Szf#fOKETBdoe_-?OoH#sv!>e2QpWmY@njOhb|D=6 zn#2!*bE@I-x(tw+=b3(+4ydRV|8)@R8ns@D09iT1Uh!cr4gGzeW|XTJ)JKw< z3dsj)nDY~+Me@_sE&{Vo*7}MbWBEVqlE2a`iXAUZOOj+|LQnwr*S#uBeKyntLXlSJ zbHf>Mbf7GXeR`4Y3UX^MAA|%A$Wp#6JaC0p&E-^ALFfCy;0F(d#00sg8001Na08&#yF#rSr009620O>o5 z`#l1_qAzj8%1@!2XGGY!rV;1EmHb9x_dyAqP~>vn&#ZDM;=hy!IbPS|j$HXRv0tNW zMmfUD@cSTu4V;C5g3V&X0mPd*{(Q9Ebm1Q1`G!^TER(R5}ma;f!$1pmEp zXLCjtbBQXpR(LcB_f3h^q&|7R#6$Ui38sWa}Aa!m<~M#@{AGkO2D9zF2;QZ;TtS>w+)pyM(T zTe-MXvsGys&n&{$NN~Ek!O$bvql;t90JFPStUz`0vk+p=HwYr}#gKwVeKo^GHv<3w z0Du4h0A6(|J<6g3-Ehw~qDq#r3vYbrcmLrL&#wnx(L61V z(7%+W8oJN$!i?Rr#JoBEVPcplxu6O5QkbnrM}PnT0Q4H1JN^mHkixluDY5Wp)d-kgV8m(}JUC~kD!DSURjOtjdTLW>hS}E0+(bl(3!=a%OTH#TrH43|5 z=NJ2fv-9=uzn2dY^AtDl#vSjDo3Tz#c%LM`nlcUCXD_Shmvk%Z#Z87mKxcyr>AuGe I>0DPWjO2X}umAu6 diff --git a/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a5.bisign b/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a5.bisign new file mode 100644 index 0000000000000000000000000000000000000000..ee1dd77072befc856a34b2f4270396071c02281f GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy<0F(d#00sg8001Na08&#yF#rSr009620I6(h z7_K~Ohk#hbn!4E7FF0X(JAIo!BMXQ%Zr0Xl42MF1UzSgdE>%y$jb=O{+8iW61ZN)3 zINKs#q6A9BDUMcWEG6`jbLFv42Li0>HpfV;I>tgk-;*e)tK~j=@1~Ea+md9^PQn}@ z7cVH+sCbUyC>5UX0i&!s9;luwsek|g0Gxs{C$uXVk5p&*<|wA|07sqLk8KGepW%6H z&}!n>5r62shk@??+ToL*lCc+bXe)FE)MpW8kzD6yXe+cy;?x#HQn*;sn+n?wS(Lk` z-AJfaSZK*&r}o$aEdw7r78jD)ZFg`%ZcBCvg~QvKpWaYm`*^Ii-Rdi=ImUaZbprqZ z0Du4h0I@Onw~jjS#n3!U-}l11&}!r0kEKr}(h-Tqh7PJ_2(vqGPuysMiI8Zq-42Eq zv~={qGq|DP+(K??i^Q6H1PSkZCQ#tlQvEZLhK1Q7c+dI1G^bI~-e?vIvd|$-P~$Rd z*1PZIc3Il-D0MMohyqDdc0ph|hrVCOQF+!tet-Y~0KS)ry&7rK$gT8Z2TM7w1|4Xl z7+~F}>;8?R>*peo-t=QJQL9jMUW|mWBWnHKWa7`6a|-=G^)Qxa5nXor3SJd`;GIdx zC41MWrg}Z9)UVs&P?(w_oZkhVjH#`cgj}Ac@;gm@7Hw0N>0Qre{uI5b ISm%idj9cLd{Qv*} literal 0 HcmV?d00001 diff --git a/release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a4.bisign b/release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a4.bisign deleted file mode 100644 index 26620e712fabec6d1e33ce7ca10e5cd4421a42b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy;0F(d#00sg8001Na08&#yF#rSr009620O>o5 z`#l1_qAzj8%1@!2XGGY!rV;1EmHb9x_dyAqP~>vn&#ZDM;=hy!IbPS|j$HXRv0tNW zMmfUD@cSTu4V;C5g3V&X0mPd*{(Q9Ebm1Q1`G!^TER(R5}ma;f!$1pmEp zXLCjtbBQXpR(Lcp|5=kHYhDX**aK`9V>FQQO$@l zo6~|>9Lq#s*ONY^_wcKJSfj`y*yHPE@?K;!8&zCTUybod5Nrj8;`OjMmWOaU$mTk3H6El1bbl_7BMh z+nmUGzHQ|!I1wej)0m%{0p4*%!!6%SjynS4*1s9(PRML`&wwX>>5_6a+>hgsTLkj* zc!&O<0yQCUP{}UOj5TS`DIQ8Kl=%A$Wp#6JaC0p&E-^ALFfCy<0F(d#00sg8001Na08&#yF#rSr009620I6(h z7_K~Ohk#hbn!4E7FF0X(JAIo!BMXQ%Zr0Xl42MF1UzSgdE>%y$jb=O{+8iW61ZN)3 zINKs#q6A9BDUMcWEG6`jbLFv42Li0>HpfV;I>tgk-;*e)tK~j=@1~Ea+md9^PQn}@ z7cVH+sCbUyC>5UX0i&!s9;luwsek|g08s=a=a=QyP|5U?Lu;SP7)F8e?;R{aX=D*7 zorq^O5&g!)cm$a?%-9GIBKgAT+sDTQqTRxucEDlL-4Rx^3DOVdGk!~ zeGQn7Hw=v$Xpr#|@PR_G3Hn7`PdNs3RH4i^j11zU3ZkwE#|ZMFRi; z0Du4h0O^tcd=&Q;DS?|}IJduAK=lZ~CALtT?WfGN)&rF5n_6lI_hHR~poNAru+cft zq=&d3+ONTe!{kxS)uco&tiVhp`S)s58(^hF)wxq2T+wa6zS#1k9e(y*kj2Rt8X|sB z`Jt$Uaic;>%V^EJUd+Kd2v9ctME%oYU5ohBB7gt@0GGfxC!g;muG60q(qt>NqKb<& z-z1$V_>Ds<<|Pu<-zG^pQdDOg#UM}bx&f*w<9W2g`DcZXasmv#RPSoRjICC7}nK)5}B}fv4Okj5#lb Id-X;veDfC!uK)l5 literal 0 HcmV?d00001 diff --git a/release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0-a4.bisign b/release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0-a4.bisign deleted file mode 100644 index db303e491a544b351635a82d25b37e7ea07cc13e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy;0F(d#00sg8001Na08&#yF#rSr009620O>o5 z`#l1_qAzj8%1@!2XGGY!rV;1EmHb9x_dyAqP~>vn&#ZDM;=hy!IbPS|j$HXRv0tNW zMmfUD@cSTu4V;C5g3V&X0mPd*{(Q9Ebm1Q1`G!^TER(R5}ma;f!$1pmEp zXLCjtbBQXpR(Lc~Wx-=c>Cdr~rB_pzY_&w+C|*0w&^wyW}O6epsNk~zxtbjG+j%mY&h-a|NUbkY_( zsPV4OiqNAwgZwj5*b$A%8sDy>clgv9nZQ zIok2r)-h>xa&U0LlK8@!V!jOfHEPHTrY$%tYk&X%0Kdx&j4J!+Ix*c(oOk8@l7%kx z1_QJzE-hf`SQNy@(SAL}X7}m`2>&|ca-}|_!L9>iqSS>CTU~-$4S;rLkiS&nl`w<# z`y8Styo0W@2Dz1~QOT~VEU@_OIhKzxwp)K2RU~S(d%A$Wp#6JaC0p&E-^ALFfCy<0F(d#00sg8001Na08&#yF#rSr009620I6(h z7_K~Ohk#hbn!4E7FF0X(JAIo!BMXQ%Zr0Xl42MF1UzSgdE>%y$jb=O{+8iW61ZN)3 zINKs#q6A9BDUMcWEG6`jbLFv42Li0>HpfV;I>tgk-;*e)tK~j=@1~Ea+md9^PQn}@ z7cVH+sCbUyC>5UX0i&!s9;luwsek|g0Q=@&^hyeQW_Ohq**GR1pYleIfk2IT(6o!w zw(3ww0o^s=e&*U`XT|mOlM&VTM+dc^gH89j?!}GiR67=*fq4$nepaVrWdkcH5T7zr zQcXC?_eh87F74i<*}qd#(iECdi#4jnK!wRZwCQnnJSEzmE1o(W@uQjuI1721dwXp%bX6J^U6 zCJ5kO#_!?jYrmau1GsS)gZq~~qpDr-H3@n99)JJ<0NK9fdKK3oC8WKfJF7*6Pr7KF$e}n6P()|xIqKvb^+|WfZ~hFZ%lOGi1FM*X I8AKH2s7LJr?f?J) literal 0 HcmV?d00001 diff --git a/release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a4.bisign b/release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a4.bisign deleted file mode 100644 index 54338513f961ffa26f9b18ae621e86856dba396c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy;0F(d#00sg8001Na08&#yF#rSr009620O>o5 z`#l1_qAzj8%1@!2XGGY!rV;1EmHb9x_dyAqP~>vn&#ZDM;=hy!IbPS|j$HXRv0tNW zMmfUD@cSTu4V;C5g3V&X0mPd*{(Q9Ebm1Q1`G!^TER(R5}ma;f!$1pmEp zXLCjtbBQXpR(Lcyda zJ_s80EKXb7O;d>N{yXZ;tRX7VHtets2zyf-Vy?0J`FSF)bvB9iH#P|c_?wj^)NfJ@OzFLJ3FOZL^m=$4*V>H3^&)k=a z^#YNBpV$GK;s0ZNW5vyJ0l|f6Za>0V^CU57gn$4500H+bSSne5GlQ!-@!uYtORZ~} z$)YcH^sqX+nj6CIgUPr&ThSZ!T~~IPlCov^i=On+uo}BlW|I)suQ-hcR|Ua!>jz0w zy%MWpKXA05k-*c1MT@`3tU(M~Zt0qMcR=ZI^{%A^X|ABJNRxl;2U8DG{^U9!L5=_T Il`=#BuCPB0l>h($ diff --git a/release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a5.bisign b/release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a5.bisign new file mode 100644 index 0000000000000000000000000000000000000000..18899dd92aa09a5983c6bb98d8ab3d1971adea1e GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy<0F(d#00sg8001Na08&#yF#rSr009620I6(h z7_K~Ohk#hbn!4E7FF0X(JAIo!BMXQ%Zr0Xl42MF1UzSgdE>%y$jb=O{+8iW61ZN)3 zINKs#q6A9BDUMcWEG6`jbLFv42Li0>HpfV;I>tgk-;*e)tK~j=@1~Ea+md9^PQn}@ z7cVH+sCbUyC>5UX0i&!s9;luwsek|g0LM>j{u(i*u{Ag`h7zaD@|4g?x@!r#vBh6L zgRKWL{%@{xrDzN^(J+ba>o<)4+G=i7rHhO7+g;hMND4ggO~k)6dgnW0|Nj6 z0Du4h0L}g8>QV!EKF&1gr}aF-aG}U`f#<*9Bm?@>WYl2~&1;ody8YFl^_)E*nZT)XNft}$_8w_jJ>Gg@c#HQeL(t3hePI)ZCuswRl<5USjh#oS zHzI^Yb@wmj(tr{C?giSq^)!F;>xG{~M06P2x In2MIpp=TTe#{d8T literal 0 HcmV?d00001 diff --git a/release/@zeusops/keys/zeusops-1.12.0-a4.bikey b/release/@zeusops/keys/zeusops-1.12.0-a4.bikey deleted file mode 100644 index 0146523344e3c365694a517315110c390549a273..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmV;b09F5bWp#6JaC0p&E-^ALFfCy;0F(d#00sg8001Na08&#yF#rSr009620O>o5 z`#l1_qAzj8%1@!2XGGY!rV;1EmHb9x_dyAqP~>vn&#ZDM;=hy!IbPS|j$HXRv0tNW zMmfUD@cSTu4V;C5g3V&X0mPd*{(Q9Ebm1Q1`G!^TER(R5}ma;f!$1pmEp YXLCjtbBQXpR(Lc%y$jb=O{+8iW61ZN)3 zINKs#q6A9BDUMcWEG6`jbLFv42Li0>HpfV;I>tgk-;*e)tK~j=@1~Ea+md9^PQn}@ Y7cVH+sCbUyC>5UX0i&!s9;luwsfCO{umAu6 literal 0 HcmV?d00001 From 9e0345be357a5000419ed886e80460f01495fc61 Mon Sep 17 00:00:00 2001 From: Sami Laine Date: Thu, 11 Mar 2021 00:01:36 +0200 Subject: [PATCH 13/18] Change module scope --- source/@zeusops/addons/zeusops_addon/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/@zeusops/addons/zeusops_addon/config.cpp b/source/@zeusops/addons/zeusops_addon/config.cpp index 47bc6ba..8cfec68 100644 --- a/source/@zeusops/addons/zeusops_addon/config.cpp +++ b/source/@zeusops/addons/zeusops_addon/config.cpp @@ -76,7 +76,7 @@ class CfgVehicles category="zeusops_modules"; scope=1; // not visible in editor scopeCurator = 2; // visible in zeus - isGlobal=2; // ran globally + isGlobal=1; // ran globally functionPriority=1; isTriggerActivated=0; isDisposable=1; From 2eed631cc4a8ffcb00b3eb1a96c8f889b8c40026 Mon Sep 17 00:00:00 2001 From: Sami Laine Date: Thu, 11 Mar 2021 00:02:02 +0200 Subject: [PATCH 14/18] Add a delay before bodybagging a player --- .../addons/zeusops_addon/functions/fn_define_bodybag_player.sqf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf index 5571f64..ca26701 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf @@ -22,6 +22,8 @@ fn_bodybag_player = { // Bodybag if player is found if (!(isNull _player)) then { _player setDamage 1; + // Wait a bit for the death to register before bagging + sleep 0.1; [objNull, _player] call ace_medical_treatment_fnc_placeInBodyBag; "Bodybagged player" call zeusops_fnc_showCuratorMessage; } else { From 9c80f42b98173031d747ae3aeeaaaadd3ff9d238 Mon Sep 17 00:00:00 2001 From: Sami Laine Date: Thu, 11 Mar 2021 00:02:38 +0200 Subject: [PATCH 15/18] Release test version v1.12.0-a6 --- ...0mm_smokefix_zops.pbo.zeusops-1.12.0-a5.bisign | Bin 570 -> 0 bytes ...0mm_smokefix_zops.pbo.zeusops-1.12.0-a6.bisign | Bin 0 -> 570 bytes .../addons/stui_core.pbo.zeusops-1.12.0-a5.bisign | Bin 570 -> 0 bytes .../addons/stui_core.pbo.zeusops-1.12.0-a6.bisign | Bin 0 -> 570 bytes .../stui_grouphud.pbo.zeusops-1.12.0-a5.bisign | Bin 570 -> 0 bytes .../stui_grouphud.pbo.zeusops-1.12.0-a6.bisign | Bin 0 -> 570 bytes .../stui_nametags.pbo.zeusops-1.12.0-a5.bisign | Bin 570 -> 0 bytes .../stui_nametags.pbo.zeusops-1.12.0-a6.bisign | Bin 0 -> 570 bytes .../zeusops_addon.pbo.zeusops-1.12.0-a5.bisign | Bin 570 -> 0 bytes .../zeusops_addon.pbo.zeusops-1.12.0-a6.bisign | Bin 0 -> 570 bytes .../addons/zops_kit.pbo.zeusops-1.12.0-a5.bisign | Bin 570 -> 0 bytes .../addons/zops_kit.pbo.zeusops-1.12.0-a6.bisign | Bin 0 -> 570 bytes release/@zeusops/keys/zeusops-1.12.0-a5.bikey | Bin 170 -> 0 bytes release/@zeusops/keys/zeusops-1.12.0-a6.bikey | Bin 0 -> 170 bytes 14 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a5.bisign create mode 100644 release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a6.bisign delete mode 100644 release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a5.bisign create mode 100644 release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a6.bisign delete mode 100644 release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a5.bisign create mode 100644 release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a6.bisign delete mode 100644 release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a5.bisign create mode 100644 release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a6.bisign delete mode 100644 release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0-a5.bisign create mode 100644 release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0-a6.bisign delete mode 100644 release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a5.bisign create mode 100644 release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a6.bisign delete mode 100644 release/@zeusops/keys/zeusops-1.12.0-a5.bikey create mode 100644 release/@zeusops/keys/zeusops-1.12.0-a6.bikey diff --git a/release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a5.bisign b/release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a5.bisign deleted file mode 100644 index 6131b8985d626dec1690bacc39b15b29fd352d0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy<0F(d#00sg8001Na08&#yF#rSr009620I6(h z7_K~Ohk#hbn!4E7FF0X(JAIo!BMXQ%Zr0Xl42MF1UzSgdE>%y$jb=O{+8iW61ZN)3 zINKs#q6A9BDUMcWEG6`jbLFv42Li0>HpfV;I>tgk-;*e)tK~j=@1~Ea+md9^PQn}@ z7cVH+sCbUyC>5UX0i&!s9;luwsek|g04%*4%81U#ifQI|%o-hc&Goj9T(o1Slqn`I zr`_mKs=RG(uff@F7`kM)K5|ZML8#LK9>edXRCyb`_E5EeYcLRDgTO3_5b#$LI3~& diff --git a/release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a6.bisign b/release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a6.bisign new file mode 100644 index 0000000000000000000000000000000000000000..e28e5725e4f1bcfae89b6a65bf2dfdb4a1ba1c62 GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy=0F(d#00sg8001Na08&#yF#rSr009620GR7+nqV!q_nno~A)wg9kI;JM2(T&GqEz=E|FwYU`g4AcL9t4%S;@(#8ueMk+ z{83+T6OqQfX4Zza_mvJ6_<>$)$wJ5=!^$te=Tto2-lu<;)RD73q40}vl(C1KS*RjS z84|4-{I^oqzE1php;#w`_Mv^ks(=6h054kGql#*MFbe)GlK^J7Z0ge&9m}_uh}XHP zK4s**d=^-#t=oj83+~7R@c*s2 z2=1}Ga7EbI=*=^)R)-{@J7XWc#py&Oer}Ecig`{H)T`2oa*pt>Ih#8Us68_onF9a- z0Du4h0I(bMD}v>|wZZ~&$Tl3|u3ish3Du(kJSiV`G$ts(yx5PUzUpRhr-=i{`Yl09 zX^mqj-|{-$lg{|#iV@zg3vX=8+-jQ9uuD2EX!9pyG2-H|_Sv%1nB7*#U`=*^BjxbY zx;3!)9DTA~Rp{8G`T(!`rl zkuC`{{hJrGX?6PPU*)JoOHd<^&bL92P>Bd I_6v%A$Wp#6JaC0p&E-^ALFfCy<0F(d#00sg8001Na08&#yF#rSr009620I6(h z7_K~Ohk#hbn!4E7FF0X(JAIo!BMXQ%Zr0Xl42MF1UzSgdE>%y$jb=O{+8iW61ZN)3 zINKs#q6A9BDUMcWEG6`jbLFv42Li0>HpfV;I>tgk-;*e)tK~j=@1~Ea+md9^PQn}@ z7cVH+sCbUyC>5UX0i&!s9;luwsek|g0Mi=OZ${iDJA2a9H!unLpkaD|?KvRe(<9H5 zJf3JuovYDBzPQtRg+0>Qpu%dm88uMEqLGkrTz$M&AgU_m7|2JG|Uil>j`l|YfqjPP}ptVzcyGb}lu_OzGtxni-tNQeTgAmu+3IhND z0Du4h0F9p^-;$E|Szf#fOKETBdoe_-?OoH#sv!>e2QpWmY@njOhb|D=6 zn#2!*bE@I-x(tw+=b3(+4ydRV|8)@R8ns@D09iT1Uh!cr4gGzeW|XTJ)JKw< z3dsj)nDY~+Me@_sE&{Vo*7}MbWBEVqlE2a`iXAUZOOj+|LQnwr*S#uBeKyntLXlSJ zbHf>Mbf7GXeR`4Y3UX^MAA|%A$Wp#6JaC0p&E-^ALFfCy=0F(d#00sg8001Na08&#yF#rSr009620GR7+nqV!q_nno~A)wg9kI;JM2(T&GqEz=E|FwYU`g4AcL9t4%S;@(#8ueMk+ z{83+T6OqQfX4Zza_mvJ6_<>$)$wJ5=!^$te=Tto2-lu<;)RD73q40}vl(C1KS*RjS z84|4-{I^oqzE1php;#w`_Mv^ks(=6h0C)i{;9C>cZvvDvevI53tE;?K=wrszn@f-7 zmkvBUNSDPG#(#PyBO{Y#n*C$n0yn{3`<;kxFDYkPWJ`c)Aktz1Kbu52@5G23dKpvp z-xNp3Js|o~tQyPPiaxR9^=rJBrbqH`Q3q5qn4W24ew1unO<1Wv56Xo#x+s$*VgmpG z0Du4h04Bho{NPNZ?7V@^RE8Zhmh#6r&3ukEVUcDF1N1wUJILol696@rWnE{^bW{(}m+0e9qLY`e<# zNDkCaane+t0Q-a4dU)$Xi&TWxMJ8&=-dpE~?4*QVG)mum;GHlg+6z7Dn90Oqi$S>& Ifon}a7kY*YVgLXD literal 0 HcmV?d00001 diff --git a/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a5.bisign b/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a5.bisign deleted file mode 100644 index ee1dd77072befc856a34b2f4270396071c02281f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy<0F(d#00sg8001Na08&#yF#rSr009620I6(h z7_K~Ohk#hbn!4E7FF0X(JAIo!BMXQ%Zr0Xl42MF1UzSgdE>%y$jb=O{+8iW61ZN)3 zINKs#q6A9BDUMcWEG6`jbLFv42Li0>HpfV;I>tgk-;*e)tK~j=@1~Ea+md9^PQn}@ z7cVH+sCbUyC>5UX0i&!s9;luwsek|g0Gxs{C$uXVk5p&*<|wA|07sqLk8KGepW%6H z&}!n>5r62shk@??+ToL*lCc+bXe)FE)MpW8kzD6yXe+cy;?x#HQn*;sn+n?wS(Lk` z-AJfaSZK*&r}o$aEdw7r78jD)ZFg`%ZcBCvg~QvKpWaYm`*^Ii-Rdi=ImUaZbprqZ z0Du4h0I@Onw~jjS#n3!U-}l11&}!r0kEKr}(h-Tqh7PJ_2(vqGPuysMiI8Zq-42Eq zv~={qGq|DP+(K??i^Q6H1PSkZCQ#tlQvEZLhK1Q7c+dI1G^bI~-e?vIvd|$-P~$Rd z*1PZIc3Il-D0MMohyqDdc0ph|hrVCOQF+!tet-Y~0KS)ry&7rK$gT8Z2TM7w1|4Xl z7+~F}>;8?R>*peo-t=QJQL9jMUW|mWBWnHKWa7`6a|-=G^)Qxa5nXor3SJd`;GIdx zC41MWrg}Z9)UVs&P?(w_oZkhVjH#`cgj}Ac@;gm@7Hw0N>0Qre{uI5b ISm%idj9cLd{Qv*} diff --git a/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a6.bisign b/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a6.bisign new file mode 100644 index 0000000000000000000000000000000000000000..2ff825c3ba474c07e4799b936c8616f57f1dc91b GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy=0F(d#00sg8001Na08&#yF#rSr009620GR7+nqV!q_nno~A)wg9kI;JM2(T&GqEz=E|FwYU`g4AcL9t4%S;@(#8ueMk+ z{83+T6OqQfX4Zza_mvJ6_<>$)$wJ5=!^$te=Tto2-lu<;)RD73q40}vl(C1KS*RjS z84|4-{I^oqzE1php;#w`_Mv^ks(=6h0Dp@#Lo7PFqI*#&&t#QDKsW@Jh4M|JY`Iez zBJKXNqb^9RdjokXM|ACRFNlSA0t-Tvh}PLqefWXGBD^8j!$POiJfq|4{qK05894^w z+GNFE=OcdHTk|`QrD>W>T|%fSH@e@hqqlRm95mMl$TCzRWkewKRRec#J62X*p#uN_ z0Du4h00b8m8)gs&Oy=5Ef*I(8N>;~ezrfrSs86^jGD13H&yD6Ilo15eNi6!-m&23% zB*;Kp4I<=65#-j4G)(yRV|P)!_-j43zU($!ws-z0jXcUF``G66?f291Vb^ zl&8jEy5}g|c)$Sm0=Q&94M8)>dk^F!(qCy8s(=6h03Qq*t;$hPD=9<)vYS@$=B-}9 z=}pkZ*+_sk8j%Ri;alC<-6Pvoz7n18f!p81Pe(u0PUO?LUrGo{Y@1ESA|j9=^ff6V z@>=Ym0($!&UUVYrBW?l><;HFb2<2wV8*M>x=z(6w#{_}0*!d$~s(>Vlk>74w1pEDj I3O^y+Sk7?+sQ>@~ literal 0 HcmV?d00001 diff --git a/release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a5.bisign b/release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a5.bisign deleted file mode 100644 index dccfef5e2f6012506c8e0842d4b45924334af586..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy<0F(d#00sg8001Na08&#yF#rSr009620I6(h z7_K~Ohk#hbn!4E7FF0X(JAIo!BMXQ%Zr0Xl42MF1UzSgdE>%y$jb=O{+8iW61ZN)3 zINKs#q6A9BDUMcWEG6`jbLFv42Li0>HpfV;I>tgk-;*e)tK~j=@1~Ea+md9^PQn}@ z7cVH+sCbUyC>5UX0i&!s9;luwsek|g08s=a=a=QyP|5U?Lu;SP7)F8e?;R{aX=D*7 zorq^O5&g!)cm$a?%-9GIBKgAT+sDTQqTRxucEDlL-4Rx^3DOVdGk!~ zeGQn7Hw=v$Xpr#|@PR_G3Hn7`PdNs3RH4i^j11zU3ZkwE#|ZMFRi; z0Du4h0O^tcd=&Q;DS?|}IJduAK=lZ~CALtT?WfGN)&rF5n_6lI_hHR~poNAru+cft zq=&d3+ONTe!{kxS)uco&tiVhp`S)s58(^hF)wxq2T+wa6zS#1k9e(y*kj2Rt8X|sB z`Jt$Uaic;>%V^EJUd+Kd2v9ctME%oYU5ohBB7gt@0GGfxC!g;muG60q(qt>NqKb<& z-z1$V_>Ds<<|Pu<-zG^pQdDOg#UM}bx&f*w<9W2g`DcZXasmv#RPSoRjICC7}nK)5}B}fv4Okj5#lb Id-X;veDfC!uK)l5 diff --git a/release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a6.bisign b/release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a6.bisign new file mode 100644 index 0000000000000000000000000000000000000000..83c6f39d51960e242165cdf01362282218080613 GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy=0F(d#00sg8001Na08&#yF#rSr009620GR7+nqV!q_nno~A)wg9kI;JM2(T&GqEz=E|FwYU`g4AcL9t4%S;@(#8ueMk+ z{83+T6OqQfX4Zza_mvJ6_<>$)$wJ5=!^$te=Tto2-lu<;)RD73q40}vl(C1KS*RjS z84|4-{I^oqzE1php;#w`_Mv^ks(=6h0LR$D_Ga}EuAr&c1R;g>@mkH+*p8lVL?D9+ zoe90OxJnT!#`mPXKyzg?ZDLOoibg|ZIgiJ+XWrf>VK{Y2%)bLM_xWN$HUgW;zU2Hv z*m!EUnzCKlUS0!~J4BA`X4dxb&0sxORz~LZm(`An%K^M?WJ@L@Kg83YNHEWxYXblP z0Du4h0Mzeve~yGx(8hd;jL=hDu3O~+*KHnTPz|~a5+xd3BKcg5$D1Aw{ZhupBAV@< zCwc6xz1C(oN6oVaN3f>5vT~13_L}jMt#b~;-PIONs!?hLx2DP0DYM9dUfSJkP@7c*S(4uC);w?`Ji*Z=|RH9BF5((9wZv3pmiaUH+W}} zJ7CH#Q5{F?Z>?=wRl~oU%4zng+b(fuZ)bR7y3)-OEPi^twW4UA^@<8vR`7d+@HGWz IhNMV~ZK!Mt_W%F@ literal 0 HcmV?d00001 diff --git a/release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0-a5.bisign b/release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0-a5.bisign deleted file mode 100644 index d810054881cd8fdc396da45db23b82f4df960c87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy<0F(d#00sg8001Na08&#yF#rSr009620I6(h z7_K~Ohk#hbn!4E7FF0X(JAIo!BMXQ%Zr0Xl42MF1UzSgdE>%y$jb=O{+8iW61ZN)3 zINKs#q6A9BDUMcWEG6`jbLFv42Li0>HpfV;I>tgk-;*e)tK~j=@1~Ea+md9^PQn}@ z7cVH+sCbUyC>5UX0i&!s9;luwsek|g0Q=@&^hyeQW_Ohq**GR1pYleIfk2IT(6o!w zw(3ww0o^s=e&*U`XT|mOlM&VTM+dc^gH89j?!}GiR67=*fq4$nepaVrWdkcH5T7zr zQcXC?_eh87F74i<*}qd#(iECdi#4jnK!wRZwCQnnJSEzmE1o(W@uQjuI1721dwXp%bX6J^U6 zCJ5kO#_!?jYrmau1GsS)gZq~~qpDr-H3@n99)JJ<0NK9fdKK3oC8WKfJF7*6Pr7KF$e}n6P()|xIqKvb^+|WfZ~hFZ%lOGi1FM*X I8AKH2s7LJr?f?J) diff --git a/release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0-a6.bisign b/release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0-a6.bisign new file mode 100644 index 0000000000000000000000000000000000000000..aa4198e0f666663bc7ce2deca97f5c84b03ab920 GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy=0F(d#00sg8001Na08&#yF#rSr009620GR7+nqV!q_nno~A)wg9kI;JM2(T&GqEz=E|FwYU`g4AcL9t4%S;@(#8ueMk+ z{83+T6OqQfX4Zza_mvJ6_<>$)$wJ5=!^$te=Tto2-lu<;)RD73q40}vl(C1KS*RjS z84|4-{I^oqzE1php;#w`_Mv^ks(=6h0AD=-Imb*hTe0h`Msr0z6de% zMayp>0VFE$b8>wp-`r=o_)a#@OxGw*6OmND!K8K%n5c!_)ITHK8fv$J$j=YVv+!B% zEXU-(6H9m&8xbH!$*MA-oJA^sg-sd5h_DvN_%d#Ux2fuWKI$;MQ+Vwp`PWszz)X) zb-1;=T5BV#Z^q{8Qtu*3qr`x$y?OSJ7Z~^BrjTIk^TL&j{|-=kVo1qsLuLS+=p;yz z{sfn+nGY`4tXnSJo6O+up{1mvUkK~~PpQ3gcYpu@06|rSwxV8wa{1#)A*vZ5Z_MCH zAF)y$m~Pfxl3gZvO($I4ALm(t8Fp#5Fdh5i_2d{`KrH;>4#)VoGM`-EDF-LAyd0O> zO+G8yy$YP{HP+kR4sqF7SB=q?v|UI^UQ3SgifiSA_*;#?=#%A$Wp#6JaC0p&E-^ALFfCy<0F(d#00sg8001Na08&#yF#rSr009620I6(h z7_K~Ohk#hbn!4E7FF0X(JAIo!BMXQ%Zr0Xl42MF1UzSgdE>%y$jb=O{+8iW61ZN)3 zINKs#q6A9BDUMcWEG6`jbLFv42Li0>HpfV;I>tgk-;*e)tK~j=@1~Ea+md9^PQn}@ z7cVH+sCbUyC>5UX0i&!s9;luwsek|g0LM>j{u(i*u{Ag`h7zaD@|4g?x@!r#vBh6L zgRKWL{%@{xrDzN^(J+ba>o<)4+G=i7rHhO7+g;hMND4ggO~k)6dgnW0|Nj6 z0Du4h0L}g8>QV!EKF&1gr}aF-aG}U`f#<*9Bm?@>WYl2~&1;ody8YFl^_)E*nZT)XNft}$_8w_jJ>Gg@c#HQeL(t3hePI)ZCuswRl<5USjh#oS zHzI^Yb@wmj(tr{C?giSq^)!F;>xG{~M06P2x In2MIpp=TTe#{d8T diff --git a/release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a6.bisign b/release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a6.bisign new file mode 100644 index 0000000000000000000000000000000000000000..d02567906b834c04fc5dfa9ae7cdcfc4433797bc GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy=0F(d#00sg8001Na08&#yF#rSr009620GR7+nqV!q_nno~A)wg9kI;JM2(T&GqEz=E|FwYU`g4AcL9t4%S;@(#8ueMk+ z{83+T6OqQfX4Zza_mvJ6_<>$)$wJ5=!^$te=Tto2-lu<;)RD73q40}vl(C1KS*RjS z84|4-{I^oqzE1php;#w`_Mv^ks(=6h0I{c<^?EO$#OQh*GYFu%P^`0;v_1Qq=p4q& zNZw7;LvR)D95p(WbdSI>tTbbb3nWqUuzPic)r zvoOndy1mkZLzaa`|Dn{ZSYN_drXfXquet-7&t90dKmhnWeqc^fzCvK@_%ig4HUj_v z0Du4h01A4)3o^$WnUFYaA6x7pSYsNX5vnLRsMHsACUpwT#xxrshyO}+gAA(W4RLlj z5&dcc=r%RqK!`dO?N0akF@2A#eAr{=W@>ropSZ%?=PGZ-4**0M#D~FA<2?aL??|UYk6ubU`l? zn|&lsScX6%zy+VXM_tn#jr<^dL^DYp+5uLOU0>6%=aE|(eTP;Tb+fFz1P7~r1GS8T zAuz^CEI3LC+r@Fr&+_7mMwa(Ug>@|E9_BC=-lO6|k%|wlf@D531+g~uqq4)jmx|V{ IaRu*oN@Ldo*Z=?k literal 0 HcmV?d00001 diff --git a/release/@zeusops/keys/zeusops-1.12.0-a5.bikey b/release/@zeusops/keys/zeusops-1.12.0-a5.bikey deleted file mode 100644 index e0f8da96ef00d1fcde0a12fcd61db0a0865f80b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmV;b09F5bWp#6JaC0p&E-^ALFfCy<0F(d#00sg8001Na08&#yF#rSr009620I6(h z7_K~Ohk#hbn!4E7FF0X(JAIo!BMXQ%Zr0Xl42MF1UzSgdE>%y$jb=O{+8iW61ZN)3 zINKs#q6A9BDUMcWEG6`jbLFv42Li0>HpfV;I>tgk-;*e)tK~j=@1~Ea+md9^PQn}@ Y7cVH+sCbUyC>5UX0i&!s9;luwsfCO{umAu6 diff --git a/release/@zeusops/keys/zeusops-1.12.0-a6.bikey b/release/@zeusops/keys/zeusops-1.12.0-a6.bikey new file mode 100644 index 0000000000000000000000000000000000000000..f532c27195a5c7bc54db1cce8d8240e26d887b06 GIT binary patch literal 170 zcmV;b09F5bWp#6JaC0p&E-^ALFfCy=0F(d#00sg8001Na08&#yF#rSr009620GR7+nqV!q_nno~A)wg9kI;JM2(T&GqEz=E|FwYU`g4AcL9t4%S;@(#8ueMk+ z{83+T6OqQfX4Zza_mvJ6_<>$)$wJ5=!^$te=Tto2-lu<;)RD73q40}vl(C1KS*RjS Y84|4-{I^oqzE1php;#w`_Mv^ks&nE=%m4rY literal 0 HcmV?d00001 From c7e08d7bfc6a74eb20833e2ef15801db2fec64b2 Mon Sep 17 00:00:00 2001 From: Sami Laine Date: Tue, 30 Mar 2021 17:05:26 +0300 Subject: [PATCH 16/18] Improve logging --- .../zeusops_addon/functions/fn_define_bodybag_player.sqf | 3 ++- .../zeusops_addon/functions/fn_define_bodybag_respawn.sqf | 3 ++- .../zeusops_addon/functions/fn_define_force_respawn.sqf | 3 ++- .../zeusops_addon/functions/fn_define_move_respawn.sqf | 3 ++- .../zeusops_addon/functions/fn_define_spawn_arsenal.sqf | 7 ++++++- .../zeusops_addon/functions/fn_define_spawn_rearm.sqf | 3 ++- .../zeusops_addon/functions/fn_define_toggle_respawn.sqf | 3 ++- 7 files changed, 18 insertions(+), 7 deletions(-) diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf index ca26701..615c73f 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_player.sqf @@ -1,7 +1,8 @@ fn_bodybag_player = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[ZOPS] [fn_bodybag_player] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; + [_logic, _type] remoteExec ["fn_log_owner", 2]; + format ["[ZOPS] [fn_bodybag_player] %1, isNull: %2. clientOwner: %3, params: %4", _type, isNull _logic, clientOwner, _this joinString ", "] remoteExec ["diag_log", 2]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf index a220017..15db828 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_bodybag_respawn.sqf @@ -1,7 +1,8 @@ fn_bodybag_respawn = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[ZOPS] [fn_bodybag_respawn] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; + [_logic, _type] remoteExec ["fn_log_owner", 2]; + format ["[ZOPS] [fn_bodybag_respawn] %1, isNull: %2. clientOwner: %3, params: %4", _type, isNull _logic, clientOwner, _this joinString ", "] remoteExec ["diag_log", 2]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf index 8981e95..3e7c92c 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_force_respawn.sqf @@ -1,7 +1,8 @@ fn_force_respawn = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[ZOPS] [fn_force_respawn] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; + [_logic, _type] remoteExec ["fn_log_owner", 2]; + format ["[ZOPS] [fn_force_respawn] %1, isNull: %2. clientOwner: %3, params: %4", _type, isNull _logic, clientOwner, _this joinString ", "] remoteExec ["diag_log", 2]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf index f5fd8ad..1149880 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_move_respawn.sqf @@ -1,7 +1,8 @@ fn_move_respawn = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[ZOPS] [fn_move_respawn] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; + [_logic, _type] remoteExec ["fn_log_owner", 2]; + format ["[ZOPS] [fn_move_respawn] %1, isNull: %2. clientOwner: %3, params: %4", _type, isNull _logic, clientOwner, _this joinString ", "] remoteExec ["diag_log", 2]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf index 86f18f4..04e417b 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_arsenal.sqf @@ -1,7 +1,12 @@ +fn_log_owner = { + params ["_object", "_type"]; + diag_log format ["[ZOPS] [log_owner] type: %1, owner: %2", _type, owner _object]; +}; fn_spawn_arsenal = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[ZOPS] [fn_spawn_arsenal] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; + [_logic, _type] remoteExec ["fn_log_owner", 2]; + format ["[ZOPS] [fn_spawn_arsenal] %1, isNull: %2. clientOwner: %3, params: %4", _type, isNull _logic, clientOwner, _this joinString ", "] remoteExec ["diag_log", 2]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf index 4686a16..eb143ae 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_spawn_rearm.sqf @@ -1,7 +1,8 @@ fn_spawn_rearm = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[ZOPS] [fn_spawn_rearm] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; + [_logic, _type] remoteExec ["fn_log_owner", 2]; + format ["[ZOPS] [fn_spawn_rearm] %1, isNull: %2. clientOwner: %3, params: %4", _type, isNull _logic, clientOwner, _this joinString ", "] remoteExec ["diag_log", 2]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { diff --git a/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf b/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf index 46ca7bb..56ce9e4 100644 --- a/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf +++ b/source/@zeusops/addons/zeusops_addon/functions/fn_define_toggle_respawn.sqf @@ -1,7 +1,8 @@ fn_toggle_respawn = { _type = if (isServer) then { "server" } else { format ["player: %1", name player] }; - format ["[ZOPS] [fn_toggle_respawn] %1, params: %2", _type, _this joinString ", "] remoteExec ["diag_log", 2]; _logic = _this param [0,objNull]; + [_logic, _type] remoteExec ["fn_log_owner", 2]; + format ["[ZOPS] [fn_toggle_respawn] %1, isNull: %2. clientOwner: %3, params: %4", _type, isNull _logic, clientOwner, _this joinString ", "] remoteExec ["diag_log", 2]; // Exit if module wasn't created by this instance if (!local _logic) exitWith { From 0a436f03428b9af10f2390f295e4c6ce94b9c75f Mon Sep 17 00:00:00 2001 From: Sami Laine Date: Tue, 30 Mar 2021 17:04:20 +0300 Subject: [PATCH 17/18] BROKEN: Inherit modules from zen_module instead of vanilla ZEN modules have a different structure for parameters than vanilla. Functions get only one parameter: _logic --- source/@zeusops/addons/zeusops_addon/config.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/@zeusops/addons/zeusops_addon/config.cpp b/source/@zeusops/addons/zeusops_addon/config.cpp index 8cfec68..3337b9c 100644 --- a/source/@zeusops/addons/zeusops_addon/config.cpp +++ b/source/@zeusops/addons/zeusops_addon/config.cpp @@ -71,7 +71,8 @@ class CfgVehicles { class Logic; class Module_F: Logic {}; - class zeusops_ModuleBase : Module_F + class zen_modules_moduleBase; + class zeusops_ModuleBase : zen_modules_moduleBase { category="zeusops_modules"; scope=1; // not visible in editor From d673d872fd041dd911ebaa54810d2bbb062b638f Mon Sep 17 00:00:00 2001 From: Sami Laine Date: Tue, 30 Mar 2021 19:00:40 +0300 Subject: [PATCH 18/18] Release test version v1.13.0-a1 --- ...smokefix_zops.pbo.zeusops-1.12.0-a6.bisign | Bin 570 -> 0 bytes ...smokefix_zops.pbo.zeusops-1.13.0-a1.bisign | Bin 0 -> 570 bytes .../stui_core.pbo.zeusops-1.12.0-a6.bisign | Bin 570 -> 0 bytes .../stui_core.pbo.zeusops-1.13.0-a1.bisign | Bin 0 -> 570 bytes ...stui_grouphud.pbo.zeusops-1.12.0-a6.bisign | Bin 570 -> 0 bytes ...stui_grouphud.pbo.zeusops-1.13.0-a1.bisign | Bin 0 -> 570 bytes ...stui_nametags.pbo.zeusops-1.12.0-a6.bisign | Bin 570 -> 0 bytes ...stui_nametags.pbo.zeusops-1.13.0-a1.bisign | Bin 0 -> 570 bytes release/@zeusops/addons/zeusops_addon.pbo | Bin 274707 -> 284131 bytes ...zeusops_addon.pbo.zeusops-1.12.0-a6.bisign | Bin 570 -> 0 bytes ...zeusops_addon.pbo.zeusops-1.13.0-a1.bisign | Bin 0 -> 570 bytes .../zops_kit.pbo.zeusops-1.12.0-a6.bisign | Bin 570 -> 0 bytes .../zops_kit.pbo.zeusops-1.13.0-a1.bisign | Bin 0 -> 570 bytes release/@zeusops/keys/zeusops-1.12.0-a6.bikey | Bin 170 -> 0 bytes release/@zeusops/keys/zeusops-1.13.0-a1.bikey | Bin 0 -> 170 bytes 15 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a6.bisign create mode 100644 release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.13.0-a1.bisign delete mode 100644 release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a6.bisign create mode 100644 release/@zeusops/addons/stui_core.pbo.zeusops-1.13.0-a1.bisign delete mode 100644 release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a6.bisign create mode 100644 release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.13.0-a1.bisign delete mode 100644 release/@zeusops/addons/stui_nametags.pbo.zeusops-1.12.0-a6.bisign create mode 100644 release/@zeusops/addons/stui_nametags.pbo.zeusops-1.13.0-a1.bisign delete mode 100644 release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.12.0-a6.bisign create mode 100644 release/@zeusops/addons/zeusops_addon.pbo.zeusops-1.13.0-a1.bisign delete mode 100644 release/@zeusops/addons/zops_kit.pbo.zeusops-1.12.0-a6.bisign create mode 100644 release/@zeusops/addons/zops_kit.pbo.zeusops-1.13.0-a1.bisign delete mode 100644 release/@zeusops/keys/zeusops-1.12.0-a6.bikey create mode 100644 release/@zeusops/keys/zeusops-1.13.0-a1.bikey diff --git a/release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a6.bisign b/release/@zeusops/addons/nb40mm_smokefix_zops.pbo.zeusops-1.12.0-a6.bisign deleted file mode 100644 index e28e5725e4f1bcfae89b6a65bf2dfdb4a1ba1c62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy=0F(d#00sg8001Na08&#yF#rSr009620GR7+nqV!q_nno~A)wg9kI;JM2(T&GqEz=E|FwYU`g4AcL9t4%S;@(#8ueMk+ z{83+T6OqQfX4Zza_mvJ6_<>$)$wJ5=!^$te=Tto2-lu<;)RD73q40}vl(C1KS*RjS z84|4-{I^oqzE1php;#w`_Mv^ks(=6h054kGql#*MFbe)GlK^J7Z0ge&9m}_uh}XHP zK4s**d=^-#t=oj83+~7R@c*s2 z2=1}Ga7EbI=*=^)R)-{@J7XWc#py&Oer}Ecig`{H)T`2oa*pt>Ih#8Us68_onF9a- z0Du4h0I(bMD}v>|wZZ~&$Tl3|u3ish3Du(kJSiV`G$ts(yx5PUzUpRhr-=i{`Yl09 zX^mqj-|{-$lg{|#iV@zg3vX=8+-jQ9uuD2EX!9pyG2-H|_Sv%1nB7*#U`=*^BjxbY zx;3!)9DTA~Rp{8G`T(!`rl zkuC`{{hJrGX?6PPU*)JoOHd<^&bL92P>Bd I_6v%A$Wp#6JaC0p&E-^DMFfCy*0F(d#00sg8001Na08&#yF#rSr0096202x99 z=$?r)kM6F<3F`UZc4Db13m(#NGsq-3$_!&nV6l8r0i&Pb58 zKS@x8=D8Dxq&B5J#_jX48y-(3*jdzb9)65S#HHLS6lxir_sjO|=O-n9Wg?v666xCr zLP`E@v}Mj_qy3s&?QUb5%|Mlt_J9BY03YVyQjR>j+U4wpDh6xgyKl2p?day5LxMB$%viL3tRBec3rrH3U8~7o zBx~+=YJnA$bLKNxU$&ezAHRSVhV9)FOrK-I?0^6O0DQ|9-mbbILh>r)*QA5sTv*x- z+@=N=WchnSvb8vQDl%(fhiAJBy(+~bZJgSI&au9lA*xHIMEWYJz9=4;FHv*d$5!-P?42`DdKvj{ I$0TY3YyavN5&!@I literal 0 HcmV?d00001 diff --git a/release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a6.bisign b/release/@zeusops/addons/stui_core.pbo.zeusops-1.12.0-a6.bisign deleted file mode 100644 index 5ae2d95f4ecc0b90288c3ed7d8b3b5fef0894ad1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy=0F(d#00sg8001Na08&#yF#rSr009620GR7+nqV!q_nno~A)wg9kI;JM2(T&GqEz=E|FwYU`g4AcL9t4%S;@(#8ueMk+ z{83+T6OqQfX4Zza_mvJ6_<>$)$wJ5=!^$te=Tto2-lu<;)RD73q40}vl(C1KS*RjS z84|4-{I^oqzE1php;#w`_Mv^ks(=6h0C)i{;9C>cZvvDvevI53tE;?K=wrszn@f-7 zmkvBUNSDPG#(#PyBO{Y#n*C$n0yn{3`<;kxFDYkPWJ`c)Aktz1Kbu52@5G23dKpvp z-xNp3Js|o~tQyPPiaxR9^=rJBrbqH`Q3q5qn4W24ew1unO<1Wv56Xo#x+s$*VgmpG z0Du4h04Bho{NPNZ?7V@^RE8Zhmh#6r&3ukEVUcDF1N1wUJILol696@rWnE{^bW{(}m+0e9qLY`e<# zNDkCaane+t0Q-a4dU)$Xi&TWxMJ8&=-dpE~?4*QVG)mum;GHlg+6z7Dn90Oqi$S>& Ifon}a7kY*YVgLXD diff --git a/release/@zeusops/addons/stui_core.pbo.zeusops-1.13.0-a1.bisign b/release/@zeusops/addons/stui_core.pbo.zeusops-1.13.0-a1.bisign new file mode 100644 index 0000000000000000000000000000000000000000..ec69abcf4673c040d89c68cb8ad68acc96f5ccd2 GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^DMFfCy*0F(d#00sg8001Na08&#yF#rSr0096202x99 z=$?r)kM6F<3F`UZc4Db13m(#NGsq-3$_!&nV6l8r0i&Pb58 zKS@x8=D8Dxq&B5J#_jX48y-(3*jdzb9)65S#HHLS6lxir_sjO|=O-n9Wg?v666xCr zLP`E@v}Mj_qy3s&?QUb5%|Mlt_J9BY0N_MSOAYQL@79|qf%8q<@u|@uK4Pec{lwc@ z$pLzK3F>49wZqs#mcnhYXJ1vl}NqYXTNk_8JPmRl`B!qrMrSn|&xOlkj)a&egt zAY_|_BJQg?pG9p~@-u(ySZK72(1Xy;W>4wb1Zl~YVHxm|8a3#wkLQgBs@3mWR|5b5 z0Du4h0E@)=D@Ckm4`OvVBOvt~M zc>LjJ+ty$m>h~6de6fs+nVFRik%?tgX1m>cyQp_0F~+OqJFQ zQDNLIQ(?4#!Sw*IF0TlFGu)>q$a;`pWRc#x;(!1E0P9~`R&C!ZP-w(I;}|wM41KY! zWue<3HC;e35Hf8PV&XEGe8SV0tfmpH8=yT^L@6NS)9-e3pr}csKU=$c&PnsqR{P5| z_9bB2Upo{%T;o1?#UGO5`{B0VFK&B(1D(qREkCYz)2qJ+GwK#$b=6>sHgFqEVEh*9 IWOkhwYOCK1qyPW_ literal 0 HcmV?d00001 diff --git a/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a6.bisign b/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.12.0-a6.bisign deleted file mode 100644 index 2ff825c3ba474c07e4799b936c8616f57f1dc91b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^ALFfCy=0F(d#00sg8001Na08&#yF#rSr009620GR7+nqV!q_nno~A)wg9kI;JM2(T&GqEz=E|FwYU`g4AcL9t4%S;@(#8ueMk+ z{83+T6OqQfX4Zza_mvJ6_<>$)$wJ5=!^$te=Tto2-lu<;)RD73q40}vl(C1KS*RjS z84|4-{I^oqzE1php;#w`_Mv^ks(=6h0Dp@#Lo7PFqI*#&&t#QDKsW@Jh4M|JY`Iez zBJKXNqb^9RdjokXM|ACRFNlSA0t-Tvh}PLqefWXGBD^8j!$POiJfq|4{qK05894^w z+GNFE=OcdHTk|`QrD>W>T|%fSH@e@hqqlRm95mMl$TCzRWkewKRRec#J62X*p#uN_ z0Du4h00b8m8)gs&Oy=5Ef*I(8N>;~ezrfrSs86^jGD13H&yD6Ilo15eNi6!-m&23% zB*;Kp4I<=65#-j4G)(yRV|P)!_-j43zU($!ws-z0jXcUF``G66?f291Vb^ zl&8jEy5}g|c)$Sm0=Q&94M8)>dk^F!(qCy8s(=6h03Qq*t;$hPD=9<)vYS@$=B-}9 z=}pkZ*+_sk8j%Ri;alC<-6Pvoz7n18f!p81Pe(u0PUO?LUrGo{Y@1ESA|j9=^ff6V z@>=Ym0($!&UUVYrBW?l><;HFb2<2wV8*M>x=z(6w#{_}0*!d$~s(>Vlk>74w1pEDj I3O^y+Sk7?+sQ>@~ diff --git a/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.13.0-a1.bisign b/release/@zeusops/addons/stui_grouphud.pbo.zeusops-1.13.0-a1.bisign new file mode 100644 index 0000000000000000000000000000000000000000..f7efa78a15a35f63c8ddc4c4e3acd58f8f0a2fc2 GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^DMFfCy*0F(d#00sg8001Na08&#yF#rSr0096202x99 z=$?r)kM6F<3F`UZc4Db13m(#NGsq-3$_!&nV6l8r0i&Pb58 zKS@x8=D8Dxq&B5J#_jX48y-(3*jdzb9)65S#HHLS6lxir_sjO|=O-n9Wg?v666xCr zLP`E@v}Mj_qy3s&?QUb5%|Mlt_J9BY0Ap8FyTe5ja@vlz$si)Y0E_IimbRE=-3lav z%DD#cYcpCNRmoz>i$|W>ufapi#kY^d?99bq72^FT;4K}P9@^fd)HcMzW3L*!_a`WF z9?_bV{V8&;o*DI?`Mm1>1;g#Lf1J);50?+d^$D~Dry9QxVtV}G0jva{L$>+{R|5b5 z0Du4h0Fd&lY&iI4M(*+0f+Zyup+g!}&|CEo1q62Y%g0dGiQdD`=p0D;i)TS zfbKDOyw2;3)f^#Fregn6bxG}TfM*H;gM;~m=L!tt`oqEYinaxDjHG2QNSqXcZtHjy z99)-vb%Qf;T*zDEz$&}Rwbxfb#LCY!g~Pz1)=wJzj^OXUqacv^6L^71+zP`kA|w&Q Inios!MR%A$Wp#6JaC0p&E-^ALFfCy=0F(d#00sg8001Na08&#yF#rSr009620GR7+nqV!q_nno~A)wg9kI;JM2(T&GqEz=E|FwYU`g4AcL9t4%S;@(#8ueMk+ z{83+T6OqQfX4Zza_mvJ6_<>$)$wJ5=!^$te=Tto2-lu<;)RD73q40}vl(C1KS*RjS z84|4-{I^oqzE1php;#w`_Mv^ks(=6h0LR$D_Ga}EuAr&c1R;g>@mkH+*p8lVL?D9+ zoe90OxJnT!#`mPXKyzg?ZDLOoibg|ZIgiJ+XWrf>VK{Y2%)bLM_xWN$HUgW;zU2Hv z*m!EUnzCKlUS0!~J4BA`X4dxb&0sxORz~LZm(`An%K^M?WJ@L@Kg83YNHEWxYXblP z0Du4h0Mzeve~yGx(8hd;jL=hDu3O~+*KHnTPz|~a5+xd3BKcg5$D1Aw{ZhupBAV@< zCwc6xz1C(oN6oVaN3f>5vT~13_L}jMt#b~;-PIONs!?hLx2DP0DYM9dUfSJkP@7c*S(4uC);w?`Ji*Z=|RH9BF5((9wZv3pmiaUH+W}} zJ7CH#Q5{F?Z>?=wRl~oU%4zng+b(fuZ)bR7y3)-OEPi^twW4UA^@<8vR`7d+@HGWz IhNMV~ZK!Mt_W%F@ diff --git a/release/@zeusops/addons/stui_nametags.pbo.zeusops-1.13.0-a1.bisign b/release/@zeusops/addons/stui_nametags.pbo.zeusops-1.13.0-a1.bisign new file mode 100644 index 0000000000000000000000000000000000000000..18d3b1e9aff487c9704d25b9962248a7bd0f792f GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^DMFfCy*0F(d#00sg8001Na08&#yF#rSr0096202x99 z=$?r)kM6F<3F`UZc4Db13m(#NGsq-3$_!&nV6l8r0i&Pb58 zKS@x8=D8Dxq&B5J#_jX48y-(3*jdzb9)65S#HHLS6lxir_sjO|=O-n9Wg?v666xCr zLP`E@v}Mj_qy3s&?QUb5%|Mlt_J9BY02vxm{=tgd175-9f0?sP_+N5!7YW%W+(4_c zVPa*lcvmK!NSY~+?0TNeC5CT#kR8L(CS_XRLjWoZbUDz1!`zq;FI8$|!}d*@-V&3be#G9_X)|PtZ{Tu~iI*v-Ds3Gz`CM5qF%i+x&IoJn`R>V_rR5-g) z!^^HH*6^w;BkgvJq+1kDAgeGsCdqwH-*CJ>pMU@W003H`^w~_Obt@TG_i}3<`{alQ zTIkmUMhvgfj1AZ<7KbEQ*doxJ>;lVjOdF4O)EnBW;63h`8m*_SjaO6k!U)rUxsGuH zkB2fysGBLO{X0?HKqchbm(~Pt>Rl`lVxDALI=9LoaKP+f+mbUXh~PBARgbe}Fiwj< IQ#<4Sl(7&7l>h($ literal 0 HcmV?d00001 diff --git a/release/@zeusops/addons/zeusops_addon.pbo b/release/@zeusops/addons/zeusops_addon.pbo index 87d7e37848cd7d9811542f04466d72e7ef5d3869..8d628b1e73506f6ab693b00f6921d2d49e7322ab 100644 GIT binary patch delta 12386 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 delta 3076 zcmcImdu$X%7~j3Uhj;Yg>h%R}>Gpb19_4KBti&P|P_RuPJt-|s`q*3V_O1)p-R< z7jem*L3L5-hhB60`t``drES8{1cq{;UYC;sw^9oHmM%L578H1ZGQ!t78-6pTm~VJ| zy--Z$4p3Pdh@A@vOg-*RJshG6veVdM{&0|TWvD(C-~#2)fPv4d82Fni(+=qGb^ERY zYsi6hdU}?+51}CGT`5)}Y!zELN@hK&nkhZ@z$+f^=?hYJY(r>%?EWY@8|n-O%{g_$ z1B_vXCJ83FNe|`vY&c^mNr5*e;F>%u*o@{B=K{_`|F$(5<>D;*WjR6Jeoc2_=I=~!X4^q>|$YxQf!k3=Gtr$A2dC>Qp?Y%(T&wfUE2G5-%?D{dS}N0m7^PW%l;6Qd zxd2EFPWaeshkEaZ*<2SN-NHxP>D?By*#Se|EE9%!Ap{kTb~x8iLMmw7{Zc*&SxwGa zLBY>pU!vfRk8IjS&M?t;8+;Fv9Bh~mp2o}sx%lqJ`gCG1Hl3YmVr|WB4-#u_E|@~B zs^#Pib1BIog0P{A7Y=VGh$m3RokBNr^JMlM?0iBqd_dxEnR(bh7NJCWu74FfuZgmt6@a4x$;ECV~h~6WxcW3C$C{ z2py`3<7pqlC;6HWAg_}#jSVLG9ve;a{oqED?}s;&eB*y5`QAa}+_5BIly6J5q`Nad zK9#V>H<@(!uLvi_BPH4Y3hY2(5v(pO0JbPU{?GgjGMgBxGavrad4KQzeHSzDj9%A$Wp#6JaC0p&E-^ALFfCy=0F(d#00sg8001Na08&#yF#rSr009620GR7+nqV!q_nno~A)wg9kI;JM2(T&GqEz=E|FwYU`g4AcL9t4%S;@(#8ueMk+ z{83+T6OqQfX4Zza_mvJ6_<>$)$wJ5=!^$te=Tto2-lu<;)RD73q40}vl(C1KS*RjS z84|4-{I^oqzE1php;#w`_Mv^ks(=6h0AD=-Imb*hTe0h`Msr0z6de% zMayp>0VFE$b8>wp-`r=o_)a#@OxGw*6OmND!K8K%n5c!_)ITHK8fv$J$j=YVv+!B% zEXU-(6H9m&8xbH!$*MA-oJA^sg-sd5h_DvN_%d#Ux2fuWKI$;MQ+Vwp`PWszz)X) zb-1;=T5BV#Z^q{8Qtu*3qr`x$y?OSJ7Z~^BrjTIk^TL&j{|-=kVo1qsLuLS+=p;yz z{sfn+nGY`4tXnSJo6O+up{1mvUkK~~PpQ3gcYpu@06|rSwxV8wa{1#)A*vZ5Z_MCH zAF)y$m~Pfxl3gZvO($I4ALm(t8Fp#5Fdh5i_2d{`KrH;>4#)VoGM`-EDF-LAyd0O> zO+G8yy$YP{HP+kR4sqF7SB=q?v|UI^UQ3SgifiSA_*;#?=#%A$Wp#6JaC0p&E-^DMFfCy*0F(d#00sg8001Na08&#yF#rSr0096202x99 z=$?r)kM6F<3F`UZc4Db13m(#NGsq-3$_!&nV6l8r0i&Pb58 zKS@x8=D8Dxq&B5J#_jX48y-(3*jdzb9)65S#HHLS6lxir_sjO|=O-n9Wg?v666xCr zLP`E@v}Mj_qy3s&?QUb5%|Mlt_J9BY02%p>Bd2Z8;)lXJ`c!RW0e9P+`1M@OBkiLq z?pP&pRHOJ6xHApP`F$ruT$<=MVK);kh9WJTTG0zbvvps*Qd^cbe2dc#eU?a>4{_>Uzzt z5(93XJ6pgWa9grq>I(zzn?AcEi3Oi6ZS;()B9%a)o%A$Wp#6JaC0p&E-^ALFfCy=0F(d#00sg8001Na08&#yF#rSr009620GR7+nqV!q_nno~A)wg9kI;JM2(T&GqEz=E|FwYU`g4AcL9t4%S;@(#8ueMk+ z{83+T6OqQfX4Zza_mvJ6_<>$)$wJ5=!^$te=Tto2-lu<;)RD73q40}vl(C1KS*RjS z84|4-{I^oqzE1php;#w`_Mv^ks(=6h0I{c<^?EO$#OQh*GYFu%P^`0;v_1Qq=p4q& zNZw7;LvR)D95p(WbdSI>tTbbb3nWqUuzPic)r zvoOndy1mkZLzaa`|Dn{ZSYN_drXfXquet-7&t90dKmhnWeqc^fzCvK@_%ig4HUj_v z0Du4h01A4)3o^$WnUFYaA6x7pSYsNX5vnLRsMHsACUpwT#xxrshyO}+gAA(W4RLlj z5&dcc=r%RqK!`dO?N0akF@2A#eAr{=W@>ropSZ%?=PGZ-4**0M#D~FA<2?aL??|UYk6ubU`l? zn|&lsScX6%zy+VXM_tn#jr<^dL^DYp+5uLOU0>6%=aE|(eTP;Tb+fFz1P7~r1GS8T zAuz^CEI3LC+r@Fr&+_7mMwa(Ug>@|E9_BC=-lO6|k%|wlf@D531+g~uqq4)jmx|V{ IaRu*oN@Ldo*Z=?k diff --git a/release/@zeusops/addons/zops_kit.pbo.zeusops-1.13.0-a1.bisign b/release/@zeusops/addons/zops_kit.pbo.zeusops-1.13.0-a1.bisign new file mode 100644 index 0000000000000000000000000000000000000000..4a2413cce55ceae2925647e47b5fe8f6a3b4a030 GIT binary patch literal 570 zcmV-A0>%A$Wp#6JaC0p&E-^DMFfCy*0F(d#00sg8001Na08&#yF#rSr0096202x99 z=$?r)kM6F<3F`UZc4Db13m(#NGsq-3$_!&nV6l8r0i&Pb58 zKS@x8=D8Dxq&B5J#_jX48y-(3*jdzb9)65S#HHLS6lxir_sjO|=O-n9Wg?v666xCr zLP`E@v}Mj_qy3s&?QUb5%|Mlt_J9BY0K2%2SRW*IA(fq0%aV{Ds^$m+v36>?Jt+dS z-PW}9)R&3ZNMH_^l4i%^={P*0+~=vfMk6nx=4uAXWVDR`3$0mTIWq?kGlB3#xI>A< zHN=eS52P$(omL{mSmW8r?-ij*c6nd2ghoTB3b%mujA1??2X~hUN@m9>$f;~>A16Y)g;V;^FKCNx1T*Br z!7`KckmrYUqSCty61@zRm@T0Y8!g{(a}{@e&#UeSiP}0Ifp^IMWCzhr5;KNqO=|@Ysk4 zQtPxgYlp|d8(HW_gs}v#aXN=GUvm+#539t5&r;_vB| z!r@&sl@{mMBD+rTo1dDSbH;JY*8mlu(j`XN9?cg?x{P~s_H5VV>o~BIHLZK?&z<{9 IH{4Ow$na+k9smFU literal 0 HcmV?d00001 diff --git a/release/@zeusops/keys/zeusops-1.12.0-a6.bikey b/release/@zeusops/keys/zeusops-1.12.0-a6.bikey deleted file mode 100644 index f532c27195a5c7bc54db1cce8d8240e26d887b06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmV;b09F5bWp#6JaC0p&E-^ALFfCy=0F(d#00sg8001Na08&#yF#rSr009620GR7+nqV!q_nno~A)wg9kI;JM2(T&GqEz=E|FwYU`g4AcL9t4%S;@(#8ueMk+ z{83+T6OqQfX4Zza_mvJ6_<>$)$wJ5=!^$te=Tto2-lu<;)RD73q40}vl(C1KS*RjS Y84|4-{I^oqzE1php;#w`_Mv^ks&nE=%m4rY diff --git a/release/@zeusops/keys/zeusops-1.13.0-a1.bikey b/release/@zeusops/keys/zeusops-1.13.0-a1.bikey new file mode 100644 index 0000000000000000000000000000000000000000..a95d929e8ecdf5ef62e4ee8ac447911986bda887 GIT binary patch literal 170 zcmV;b09F5bWp#6JaC0p&E-^DMFfCy*0F(d#00sg8001Na08&#yF#rSr0096202x99 z=$?r)kM6F<3F`UZc4Db13m(#NGsq-3$_!&nV6l8r0i&Pb58 zKS@x8=D8Dxq&B5J#_jX48y-(3*jdzb9)65S#HHLS6lxir_sjO|=O-n9Wg?v666xCr YLP`E@v}Mj_qy3s&?QUb5%|Mlt_OeDv*Z=?k literal 0 HcmV?d00001