Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compat SPE - Remove ace_hearing hard dependency #10652

Merged
merged 1 commit into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion addons/compat_spe/CfgWeapons.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
class CfgWeapons {
#include "CfgWeapons\helmets.hpp"
#include "CfgWeapons\launchers.hpp"
#include "CfgWeapons\weapons.hpp"
};
142 changes: 0 additions & 142 deletions addons/compat_spe/CfgWeapons/helmets.hpp

This file was deleted.

145 changes: 145 additions & 0 deletions addons/compat_spe/compat_spe_hearing/CfgWeapons.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
class CfgWeapons {
class H_SPE_HelmetB;
class H_SPE_Hat: H_SPE_HelmetB {};

//ALLIED PILOT
class H_SPE_US_Helmet_Pilot: H_SPE_Hat {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_Pilot_Op: H_SPE_US_Helmet_Pilot {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_Pilot_Glasses_Up: H_SPE_US_Helmet_Pilot {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_Pilot_Glasses_Down: H_SPE_US_Helmet_Pilot {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_Pilot_Respirator: H_SPE_US_Helmet_Pilot {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_Pilot_Respirator_Glasses_Up: H_SPE_US_Helmet_Pilot_Respirator {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_Pilot_Respirator_Glasses_Down: H_SPE_US_Helmet_Pilot_Respirator {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_Pilot_SWDG_Respirator: H_SPE_US_Helmet_Pilot {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_Pilot_SWDG_low_Respirator: H_SPE_US_Helmet_Pilot {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_H15: H_SPE_US_Helmet_Pilot {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_H15_Op: H_SPE_US_Helmet_H15 {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_H15_SWDG: H_SPE_US_Helmet_H15 {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_H15_SWDG_low: H_SPE_US_Helmet_H15 {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_H15_O2: H_SPE_US_Helmet_H15 {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_H15_B7_O2: H_SPE_US_Helmet_H15_O2 {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_H15_B7_low_O2: H_SPE_US_Helmet_H15_O2 {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_H15_SWDG_O2: H_SPE_US_Helmet_H15_O2 {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_H15_SWDG_low_O2: H_SPE_US_Helmet_H15_O2 {
HEARING_PROTECTION_EARMUFF;
};

//ALLIED TANKER
class H_SPE_US_Helmet_Tank: H_SPE_HelmetB {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_Tank_NG: H_SPE_US_Helmet_Tank {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_Tank_Nun: H_SPE_US_Helmet_Tank {
HEARING_PROTECTION_OPEN;
};
class H_SPE_US_Helmet_Tank_M1_OS: H_SPE_US_Helmet_Tank {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_Tank_M1_NS: H_SPE_US_Helmet_Tank_M1_OS {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_Tank_M1_Scrim: H_SPE_US_Helmet_Tank_M1_OS {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_Tank_polar: H_SPE_US_Helmet_Tank {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_Tank_polar_tapes: H_SPE_US_Helmet_Tank_polar {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_Tank_polar_low: H_SPE_US_Helmet_Tank_polar {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_US_Helmet_Tank_tapes: H_SPE_US_Helmet_Tank {
HEARING_PROTECTION_EARMUFF;
};

//AXIS PILOT
class H_SPE_GER_LW_PilotHelmet_base: H_SPE_Hat {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_GER_LW_PilotHelmet: H_SPE_GER_LW_PilotHelmet_base {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_GER_LW_S_PilotHelmet: H_SPE_GER_LW_PilotHelmet_base {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_GER_LW_PilotHelmet_Mask_base: H_SPE_Hat {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_GER_LW_PilotHelmet_Mask: H_SPE_GER_LW_PilotHelmet_Mask_base {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_GER_LW_PilotHelmet_S_Mask: H_SPE_GER_LW_PilotHelmet_Mask_base {
HEARING_PROTECTION_EARMUFF;
};

//AXIS TANKER
class H_SPE_GER_TankPrivateCap: H_SPE_Hat {
HEARING_PROTECTION_OPEN;
};
class H_SPE_GER_TankOfficerCap: H_SPE_Hat {
HEARING_PROTECTION_OPEN;
};
class H_SPE_GER_Fieldcap: H_SPE_Hat {
HEARING_PROTECTION_OPEN;
};
class H_SPE_GER_Fieldcap2: H_SPE_GER_Fieldcap {
HEARING_PROTECTION_OPEN;
};
class H_SPE_GER_TankPrivateCap2: H_SPE_GER_TankPrivateCap {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_GER_TankOffzCap2: H_SPE_GER_TankPrivateCap {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_GER_TankOfficerCap2: H_SPE_GER_TankOfficerCap {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_GER_SPGPrivateCap: H_SPE_Hat {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_GER_ST_Tanker_Cap2: H_SPE_GER_Fieldcap2 {
HEARING_PROTECTION_EARMUFF;
};
class H_SPE_GER_ST_Tanker_Cap: H_SPE_GER_Fieldcap {
HEARING_PROTECTION_EARMUFF;
};

};
27 changes: 27 additions & 0 deletions addons/compat_spe/compat_spe_hearing/config.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#include "script_component.hpp"
#include "\z\ace\addons\hearing\script_macros_hearingProtection.hpp"

class CfgPatches {
class SUBADDON {
name = COMPONENT_NAME;
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {
"ww2_spe_assets_c_weapons_infantryweapons_c",
"ww2_spe_assets_c_vehicles_staticweapons_c",
"ww2_spe_assets_c_vehicles_weapons_c",
"ww2_spe_core_f_system_staticweapons_f",
"ww2_spe_core_c_core_c_eventhandlers",
"ace_hearing"
};
skipWhenMissingDependencies = 1;
author = ECSTRING(common,ACETeam);
url = ECSTRING(main,URL);
VERSION_CONFIG;

addonRootClass = QUOTE(ADDON);
};
};

#include "CfgWeapons.hpp"
3 changes: 3 additions & 0 deletions addons/compat_spe/compat_spe_hearing/script_component.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#define SUBCOMPONENT hearing
#define SUBCOMPONENT_BEAUTIFIED Hearing
#include "..\script_component.hpp"
1 change: 0 additions & 1 deletion addons/compat_spe/config.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "script_component.hpp"
#include "\z\ace\addons\hearing\script_macros_hearingProtection.hpp"

class CfgPatches {
class ADDON {
Expand Down
Loading