Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
f673ef3
Docs - Fixed Typo
OverlordZorn Nov 5, 2024
70a9123
Revert "Docs - Fixed Typo"
OverlordZorn Nov 7, 2024
cf07da2
add _nozzle to Events
OverlordZorn Mar 25, 2025
cadecdf
Merge remote-tracking branch 'upstream/master'
OverlordZorn Mar 28, 2025
1cd224e
Merge remote-tracking branch 'upstream/master'
OverlordZorn Apr 1, 2025
eaa080d
Merge branch 'acemod:master' into master
OverlordZorn May 11, 2025
9411d9a
Merge remote-tracking branch 'upstream/master'
OverlordZorn May 11, 2025
1c8416d
Merge remote-tracking branch 'upstream/master'
OverlordZorn May 12, 2025
ee08957
Merge branch 'acemod:master' into master
OverlordZorn May 26, 2025
1685723
Merge remote-tracking branch 'upstream/master'
OverlordZorn Jun 16, 2025
224b372
Merge remote-tracking branch 'upstream/master'
OverlordZorn Jul 16, 2025
629acb9
Merge remote-tracking branch 'upstream/master'
OverlordZorn Jul 25, 2025
5be0460
Merge remote-tracking branch 'upstream/master'
OverlordZorn Aug 26, 2025
d9ed640
Merge remote-tracking branch 'upstream/master'
OverlordZorn Sep 7, 2025
abeb198
Merge remote-tracking branch 'upstream/master'
OverlordZorn Sep 21, 2025
7293503
Merge remote-tracking branch 'upstream/master'
OverlordZorn Oct 11, 2025
51d596d
Merge remote-tracking branch 'upstream/master'
OverlordZorn Nov 25, 2025
1c5b7f4
Merge remote-tracking branch 'upstream/master'
OverlordZorn Dec 22, 2025
975044b
init
OverlordZorn Dec 22, 2025
82dedf5
Donate macros
OverlordZorn Dec 22, 2025
62924b5
init
OverlordZorn Dec 22, 2025
9007ba8
HELMET_GOGGLES_COMPONENT -> HELMET_GOGGLES
OverlordZorn Dec 22, 2025
8e577bc
wtf github what u do
OverlordZorn Dec 22, 2025
706b45b
rm cmt
OverlordZorn Dec 22, 2025
21c7bc1
Merge branch 'wardrobe-extended-donate-macros' into wardrobe-extended…
OverlordZorn Dec 22, 2025
6a99a73
fix path and rm empty file
OverlordZorn Dec 22, 2025
b1ab08b
Update script_macros_wardrobe.hpp
OverlordZorn Dec 22, 2025
73d6b46
rm double ref of macro file
OverlordZorn Dec 22, 2025
d4c4b92
rm unused base classes
OverlordZorn Dec 22, 2025
1c8bc83
Update addons/compat_spe/compat_spe_wardrobe/config.cpp
OverlordZorn Dec 24, 2025
eb1a6ad
Update addons/compat_spe/compat_spe_wardrobe/ACE_wardrobe_uniforms.hpp
OverlordZorn Dec 24, 2025
460d427
Update addons/compat_spe/compat_spe_wardrobe/ACE_wardrobe_uniforms.hpp
OverlordZorn Dec 24, 2025
e5ca482
cleanup
OverlordZorn Dec 24, 2025
21c3a03
added TIE Variants
OverlordZorn Dec 26, 2025
9877887
new macro: collar open/closed + sleeves up
OverlordZorn Dec 26, 2025
bf7db97
CSTRING -> ECSTRING
OverlordZorn Dec 26, 2025
2322ff9
upt U_SPE_CSK
OverlordZorn Dec 26, 2025
fc03892
rm empty line
OverlordZorn Dec 26, 2025
acd1afe
Update ACE_wardrobe_uniforms.hpp
OverlordZorn Dec 26, 2025
69a3714
Merge branch 'master' into compat-spe-wardrobe-changes
johnb432 Dec 27, 2025
6721550
Add more wardrobe compat for SPE
johnb432 Dec 27, 2025
7a9639b
Removed kneepad variants
johnb432 Dec 29, 2025
e0fed7d
Use macros
johnb432 Jan 5, 2026
8e90e1a
Add tanker headwear variants
johnb432 Jan 5, 2026
f5100b6
Add M1 helmet variants
johnb432 Jan 5, 2026
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
14 changes: 14 additions & 0 deletions addons/compat_spe/compat_spe_wardrobe/ACE_wardrobe.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
class ace_wardrobe {
class ACEWARDROBE(base);
class ACEWARDROBE(base_U_sleeves_up);
class ACEWARDROBE(base_U_sleeves_down);
class ACEWARDROBE(base_U_gloves_on);
class ACEWARDROBE(base_U_gloves_off);
class ACEWARDROBE(base_H_goggles_on);
class ACEWARDROBE(base_H_goggles_off);
class ACEWARDROBE(base_U_tie_on);
class ACEWARDROBE(base_U_tie_off);

#include "ACE_wardrobe_uniforms.hpp"
#include "ACE_wardrobe_headgear.hpp"
};
231 changes: 231 additions & 0 deletions addons/compat_spe/compat_spe_wardrobe/ACE_wardrobe_headgear.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,231 @@
// Helmet with normal strap and folded Strap
// Normal, Folded
// FR
BASE_PAIR(H_SPE_FR_Adrian,H_SPE_FR_Adrian_ns);
BASE_PAIR(H_SPE_FR_Adrian_cover,H_SPE_FR_Adrian_cover_ns);
BASE_PAIR(H_SPE_FR_Adrian_net,H_SPE_FR_Adrian_net_ns);

// GER
BASE_PAIR(H_SPE_GER_Helmet_M35_LW,H_SPE_GER_Helmet_M35_LW_ns);

BASE_PAIR(H_SPE_GER_Helmet_M40_lw,H_SPE_GER_Helmet_M40_ns_lw);
BASE_PAIR(H_SPE_GER_Helmet_M40_lw_net,H_SPE_GER_Helmet_M40_ns_lw_net);

BASE_PAIR(H_SPE_GER_Helmet_M40_lw_net_camo,H_SPE_GER_Helmet_M40_ns_lw_net_camo);
BASE_PAIR(H_SPE_GER_Helmet_M40_lw_camo,H_SPE_GER_Helmet_M40_ns_lw_camo);

BASE_PAIR(H_SPE_GER_HelmetCamo3,H_SPE_GER_HelmetCamo3_OS);

BASE_PAIR(H_SPE_GER_Helmet_M40_burlap_band,H_SPE_GER_Helmet_M40_burlap_band_ns);

BASE_PAIR(H_SPE_GER_Helmet_M40_net,H_SPE_GER_Helmet_M40_ns_net);
BASE_PAIR(H_SPE_GER_Helmet_M40Utility,H_SPE_GER_Helmet_M40Utility_OS);


BASE_PAIR(H_SPE_GER_Helmet_M40_wire,H_SPE_GER_Helmet_M40_ns_wire);

BASE_PAIR(H_SPE_GER_Helmet_net,H_SPE_GER_Helmet_net_ns);

BASE_PAIR(H_SPE_GER_Helmet_os,H_SPE_GER_Helmet_ns_wire);


// Headphones Up, Headphones Down
BASE_PAIR(H_SPE_GER_SPGPrivateCap,H_SPE_GER_SPGPrivateCap2);

BASE_PAIR(H_SPE_GER_TankPrivateCap,H_SPE_GER_TankPrivateCap2);
BASE_PAIR(H_SPE_GER_TankOffzCap,H_SPE_GER_TankOffzCap2);

BASE_PAIR(H_SPE_GER_TankOfficerCap,H_SPE_GER_TankOfficerCap2);


// Hat, Tilted
// Normal, Tilted

BASE_PAIR(H_SPE_GER_M40_LW,H_SPE_GER_M40_LW_2);
BASE_PAIR(H_SPE_GER_M40_LW_Offz,H_SPE_GER_M40_LW_Offz_2);

BASE_PAIR(H_SPE_GER_M38,H_SPE_GER_M38_2);
BASE_PAIR(H_SPE_GER_M38_Offz,H_SPE_GER_M38_Offz_2);

BASE_PAIR(H_SPE_GER_M38_art,H_SPE_GER_M38_art_2);
BASE_PAIR(H_SPE_GER_M38_Art_Offz,H_SPE_GER_M38_Art_Offz_2);

BASE_PAIR(H_SPE_GER_M38_inf,H_SPE_GER_M38_inf_2);
BASE_PAIR(H_SPE_GER_M38_inf_Offz,H_SPE_GER_M38_inf_Offz_2);

BASE_PAIR(H_SPE_GER_M38_Pz,H_SPE_GER_M38_Pz_2);
BASE_PAIR(H_SPE_GER_M38_Pz_Offz,H_SPE_GER_M38_Pz_Offz_2);

BASE_PAIR(H_SPE_GER_M38_pzgren,H_SPE_GER_M38_pzgren_2);
BASE_PAIR(H_SPE_GER_M38_PzGren_Offz,H_SPE_GER_M38_PzGren_Offz_2);

BASE_PAIR(H_SPE_GER_ST_M40_cap,H_SPE_GER_ST_M40_cap_2);
BASE_PAIR(H_SPE_GER_ST_M40_cap_Offz,H_SPE_GER_ST_M40_cap_Offz_2);

BASE_PAIR(H_SPE_GER_ST_M40_Pz_cap,H_SPE_GER_ST_M40_Pz_cap_2);
BASE_PAIR(H_SPE_GER_ST_M40_Pz_cap_Offz,H_SPE_GER_ST_M40_Pz_cap_Offz_2);


HELMET_2VARIANTS_GOGGLES(H_SPE_GER_Helmet_M35,H_SPE_GER_Helmet_M35_ns,H_SPE_GER_Helmet_M35_Glasses,H_SPE_GER_Helmet_M35_Glasses_ns,G_SPE_Dust_Goggles);
HELMET_2VARIANTS_GOGGLES(H_SPE_GER_Helmet_M40,H_SPE_GER_Helmet_M40_ns,H_SPE_GER_Helmet_M40_Glasses,H_SPE_GER_Helmet_M40_Glasses_ns,G_SPE_Dust_Goggles);


// Helmet With 2 Variants but only one has Goggles
class H_SPE_GER_Helmet: ACEWARDROBE(base) {
class modifiableTo {
class H_SPE_GER_Helmet_ns {};
class H_SPE_GER_Helmet_Glasses {};
};
};
class H_SPE_GER_Helmet_ns: ACEWARDROBE(base) {
class modifiableTo {
class H_SPE_GER_Helmet {};
class H_SPE_GER_Helmet_Glasses {};
};
};
class H_SPE_GER_Helmet_Glasses: ACEWARDROBE(base) {
class modifiableTo {
class H_SPE_GER_Helmet {};
class H_SPE_GER_Helmet_ns {};
};
components[] = { QUOTE(G_SPE_Dust_Goggles) };
};

BASE_PAIR(H_SPE_GER_HelmetUtility,H_SPE_GER_HelmetUtility_OS);

// US
HELMET_GOGGLES(H_SPE_US_AB_Helmet_Net,H_SPE_US_AB_Helmet_polar_net,G_SPE_Polar_Goggles);

BASE_TRIPLET(H_SPE_US_AB_Helmet_Net_up,H_SPE_US_AB_Helmet_Net_ns,H_SPE_US_AB_Helmet_Net_os);
BASE_TRIPLET(H_SPE_US_AB_Helmet_Scrim_up,H_SPE_US_AB_Helmet_Scrim_ns,H_SPE_US_AB_Helmet_Scrim_os);

BASE_PAIR(H_SPE_US_AB_Helmet_501,H_SPE_US_AB_Helmet_501_ns);
BASE_TRIPLET(H_SPE_US_AB_Helmet_501_Net_up,H_SPE_US_AB_Helmet_501_Net_ns,H_SPE_US_AB_Helmet_501_Net_os);
BASE_TRIPLET(H_SPE_US_AB_Helmet_501_Scrim_os,H_SPE_US_AB_Helmet_501_Scrim_ns,H_SPE_US_AB_Helmet_501_Scrim_up);

BASE_PAIR(H_SPE_US_AB_Helmet_502,H_SPE_US_AB_Helmet_502_ns);
BASE_TRIPLET(H_SPE_US_AB_Helmet_502_Net_up,H_SPE_US_AB_Helmet_502_Net_ns,H_SPE_US_AB_Helmet_502_Net_os);
BASE_TRIPLET(H_SPE_US_AB_Helmet_502_Scrim_os,H_SPE_US_AB_Helmet_502_Scrim_ns,H_SPE_US_AB_Helmet_502_Scrim_up);

BASE_PAIR(H_SPE_US_Helmet_Pilot_Glasses_Down,H_SPE_US_Helmet_Pilot_Glasses_Up);
BASE_PAIR(H_SPE_US_Helmet_Pilot_Respirator_Glasses_Down,H_SPE_US_Helmet_Pilot_Respirator_Glasses_Up);
BASE_PAIR(H_SPE_US_Helmet_Pilot_SWDG_Respirator,H_SPE_US_Helmet_Pilot_SWDG_low_Respirator);
BASE_PAIR(H_SPE_US_Helmet_Pilot,H_SPE_US_Helmet_Pilot_Op);

BASE_PAIR(H_SPE_US_Helmet_H15_SWDG,H_SPE_US_Helmet_H15_SWDG_low);
BASE_PAIR(H_SPE_US_Helmet_H15,H_SPE_US_Helmet_H15_Op);
BASE_PAIR(H_SPE_US_Helmet_H15_SWDG_O2,H_SPE_US_Helmet_H15_SWDG_low_O2);
BASE_PAIR(H_SPE_US_Helmet_H15_B7_O2,H_SPE_US_Helmet_H15_B7_low_O2);

BASE_PAIR(H_SPE_US_Helmet_29ID_Net_ns,H_SPE_US_Helmet_29ID_Net_os);
BASE_PAIR(H_SPE_US_Helmet_29ID_Scrim_ns,H_SPE_US_Helmet_29ID_Scrim_os);
BASE_TRIPLET(H_SPE_US_Helmet_cover,H_SPE_US_Helmet_cover_ns,H_SPE_US_Helmet_cover_os);
BASE_PAIR(H_SPE_US_Helmet_Med,H_SPE_US_Helmet_Med_os);
BASE_TRIPLET(H_SPE_US_MP_Helmet_White,H_SPE_US_MP_Helmet_White_ns,H_SPE_US_MP_Helmet_White_os);
BASE_PAIR(H_SPE_US_Helmet_band_net_up,H_SPE_US_Helmet_band_net_os);
BASE_TRIPLET(H_SPE_US_Helmet_Net_ns,H_SPE_US_Helmet_Net_up,H_SPE_US_Helmet_Net_os);
BASE_PAIR(H_SPE_US_Helmet_Scrim,H_SPE_US_Helmet_Scrim_up);
HELMET_SCRIM(H_SPE_US_Helmet_Tank_M1_NS,H_SPE_US_Helmet_Tank_M1_Scrim);


class H_SPE_US_HBT_cap: ACEWARDROBE(base) {
class modifiableTo {
class H_SPE_US_HBT_cap_up {};
class H_SPE_US_HBT_cap_rear {};
class H_SPE_US_HBT_cap_polar {};
};
};
class H_SPE_US_HBT_cap_up: ACEWARDROBE(base) {
class modifiableTo {
class H_SPE_US_HBT_cap {};
class H_SPE_US_HBT_cap_rear {};
};
};
class H_SPE_US_HBT_cap_rear: ACEWARDROBE(base) {
class modifiableTo {
class H_SPE_US_HBT_cap {};
class H_SPE_US_HBT_cap_up {};
};
};

class H_SPE_US_HBT_cap_polar: ACEWARDROBE(base) {
class modifiableTo {
class H_SPE_US_HBT_cap {};
};
components[] = { QUOTE(G_SPE_Polar_Goggles) };
};


class H_SPE_US_Helmet_polar_ns: ACEWARDROBE(base) {
class modifiableTo {
class H_SPE_US_Helmet_ns {};
};
components[] = { QUOTE(G_SPE_Polar_Goggles) };
};
class H_SPE_US_Helmet_ns: ACEWARDROBE(base) {
class modifiableTo {
class H_SPE_US_Helmet_polar_ns {};
};
};


class H_SPE_US_Helmet_Tank_NG: ACEWARDROBE(base) {
class modifiableTo {
class H_SPE_US_Helmet_Tank_polar_low {};
class H_SPE_US_Helmet_Tank_polar {};
class H_SPE_US_Helmet_Tank_Nun {};
};
};
class H_SPE_US_Helmet_Tank_Nun: ACEWARDROBE(base) {
class modifiableTo {
class H_SPE_US_Helmet_Tank_NG {};
};
};

class H_SPE_US_Helmet_Tank_polar_low: ACEWARDROBE(base) {
class modifiableTo {
class H_SPE_US_Helmet_Tank_NG {};
class H_SPE_US_Helmet_Tank_polar {};
};
components[] = { QUOTE(G_SPE_Polar_Goggles) };
};
class H_SPE_US_Helmet_Tank_polar: ACEWARDROBE(base) {
class modifiableTo {
class H_SPE_US_Helmet_Tank_NG {};
class H_SPE_US_Helmet_Tank_polar_low {};
};
components[] = { QUOTE(G_SPE_Polar_Goggles) };
};


class H_SPE_US_Helmet_Tank_polar_tapes: ACEWARDROBE(base) {
class modifiableTo {
class H_SPE_US_Helmet_Tank_tapes {};
};
components[] = { QUOTE(G_SPE_Polar_Goggles) };
};
class H_SPE_US_Helmet_Tank_tapes: ACEWARDROBE(base) {
class modifiableTo {
class H_SPE_US_Helmet_Tank_polar_tapes {};
};
};


class H_SPE_US_jeep_cap: ACEWARDROBE(base) {
class modifiableTo {
class H_SPE_US_jeep_cap_rear {};
class H_SPE_US_jeep_cap_polar {};
};
};
class H_SPE_US_jeep_cap_rear: ACEWARDROBE(base) {
class modifiableTo {
class H_SPE_US_jeep_cap {};
};
};

class H_SPE_US_jeep_cap_polar: ACEWARDROBE(base) {
class modifiableTo {
class H_SPE_US_jeep_cap {};
};
components[] = { QUOTE(G_SPE_Polar_Goggles) };
};
Loading