Add Global Mobilization Compatibility (acemod#7835)

* GM Compat add GM Compat addon - it's acemod#7835 without fastroping & refuel changes * plus compat_gm moved into optionals * plus a few whitespace fixes Co-authored-by: jonpas <jonpas33@gmail.com> Co-authored-by: Fusselwurm <fusselwurm@gmail.com> * add ACE CSW dep (see script_component.hpp) * warn about missiong compat_gm if GM is loaded * move medic tents to EGVAR(medical,facilities) array thing * add pDumbs Co-authored-by: jonpas <jonpas33@gmail.com> Co-authored-by: Fusselwurm <fusselwurm@gmail.com> Co-authored-by: PabstMirror <pabstmirror@gmail.com>
AndreasBrostrom · Dec 3, 2021 · 8f4b3d7 · 8f4b3d7
1 parent 316d121
commit 8f4b3d7
Show file tree

Hide file tree

Showing 25 changed files with 933 additions and 1 deletion.
diff --git a/addons/main/CfgSettings.hpp b/addons/main/CfgSettings.hpp
@@ -13,8 +13,9 @@ class CfgSettings {
                     compat_rhs_gref3[] = {"ace_compat_rhs_gref3", {VERSION_AR}, "isClass (configFile >> 'CfgPatches' >> 'rhsgref_main')"};
                     compat_rhs_saf3[] = {"ace_compat_rhs_saf3", {VERSION_AR}, "isClass (configFile >> 'CfgPatches' >> 'rhssaf_main')"};
 
-                    //Warning for missing SOG:PF compat
+                    //Warnings for missing DLC compat
                     ace_compat_sog[] = {"ace_compat_sog", {VERSION_AR}, "isClass (configFile >> 'CfgPatches' >> 'data_f_vietnam')"};
+                    ace_compat_gm[] = {"ace_compat_gm", {VERSION_AR}, "isClass (configFile >> 'CfgPatches' >> 'gm_core')"};
                 };
             };
         };

diff --git a/addons/medical_treatment/ACE_Medical_Facilities.hpp b/addons/medical_treatment/ACE_Medical_Facilities.hpp
@@ -23,4 +23,9 @@ class EGVAR(medical,facilities) {
         "RU_WarfareBFieldhHospital",
         "USMC_WarfareBFieldhHospital"
     };
+    GM[] = {
+        "gm_ge_army_shelteraceI_medic",
+        "gm_ge_army_shelteraceII_medic",
+        "gm_gc_army_shelterlakII_medic"
+    };
 };
diff --git a/addons/repair/CfgVehicles.hpp b/addons/repair/CfgVehicles.hpp
@@ -106,6 +106,7 @@ class CfgVehicles {
                 class values {
                     class None { name = "None"; value = 0;  default = 1;};
                     class ToolKit { name = "ToolKit"; value = 1; };
+                    class gm_repairkit_01 { name = "GM Repair Kit"; value = 1; };
                 };
             };
         };

diff --git a/optionals/compat_gm/$PBOPREFIX$ b/optionals/compat_gm/$PBOPREFIX$
@@ -0,0 +1 @@
+z\ace\addons\compat_gm
diff --git a/optionals/compat_gm/CfgAmmo.hpp b/optionals/compat_gm/CfgAmmo.hpp
@@ -0,0 +1,25 @@
+class CfgAmmo {
+    class PipeBombBase;
+    class gm_explosive_petn_charge: PipeBombBase {
+        EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
+    };
+    class gm_explosive_plnp_charge: PipeBombBase {
+        EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
+    };
+
+    class MineBase;
+    class gm_mine_at_mn111: MineBase {
+        EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
+    };
+    class gm_mine_at_dm21: MineBase {
+        EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
+    };
+    class gm_mine_at_tm46: MineBase {
+        EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
+    };
+
+    class APERSMine_Range_Ammo;
+    class gm_mine_ap_dm31: APERSMine_Range_Ammo {
+        EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
+    };
+};
diff --git a/optionals/compat_gm/CfgEventHandlers.hpp b/optionals/compat_gm/CfgEventHandlers.hpp
@@ -0,0 +1,19 @@
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+    };
+};
+
+class Extended_PreInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+    };
+};
+
+class Extended_InitPost_EventHandlers {
+    class gm_jerrycan {
+        class ADDON {
+            init = QUOTE(call EFUNC(refuel,makeJerryCan));
+        };
+    };
+};
diff --git a/optionals/compat_gm/CfgMagazines.hpp b/optionals/compat_gm/CfgMagazines.hpp
@@ -0,0 +1,128 @@
+class cfgMagazines {
+    class CA_Magazine;
+
+    // MG3
+    class gm_120rnd_762x51mm_mg3_grn;
+    class gm_120Rnd_762x51mm_B_T_DM21_mg3_grn: gm_120rnd_762x51mm_mg3_grn {
+        ACE_isBelt = 1;
+    };
+    class gm_120Rnd_762x51mm_B_T_DM21A1_mg3_grn: gm_120rnd_762x51mm_mg3_grn {
+        ACE_isBelt = 1;
+    };
+    class gm_120Rnd_762x51mm_B_T_DM21A2_mg3_grn: gm_120rnd_762x51mm_mg3_grn {
+        ACE_isBelt = 1;
+    };
+
+    // PK
+    class gm_100rnd_762x54mm_pk_grn;
+    class gm_100Rnd_762x54mm_API_b32_pk_grn: gm_100rnd_762x54mm_pk_grn {
+        ACE_isBelt = 1;
+    };
+    class gm_100Rnd_762x54mm_B_T_t46_pk_grn: gm_100rnd_762x54mm_pk_grn {
+        ACE_isBelt = 1;
+    };
+    class gm_100rnd_762x54mmR_pk_grn;
+    class gm_100Rnd_762x54mmR_API_7bz3_pk_grn: gm_100rnd_762x54mmR_pk_grn {
+        ACE_isBelt = 1;
+    };
+    class gm_100Rnd_762x54mmR_B_T_7t2_pk_grn: gm_100rnd_762x54mmR_pk_grn {
+        ACE_isBelt = 1;
+    };
+
+    // Explosives
+    class gm_explosive_petn_charge: CA_Magazine {
+        EGVAR(explosive,DelayTime) = 1;
+        EGVAR(explosive,Placeable) = 1;
+        EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_gm_explosive_petn";
+        useAction = 0;
+        class ACE_Triggers {
+            SupportedTriggers[] = {"Timer", "Command", "MK16_Transmitter", "DeadmanSwitch"};
+            class Timer {
+                FuseTime = 0.5;
+            };
+            class Command {
+                FuseTime = 0.5;
+            };
+            class MK16_Transmitter: Command {};
+            class DeadmanSwitch: Command {};
+        };
+    };
+
+    class gm_explosive_plnp_charge: gm_explosive_petn_charge {
+        EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_gm_explosive_plnp";
+    };
+
+    class ATMine_Range_Mag;
+    class gm_mine_at_tm46: ATMine_Range_Mag {
+        EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_gm_mine_tm46";
+        useAction = 0;
+        class ACE_Triggers {
+            SupportedTriggers[] = {"PressurePlate"};
+            class PressurePlate {
+                digDistance = 0.03;
+            };
+        };
+    };
+    class gm_mine_at_dm21: ATMine_Range_Mag {
+        EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_gm_explosive_dm21";
+        useAction = 0;
+        class ACE_Triggers {
+            SupportedTriggers[] = {"PressurePlate"};
+            class PressurePlate {
+                digDistance = 0.03;
+            };
+        };
+    };
+    class gm_mine_at_mn111: ATMine_Range_Mag {
+        EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_gm_explosive_m111";
+        useAction = 0;
+        class ACE_Triggers {
+            SupportedTriggers[] = {"PressurePlate"};
+            class PressurePlate {
+                digDistance = 0.03;
+            };
+        };
+    };
+
+    // class ATMine_Range_Mag;
+    class gm_mine_ap_dm31: ATMine_Range_Mag {
+        EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_gm_explosive_dm31";
+        useAction = 0;
+        class ACE_Triggers {
+            SupportedTriggers[] = {"Tripwire"};
+            class Tripwire {
+                digDistance = 0.125;
+            };
+        };
+    };
+
+
+    // Vehicle Ammo
+    class gm_magazine_20x139mm_base;
+    class gme_320Rnd_20x139mm_hei_t_dm81: gm_magazine_20x139mm_base {
+        displayName = "20 mm 320Rnd HEI-T DM81";
+        descriptionShort = "Caliber: 20x139 mm HEI-T DM81<br />Rounds: 320<br />Used in: RH202";
+        displaynameshort = "HEI-T";
+        ammo = "gm_bullet_20x139mm_hei_t_dm81";
+        count = 320;
+        initSpeed = 1175;
+        tracersEvery = 1;
+        lastRoundsTracer = 1;
+        scope = 1;
+        scopeCurator = 2;
+        author = "Global Mobilization";
+    };
+    class gme_180Rnd_20x139mm_apds_t_dm63: gm_magazine_20x139mm_base {
+        displayName = "20 mm 180Rnd APDS-T DM63";
+        descriptionShort = "Caliber: 20x139 mm APDS-T DM63<br />Rounds: 120<br />Used in: RH202";
+        displaynameshort = "APDS-T";
+        ammo = "gm_bullet_20x139mm_apds_t_dm63";
+        count = 180;
+        initSpeed = 1175;
+        tracersEvery = 1;
+        lastRoundsTracer = 1;
+        scope = 1;
+        scopeCurator = 2;
+        author = "Global Mobilization";
+    };
+};