Skip to content

Wardrobe - Add Special Variants #11440

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.

Sign up for GitHub

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

Draft
OverlordZorn wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Wardrobe - Add Special Variants #11440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcc784b
Update AUTHORS.txt
OverlordZorn Jul 24, 2026
24c3f60
init
OverlordZorn Jul 24, 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
1 change: 1 addition & 0 deletions AUTHORS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ Hypoxic <martini_a@outlook.com>
IENBA <Wardrobe Sounds - CreativeCommons Zero 1.0 Universal>
JasperRab <jasper@jasperrab.eu>
JDT
JetfireBlack <jetfire97@hotmail.be>
john681611 <john681611@hotmail.com>
JoramD
Joe DeShon <Refueling Sound - CreativeCommons Attributions 4.0>
Expand Down
2 changes: 2 additions & 0 deletions addons/wardrobe/ACE_Wardrobe_BaseClasses.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ class GVAR(base) {
// Subclasses can contain optional directional properties, see documentation for details.
class modifiableTo { };

class modifiableToSpecial { };

// Components the current variant contains within itself
components[] = { };

Expand Down
6 changes: 6 additions & 0 deletions addons/wardrobe/ACE_Wardrobe_Facewear.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,3 +179,9 @@ class G_WirelessEarpiece_F: EGVAR(wardrobe,base) {
};
components[] = { "G_WirelessEarpiece_F" };
};

// Contact DLC CBRN Masks
RESPIRATOR_PAIR(G_AirPurifyingRespirator_01_F,G_AirPurifyingRespirator_01_nofilter_F);
RESPIRATOR_PAIR(G_AirPurifyingRespirator_02_black_F,G_AirPurifyingRespirator_02_black_nofilter_F);
RESPIRATOR_PAIR(G_AirPurifyingRespirator_02_olive_F,G_AirPurifyingRespirator_02_olive_nofilter_F);
RESPIRATOR_PAIR(G_AirPurifyingRespirator_02_sand_F,G_AirPurifyingRespirator_02_sand_nofilter_F);
17 changes: 17 additions & 0 deletions addons/wardrobe/script_macros_wardrobe.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,3 +397,20 @@ class FaceMaskGoggles2: ACEWARDROBE(base) {\
};\
components[] = {QUOTE(FaceMaskBase),QUOTE(Goggles2)};\
}

// Contact DLC Respirators - Remove/Add Filter
#define RESPIRATOR_PAIR(RespiratorWithFilter,RespiratorWithoutFilter)\
class RespiratorWithFilter: ACEWARDROBE(base) {\
class modifiableTo {\
class RespiratorWithoutFilter {\
displayName = ACEWARDROBE_CSTRING(filterRemove);\
};\
};\
};\
class RespiratorWithoutFilter: ACEWARDROBE(base) {\
class modifiableTo {\
class RespiratorWithFilter {\
displayName = ACEWARDROBE_CSTRING(filterAdd);\
};\
};\
}
8 changes: 8 additions & 0 deletions addons/wardrobe/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,14 @@
<Russian>Растегнуть куртку</Russian>
<Japanese>ジャケットを開く</Japanese>
</Key>
<Key ID="STR_ACE_Wardrobe_filterRemove">
<English>Remove Filter</English>
<German>Atemschutzfilter entfernen</German>
</Key>
<Key ID="STR_ACE_Wardrobe_filterAdd">
<English>Add Filter</English>
<German>Atemschutzfilter anbringen</German>
</Key>
<Key ID="STR_ACE_Wardrobe_maskOff">
<English>Take mask off</English>
<French>Enlevez votre masque</French>
Expand Down
Loading