Merge branch 'master' into release-3.12.2

addons/common/CfgUIGrids.hpp

@@ -0,0 +1,20 @@
+class CfgUIGrids {
+    class IGUI {
+        class Presets {
+            class Arma3 {
+                class Variables {
+                    grid_ACE_displayText[] = {{((safezoneX + safezoneW) - (10 *(((safezoneW / safezoneH) min 1.2) / 40)) - 2.9 *(((safezoneW / safezoneH) min 1.2) / 40)),safeZoneY + 0.175 * safezoneH, (10 *(((safezoneW / safezoneH) min 1.2) / 40)), (3 *((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))}, "(((safezoneW / safezoneH) min 1.2) / 40)","((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"};
+                };
+            };
+        };
+
+        class Variables {
+            class grid_ACE_displayText {
+                displayName = "ACE Hint";
+                description = "Textual in game feedback to the player.";
+                preview = QPATHTOF(UI\ACE_Hint_Preview_ca.paa);
+                saveToProfile[] = {0,1};
+            };
+        };
+    };
+};

addons/common/config.cpp

@@ -65,27 +65,7 @@ class ACE_Rsc_Control_Base {
 #include <HintConfig.hpp>
 #include <RscInfoType.hpp>
 #include "CompassControl.hpp"
-
+#include "CfgUIGrids.hpp"
-class CfgUIGrids {
-    class IGUI {
-        class Presets {
-            class Arma3 {
-                class Variables {
-                    grid_ACE_displayText[] = {{((safezoneX + safezoneW) - (10 *(((safezoneW / safezoneH) min 1.2) / 40)) - 2.9 *(((safezoneW / safezoneH) min 1.2) / 40)),safeZoneY + 0.175 * safezoneH, (10 *(((safezoneW / safezoneH) min 1.2) / 40)), (3 *((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))}, "(((safezoneW / safezoneH) min 1.2) / 40)","((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"};
-                };
-            };
-        };
-
-        class Variables {
-            class grid_ACE_displayText {
-                displayName = "ACE Hint";
-                description = "Textual in game feedback to the player.";
-                preview = QPATHTOF(UI\ace_hint_ca.paa);
-                saveToProfile[] = {0,1};
-            };
-        };
-    };
-};
 
 class ACE_Extensions {
     extensions[] = {};

addons/common/functions/fnc_assignedItemFix.sqf

@@ -15,11 +15,11 @@
  */
 #include "script_component.hpp"
 
-ACE_isMapEnabled     = call {private _config = missionConfigFile >> "showMap";     !isNumber _config || {getNumber _config == 1}};  // default value is 1, so do isNumber check first
+ACE_isMapEnabled     = getMissionConfigValue ["showMap", 1] in [true, 1];
-ACE_isCompassEnabled = call {private _config = missionConfigFile >> "showCompass"; !isNumber _config || {getNumber _config == 1}};
+ACE_isCompassEnabled = getMissionConfigValue ["showCompass", 1] in [true, 1];
-ACE_isWatchEnabled   = call {private _config = missionConfigFile >> "showWatch";   !isNumber _config || {getNumber _config == 1}};
+ACE_isWatchEnabled   = getMissionConfigValue ["showWatch", 1] in [true, 1];
-ACE_isRadioEnabled   = call {private _config = missionConfigFile >> "showRadio";   !isNumber _config || {getNumber _config == 1}};
+ACE_isRadioEnabled   = getMissionConfigValue ["showRadio", 1] in [true, 1];
-ACE_isGPSEnabled     = call {private _config = missionConfigFile >> "showGPS";     !isNumber _config || {getNumber _config == 1}};
+ACE_isGPSEnabled     = getMissionConfigValue ["showGPS", 1] in [true, 1];
 
 GVAR(AssignedItems) = [];
 GVAR(AssignedItemsInfo) = [];

addons/cookoff/ACE_Settings.hpp

@@ -4,7 +4,7 @@ class ACE_Settings {
         category = CSTRING(displayName);
         displayName = CSTRING(enable_name);
         description = CSTRING(enable_tooltip);
-        value = 1;
+        value = 0;
         typeName = "BOOL";
     };
     class GVAR(enableAmmobox) {

addons/fcs/CfgVehicles.hpp

@@ -97,35 +97,4 @@ class CfgVehicles {
             };
         };
     };
-
-    // AIR VEHICLES
-    class Air: AllVehicles {};
-
-    class Helicopter: Air {
-        class Turrets {
-            class MainTurret;
-        };
-    };
-
-    class Helicopter_Base_F: Helicopter {};
-
-    class Heli_Attack_01_base_F: Helicopter_Base_F {
-        class Turrets: Turrets {
-            class MainTurret: MainTurret {
-                GVAR(Enabled) = 1;
-                discreteDistance[] = {};
-                discreteDistanceInitIndex = 0;
-            };
-        };
-    };
-
-    class Heli_Attack_02_base_F: Helicopter_Base_F {
-        class Turrets: Turrets {
-            class MainTurret: MainTurret {
-                GVAR(Enabled) = 1;
-                discreteDistance[] = {};
-                discreteDistanceInitIndex = 0;
-            };
-        };
-    };
 };

addons/hellfire/CfgWeapons.hpp

@@ -1,15 +1,28 @@
 class CfgWeapons {
-    class missiles_SCALPEL;
+    class RocketPods;
-    class GVAR(launcher): missiles_SCALPEL {
+    class GVAR(launcher): RocketPods {
         displayName = "AGM-114K Hellfire II";
         GVAR(enabled) = 1; // handle adding interactions and adding Laser Designator
         EGVAR(laser,canSelect) = 1; // can ace_laser lock (allows switching laser code)
         EGVAR(laser,showHud) = 1; // show attack profile / lock on hud
+        magazines[] = {"6Rnd_ACE_Hellfire_AGM114K", "PylonMissile_1Rnd_ACE_Hellfire_AGM114K", "PylonRack_1Rnd_ACE_Hellfire_AGM114K", "PylonRack_3Rnd_ACE_Hellfire_AGM114K", "PylonRack_4Rnd_ACE_Hellfire_AGM114K"};
+        
+        autoFire = 0;
         canLock = 0;
         weaponLockSystem = 0;
-        magazines[] = {"6Rnd_ACE_Hellfire_AGM114K", "PylonMissile_1Rnd_ACE_Hellfire_AGM114K", "PylonRack_1Rnd_ACE_Hellfire_AGM114K", "PylonRack_3Rnd_ACE_Hellfire_AGM114K", "PylonRack_4Rnd_ACE_Hellfire_AGM114K"};
         lockingTargetSound[] = {"",0,1};
         lockedTargetSound[] = {"",0,1};
+        soundFly[] = {"A3\Sounds_F\weapons\Rockets\rocket_fly_1",1,1.1,700};
+        nameSound = "MissileLauncher";
+        sounds[] = {"StandardSound"};        
+        class StandardSound {
+            begin1[] = {"A3\Sounds_F\weapons\Rockets\missile_1",1.12202,1.3,1000};
+            soundBegin[] = {"begin1",1};
+            soundsetshot[] = {"RocketsMedium_Shot_SoundSet"};
+        };
+        cursor = "EmptyCursor";
+        cursorAim = "missile";
+        showAimCursorInternal = 0;
     };
     class GVAR(launcher_N): GVAR(launcher) {
         displayName = "AGM-114N Hellfire II";

addons/javelin/CfgVehicles.hpp

@@ -65,4 +65,22 @@ class CfgVehicles {
             };
         };
     };
+    class Car;
+    class Car_F: Car {
+        class Turrets {
+            class MainTurret;
+        };
+    };
+    class LSV_01_base_F: Car_F {
+        class Turrets: Turrets {};
+    };
+    class LSV_01_AT_base_F: LSV_01_base_F { // Prowler / Polaris DAGOR
+        class Turrets: Turrets {
+            class TopTurret: MainTurret {
+                weapons[] = { QGVAR(Titan_Static) };
+                turretInfoType = "ACE_RscOptics_javelin";
+                gunnerOpticsModel = QPATHTOF(data\reticle_titan.p3d);
+            };
+        };
+    };
 };

addons/javelin/CfgWeapons.hpp

@@ -1,18 +1,8 @@
 class CfgWeapons {
-    class Launcher;
+    
-    class MissileLauncher;
+    class missiles_titan_static;
-
+    class GVAR(Titan_Static): missiles_titan_static {
-    class Launcher_Base_F: Launcher {
+        modes[] = {"Player"};
-        class WeaponSlotsInfo;
-    };
-
-    // @TODO: AA by default, motherfuckers
-    class missiles_titan: MissileLauncher {
-
-    };
-
-    class missiles_titan_at: missiles_titan { };
-    class GVAR(Titan_Static): missiles_titan_at {
         GVAR(enabled) = 1;
         weaponInfoType = "ACE_RscOptics_javelin";
         modelOptics = QPATHTOF(data\reticle_titan.p3d);
@@ -23,11 +13,7 @@ class CfgWeapons {
         lockedTargetSound[] = {"",0,1};
     };
 
-    // @TODO: AA by default, motherfuckers
+    class launch_Titan_short_base;
-    class launch_Titan_base: Launcher_Base_F {};
-
-    class launch_Titan_short_base: launch_Titan_base {  };
-
     class launch_B_Titan_short_F: launch_Titan_short_base {
         GVAR(enabled) = 1;
         weaponInfoType = "ACE_RscOptics_javelin";

addons/missionmodules/stringtable.xml

@@ -18,20 +18,20 @@
             <Chinese>ACE 任務模塊</Chinese>
         </Key>
         <Key ID="STR_ACE_MissionModules_AmbianceSounds_DisplayName">
-            <English>Ambiance Sounds [ACE]</English>
+            <English>Ambiance Sounds</English>
-            <Polish>Dźwięki [ACE]</Polish>
+            <Polish>Dźwięki</Polish>
-            <Spanish>[ACE] Sonidos ambiente</Spanish>
+            <Spanish>Sonidos ambiente</Spanish>
-            <German>Umgebungsgeräusche [ACE]</German>
+            <German>Umgebungsgeräusche</German>
-            <Czech>Zvuky prostředí [ACE]</Czech>
+            <Czech>Zvuky prostředí</Czech>
-            <Portuguese>[ACE] Sons ambientes</Portuguese>
+            <Portuguese>Sons ambientes</Portuguese>
-            <French>Sons d'ambiance [ACE]</French>
+            <French>Sons d'ambiance</French>
-            <Hungarian>Ambiens hangok [ACE]</Hungarian>
+            <Hungarian>Ambiens hangok</Hungarian>
-            <Russian>Звук окружения [ACE]</Russian>
+            <Russian>Звук окружения</Russian>
-            <Italian>Souni Ambientali [ACE]</Italian>
+            <Italian>Souni Ambientali</Italian>
-            <Japanese>環境音 [ACE]</Japanese>
+            <Japanese>環境音</Japanese>
-            <Korean>환경 효과음 [ACE]</Korean>
+            <Korean>환경 효과음</Korean>
-            <Chinesesimp>环境声音 [ACE]</Chinesesimp>
+            <Chinesesimp>环境声音</Chinesesimp>
-            <Chinese>環境聲音 [ACE]</Chinese>
+            <Chinese>環境聲音</Chinese>
         </Key>
         <Key ID="STR_ACE_MissionModules_AmbianceSounds_soundFiles_DisplayName">
             <English>Sounds</English>

addons/nlaw/CfgAmmo.hpp

@@ -39,11 +39,11 @@ class CfgAmmo {
     // Sub ammos used in OTA mode (see fnc_seeker.sqf)
     class ACE_NLAW_Explosion: ACE_NLAW { // Based on FCS-Airburst, will explode right away
         timeToLive = 0;
-        model = "";
+        model = "\A3\weapons_f\empty";
     };
     class ACE_NLAW_ShapedCharge: ACE_NLAW { // Shaped charge from rocket explosion, no effects
         timeToLive = 1;
-        model = "";
+        model = "\A3\weapons_f\empty";
         hit = 750;
         indirectHit = 0;
         indirectHitRange = 0;

addons/realisticnames/CfgWeapons.hpp

@@ -350,6 +350,9 @@ class CfgWeapons {
     class Missile_AGM_02_Plane_CAS_01_F: MissileLauncher {
         displayName = "AGM-65 Maverick G";
     };
+     class weapon_AGM_65Launcher: RocketPods {
+        displayName = "AGM-65 Maverick G";
+     };
     class Missile_AGM_01_Plane_CAS_02_F: Missile_AGM_02_Plane_CAS_01_F {
         displayName = "Kh-25MTP";
     };

addons/rearm/script_component.hpp

@@ -18,8 +18,8 @@
 #include "\z\ace\addons\main\script_macros.hpp"
 
 
-#define REARM_ACTION_DISTANCE 7
+#define REARM_ACTION_DISTANCE 9
-#define REARM_ACTION_DISTANCE_SQR 49
+#define REARM_ACTION_DISTANCE_SQR 81
 
 #define REARM_CALIBERS        [  6,   7,   8,  13, 19, 20, 25, 30, 35, 39, 40, 60, 70, 80, 82, 100, 105, 120, 122, 125, 155, 230, 250]
 #define REARM_DURATION_TAKE   [  5,   5,   5,   5,  5,  5,  5,  5,  5,  5,  5,  3,  3,  3,  3,   3,   4,   5,   5,   5,   5,  13,  10]

addons/repair/functions/fnc_isNearRepairVehicle.sqf

@@ -22,7 +22,7 @@ private _nearObjects = nearestObjects [_unit, ["Air", "LandVehicle", "Slingload_
 
 private _return = false;
 {
-    if ([_x] call FUNC(isRepairVehicle)) exitWith {_return = true;};
+    if (alive _x && {[_x] call FUNC(isRepairVehicle)}) exitWith {_return = true;};
 } forEach _nearObjects;
 
 _return;

optionals/compat_rhs_afrf3/CfgVehicles.hpp

@@ -152,33 +152,15 @@ class CfgVehicles {
     };
 
     class Heli_Attack_02_base_F: Helicopter_Base_F {};
-    class rhs_mi28_base: Heli_Attack_02_base_F {
-        class Turrets: Turrets {
-            class MainTurret: MainTurret {
-                EGVAR(fcs,enabled) = 0; // Note: This is still required because of inheritance from Heli_Attack_02_base_F
-            };
-        };
-    };
-
     class RHS_Ka52_base: Heli_Attack_02_base_F {
         EGVAR(refuel,fuelCapacity) = 1870;
         EGVAR(fastroping,enabled) = 0;
-        class Turrets: Turrets {
-            class MainTurret: MainTurret {
-                EGVAR(fcs,enabled) = 0; // Note: This is still required because of inheritance from Heli_Attack_02_base_F
-            };
-        };
     };
 
     class RHS_Mi24_base: Heli_Attack_02_base_F {
         EGVAR(map,vehicleLightColor)[] = {1,0,0,0.1};
         EGVAR(refuel,fuelCapacity) = 1851;
         EGVAR(fastroping,enabled) = 0;
-        class Turrets: Turrets {
-            class MainTurret: MainTurret {
-                EGVAR(fcs,enabled) = 0; // Note: This is still required because of inheritance from Heli_Attack_02_base_F
-            };
-        };
     };
 
     class rhs_t80b: rhs_tank_base {

optionals/compat_rhs_usf3/CfgVehicles.hpp

@@ -196,24 +196,10 @@ class CfgVehicles {
         EGVAR(hellfire,addLaserDesignator) = 1;
     };
 
-    class RHS_AH1Z: RHS_AH1Z_base {
-        class Turrets: Turrets {
-            class MainTurret: MainTurret {
-                ace_fcs_Enabled = 0; // Note: This is still required because of inheritance from Heli_Attack_01_base_F
-            };
-        };
-    };
     class RHS_AH64_base: Heli_Attack_01_base_F {
         EGVAR(refuel,fuelCapacity) = 1420;
         EGVAR(hellfire,addLaserDesignator) = 1;
     };
-    class RHS_AH64D: RHS_AH64_base {
-        class Turrets: Turrets {
-            class MainTurret: MainTurret {
-                ace_fcs_Enabled = 0; // Note: This is still required because of inheritance from Heli_Attack_01_base_F
-            };
-        };
-    };
 
     class MBT_01_arty_base_F;
     class rhsusf_m109tank_base: MBT_01_arty_base_F {

tools/make.py

@@ -432,9 +432,15 @@ def cleanup_optionals(mod):
 
 
                 if (os.path.isfile(src_file_path)):
+                    if (os.path.isfile(dst_file_path)):
+                        # print("Cleanuping up old file {}".format(dst_file_path))
+                        os.remove(dst_file_path);
                     #print("Preserving {}".format(file_name))
                     os.renames(src_file_path,dst_file_path)
                 if (os.path.isfile(src_sig_path)):
+                    if (os.path.isfile(dst_sig_path)):
+                        # print("Cleanuping up old file {}".format(dst_sig_path))
+                        os.remove(dst_sig_path);
                     #print("Preserving {}".format(sigFile_name))
                     os.renames(src_sig_path,dst_sig_path)
             except FileExistsError: