Merge branch 'master' into PLA-tank-fix

BourbonWarfare · Oct 9, 2024 · a1a3cbd · a1a3cbd
2 parents 9f0998e + c107e60
commit a1a3cbd
Show file tree

Hide file tree

Showing 163 changed files with 4,457 additions and 1,557 deletions.
diff --git a/.hemtt/presets/bw.html b/.hemtt/presets/bw.html
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <html>
   <!--Created by Arma 3 Launcher: https://arma3.com-->
   <head>
     <meta name="arma:Type" content="preset" />
-    <meta name="arma:PresetName" content="07_18_24_BourbonMods" />
+    <meta name="arma:PresetName" content="2024_09_19_BourbonMods" />
     <meta name="generator" content="Arma 3 Launcher - https://arma3.com" />
     <title>Arma 3</title>
     <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet" type="text/css" />
@@ -80,7 +80,7 @@
 </style>
   </head>
   <body>
-    <h1>Arma 3  - Preset <strong>07_18_24_BourbonMods</strong></h1>
+    <h1>Arma 3  - Preset <strong>2024_09_19_BourbonMods</strong></h1>
     <p class="before-list">
       <em>To import this preset, drag this file onto the Launcher window. Or click the MODS tab, then PRESET in the top right, then IMPORT at the bottom, and finally select this file.</em>
     </p>
@@ -203,7 +203,6 @@ <h1>Arma 3  - Preset <strong>07_18_24_BourbonMods</strong></h1>
             <a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1713801249" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=1713801249</a>
           </td>
         </tr>
-        </tr>
         <tr data-type="ModContainer">
           <td data-type="DisplayName">Reduced Haze Mod v3.1</td>
           <td>
@@ -492,15 +491,6 @@ <h1>Arma 3  - Preset <strong>07_18_24_BourbonMods</strong></h1>
             <a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1638341685" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=1638341685</a>
           </td>
         </tr>
-        <tr data-type="ModContainer">
-          <td data-type="DisplayName">ACE Armor Adjuster</td>
-          <td>
-            <span class="from-steam">Steam</span>
-          </td>
-          <td>
-            <a href="https://steamcommunity.com/sharedfiles/filedetails/?id=2849354160" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=2849354160</a>
-          </td>
-        </tr>
         <tr data-type="ModContainer">
           <td data-type="DisplayName">Breaching Charge</td>
           <td>
@@ -582,15 +572,6 @@ <h1>Arma 3  - Preset <strong>07_18_24_BourbonMods</strong></h1>
             <a href="https://steamcommunity.com/sharedfiles/filedetails/?id=2789152015" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=2789152015</a>
           </td>
         </tr>
-        <tr data-type="ModContainer">
-          <td data-type="DisplayName">ACE Moaning</td>
-          <td>
-            <span class="from-steam">Steam</span>
-          </td>
-          <td>
-            <a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3024549278" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3024549278</a>
-          </td>
-        </tr>
         <tr data-type="ModContainer">
           <td data-type="DisplayName">TunCon - More info for unconscious!</td>
           <td>
@@ -726,24 +707,6 @@ <h1>Arma 3  - Preset <strong>07_18_24_BourbonMods</strong></h1>
             <a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3237942199" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3237942199</a>
           </td>
         </tr>
-        <tr data-type="ModContainer">
-          <td data-type="DisplayName">VileHUD</td>
-          <td>
-            <span class="from-steam">Steam</span>
-          </td>
-          <td>
-            <a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1538673636" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=1538673636</a>
-          </td>
-        </tr>
-        <tr data-type="ModContainer">
-          <td data-type="DisplayName">Better Inventory</td>
-          <td>
-            <span class="from-steam">Steam</span>
-          </td>
-          <td>
-            <a href="https://steamcommunity.com/sharedfiles/filedetails/?id=2791403093" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=2791403093</a>
-          </td>
-        </tr>
         <tr data-type="ModContainer">
           <td data-type="DisplayName">Novogorsk</td>
           <td>

diff --git a/addons/adminMenu/Interrupt_adminMenu.hpp b/addons/adminMenu/Interrupt_adminMenu.hpp
@@ -190,7 +190,7 @@ class GVAR(adminMenuDialog) {
                     y = QUOTE(0.01 * safezoneH);
                     w = QUOTE(0.27 * safezoneW);
                     h = QUOTE(0.05 * safezoneH);
-                    action = QUOTE(_this call FUNC(uihook_zeusConnectPlayer));
+                    action = QUOTE([] call FUNC(uihook_zeusConnectPlayer));
                 };
             };
         };
@@ -208,7 +208,7 @@ class GVAR(adminMenuDialog) {
                     y = QUOTE(0.01 * safezoneH);
                     w = QUOTE(0.52 * safezoneW);
                     h = QUOTE(0.05 * safezoneH);
-                    action = QUOTE(_this call FUNC(uiHook_openEndMission));
+                    action = QUOTE([] call FUNC(uiHook_openEndMission));
                 };
                 class RscStructuredText_1100: RscStructuredText {
                     idc = 1100;
@@ -285,7 +285,7 @@ class GVAR(adminMenuDialog) {
                     y = QUOTE(0.52 * safezoneH);
                     w = QUOTE(0.26 * safezoneW);
                     h = QUOTE(0.05 * safezoneH);
-                    action = QUOTE(_this call FUNC(uihook_supplySpawn));
+                    action = QUOTE([] call FUNC(uihook_supplySpawn));
                 };
             };
         };
@@ -319,7 +319,7 @@ class GVAR(adminMenuDialog) {
                     y = QUOTE(0.52 * safezoneH);
                     w = QUOTE(0.26 * safezoneW);
                     h = QUOTE(0.05 * safezoneH);
-                    action = QUOTE(_this call FUNC(uihook_teleportButton));
+                    action = QUOTE([] call FUNC(uihook_teleportButton));
                 };
             };
         };
@@ -373,7 +373,7 @@ class GVAR(adminMenuDialog) {
                     y = QUOTE(0.08 * safezoneH);
                     w = QUOTE(0.52 * safezoneW);
                     h = QUOTE(0.05 * safezoneH);
-                    action = QUOTE(_this call FUNC(uihook_weaponTest));
+                    action = QUOTE([] call FUNC(uihook_weaponTest));
                 };
                 class RscButton_MissionTesting: RscButton {
                     idc = -1;
@@ -450,7 +450,7 @@ class GVAR(adminMenuDialog) {
                     y = QUOTE(0.52 * safezoneH);
                     w = QUOTE(0.125 * safezoneW);
                     h = QUOTE(0.05 * safezoneH);
-                    action = QUOTE(_this call FUNC(uihook_resetGearButton));
+                    action = QUOTE([] call FUNC(uihook_resetGearButton));
                 };
                 class ResetGearList: RscCombo {
                     idc = 2181;
@@ -466,7 +466,7 @@ class GVAR(adminMenuDialog) {
                     y = QUOTE(0.42 * safezoneH);
                     w = QUOTE(0.26 * safezoneW);
                     h = QUOTE(0.05 * safezoneH);
-                    action = QUOTE(_this call FUNC(uihook_resetSpectateButton));
+                    action = QUOTE([] call FUNC(uihook_resetSpectateButton));
                 };
                 class ResetMedicalButton: RscButton {
                     idc = -1;
@@ -475,7 +475,7 @@ class GVAR(adminMenuDialog) {
                     y = QUOTE(0.22 * safezoneH);
                     w = QUOTE(0.26 * safezoneW);
                     h = QUOTE(0.05 * safezoneH);
-                    action = QUOTE(_this call FUNC(uihook_resetMedicalButton));
+                    action = QUOTE([] call FUNC(uihook_resetMedicalButton));
                 };
                 class ResetMarkersButton: RscButton {
                     idc = -1;
@@ -484,7 +484,7 @@ class GVAR(adminMenuDialog) {
                     y = QUOTE(0.32 * safezoneH);
                     w = QUOTE(0.26 * safezoneW);
                     h = QUOTE(0.05 * safezoneH);
-                    action = QUOTE(_this call FUNC(uihook_resetMarkersButton));
+                    action = QUOTE([] call FUNC(uihook_resetMarkersButton));
                 };
             };
         };
@@ -502,7 +502,7 @@ class GVAR(adminMenuDialog) {
                     y = QUOTE(0.01 * safezoneH);
                     w = QUOTE(0.52 * safezoneW);
                     h = QUOTE(0.05 * safezoneH);
-                    action = QUOTE(_this call FUNC(uihook_giveAdminGun));
+                    action = QUOTE([] call FUNC(uihook_giveAdminGun));
                 };
             };
         };

diff --git a/addons/adminMenu/functions/fnc_checkMods.sqf b/addons/adminMenu/functions/fnc_checkMods.sqf
@@ -4,9 +4,9 @@
 params [["_createOrginalVersionInfo", false]];
 TRACE_1("params",_createOrginalVersionInfo);
 
-_getStringFromConfig = {
-    _cfgPath = _this select 0;
-    _returnValue = switch (true) do
+private _getStringFromConfig = {
+    private _cfgPath = _this select 0;
+    private _returnValue = switch (true) do
     {
     case (isNumber _cfgPath):     {str getNumber _cfgPath};
     case (isText _cfgPath):     {str getText _cfgPath};
@@ -15,12 +15,12 @@ _getStringFromConfig = {
     };
     (_returnValue)
 };
-_modsAndVersionsPairs = [];
+private _modsAndVersionsPairs = [];
 {
-    _name = configName _x;
-    _path = _x;
-    _author             = [_path >> "author"] call _getStringFromConfig;
-    _version             = [_path >> "version"] call _getStringFromConfig;
+    private _name = configName _x;
+    private _path = _x;
+    private _author             = [_path >> "author"] call _getStringFromConfig;
+    private _version             = [_path >> "version"] call _getStringFromConfig;
     if (_version == "") then {
         _version             = [_path >> "versionStr"] call _getStringFromConfig;
         if (_version == "") then {
@@ -45,13 +45,13 @@ if (_createOrginalVersionInfo) then {
 
     waitUntil {sleep 1; systemChat "getting versions from server..."; !isNil QGVAR(pvModVersions)};
 
-    _diaryText = format ["Mod Problems for: %1<br/><br/>", profileName];
+    private _diaryText = format ["Mod Problems for: %1<br/><br/>", profileName];
 
     //Mods server has but we don't
     {
-        _modName = _x select 0;
-        _serverVersion = _x select 1;
-        _problem = "";
+        private _modName = _x select 0;
+        private _serverVersion = _x select 1;
+        private _problem = "";
         {
             if ((_x select 0) == _modName) exitWith {
                 if (_serverVersion != (_x select 1)) then {        //should always be true, right?
@@ -68,8 +68,8 @@ if (_createOrginalVersionInfo) then {
 
     //mods we have, but server doesn't
     {
-        _modName = _x select 0;
-        _problem = format ["<br/>%1 - <font color='#CC00CC'>Should Not Have</font>", _modName];
+        private _modName = _x select 0;
+        private _problem = format ["<br/>%1 - <font color='#CC00CC'>Should Not Have</font>", _modName];
         {
             if ((_x select 0) == _modName) exitWith {
                 _problem = "";

diff --git a/addons/adminMenu/functions/fnc_endMission.sqf b/addons/adminMenu/functions/fnc_endMission.sqf
@@ -7,8 +7,8 @@ if (isServer) then {
     private _missionType = getMissionConfigValue[QEGVAR(missionTesting,missionType), 0];
     private _missionTypeStr = ["Other", "COOP", "TvT"] select _missionType;
     [_winningSide, "Mission ended", _missionTypeStr] call ocap_fnc_exportData;
-    ["potato_adminMsg", [_debugMsg, profileName, "#ALL"]] call CBA_fnc_globalEvent;
     private _debugMsg = format ["Saving OCAP recording with winning side %1 and mission type %2", _winningSide, _missionTypeStr];
+    ["potato_adminMsg", [_debugMsg, profileName, "#ALL"]] call CBA_fnc_globalEvent;
 };
 
 if ((!hasInterface) || {EGVAR(core,playerStartingSide) == _winningSide}) then {

diff --git a/addons/adminMenu/functions/fnc_uihook_checkMods.sqf b/addons/adminMenu/functions/fnc_uihook_checkMods.sqf
@@ -2,7 +2,7 @@
 
 TRACE_1("params",_this);
 
-private _debugMsg = format ["Verifying Mods", (profileName)];
+private _debugMsg = format ["Verifying Mods"];
 ["potato_adminMsg", [_debugMsg, profileName]] call CBA_fnc_globalEvent;
 
 [true] spawn FUNC(checkMods);
diff --git a/addons/adminMenu/functions/fnc_uihook_resetGearButton.sqf b/addons/adminMenu/functions/fnc_uihook_resetGearButton.sqf
@@ -12,7 +12,7 @@ private _selectedUnit = missionNamespace getVariable [
 
 TRACE_2("",_selectedUnit,_selectedLoadout);
 
-if (isNull _selectedUnit) exitWith { WARNING_1("Bad unit - disconnect?",_selectedUnit); };
+if (isNull _selectedUnit) exitWith { WARNING_1("Bad unit [%1] - disconnect?",_selectedUnit); };
 
 if (_selectedLoadout == "") then {
     _selectedUnit setVariable ["F_Gear", nil, true];

diff --git a/addons/adminMenu/functions/fnc_uihook_resetMarkersButton.sqf b/addons/adminMenu/functions/fnc_uihook_resetMarkersButton.sqf
@@ -9,7 +9,7 @@ private _selectedUnit = missionNamespace getVariable [
 
 TRACE_1("Selected unit: ",_selectedUnit);
 
-if (isNull _selectedUnit) exitWith {WARNING_1("Bad unit,disconnect?",_selectedUnit);};
+if (isNull _selectedUnit) exitWith {WARNING_1("Bad unit [%1] disconnect?",_selectedUnit);};
 
 [QGVAR(resetMarkers), [_selectedUnit], [_selectedUnit]] call CBA_fnc_targetEvent;
 

diff --git a/addons/adminMenu/functions/fnc_uihook_resetMedicalButton.sqf b/addons/adminMenu/functions/fnc_uihook_resetMedicalButton.sqf
@@ -9,7 +9,7 @@ private _selectedUnit = missionNamespace getVariable [
 
 TRACE_1("Selected unit: ",_selectedUnit);
 
-if (isNull _selectedUnit) exitWith {WARNING_1("Bad unit,disconnect?",_selectedUnit);};
+if (isNull _selectedUnit) exitWith {WARNING_1("Bad unit [%1] disconnect?",_selectedUnit);};
 
 if (!alive _selectedUnit) exitWith {hint "No zombies!";};
 

diff --git a/addons/adminMenu/functions/fnc_uihook_resetSpectateButton.sqf b/addons/adminMenu/functions/fnc_uihook_resetSpectateButton.sqf
@@ -9,7 +9,7 @@ private _selectedUnit = missionNamespace getVariable [
 
 TRACE_1("Selected unit: ",_selectedUnit);
 
-if (isNull _selectedUnit) exitWith {WARNING_1("Bad unit,disconnect?",_selectedUnit);};
+if (isNull _selectedUnit) exitWith {WARNING_1("Bad unit [%1] disconnect?",_selectedUnit);};
 
 [QGVAR(resetSpectator), [_selectedUnit], [_selectedUnit]] call CBA_fnc_targetEvent;
 

diff --git a/addons/adminMenu/functions/fnc_uihook_tabChange.sqf b/addons/adminMenu/functions/fnc_uihook_tabChange.sqf
@@ -82,7 +82,7 @@ case (1): {
                 } else {
                     getText (configFile >> "CfgVehicles" >> _className >> "displayName"); // use veh name
                 };
-                _index = UI_TAB_SUPPLIES_TYPE lbAdd format ["%1", _description];
+                private _index = UI_TAB_SUPPLIES_TYPE lbAdd format ["%1", _description];
                 UI_TAB_SUPPLIES_TYPE lbSetTooltip [_index, _className];
             } else {
                 TRACE_2("veh missing from modset",_x,_className);
@@ -97,7 +97,7 @@ case (1): {
                 GVAR(groupsArray) pushBack _x;
                 private _grpMembers = "";
                 {_grpMembers = _grpMembers + format ["%1, ", (name _x)];} forEach (units _x);
-                _txt = format ["%1 [%2]", _x, _grpMembers];
+                private _txt = format ["%1 [%2]", _x, _grpMembers];
                 private _index = UI_TAB_SUPPLIES_GROUP lbAdd _txt;
                 UI_TAB_SUPPLIES_GROUP lbSetTooltip [_index, _grpMembers];
             };
@@ -109,7 +109,7 @@ case (2): {
         if (GVAR(openEndMission)) then {
             UI_TAB_END_TEXT ctrlShow true;
             UI_TAB_END_UNLOCK ctrlShow false;
-            _txt = format ["Players Alive: %1<br/>", ({(alive _x)&&{isPlayer _x}} count allUnits)];
+            private _txt = format ["Players Alive: %1<br/>", ({(alive _x)&&{isPlayer _x}} count allUnits)];
             _txt = _txt + format ["<br/><t color='#9999FF'>West Alive: %1 [Players: %2]</t>", ({(alive _x)&&{side _x == west}} count allUnits), ({(alive _x)&&(side _x == west)&&(isPlayer _x)} count allUnits)];
             _txt = _txt + format ["<br/><t color='#FF9999'>East Alive: %1 [Players: %2]</t>", ({(alive _x)&&{side _x == east}} count allUnits), ({(alive _x)&&(side _x == east)&&(isPlayer _x)} count allUnits)];
             _txt = _txt + format ["<br/><t color='#99FF99'>Indp Alive: %1 [Players: %2]</t>", ({(alive _x)&&{side _x == resistance}} count allUnits), ({(alive _x)&&(side _x == resistance)&&(isPlayer _x)} count allUnits)];
@@ -135,7 +135,7 @@ case (3): {
                 GVAR(groupsArray) pushBack _x;
                 private _grpMembers = "";
                 {_grpMembers = _grpMembers + format ["%1, ", (name _x)];} forEach (units _x);
-                _txt = format ["%1 [%2]", _x, _grpMembers];
+                private _txt = format ["%1 [%2]", _x, _grpMembers];
                 private _index = UI_TAB_TELEPORT_GROUP lbAdd _txt;
                 UI_TAB_TELEPORT_GROUP lbSetTooltip [_index, _grpMembers];
             };
@@ -215,6 +215,7 @@ case (7): {
         } forEach _loadouts;
         _listGear lbSetCurSel 0;
 
+        //IGNORE_PRIVATE_WARNING ["_x"];
         [
             UI_TAB_FIX_UNIT_LIST,
             {

diff --git a/addons/adminMenu/functions/fnc_uihook_teleportButton.sqf b/addons/adminMenu/functions/fnc_uihook_teleportButton.sqf
@@ -9,7 +9,7 @@ private _selectedUnit = missionNamespace getVariable [
 
 TRACE_1("Selected unit: ",_selectedUnit);
 
-if (isNull _selectedUnit) exitWith {WARNING_1("Bad unit,disconnect?",_selectedUnit);};
+if (isNull _selectedUnit) exitWith {WARNING_1("Bad unit [%1] disconnect?",_selectedUnit);};
 
 private _selectedGroupIndex = lbCurSel UI_TAB_TELEPORT_GROUP;
 if ((_selectedGroupIndex < 0) || (_selectedGroupIndex >= (count GVAR(groupsArray)))) exitWith {};

diff --git a/addons/adminMenu/functions/fnc_uihook_weaponTest.sqf b/addons/adminMenu/functions/fnc_uihook_weaponTest.sqf
@@ -21,10 +21,10 @@ private _fncGetWeaponInfo = {
     if (_weaponClassname == "throw") then {
         _unitText = _unitText + "[Thrown: ";
     };
-    private _config = configfile >> "CfgWeapons" >> _weaponClassname;
+    private _config = configFile >> "CfgWeapons" >> _weaponClassname;
     private _muzzles = getArray (_config >> "muzzles");
     {
-        _muzzleConfig = if (_x == "this") then {
+        private _muzzleConfig = if (_x == "this") then {
             _config;
         } else {
             _config >> _x
@@ -88,9 +88,9 @@ private _fncGetWeaponInfo = {
     if (!(_classname in _handledClasses)) then {
         _handledClasses pushBack _classname;
 
-        private _displayName = getText (configfile >> "CfgVehicles" >> _classname >> "displayName");
-        private _xIcon = gettext (configfile >> "CfgVehicles" >> _classname >> "icon");
-        private _image = gettext (configfile >> "CfgVehicleIcons" >> _xIcon);
+        private _displayName = getText (configFile >> "CfgVehicles" >> _classname >> "displayName");
+        private _xIcon = getText (configFile >> "CfgVehicles" >> _classname >> "icon");
+        private _image = getText (configFile >> "CfgVehicleIcons" >> _xIcon);
         private _color = "";
         private _sideArray = [];
 

diff --git a/addons/adminMenu/functions/fnc_uihook_zeusConnectPlayer.sqf b/addons/adminMenu/functions/fnc_uihook_zeusConnectPlayer.sqf
@@ -9,7 +9,7 @@ private _selectedUnit = missionNamespace getVariable [
 
 TRACE_1("Selected unit: ",_selectedUnit);
 
-if (isNull _selectedUnit) exitWith {WARNING_1("Bad unit,disconnect?",_selectedUnit);};
+if (isNull _selectedUnit) exitWith {WARNING_1("Bad unit [%1] disconnect?",_selectedUnit);};
 
 private _giveZeus = isNull getAssignedCuratorLogic _selectedUnit;
 

diff --git a/addons/aiCfgFixes/functions/fnc_generateAmmo.sqf b/addons/aiCfgFixes/functions/fnc_generateAmmo.sqf
@@ -68,7 +68,7 @@ private _ammoToGenerateCorrect = [];
         };
     };
     _ammoToGenerateCorrect pushBackUnique (_x select 0);
-} foreach _ammoToGenerate;
+} forEach _ammoToGenerate;
 
 //reverse _ammoToGenerateCorrect;
 _ammoToGenerate = _ammoToGenerateCorrect;