Spearhead 1944 Compatibility (acemod#9292)

* compat(spe): initial

* --changed csw/turrets

* disable spe disassemble

* csw: all mortars done

* more cleanup

* add missing hearing protection

* final cleanup

* goofed and removed too much

* ok all done

* formatting

* remove adt

* -+ updated frameworks

- Ballistics Framework Finished (Infantry Weapons)
- Wirecutter & Trench Framework Finished (Vests/Backpacks)
- Explosives Framework Finished (Added backward support for IFA3 Detonator/Firecord)
- Crew Served Weapons Framework Finished (Fixed Assemble/Disassemble)

* formatting

* Require HEMTT v1.7.2

* cleanup tabs / formating

* Apply suggestions from code review

Co-authored-by: Filip Maciejewski <[email protected]>
Co-authored-by: PabstMirror <[email protected]>
Co-authored-by: ZluskeN <[email protected]>

* split to subcomponents, fix ubcs

* swap has_include for skipWhenMissingDependencies

* fix explosives

* add pdumies for ww2

* Apply suggestions from code review

Co-authored-by: Jouni Järvinen <[email protected]>

* cleanup sten duplicate configs

* move hearing to macro

* fix macro repaclement

* Use `SUBADDON`

* Move `addonRootClass` to bottom of CfgPatches

* Relative includes

* move config macro includes to config.cpp

* comment off csw changes for now

* Update .hemtt/project.toml

---------

Co-authored-by: Coldfront15 <[email protected]>
Co-authored-by: Brett Mayson <[email protected]>
Co-authored-by: jonpas <[email protected]>
Co-authored-by: PabstMirror <[email protected]>
Co-authored-by: Filip Maciejewski <[email protected]>
Co-authored-by: ZluskeN <[email protected]>
Co-authored-by: Jouni Järvinen <[email protected]>

.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

@@ -34,7 +34,15 @@ 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]

addons/compat_gm/CfgWeapons.hpp

@@ -56,98 +56,92 @@ class CfgWeapons {
     };
 
     // HELMETS
-    #define HEARING_PROTECTION_OPEN EGVAR(hearing,protection) = 0; EGVAR(hearing,lowerVolume) = 0;
-    #define HEARING_PROTECTION_VICCREW EGVAR(hearing,protection) = 0.85; EGVAR(hearing,lowerVolume) = 0.6;
-    #define HEARING_PROTECTION_EARMUFF EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.5;
-    #define HEARING_PROTECTION_PELTOR EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0;
-
-
     class gm_ge_headgear_headset_crew_base;
     class gm_ge_headgear_headset_crew_oli: gm_ge_headgear_headset_crew_base {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
 
     class gm_ge_headgear_sph4_base;
     class gm_ge_headgear_sph4_oli: gm_ge_headgear_sph4_base {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
 
     class gm_pl_headgear_wz63_base;
     class gm_pl_army_headgear_wz63_oli: gm_pl_headgear_wz63_base {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
     class gm_pl_army_headgear_wz63_net_oli: gm_pl_headgear_wz63_base {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
 
     class gm_ge_headgear_crewhat_80_base;
     class gm_ge_headgear_crewhat_80_blk: gm_ge_headgear_crewhat_80_base {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
 
     class gm_gc_headgear_crewhat_80_base;
     class gm_gc_army_headgear_crewhat_80_blk: gm_gc_headgear_crewhat_80_base {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
 
     class gm_gc_headgear_zsh3_base;
     class gm_gc_headgear_zsh3_wht: gm_gc_headgear_zsh3_base {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
     class gm_gc_headgear_zsh3_blu: gm_gc_headgear_zsh3_base {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
     class gm_gc_headgear_zsh3_orn: gm_gc_headgear_zsh3_base {
-        HEARING_PROTECTION_PELTOR
+        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
+        HEARING_PROTECTION_PELTOR;
     };
     class gm_ge_headgear_beret_crew_blk_antitank: gm_ge_headgear_beret_crew_blk {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
     class gm_ge_headgear_beret_crew_blk_armor: gm_ge_headgear_beret_crew_blk {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
     class gm_ge_headgear_beret_crew_blk_armorrecon: gm_ge_headgear_beret_crew_blk {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
     class gm_ge_headgear_beret_crew_red_artillery: gm_ge_headgear_beret_crew_red {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
     class gm_ge_headgear_beret_crew_red_engineer: gm_ge_headgear_beret_crew_red {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
     class gm_ge_headgear_beret_crew_red_maintenance: gm_ge_headgear_beret_crew_red {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
     class gm_ge_headgear_beret_crew_grn_mechinf: gm_ge_headgear_beret_crew_grn {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
     class gm_ge_headgear_beret_crew_red_militarypolice: gm_ge_headgear_beret_crew_red {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
     class gm_ge_headgear_beret_crew_red_nbc: gm_ge_headgear_beret_crew_red {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
     class gm_ge_headgear_beret_crew_red_opcom: gm_ge_headgear_beret_crew_red {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
     class gm_ge_headgear_beret_crew_bdx_paratrooper: gm_ge_headgear_beret_crew_bdx {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
     class gm_ge_headgear_beret_crew_blk_recon: gm_ge_headgear_beret_crew_blk {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
     class gm_ge_headgear_beret_crew_red_supply: gm_ge_headgear_beret_crew_red {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
     class gm_ge_headgear_beret_crew_red_signals: gm_ge_headgear_beret_crew_red {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
 };

addons/compat_gm/config.cpp

@@ -1,4 +1,7 @@
 #include "script_component.hpp"
+#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
+#include "\z\ace\addons\hearing\script_macros_hearingProtection.hpp"
+
 
 class CfgPatches {
     class ADDON {

addons/compat_rhs_afrf3/CfgWeapons.hpp

@@ -108,21 +108,18 @@ class CfgWeapons {
         EGVAR(overpressure,offset) = 1.65;
     };
 
-    #define HEARING_PROTECTION_VICCREW EGVAR(hearing,protection) = 0.85; EGVAR(hearing,lowerVolume) = 0.6;
-    #define HEARING_PROTECTION_EARMUFF EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.5;
-    #define HEARING_PROTECTION_PELTOR EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0;
     class H_HelmetB;
     class rhs_tsh4: H_HelmetB {
-        HEARING_PROTECTION_VICCREW
+        HEARING_PROTECTION_VICCREW;
     };
 
     class rhs_6b47_bare;
     class rhs_6b48: rhs_6b47_bare {
-        HEARING_PROTECTION_VICCREW
+        HEARING_PROTECTION_VICCREW;
     };
 
     class rhs_zsh7a: H_HelmetB {
-        HEARING_PROTECTION_VICCREW
+        HEARING_PROTECTION_VICCREW;
     };
     class rhs_zsh7a_alt: rhs_zsh7a {
         ACE_Protection = 1;
@@ -137,19 +134,19 @@ class CfgWeapons {
     };
 
     class rhs_gssh18: H_HelmetB {
-        HEARING_PROTECTION_EARMUFF
+        HEARING_PROTECTION_EARMUFF;
     };
 
     class rhs_6b47;
     class rhs_6b47_6m2: rhs_6b47 {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
     class rhs_6b47_6m2_1: rhs_6b47 {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
 
     class rhs_6m2: H_HelmetB {
-        HEARING_PROTECTION_PELTOR
+        HEARING_PROTECTION_PELTOR;
     };
 
     class rhs_weap_d81;

addons/compat_rhs_afrf3/config.cpp

@@ -1,4 +1,5 @@
 #include "script_component.hpp"
+#include "\z\ace\addons\hearing\script_macros_hearingProtection.hpp"
 
 class CfgPatches {
     class ADDON {