Merge branch 'master' into iron_dome

.github/workflows/arma.yml

@@ -43,3 +43,4 @@ jobs:
       with:
         name: ace3-${{ github.sha }}-nobin
         path: .hemttout/@*
+        include-hidden-files: true # Because .hemttout is a hidden directory

.github/workflows/extensions.yml

@@ -57,7 +57,7 @@ jobs:
     - name: Build
       run: cargo build --verbose
     - name: Upload
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.arrays.os.target }}
         path: target/debug/ace.dll

.github/workflows/hemtt.yml

@@ -44,3 +44,4 @@ jobs:
       with:
         name: ace3-${{ github.sha }}
         path: .hemttout/@*
+        include-hidden-files: true # Because .hemttout is a hidden directory

.hemtt/launch.toml

@@ -0,0 +1,31 @@
+[default]
+workshop = [
+    "450814997", # CBA_A3
+]
+
+[spe]
+extends = "default"
+dlc = [
+    "Spearhead 1944"
+]
+
+[vn]
+extends = "default"
+dlc = [
+    "S.O.G. Prairie Fire",
+]
+
+[ws]
+extends = "default"
+dlc = [
+    "Western Sahara",
+]
+
+[rhs]
+extends = "default"
+workshop = [
+    "843425103", # RHS AFRF Workshop ID
+    "843577117", # RHS USAF Workshop ID
+    "843593391", # RHS GREF Workshop ID
+    "843632231", # RHS SAF  Workshop ID
+]

.hemtt/lints.toml

@@ -0,0 +1,5 @@
+[sqf.banned_commands]
+options.ignore = [
+    "addPublicVariableEventHandler", # Alt syntax is broken, we are using main syntax
+    "createSoundSource", # Greatly attenuated when in first person and in a vehicle
+]

.hemtt/project.toml

@@ -27,35 +27,3 @@ exclude = [
     "common/functions/fnc_dummy.sqf",
     "zeus/functions/fnc_zeusAttributes.sqf",
 ]
-
-[hemtt.launch.default]
-workshop = [
-    "450814997", # CBA_A3
-]
-
-[hemtt.launch.spe]
-extends = "default"
-dlc = [
-    "spe"
-]
-
-[hemtt.launch.vn]
-extends = "default"
-dlc = [
-    "S.O.G. Prairie Fire",
-]
-
-[hemtt.launch.ws]
-extends = "default"
-dlc = [
-    "Western Sahara",
-]
-
-[hemtt.launch.rhs]
-extends = "default"
-workshop = [
-    "843425103", # RHS AFRF Workshop ID
-    "843577117", # RHS USAF Workshop ID
-    "843593391", # RHS GREF Workshop ID
-    "843632231", # RHS SAF  Workshop ID
-]

addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf

@@ -80,7 +80,7 @@ for "_i" from 0 to (count _cfgWeapons)-1 do {
                         diag_log text format ["AB_Diagnose_barrelTwist,%1,%2,%3,%4,%5",_weapon,_magazine,_ammo,_twistDirection,_barrelTwist];
                     };
                     if (_barrelLength == 0) then {
-                        diag_log text format ["AB_Diagnose_barrelLength,%1,%2,%3,%4,%5",_weapon,_magazine,_ammo,_barrelLength];
+                        diag_log text format ["AB_Diagnose_barrelLength,%1,%2,%3,%4",_weapon,_magazine,_ammo,_barrelLength];
                     };
                 };
             } forEach _magazines;

addons/advanced_ballistics/functions/fnc_displayProtractor.sqf

@@ -50,7 +50,7 @@ GVAR(Protractor) = true;
     __ctrl1 ctrlSetTextColor [1, 1, 1, 1];
 
     __ctrl2 ctrlSetScale 1;
-    __ctrl2 ctrlSetPosition [SafeZoneX + 0.001, SafeZoneY - 0.001 - 0.1074 * (-0.86 max ((ACE_player weaponDirection currentWeapon ACE_player) select 2) min 0.86), 0.2, 0.2 * 4/3];
+    __ctrl2 ctrlSetPosition [safeZoneX + 0.001, safeZoneY - 0.001 - 0.1074 * (-0.86 max ((ACE_player weaponDirection currentWeapon ACE_player) select 2) min 0.86), 0.2, 0.2 * 4/3];
     __ctrl2 ctrlCommit 0;
     __ctrl2 ctrlSetText QPATHTOF(UI\protractor_marker.paa);
     __ctrl2 ctrlSetTextColor [1, 1, 1, 1];

addons/advanced_ballistics/stringtable.xml

@@ -46,7 +46,7 @@
             <Hungarian>Fejlett ballisztika</Hungarian>
             <Russian>Продвинутая баллистика</Russian>
             <Italian>Balistica Avanzata</Italian>
-            <Japanese>アドバンスド弾道計算</Japanese>
+            <Japanese>高度な弾道計算</Japanese>
             <Korean>고급 탄도학</Korean>
             <Chinese>先進彈道系統</Chinese>
             <Chinesesimp>进阶弹道系统</Chinesesimp>
@@ -63,7 +63,7 @@
             <Hungarian>Fejlett ballisztika</Hungarian>
             <Russian>Продвинутая баллистика</Russian>
             <Italian>Balistica Avanzata</Italian>
-            <Japanese>アドバンスド弾道計算を有効化</Japanese>
+            <Japanese>高度な弾道計算を有効化</Japanese>
             <Korean>고급 탄도학</Korean>
             <Chinese>先進彈道系統</Chinese>
             <Chinesesimp>进阶弹道系统</Chinesesimp>
@@ -80,7 +80,7 @@
             <Hungarian>Engedélyezi a fejlett ballisztikát</Hungarian>
             <Russian>Включает продвинутую баллистику</Russian>
             <Italian>Abilita Balistica Avanzata</Italian>
-            <Japanese>アドバンスド弾道計算は高度な弾道計算処理を有効化します。</Japanese>
+            <Japanese>高度な弾道計算を有効化します。</Japanese>
             <Korean>고급 탄도학을 적용합니다</Korean>
             <Chinese>啟用先進彈道系統</Chinese>
             <Chinesesimp>启用进阶弹道系统</Chinesesimp>
@@ -280,7 +280,7 @@
             <Hungarian>Meghatározza a játékos körüli hatókört (méterben), ahol a lövedékek fejlett ballisztikát használnak</Hungarian>
             <Russian>Определяет радиус вокруг игрока (в метрах), в котором продвинутая баллистика применяется к снарядам</Russian>
             <Italian>Definisce il raggio attorno al giocatore (in metri) entro il quale la Balistica Avanzata è applicata ai proiettili</Italian>
-            <Japanese>アドバンスド弾道計算の適用半径範囲 (プレイヤー中心、メートル単位) を定義します。</Japanese>
+            <Japanese>高度な弾道計算が飛翔体に適用される半径距離 (プレイヤー中心、メートル単位) を定義します。</Japanese>
             <Korean>플레이어 주위의 발사체를 고급 탄도학으로 정의하는 범위를 정합니다(미터)</Korean>
             <Chinese>以玩家的半徑距離(公尺)定義先進彈道系統啟用範圍</Chinese>
             <Chinesesimp>定义玩家周围的半径（米），在这个半径内，进阶弹道系统会被启用</Chinesesimp>
@@ -297,7 +297,7 @@
             <Russian>Этот модуль включает симуляцию продвинутой баллистики - при этом на траекторию полета снаряда влияют различные параметры, такие как температура воздуха, атмосферное давление, влажность, гравитация, тип боеприпаса и оружия, из которого произвели выстрел.</Russian>
             <Spanish>Este módulo permite la simulación balística avanzada - es decir, la trayectoria de los proyectiles está influenciada por variables como la temperatura del aire, la presión atmosférica, la humedad, la gravedad, el tipo de municiones y el arma desde el que fue disparada.</Spanish>
             <Italian>Questo modulo abilita la simulazione della Balistica Avanzata - essa comporta che la traiettoria dei proiettili è influenzata da variabili come la temperatura dell'aria, pressione atmosferica, umidità, gravità, il tipo di munizione e l'arma da cui è sparata.</Italian>
-            <Japanese>アドバンスド弾道計算のシミュレーションを有効化します。 弾道は気温・気圧・湿度・重力・弾薬の種類・発射する武器などの変化による影響を受けるようになります。</Japanese>
+            <Japanese>高度な弾道計算のシミュレーションを有効化します。 弾道は気温・気圧・湿度・重力・弾薬の種類・発射する武器などの変化による影響を受けるようになります。</Japanese>
             <Korean>이 모듈은 고급 탄도학을 적용시킵니다 - 이는 발사체의 궤적이 기온, 대기압, 습도, 중력, 탄환의 종류와 어느 무기에서 발사되는지에 따라 영향을 받습니다.</Korean>
             <Chinese>該模塊實現先進的彈道仿真 - 這意味著子彈的軌跡是由空氣溫度、大氣壓力、濕度、重力、彈藥類型以及射擊的武器所影響</Chinese>
             <Chinesesimp>该模块实现增强的弹道模拟—子弹的轨迹由空气温度、大气压力、湿度、重力、弹药类型和射击的武器等变量所影响</Chinesesimp>

addons/advanced_fatigue/Dialog.hpp

@@ -2,18 +2,18 @@ class RscControlsGroupNoScrollbars;
 class RscPicture;
 
 class GVAR(StaminaBarContainer): RscControlsGroupNoScrollbars {
-    x = "(profilenamespace getvariable [""IGUI_GRID_STAMINA_X"", ((safezoneX + safezoneW) - (10 * (((safezoneW / safezoneH) min 1.2) / 40)) - 4.3 * (((safezoneW / safezoneH) min 1.2) / 40))])";
-    y = "(profilenamespace getvariable [""IGUI_GRID_STAMINA_Y"", (safezoneY + 4.05 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))])";
-    w = "10 * (((safezoneW / safezoneH) min 1.2) / 40)";
-    h = "0.15 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
+    x = "(profilenamespace getvariable [""IGUI_GRID_STAMINA_X"", ((safeZoneX + safeZoneW) - (10 * (((safeZoneW / safeZoneH) min 1.2) / 40)) - 4.3 * (((safeZoneW / safeZoneH) min 1.2) / 40))])";
+    y = "(profilenamespace getvariable [""IGUI_GRID_STAMINA_Y"", (safeZoneY + 4.05 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25))])";
+    w = "10 * (((safeZoneW / safeZoneH) min 1.2) / 40)";
+    h = "0.15 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)";
 
     class Controls {
         class StaminaBar: RscPicture {
             idc = 10;
             x = 0;
             y = 0;
-            w = "10 * (((safezoneW / safezoneH) min 1.2) / 40)";
-            h = "0.15 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
+            w = "10 * (((safeZoneW / safeZoneH) min 1.2) / 40)";
+            h = "0.15 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)";
             text = "\A3\Ui_f\data\IGUI\RscIngameUI\RscUnitInfo\stamina_ca.paa";
         };
     };

addons/advanced_fatigue/XEH_preInit.sqf

@@ -8,7 +8,7 @@ PREP_RECOMPILE_END;
 
 #include "initSettings.inc.sqf"
 
-GVAR(staminaBarWidth) = 10 * (((safezoneW / safezoneH) min 1.2) / 40);
+GVAR(staminaBarWidth) = 10 * (((safeZoneW / safeZoneH) min 1.2) / 40);
 GVAR(dutyList) = createHashMap;
 GVAR(setAnimExclusions) = [];
 GVAR(inertia) = 0;

addons/advanced_fatigue/functions/fnc_mainLoop.sqf

@@ -27,9 +27,18 @@ if (!alive ACE_player) exitWith {
 private _velocity = velocity ACE_player;
 private _normal = surfaceNormal (getPosWorld ACE_player);
 private _movementVector = vectorNormalized _velocity;
-private _sideVector = vectorNormalized (_movementVector vectorCrossProduct _normal);
 private _fwdAngle = asin (_movementVector select 2);
-private _sideAngle = asin (_sideVector select 2);
+private _sideAngle = if ((getPosATL ACE_player) select 2 > 0.01) then { 
+    0 // ignore terrain normal if not touching it
+} else {
+    private _sideVector = vectorNormalized (_movementVector vectorCrossProduct _normal);
+    asin (_sideVector select 2);
+};
+if (GVAR(isSwimming)) then { // ignore when floating
+    _fwdAngle = 0;
+    _sideAngle = 0;
+};
+
 
 private _currentWork = REE;
 private _currentSpeed = (vectorMagnitude _velocity) min 6;
@@ -62,7 +71,7 @@ if (isNull objectParent ACE_player && {_currentSpeed > 0.1} && {isTouchingGround
         };
 
         // Used to simulate the unevenness/roughness of the terrain
-        if ((getPosATL ACE_player) select 2 < 0.01) then {
+        if (_sideAngle != 0) then {
             private _sideGradient = abs (_sideAngle / 45) min 1;
 
             _terrainFactor = 1 + _sideGradient ^ 4;

addons/advanced_fatigue/stringtable.xml

@@ -7,7 +7,7 @@
             <German>ACE Erweiterte Ausdauer</German>
             <Chinese>ACE 進階疲勞</Chinese>
             <Chinesesimp>ACE 进阶体力</Chinesesimp>
-            <Japanese>ACE アドバンスド疲労</Japanese>
+            <Japanese>ACE 高度な疲労</Japanese>
             <Italian>ACE Fatica Avanzata</Italian>
             <Korean>ACE 고급 피로도</Korean>
             <French>ACE Fatigue avancée</French>
@@ -173,7 +173,7 @@
             <English>Enables/disables Advanced Fatigue.</English>
             <Spanish>Activa/desactiva la fatiga avanzada</Spanish>
             <German>Aktiviert/deaktiviert Advanced Fatigue.</German>
-            <Japanese>アドバンスド疲労は高度な疲労管理システムを有効化します。</Japanese>
+            <Japanese>高度な疲労を有効/無効化します。</Japanese>
             <Polish>Włącza/wyłącza zaawansowaną wytrzymałość</Polish>
             <Korean>고급 피로도 활성화/비활성화</Korean>
             <French>Active/Désactive la fatigue avancée.</French>

addons/advanced_throwing/functions/fnc_throw.sqf

@@ -89,7 +89,7 @@ GVAR(flightPath) = [];
 GVAR(flightRotation) = [];
 (_unit getVariable QGVAR(activeThrowable)) spawn {
     while {!isNull _this && {(getPosATL _this) select 2 > 0.05}} do {
-        GVAR(flightPath) pushBack [ASLtoAGL (getPosASL _this), vectorUp _this];
+        GVAR(flightPath) pushBack [ASLToAGL (getPosASL _this), vectorUp _this];
         sleep 0.05;
     };
 };

addons/advanced_throwing/stringtable.xml

@@ -5,7 +5,7 @@
             <English>Advanced Throwing</English>
             <Spanish>Lanzamiento Avanzado</Spanish>
             <Russian>Улучшенный бросок гранат</Russian>
-            <Japanese>アドバンスド投擲</Japanese>
+            <Japanese>高度な投擲</Japanese>
             <Polish>Zaawansowane rzucanie</Polish>
             <German>Erweitertes Wurfsystem</German>
             <Korean>고급 투척</Korean>
@@ -21,7 +21,7 @@
             <English>Allows changing advanced throwing behaviour.</English>
             <Spanish>Permite modificar el comportamiento del lanzamiento avanzado</Spanish>
             <Russian>Позволяет настраивать поведение улучшенного броска гранат.</Russian>
-            <Japanese>アドバンスド投擲は投擲の高度な動作挙動を変更可能にします。</Japanese>
+            <Japanese>高度な投擲挙動への変更を可能にします。</Japanese>
             <Polish>Zezwala na zmianę zachowania zaawansowanego trybu rzucania.</Polish>
             <German>Erlaubt es, das Verhalten des erweiterten Wurfsystems zu ändern.</German>
             <Korean>고급 투척 행위를 허가합니다</Korean>
@@ -36,7 +36,7 @@
             <English>Enable Advanced Throwing</English>
             <Spanish>Activar Lanzamiento Avanzado</Spanish>
             <Russian>Вкл. улучшенный бросок</Russian>
-            <Japanese>アドバンスド投擲を有効化</Japanese>
+            <Japanese>高度な投擲を有効化</Japanese>
             <Polish>Aktywuj zaawansowane rzucanie</Polish>
             <German>Aktiviere erweitertes Wurfsystem</German>
             <Korean>고급 투척 활성화 </Korean>
@@ -52,7 +52,7 @@
             <English>Enables advanced throwing system.</English>
             <Spanish>Activa el Lanzamiento Avanzado</Spanish>
             <Russian>Включает систему улучшенного броска.</Russian>
-            <Japanese>アドバンスド投擲は高度な投擲システムを有効化します。</Japanese>
+            <Japanese>高度な投擲システムを有効化します。</Japanese>
             <Polish>Aktywuje system zaawansowanego rzucania.</Polish>
             <German>Aktiviert das erweiterte Wurfsystem.</German>
             <Korean>고급 투척을 활성화 합니다</Korean>