Merge branch 'master' into compat-cup-terrain-sitting

.hemtt/launch.toml

@@ -27,6 +27,12 @@ dlc = [
     "Reaction Forces"
 ]
 
+[gm]
+extends = "default"
+dlc = [
+    "Global Mobilization - Cold War Germany"
+]
+
 [rhs]
 extends = "default"
 workshop = [

addons/compat_cup_terrains/CfgVehicles.hpp

@@ -109,4 +109,20 @@ class CfgVehicles {
         EGVAR(dragging,carryPosition)[] = {0, 0.75, 0.5};
         EGVAR(dragging,carryDirection) = 270;
     };
+
+    class Land_stand_waterl_EP1: House_EP1 {
+        EXGVAR(field_rations,waterSupply) = 250;
+        EXGVAR(field_rations,offset)[] = {0, -0.33, 0.4};
+    };
+
+    class Land_pumpa: House {
+        EXGVAR(field_rations,waterSupply) = -10;
+        EXGVAR(field_rations,offset)[] = {0.3, 0, 0.68};
+    };
+
+    class Thing;
+    class Land_Barrel_water: Thing {
+        EXGVAR(field_rations,waterSupply) = 160;
+        EXGVAR(field_rations,offset)[] = {0, 0, 0.25};
+    };
 };

addons/compat_gm/CfgWeapons.hpp

@@ -95,22 +95,18 @@ class CfgWeapons {
         HEARING_PROTECTION_PELTOR;
     };
 
+    class gm_ge_headgear_beret_crew_base;
+    class gm_ge_headgear_beret_crew_blk: gm_ge_headgear_beret_crew_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+
     class gm_ge_headgear_beret_crew_bdx;
-    class gm_ge_headgear_beret_crew_blk;
     class gm_ge_headgear_beret_crew_grn;
     class gm_ge_headgear_beret_crew_red;
+
     class gm_ge_headgear_beret_crew_red_antiair: gm_ge_headgear_beret_crew_red {
         HEARING_PROTECTION_PELTOR;
     };
-    class gm_ge_headgear_beret_crew_blk_antitank: gm_ge_headgear_beret_crew_blk {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_ge_headgear_beret_crew_blk_armor: gm_ge_headgear_beret_crew_blk {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_ge_headgear_beret_crew_blk_armorrecon: gm_ge_headgear_beret_crew_blk {
-        HEARING_PROTECTION_PELTOR;
-    };
     class gm_ge_headgear_beret_crew_red_artillery: gm_ge_headgear_beret_crew_red {
         HEARING_PROTECTION_PELTOR;
     };
@@ -123,6 +119,9 @@ class CfgWeapons {
     class gm_ge_headgear_beret_crew_grn_mechinf: gm_ge_headgear_beret_crew_grn {
         HEARING_PROTECTION_PELTOR;
     };
+    class gm_ge_headgear_beret_crew_grn_infantry: gm_ge_headgear_beret_crew_grn {
+        HEARING_PROTECTION_PELTOR;
+    };
     class gm_ge_headgear_beret_crew_red_militarypolice: gm_ge_headgear_beret_crew_red {
         HEARING_PROTECTION_PELTOR;
     };
@@ -135,7 +134,7 @@ class CfgWeapons {
     class gm_ge_headgear_beret_crew_bdx_paratrooper: gm_ge_headgear_beret_crew_bdx {
         HEARING_PROTECTION_PELTOR;
     };
-    class gm_ge_headgear_beret_crew_blk_recon: gm_ge_headgear_beret_crew_blk {
+    class gm_ge_headgear_beret_crew_bdx_lrrp: gm_ge_headgear_beret_crew_bdx {
         HEARING_PROTECTION_PELTOR;
     };
     class gm_ge_headgear_beret_crew_red_supply: gm_ge_headgear_beret_crew_red {
@@ -144,4 +143,39 @@ class CfgWeapons {
     class gm_ge_headgear_beret_crew_red_signals: gm_ge_headgear_beret_crew_red {
         HEARING_PROTECTION_PELTOR;
     };
+
+    class gm_ge_bgs_headgear_beret_crew_grn: gm_ge_headgear_beret_crew_grn {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_ge_bgs_headgear_beret_crew_grn_sf: gm_ge_headgear_beret_crew_grn {
+        HEARING_PROTECTION_PELTOR;
+    };
+
+    class gm_ge_headgear_hat_beanie_base;
+    class gm_ge_headgear_hat_beanie_crew_blk: gm_ge_headgear_hat_beanie_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+
+    class gm_xx_headgear_headwrap_01_base;
+    class gm_xx_headgear_headwrap_crew_01_oli: gm_xx_headgear_headwrap_01_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_xx_headgear_headwrap_crew_01_m84: gm_xx_headgear_headwrap_01_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_xx_headgear_headwrap_crew_01_grn: gm_xx_headgear_headwrap_01_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_xx_headgear_headwrap_crew_01_smp: gm_xx_headgear_headwrap_01_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_xx_headgear_headwrap_crew_01_blk: gm_xx_headgear_headwrap_01_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_xx_headgear_headwrap_crew_01_flk: gm_xx_headgear_headwrap_01_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_xx_headgear_headwrap_crew_01_trp: gm_xx_headgear_headwrap_01_base {
+        HEARING_PROTECTION_PELTOR;
+    };
 };

addons/compat_rf/CfgVehicles.hpp

@@ -4,6 +4,10 @@ class CfgVehicles {
     class Pickup_01_base_rf: Offroad_01_unarmed_base_F {
         EXGVAR(field_rations,offset)[] = {-0.04, -2.45, -0.9};
     };
+    class Pickup_fuel_base_rf: Pickup_01_base_rf {
+        EGVAR(refuel,hooks)[] = {{-0.05, -2.4, -1.2}};
+        EGVAR(refuel,fuelCargo) = 1526; // Bed on 2024 RAM 1500 is 53.9 cubic feet
+    };
 
     // Enable Water Source by Default
     class C_IDAP_Pickup_rf;

addons/compat_sog/CfgEventHandlers.hpp

@@ -44,7 +44,7 @@ class Extended_InitPost_EventHandlers {
     };
     class vn_bicycle_base {
         class ADDON {
-            init = QUOTE(call FUNC(disableCookoff));
+            init = QUOTE(call EFUNC(cookoff,disableCookoff));
         };
     };
 };

addons/compat_sog/CfgVehicles/land.hpp

@@ -65,3 +65,10 @@ class Land_vn_fuelcan: Land_vn_object_c_base {
     EGVAR(cargo,canLoad) = 1;
     EGVAR(cargo,noRename) = 1;
 };
+
+// M149
+class Land_vn_b_prop_m149: Land_vn_object_b_base {
+    XEH_INHERITED;
+    EXGVAR(field_rations,waterSupply) = 1514.16; // 400 US gallons
+    EXGVAR(field_rations,offset)[] = {0, -0.3, -0.3};
+};

addons/compat_sog/CfgVehicles/wheeled.hpp

@@ -19,6 +19,23 @@ class vn_wheeled_m151_base: vn_wheeled_car_base {
     EGVAR(refuel,fuelCapacity) = 65;
 };
 
+// M149
+class Slingload_01_Base_F;
+class Land_vn_b_prop_m149_01: Slingload_01_Base_F {
+    EXGVAR(field_rations,waterSupply) = 1514.16; // 400 US gallons
+    EXGVAR(field_rations,offset)[] = {0, -0.3, -0.3};
+};
+class vn_object_b_base_02;
+class Land_vn_b_prop_m149_02: vn_object_b_base_02 {
+    EXGVAR(field_rations,waterSupply) = 1514.16; // 400 US gallons
+    EXGVAR(field_rations,offset)[] = {0, -0.3, -0.3};
+};
+class vn_object_b_base;
+class Land_vn_b_prop_m149_03: vn_object_b_base {
+    EXGVAR(field_rations,waterSupply) = 1514.16; // 400 US gallons
+    EXGVAR(field_rations,offset)[] = {0, -0.3, -0.3};
+};
+
 // ZIL-157
 class vn_wheeled_z157_base: vn_wheeled_truck_base {
     EGVAR(refuel,fuelCapacity) = 150;

addons/compat_sog/XEH_PREP.hpp

@@ -1,4 +1,3 @@
-PREP(disableCookoff);
 PREP(handleBikeMinePlace);
 PREP(handlePunjiTrapDamage);
 PREP(handlePunjiTrapPlace);

addons/compat_ws/CfgEventHandlers.hpp

@@ -0,0 +1,13 @@
+class Extended_InitPost_EventHandlers {
+    class UAV_02_Base_lxWS {
+        class ADDON {
+            init = QUOTE(call EFUNC(cookoff,disableCookoff));
+        };
+    };
+
+    class UAV_02_IED_Base_lxWS {
+        class ADDON {
+            init = ""; // Enable cook-off for IED drone
+        };
+    };
+};

addons/compat_ws/config.cpp

@@ -15,5 +15,6 @@ class CfgPatches {
     };
 };
 
+#include "CfgEventHandlers.hpp"
 #include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"

addons/cookoff/CfgEventHandlers.hpp

@@ -15,3 +15,17 @@ class Extended_PostInit_EventHandlers {
         init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
     };
 };
+
+class Extended_InitPost_EventHandlers {
+    class UGV_02_Demining_Base_F {
+        class ADDON {
+            init = QUOTE(call FUNC(disableCookoff));
+        };
+    };
+
+    class UGV_02_Science_Base_F {
+        class ADDON {
+            init = QUOTE(call FUNC(disableCookoff));
+        };
+    };
+};

addons/cookoff/XEH_PREP.hpp

@@ -4,6 +4,7 @@ PREP(cookOffLocal);
 PREP(cookOffServer);
 PREP(detonateAmmunitionServer);
 PREP(detonateAmmunitionServerLoop);
+PREP(disableCookoff);
 PREP(engineFireLocal);
 PREP(engineFireServer);
 PREP(getVehicleAmmo);

addons/cookoff/functions/fnc_disableCookoff.sqf

@@ -0,0 +1,21 @@
+#include "..\script_component.hpp"
+/*
+ * Author: BaerMitUmlaut
+ * Disables cookoff for objects. Use in init fields.
+ *
+ * Arguments:
+ * 0: Object <OBJECT>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * cursorObject call ace_cookoff_fnc_disableCookoff
+ *
+ * Public: No
+ */
+
+params ["_object"];
+
+_object setVariable [QGVAR(enable), false];
+_object setVariable [QGVAR(enableAmmoCookoff), false];

addons/dragging/CfgVehicles.hpp

@@ -350,6 +350,11 @@ class CfgVehicles {
         GVAR(canDrag) = 1;
         GVAR(dragPosition)[] = {0,1,0};
     };
+    class Land_BarrelWater_grey_F: Items_base_F {
+        EGVAR(interaction,replaceTerrainObject) = 1;
+        GVAR(canDrag) = 1;
+        GVAR(dragPosition)[] = {0,1,0};
+    };
     class Land_Bucket_F: Items_base_F {
         EGVAR(interaction,replaceTerrainObject) = 1;
         GVAR(canCarry) = 1;

addons/explosives/ACE_Medical_Injuries.hpp

@@ -0,0 +1,13 @@
+class ACE_Medical_Injuries {
+    class damageTypes {
+        class woundHandlers;
+        class explosive {
+            class woundHandlers: woundHandlers {};
+        };
+        class GVAR(toePopper): explosive {
+            class woundHandlers: woundHandlers {
+                ADDON = QFUNC(woundsHandlerToePopper);
+            };
+        };
+    };
+};

addons/explosives/CfgAmmo.hpp

@@ -175,6 +175,9 @@ class CfgAmmo {
         GVAR(defuseObjectPosition)[] = {0.0, -0.05, 0.15};
     };
     class APERSMine_Range_Ammo;
+    class ACE_APERSMine_ToePopper_Ammo: APERSMine_Range_Ammo {
+        ACE_damageType = QGVAR(toePopper);
+    };
     class TrainingMine_Ammo: APERSMine_Range_Ammo {
         GVAR(magazine) = "TrainingMine_Mag";
         GVAR(size) = 0;

addons/explosives/CfgMagazines.hpp

@@ -29,6 +29,10 @@ class CfgMagazines {
             };
         };
     };
+    class ACE_APERSMine_ToePopper_Mag: APERSMine_Range_Mag {
+        displayName = CSTRING(apersToePopper);
+        ammo = "ACE_APERSMine_ToePopper_Ammo";
+    };
     class APERSTripMine_Wire_Mag: ATMine_Range_Mag {
         GVAR(setupObject) = "ACE_Explosives_Place_APERSTripwireMine";
         class ACE_Triggers {

addons/explosives/CfgVehicles.hpp

@@ -380,6 +380,12 @@ class CfgVehicles {
     class APERSBoundingMine: MineBase {
         ammo = "ACE_APERSBoundingMine_Range_Ammo";
     };
+    class APERSMine;
+    class ACE_APERSMine_ToePopper: APERSMine {
+        author = ECSTRING(common,aceteam);
+        ammo = "ACE_APERSMine_ToePopper_Ammo";
+        displayName = CSTRING(apersToePopper);
+    };
 
     class DemoCharge_F: MineBase {
         ammo = "ACE_DemoCharge_Remote_Ammo";

addons/explosives/CfgWeapons.hpp

@@ -4,7 +4,7 @@ class CfgWeapons {
         muzzles[] += {QGVAR(muzzle)};
         class PutMuzzle: Default {};
         class GVAR(muzzle): PutMuzzle {
-            magazines[] = {"ACE_FlareTripMine_Mag"};
+            magazines[] = {"ACE_FlareTripMine_Mag", "ACE_APERSMine_ToePopper_Mag"};
         };
     };
 

addons/explosives/XEH_PREP.hpp

@@ -41,3 +41,4 @@ PREP(triggerType);
 PREP(allowDefuse);
 PREP(isAllowedDefuse);
 PREP(checkDetonateHandlers);
+PREP(woundsHandlerToePopper);

addons/explosives/config.cpp

@@ -25,6 +25,7 @@ class CfgPatches {
 
 #include "ACE_Triggers.hpp"
 #include "ACE_Arsenal_Stats.hpp"
+#include "ACE_Medical_Injuries.hpp"
 
 // UI stuff
 class RscText;

addons/explosives/functions/fnc_woundsHandlerToePopper.sqf

@@ -0,0 +1,30 @@
+#include "..\script_component.hpp"
+/*
+ * Author: PabstMirror
+ * Wound handler for the toe-popper ammo; only does damage to legs
+ *
+ * Arguments:
+ * 0: Unit <OBJECT>
+ * 1: Damage <ARRAY>
+ *
+ * Return Value:
+ * <ARRAY>
+ *
+ * Example:
+ * [player, []] call ace_explosives_fnc_woundsHandlerToePopper
+ *
+ * Public: No
+ */
+
+params ["", "_array"];
+TRACE_1("woundsHandlerToePopper",_this);
+
+_array = _array select {
+    _x params ["", "_part"];
+    _part in ["LeftLeg", "RightLeg"]
+};
+
+_this set [1, _array];
+
+_this
+

addons/explosives/stringtable.xml

@@ -1209,5 +1209,8 @@
             <Turkish>Zamanlayıcı</Turkish>
             <Hungarian>Időzítő</Hungarian>
         </Key>
+        <Key ID="STR_ACE_Explosives_apersToePopper">
+            <English>APERS Mine (Toe-Popper)</English>
+        </Key>
     </Package>
 </Project>