From 1fb276398cd57603dcd0bb1f06ea93710ac25f46 Mon Sep 17 00:00:00 2001 From: Saborknight Date: Wed, 13 Oct 2021 16:34:14 +1100 Subject: [PATCH] Added - ACE Compatibility for Global Mobilisation What ================= Added: Swap Barrel Compat Added: Explosives Compat Added: Hearing Compat Issue ID: N/A --- addons/core/config.cpp | 27 +++--- addons/core/configs/CfgBarrelSwaps.hpp | 11 +++ addons/core/configs/CfgExplosives.hpp | 91 ++++++++++++++++++++ addons/core/configs/CfgHearingProtection.hpp | 31 +++++++ 4 files changed, 147 insertions(+), 13 deletions(-) create mode 100644 addons/core/configs/CfgHearingProtection.hpp diff --git a/addons/core/config.cpp b/addons/core/config.cpp index 19cbd2b..8bfc7c1 100644 --- a/addons/core/config.cpp +++ b/addons/core/config.cpp @@ -88,16 +88,17 @@ class Extended_PostInit_EventHandlers { }; // Config features/fixes -#include "configs\CfgArsenalStats.hpp"; -#include "configs\CfgBarrelSwaps.hpp"; -#include "configs\CfgDirectConnect.hpp"; -#include "configs\CfgEdenModules.hpp"; -#include "configs\CfgEnableDebug.hpp"; -#include "configs\CfgExplosives.hpp"; -#include "configs\CfgLadderTweak.hpp"; -#include "configs\CfgMedicalEquipment.hpp"; -#include "configs\CfgRadioEquipment.hpp"; -#include "configs\CfgUnitTrainerTools.hpp"; -#include "configs\CfgVehicleDeploy.hpp"; -#include "configs\CfgZenMenu.hpp"; -#include "configs\CfgZeusActions.hpp"; +#include "configs\CfgArsenalStats.hpp" +#include "configs\CfgBarrelSwaps.hpp" +#include "configs\CfgDirectConnect.hpp" +#include "configs\CfgEdenModules.hpp" +#include "configs\CfgEnableDebug.hpp" +#include "configs\CfgExplosives.hpp" +#include "configs\CfgHearingProtection.hpp" +#include "configs\CfgLadderTweak.hpp" +#include "configs\CfgMedicalEquipment.hpp" +#include "configs\CfgRadioEquipment.hpp" +#include "configs\CfgUnitTrainerTools.hpp" +#include "configs\CfgVehicleDeploy.hpp" +#include "configs\CfgZenMenu.hpp" +#include "configs\CfgZeusActions.hpp" diff --git a/addons/core/configs/CfgBarrelSwaps.hpp b/addons/core/configs/CfgBarrelSwaps.hpp index 2963841..d462603 100644 --- a/addons/core/configs/CfgBarrelSwaps.hpp +++ b/addons/core/configs/CfgBarrelSwaps.hpp @@ -9,6 +9,7 @@ Config: Barrel Swaps Arend ---------------------------------------------------------------------------- */ class CfgWeapons { + // UK3CB Weapons class Rifle_Long_Base_F; class UK3CB_BAF_L110_Base : Rifle_Long_Base_F { ace_overheating_allowSwapBarrel = 1; @@ -17,8 +18,18 @@ class CfgWeapons { ace_overheating_allowSwapBarrel = 1; }; + // Vanilla Minimi class LMG_03_base_F; class LMG_03_F : LMG_03_base_F { ace_overheating_allowSwapBarrel = 1; }; + + // Global Mobilisation MG3 + class gm_mg3_base; + class gm_mg3_blk : gm_mg3_base { + ace_overheating_allowSwapBarrel = 1; + }; + class gm_mg3_des : gm_mg3_base { + ace_overheating_allowSwapBarrel = 1; + }; }; diff --git a/addons/core/configs/CfgExplosives.hpp b/addons/core/configs/CfgExplosives.hpp index 5d4e06e..22676ff 100644 --- a/addons/core/configs/CfgExplosives.hpp +++ b/addons/core/configs/CfgExplosives.hpp @@ -10,6 +10,7 @@ Config: ACE Explosives ---------------------------------------------------------------------------- */ class CfgMagazines { class CA_Magazine; + // RHS M112 class rhsusf_m112_mag : CA_Magazine { ACE_Explosives_Placeable = 1; useAction = 0; @@ -33,12 +34,102 @@ class CfgMagazines { class rhsusf_m112x4_mag : rhsusf_m112_mag { ACE_Explosives_SetupObject = "rhsusf_explosive_m112x4"; }; + + // Global Mobilisation Explosives + class gm_explosiveRemoteMagazine_base; + class gm_explosive_petn_charge : gm_explosiveRemoteMagazine_base { + useAction = 0; + ACE_Explosives_SetupObject = "ACE_Explosives_Place_gm_explosive_petn_charge"; + }; + class gm_explosive_plnp_charge : gm_explosiveRemoteMagazine_base { + useAction = 0; + ACE_Explosives_SetupObject = "ACE_Explosives_Place_gm_explosive_plnp_charge"; + }; + + // Global Mobilisation Mines + class gm_putMagazine_base; + class gm_mine_at_base : gm_putMagazine_base { + ACE_Explosives_Placeable = 1; + useAction = 0; + ACE_Explosives_DelayTime = 1.5; + + class ACE_Triggers { + SupportedTriggers[] = {"PressurePlate"}; + class PressurePlate { + FuseTime = 0.5; + digDistance = 0.05; + }; + }; + }; + class gm_mine_ap_dm31 : gm_mine_at_base { + ACE_Explosives_SetupObject = "ACE_Explosives_Place_gm_mine_ap_dm31"; + + class ACE_Triggers { + SupportedTriggers[] = {"Tripwire"}; + class Tripwire { + FuseTime = 0.5; + digDistance = 0.05; + }; + }; + }; + class gm_mine_ap_pfm1 : gm_mine_at_base { + ACE_Explosives_SetupObject = "ACE_Explosives_Place_gm_mine_ap_pfm1"; + }; + class gm_mine_at_dm21 : gm_mine_at_base { + ACE_Explosives_SetupObject = "ACE_Explosives_Place_gm_mine_at_dm21"; + }; + class gm_mine_at_dm1233 : gm_mine_at_base { + ACE_Explosives_SetupObject = "ACE_Explosives_Place_gm_mine_at_dm1233"; + }; + class gm_mine_at_tm46 : gm_mine_at_base { + ACE_Explosives_SetupObject = "ACE_Explosives_Place_gm_mine_at_tm46"; + }; +}; + +class CfgAmmo { + class gm_mine_bounce_base; + class gm_mine_ap_dm31 : gm_mine_bounce_base { + ACE_explosives_defuseObjectPosition[] = {-4.96289,0.0348816,0}; + }; }; class CfgVehicles { class ACE_Explosives_Place; + // RHS M112 class rhsusf_explosive_m112 : ACE_Explosives_Place {}; class rhsusf_explosive_m112x4 : ACE_Explosives_Place {}; + + // Global Mobilisation Explosives + class ACE_Explosives_Place_gm_explosive_petn_charge : ACE_Explosives_Place { + displayName = "PETN"; + model = "gm\gm_weapons\gm_put\gm_explosive_charge_petn"; + }; + class ACE_Explosives_Place_gm_explosive_plnp_charge : ACE_Explosives_Place { + displayName = "PLNP"; + model = "gm\gm_weapons\gm_put\gm_explosive_charge_plnp"; + }; + + // Global Mobilisation Mines + class ACE_Explosives_Place_gm_mine_ap_dm31 : ACE_Explosives_Place { + displayName = "AP Mine DM31"; + model = "gm\gm_weapons\gm_put\gm_mine_ap_dm31_disarmed"; + }; + class ACE_Explosives_Place_gm_mine_ap_pfm1 : ACE_Explosives_Place { + displayName = "AP Mine Scatterable PFM1"; + model = "gm\gm_weapons\gm_put\gm_mine_ap_pfm1_disarmed"; + }; + class ACE_Explosives_Place_gm_mine_at_dm21 : ACE_Explosives_Place { + displayName = "AT Mine DM21"; + model = "gm\gm_weapons\gm_put\gm_mine_at_dm21_disarmed"; + }; + class ACE_Explosives_Place_gm_mine_at_dm1233 : ACE_Explosives_Place { + displayName = "AT Mine Scatterable DM1233"; + model = "gm\gm_weapons\gm_put\gm_mine_at_dm1233_disarmed"; + }; + class ACE_Explosives_Place_gm_mine_at_tm46 : ACE_Explosives_Place { + displayName = "AT Mine TM46"; + model = "gm\gm_weapons\gm_put\gm_mine_at_tm46_disarmed"; + }; }; // Remove "Activate mine" action from diffused explosives/mines diff --git a/addons/core/configs/CfgHearingProtection.hpp b/addons/core/configs/CfgHearingProtection.hpp new file mode 100644 index 0000000..797319c --- /dev/null +++ b/addons/core/configs/CfgHearingProtection.hpp @@ -0,0 +1,31 @@ +/* ---------------------------------------------------------------------------- +Config: Hearing Protection + +Description: + Registers modded and vanilla headgear to be able to use the + ACE hearing framework. + +Author: + Arend +---------------------------------------------------------------------------- */ +class CfgWeapons { + // Global Mobilisation Crew Headgear + class gm_headgear_unarmored_base; + class gm_ge_headgear_crewhat_80_base : gm_headgear_unarmored_base { + ace_hearing_protection = 0.85; + ace_hearing_lowerVolume = 0.6; + }; + class gm_gc_headgear_hat_base; + class gm_gc_headgear_crewhat_80_base : gm_gc_headgear_hat_base { + ace_hearing_protection = 0.85; + ace_hearing_lowerVolume = 0.6; + }; + class gm_ge_headgear_headset_crew_base : gm_headgear_unarmored_base { + ace_hearing_protection = 0.75; + ace_hearing_lowerVolume = 0.5; + }; + class gm_ge_headgear_beret_crew_base : gm_headgear_unarmored_base { + ace_hearing_protection = 0.75; + ace_hearing_lowerVolume = 0.5; + }; +};