Merge remote-tracking branch 'upstream/master' into pbo-check-update

.github/CONTRIBUTING.md

@@ -36,7 +36,7 @@ We welcome anyone to contribute to this repository. Issues that we are actively
 
 When contributing to this repository, please first discuss the change you wish to make via issue or [Discord](https://acemod.org/discord) with the [ACE3 project maintainers](https://ace3.acemod.org/team.html) before making a change. This may not be necessary if you are contributing for something which has an existing issue in our repository already.
 
-1. Please make a pull request (PR) as early as possible. This lets use help you in the proces of developing it. When opening a work in progress pull request, mark your PR with a `WIP:` prefix.
+1. Please make a pull request (PR) as early as possible. This lets use help you in the proces of developing it. When opening a work in progress pull request, use GitHub's draft feature. This will mark the PR as a work in progress and will prevent it from being merged until you mark it as ready for review.
 2. Describe what this pull request will do and how it solves this in the description of your PR. A clear intent and description of the way the issue is resolved will help us to review the PR more efficiently.
 3. Please follow our [Development Guidelines](https://ace3.acemod.org/wiki/development/). 
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,6 +4,6 @@
 
 ### IMPORTANT
 
-- [ ] If the contribution affects [the documentation](https://github.com/acemod/ACE3/tree/master/docs), please include your changes in this pull request so the documentation will appear on the [website](https://ace3.acemod.org/).
-- [ ] [Development Guidelines](https://ace3.acemod.org/wiki/development/) are read, understood and applied.
-- [ ] Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`.
+- If the contribution affects [the documentation](https://github.com/acemod/ACE3/tree/master/docs), please include your changes in this pull request so the documentation will appear on the [website](https://ace3.acemod.org/).
+- [Development Guidelines](https://ace3.acemod.org/wiki/development/) are read, understood and applied.
+- Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`.

.github/workflows/arma.yml

@@ -22,6 +22,8 @@ jobs:
       run: python3 tools/check_strings.py
     - name: Check for BOM
       uses: arma-actions/bom-check@master
+      with:
+        path: 'addons'
     - name: Validate function headers
       run: python3 docs/tools/document_functions.py --debug
 

.github/workflows/pboproject.yml

@@ -66,6 +66,7 @@ jobs:
         pboproject -P
         xcopy /e /h /q z\ace\tools\pDummies\gm gm\
         xcopy /e /h /q z\ace\tools\pDummies\vn vn\
+        xcopy /e /h /q z\ace\tools\pDummies\WW2 WW2\
     - name: Build
       run: py P:\z\ace\tools\make.py ci
       env:

.hemtt/project.toml

@@ -24,17 +24,26 @@ exclude = [
     "/initsettings.sqf",
     "/initkeybinds.sqf",
     "/xeh_prep.sqf",
-    "dev",
+    "/dev/",
     "medical_ai/statemachine.sqf",
     "common/functions/fnc_dummy.sqf",
+    "zeus/functions/fnc_zeusAttributes.sqf",
 ]
 
 [hemtt.config]
 preset = "Hemtt"
 
 [hemtt.launch]
 workshop = [
-    "450814997", # CBA_A3's Workshop ID
+    "450814997", # CBA_A3
+]
+
+[hemtt.launch.spe]
+workshop = [
+    "450814997", # CBA_A3
+]
+dlc = [
+    "spe"
 ]
 
 [hemtt.launch.vn]
@@ -44,3 +53,20 @@ workshop = [
 dlc = [
     "S.O.G. Prairie Fire",
 ]
+
+[hemtt.launch.ws]
+workshop = [
+    "450814997", # CBA_A3's Workshop ID
+]
+dlc = [
+    "Western Sahara",
+]
+
+[hemtt.launch.rhs]
+workshop = [
+    "450814997", # CBA_A3's Workshop ID
+    "843425103", # RHS AFRF Workshop ID
+    "843577117", # RHS USAF Workshop ID
+    "843593391", # RHS GREF Workshop ID
+    "843632231", # RHS SAF  Workshop ID
+]

AUTHORS.txt

@@ -113,6 +113,7 @@ havena <silveredenis@gmail.com>
 Hawkins
 Head <brobergsebastian@gmail.com>
 Hybrid V
+Hypoxic <martini_a@outlook.com>
 JasperRab <jasper@jasperrab.eu>
 JDT
 john681611 <john681611@hotmail.com>

README.md

@@ -1,10 +1,11 @@
 <p align="center">
-    <img src="https://github.com/acemod/ACE3/raw/master/extras/assets/logo/black/ACE3-Logo.png" width="480">
+    <img src="https://github.com/acemod/ACE3/raw/master/extras/assets/logo/black/ACE3-Logo.png#gh-light-mode-only" width="480">
+    <img src="https://github.com/acemod/ACE3/raw/master/extras/assets/logo/white/ACE3-Logo.png#gh-dark-mode-only" width="480">
 </p>
 
 <p align="center">
     <a href="https://github.com/acemod/ACE3/releases/latest">
-        <img src="https://img.shields.io/badge/Version-3.15.2-blue.svg?style=flat-square" alt="ACE3 Version">
+        <img src="https://img.shields.io/badge/Version-3.16.0-blue.svg?style=flat-square" alt="ACE3 Version">
     </a>
     <a href="https://github.com/acemod/ACE3/issues">
         <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Issues">
@@ -21,9 +22,6 @@
     <a href="https://acemod.org/discord">
         <img src="https://img.shields.io/badge/Discord-Join-darkviolet.svg?style=flat-square" alt="ACE3 Discord">
     </a>
-    <a href="https://circleci.com/gh/acemod/ACE3">
-        <img src="https://circleci.com/gh/acemod/ACE3.svg?style=svg" alt="ACE3 Build Status">
-    </a>
 </p>
 
 <p align="center">
@@ -97,7 +95,7 @@ Please, use our [Issue Tracker](https://github.com/acemod/ACE3/issues) to report
 
 ### Testing & building
 
-To help us test the latest development changes, download the [artifact](https://github.com/acemod/ACE3/actions/workflows/arma.yml) of the branch you'd like to test or subscribe to [nightly build](https://steamcommunity.com/sharedfiles/filedetails/?id=1882627645) to test `master` branch. Alternatively [build your own version](https://ace3.acemod.org/wiki/development/setting-up-the-development-environment.html).
+To help us test the latest development changes, download the [artifact](https://github.com/acemod/ACE3/actions/workflows/arma.yml) of the branch you'd like to test or subscribe to "Anrop ACE3 Master" on the workshop to test `master` branch. Alternatively [build your own version](https://ace3.acemod.org/wiki/development/setting-up-the-development-environment.html).
 
 ### Get in touch
 

addons/advanced_fatigue/XEH_postInit.sqf

@@ -17,7 +17,19 @@ if (!hasInterface) exitWith {};
     };
 }, QUOTE(ADDON)] call EFUNC(common,addSwayFactor);
 
-["multiplier", {GVAR(swayFactor)}, QUOTE(ADDON)] call EFUNC(common,addSwayFactor);
+["multiplier", {
+    switch (true) do {
+        case (isWeaponRested ACE_player): {
+            GVAR(swayFactor) * GVAR(restedSwayFactor)
+        };
+        case (isWeaponDeployed ACE_player): {
+            GVAR(swayFactor) * GVAR(deployedSwayFactor)
+        };
+        default {
+            GVAR(swayFactor)
+        };
+    };
+}, QUOTE(ADDON)] call EFUNC(common,addSwayFactor);
 
 // recheck weapon inertia after weapon swap, change of attachments or switching unit
 ["weapon", {[ACE_player] call FUNC(getWeaponInertia)}, true] call CBA_fnc_addPlayerEventHandler;

addons/advanced_fatigue/initSettings.sqf

@@ -89,3 +89,21 @@
     [0, 5, 1, 1],
     true
 ] call CBA_fnc_addSetting;
+
+[
+    QGVAR(restedSwayFactor),
+    "SLIDER",
+    [LSTRING(RestedSwayFactor), LSTRING(RestedSwayFactor_Description)],
+    LSTRING(DisplayName),
+    [0, 5, 1, 2],
+    true
+] call CBA_fnc_addSetting;
+
+[
+    QGVAR(deployedSwayFactor),
+    "SLIDER",
+    [LSTRING(DeployedSwayFactor), LSTRING(DeployedSwayFactor_Description)],
+    LSTRING(DisplayName),
+    [0, 5, 1, 2],
+    true
+] call CBA_fnc_addSetting;

addons/advanced_fatigue/stringtable.xml

@@ -184,6 +184,22 @@
             <Czech>Ovlivňuje množství kývání zbraní. Vyšší znamená více kývání.</Czech>
             <Korean>손떨림의 정도를 정합니다. 높을 수록 많이 휘적입니다.</Korean>
         </Key>
+        <Key ID="STR_ACE_Advanced_Fatigue_RestedSwayFactor">
+            <English>Rested sway factor</English>
+            <French>Facteur de balancement au repos</French>
+        </Key>
+        <Key ID="STR_ACE_Advanced_Fatigue_RestedSwayFactor_Description">
+            <English>Influences the amount of weapon sway while weapon is rested.</English>
+            <French>Influence le degré de balancement de l'arme au repos.</French>
+        </Key>
+        <Key ID="STR_ACE_Advanced_Fatigue_DeployedSwayFactor">
+            <English>Deployed sway factor</English>
+            <French>Facteur de balancement déployé</French>
+        </Key>
+        <Key ID="STR_ACE_Advanced_Fatigue_DeployedSwayFactor_Description">
+            <English>Influences the amount of weapon sway while weapon is deployed.</English>
+            <French>Influence le degré de balancement de l'arme déployée.</French>
+        </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_Enabled">
             <English>Enabled</English>
             <Spanish>Activada</Spanish>

addons/advanced_throwing/XEH_postInit.sqf

@@ -1,6 +1,7 @@
 #include "script_component.hpp"
 
 // Fired XEH
+GVAR(ammoEventHandlers) = createHashMap;
 [QGVAR(throwFiredXEH), FUNC(throwFiredXEH)] call CBA_fnc_addEventHandler;
 
 // Exit on HC

addons/advanced_throwing/functions/fnc_throwFiredXEH.sqf

@@ -20,14 +20,25 @@
  *
  * Public: No
  */
-
+params ["_unit", "", "_muzzle", "", "_ammo"];
 TRACE_1("Fired",_this);
 
 {
     _this call _x;
-} forEach ((_this select 0) getVariable "cba_xeh_fired");
+} forEach (_unit getVariable "cba_xeh_fired");
 
 // Call muzzle fired EH
 {
     _this call compile getText (_x >> "fired");
-} forEach (configProperties [configFile >> "CfgWeapons" >> "Throw" >> (_this select 2) >> "EventHandlers", "isClass _x", true]);
+} forEach (configProperties [configFile >> "CfgWeapons" >> "Throw" >> _muzzle >> "EventHandlers", "isClass _x", true]);
+
+// Call ammo fired EH
+{ _this call _x } forEach (GVAR(ammoEventHandlers) getOrDefaultCall [_ammo, {
+    private _cfg = configFile >> "CfgAmmo" >> _ammo >> "EventHandlers";
+    private _eventHandlers = [];
+    {
+        private _eh = getText (_x >> "fired");
+        if (_eh != "") then { _eventHandlers pushBack compile _eh };
+    } forEach ([_cfg] + configProperties [_cfg, "isClass _x", true]);
+    _eventHandlers
+}, true]);

addons/ai/stringtable.xml

@@ -85,11 +85,13 @@
             <English>Auto-Equip NVGs</English>
             <Polish>Automatyczne zakładanie NVG</Polish>
             <German>Automatisch NVGs ausrüsten</German>
+            <Korean>야투경 자동 창착</Korean>
         </Key>
         <Key ID="STR_ACE_AI_AssignNVG_Description">
             <English>Equips NVG in inventory during night time and unequips it during day time.\nDoes not add NVGs to inventory!</English>
             <Polish>Zakłada NVG w nocy i zdejmuje je w ciągu dnia.\nNie dodaje NVG do ekwipunku!</Polish>
             <German>Rüstet NVG nachts aus dem Inventar aus und entfernt es tagsüber.\nFügt keine NVGs zum Inventar hinzu!</German>
+            <Korean>야간에는 야투경을 소지품에 장착하고 주간에는 장착을 해제합니다.\n주의! 소지품에 야투경을 추가하는 것이 아닙니다!</Korean>
         </Key>
     </Package>
 </Project>

addons/arsenal/ACE_Arsenal_Stats.hpp

@@ -152,4 +152,13 @@ class GVAR(stats) {
         textStatement = QUOTE(call FUNC(statTextStatement_magCount));
         tabs[] = {{}, {4}};
     };
+    class ACE_illuminators: statBase {
+        scope = 2;
+        priority = 1;
+        stats[] = {};
+        displayName = CSTRING(statIlluminators);
+        showText = 1;
+        textStatement = QUOTE(call FUNC(statTextStatement_illuminators));
+        tabs[] = {{}, {1}};
+    };
 };

addons/arsenal/XEH_PREP.hpp

@@ -39,6 +39,7 @@ PREP(fillLeftPanel);
 PREP(fillLoadoutsList);
 PREP(fillRightPanel);
 PREP(fillSort);
+PREP(getVirtualItems);
 PREP(handleActions);
 PREP(handleLoadoutsSearchbar);
 PREP(handleMouse);
@@ -92,6 +93,7 @@ PREP(statBarStatement_impact);
 PREP(statBarStatement_rateOfFIre);
 PREP(statTextStatement_accuracy);
 PREP(statTextStatement_explosionTime);
+PREP(statTextStatement_illuminators);
 PREP(statTextStatement_magCount);
 PREP(statTextStatement_mass);
 PREP(statTextStatement_rateOfFire);
@@ -102,4 +104,5 @@ PREP(updateCamPos);
 PREP(updateRightPanel);
 PREP(updateCurrentItemsList);
 PREP(updateUniqueItemsList);
+PREP(updateVirtualItemsFlat);
 PREP(verifyLoadout);

addons/arsenal/XEH_postInit.sqf

@@ -149,3 +149,25 @@ GVAR(lastSortDirectionRight) = DESCENDING;
         };
     };
 }] call CBA_fnc_addEventHandler;
+
+// Compatibility for RHS attachment system. Also used by NIArms.
+// Will only work for ACE_player, different arsenal centers will be ignored. RHS limitation.
+if (!isNil "rhs_fnc_accGripod") then {
+    [QEGVAR(arsenal,weaponItemChanged), {
+        params ["_weapon", "_item", "_itemIndex"];
+        if (EGVAR(arsenal,center) != ACE_player) exitWith {};
+
+        switch (_itemIndex) do {
+            case ITEM_INDEX_SIDE: {
+                call rhs_fnc_anpeq15_rail;
+            };
+            case ITEM_INDEX_BIPOD: {
+                // Need this call to make sure RHS's functions are set
+                call rhs_fnc_accGripod;
+                if (getText (configFile >> "CfgWeapons" >> _item >> "rhs_grip_type") == "") then {
+                    call rhs_grip_deinitialize;
+                };
+            };
+        };
+    }] call CBA_fnc_addEventHandler;
+};

addons/arsenal/defines.hpp

@@ -22,6 +22,14 @@
 // Favorites
 #define FAVORITES_COLOR (GVAR(favoritesColor) + [1])
 
+// Attachments
+#define ITEM_INDEX_MUZZLE 0
+#define ITEM_INDEX_SIDE 1
+#define ITEM_INDEX_OPTIC 2
+#define ITEM_INDEX_BIPOD 3
+#define ITEM_INDEX_MAGAZINE 4
+#define ITEM_INDEX_MAGAZINE_SECONDARY 5
+
 // IDCs
 #define IDD_ace_arsenal 1127001
 #define IDC_mouseArea 0

addons/arsenal/functions/fnc_addVirtualItems.sqf

@@ -123,3 +123,8 @@ if (_items isEqualType true) then {
 };
 
 _object setVariable [QGVAR(virtualItems), _cargo, _global];
+
+// If the arsenal is already open, refresh arsenal display
+if (!isNil QGVAR(currentBox) && {GVAR(currentBox) isEqualTo _object}) then {
+    [true, true] call FUNC(refresh);
+};

addons/arsenal/functions/fnc_attributeAddItems.sqf

@@ -19,7 +19,8 @@
 params ["_controlsGroup"];
 
 private _category = lbCurSel (_controlsGroup controlsGroupCtrl IDC_ATTRIBUTE_CATEGORY);
-private _filter = ctrlText (_controlsGroup controlsGroupCtrl IDC_ATTRIBUTE_SEARCHBAR);
+// Have to use toLower here and displayName to handle non-ANSI characters
+private _filter = toLower ctrlText (_controlsGroup controlsGroupCtrl IDC_ATTRIBUTE_SEARCHBAR);
 private _configItems = uiNamespace getVariable QGVAR(configItems);
 private _magazineMiscItems = uiNamespace getVariable QGVAR(magazineMiscItems);
 private _attributeValue = uiNamespace getVariable [QGVAR(attributeValue), [[], 0]];
@@ -28,7 +29,7 @@ _attributeValue params ["_attributeItems", "_attributeMode"];
 TRACE_3("Populating list",_category,_filter,_attributeValue);
 if (_filter != "") then {
     _filter = _filter call EFUNC(common,escapeRegex);
-    _filter = ".*?" + (_filter splitString " " joinString ".*?" + ".*?/io");
+    _filter = ".*?" + (_filter splitString " " joinString ".*?") + ".*?/io";
 } else {
     _filter = ".*?/io";
 };
@@ -63,7 +64,7 @@ if (_category == IDX_CAT_ALL) exitWith {
             default {_cfgWeapons >> _x};
         };
 
-        _displayName = getText (_config >> "displayName");
+        _displayName = toLower getText (_config >> "displayName");
 
         // Add item if not filtered
         if (_displayName regexMatch _filter || {_x regexMatch _filter}) then {
@@ -115,7 +116,7 @@ private _config = _cfgClass;
         _config = [_cfgClass, _cfgMagazines] select (_x in _magazineMiscItems);
     };
 
-    _displayName = getText (_config >> _x >> "displayName");
+    _displayName = toLower getText (_config >> _x >> "displayName");
 
     // Add item if not filtered
     if (_displayName regexMatch _filter || {_x regexMatch _filter}) then {