Skip to content

General - Add directional names #99

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

Open
Andx667 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

General - Add directional names #99

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
4020eb4
wip
Andx667 Jan 8, 2026
863ef67
fix macro and sort
Andx667 Jan 8, 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
120 changes: 89 additions & 31 deletions addons/main/script_macros_wardrobe.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,12 @@ BASIC3(variant1,variant2,variant3,ACEWARDROBE(base),ACEWARDROBE(base),ACEWARDROB
#define UNIFORM_GLOVES_ROLLED(UniformBase,UniformGloves,UniformRolled,UniformGlovesRolled)\
class UniformBase: ace_wardrobe_base {\
class modifiableTo {\
class UniformGloves {};\
class UniformRolled {};\
class UniformGloves {\
directionalActionName = ECSTRING(main,PutGlovesOn);\
};\
class UniformRolled {\
directionalActionName = ECSTRING(main,RollSleevesUp);\
};\
};\
};\
class UniformGloves: ace_wardrobe_base_U_gloves_on {\
Expand All @@ -45,17 +49,25 @@ class UniformRolled: ace_wardrobe_base_U_sleeves_up {\
};\
class UniformGlovesRolled: ace_wardrobe_base {\
class modifiableTo {\
class UniformGloves {};\
class UniformRolled {};\
class UniformGloves {\
directionalActionName = ECSTRING(main,RollSleevesDown);\
};\
class UniformRolled {\
directionalActionName = ECSTRING(main,TakeGlovesOff);\
};\
};\
}

//Uniform with Gloves as Component, and Sleeves Rolled up and Combined
#define UNIFORM_GLOVES_ROLLED_COMPONENT(UniformBase,UniformGloves,UniformRolled,UniformGlovesRolled,Gloves)\
class UniformBase: ace_wardrobe_base {\
class modifiableTo {\
class UniformGloves {};\
class UniformRolled {};\
class UniformGloves {\
directionalActionName = ECSTRING(main,PutGlovesOn);\
};\
class UniformRolled {\
directionalActionName = ECSTRING(main,RollSleevesUp);\
};\
};\
};\
class UniformGloves: ace_wardrobe_base_U_gloves_on {\
Expand All @@ -73,8 +85,12 @@ class UniformRolled: ace_wardrobe_base_U_sleeves_up {\
};\
class UniformGlovesRolled: ace_wardrobe_base {\
class modifiableTo {\
class UniformGloves {};\
class UniformRolled {};\
class UniformGloves {\
directionalActionName = ECSTRING(main,RollSleevesDown);\
};\
class UniformRolled {\
directionalActionName = ECSTRING(main,TakeGlovesOff);\
};\
};\
components[] = {QUOTE(Gloves)};\
}
Expand All @@ -98,8 +114,12 @@ class UniformGloves: ace_wardrobe_base_U_gloves_on {\
#define UNIFORM_GLOVES_ROLLED2(UniformBase,UniformGloves,UniformRolled)\
class UniformBase: ace_wardrobe_base {\
class modifiableTo {\
class UniformGloves {};\
class UniformRolled {};\
class UniformGloves {\
directionalActionName = ECSTRING(main,PutGlovesOn);\
};\
class UniformRolled {\
directionalActionName = ECSTRING(main,RollSleevesUp);\
};\
};\
};\
class UniformGloves: ace_wardrobe_base_U_gloves_on {\
Expand Down Expand Up @@ -146,12 +166,16 @@ class HelmetCoverBack: ace_wardrobe_base_H_goggles_on {\
#define BOONIE_ROLLED(Boonie,BoonieRolled)\
class Boonie: ace_wardrobe_base {\
class modifiableTo {\
class BoonieRolled {};\
class BoonieRolled {\
directionalActionName = ECSTRING(main,RollUpSides);\
};\
};\
};\
class BoonieRolled: ace_wardrobe_base {\
class modifiableTo {\
class Boonie {};\
class Boonie {\
directionalActionName = ECSTRING(main,RollDownSides);\
};\
};\
}

Expand Down Expand Up @@ -187,27 +211,43 @@ class HelmetGoggles: ace_wardrobe_base_H_goggles_on {\
#define HELMET_2VARIANTS_GOGGLES(HelmetV1,HelmetV2,HelmetV1Goggles,HelmetV2Goggles,Component)\
class HelmetV1: ace_wardrobe_base {\
class modifiableTo {\
class HelmetV2 {};\
class HelmetV1Goggles {};\
class HelmetV2 {\
directionalActionName = ECSTRING(main,SwitchVariant2);\
};\
class HelmetV1Goggles {\
directionalActionName = ECSTRING(main,AttachGoggles);\
};\
};\
};\
class HelmetV2: ace_wardrobe_base {\
class modifiableTo {\
class HelmetV1 {};\
class HelmetV2Goggles {};\
class HelmetV1 {\
directionalActionName = ECSTRING(main,SwitchVariant1);\
};\
class HelmetV2Goggles {\
directionalActionName = ECSTRING(main,AttachGoggles);\
};\
};\
};\
class HelmetV1Goggles: ace_wardrobe_base {\
class modifiableTo {\
class HelmetV2Goggles {};\
class HelmetV1 {};\
class HelmetV2Goggles {\
directionalActionName = ECSTRING(main,SwitchVariant2);\
};\
class HelmetV1 {\
directionalActionName = ECSTRING(main,RemoveGoggles);\
};\
};\
components[] = { QUOTE(Component) };\
};\
class HelmetV2Goggles: ace_wardrobe_base {\
class modifiableTo {\
class HelmetV1Goggles {};\
class HelmetV2 {};\
class HelmetV1Goggles {\
directionalActionName = ECSTRING(main,SwitchVariant1);\
};\
class HelmetV2 {\
directionalActionName = ECSTRING(main,RemoveGoggles);\
};\
};\
components[] = { QUOTE(Component) };\
}
Expand All @@ -218,13 +258,17 @@ class HelmetV2Goggles: ace_wardrobe_base {\
#define FACEMASK_GOGGLES(FaceMaskBase,FaceMaskGoggles,Goggles)\
class FaceMaskBase: ace_wardrobe_base {\
class modifiableTo {\
class FaceMaskGoggles {};\
class FaceMaskGoggles {\
directionalActionName = ECSTRING(main,AttachGoggles);\
};\
};\
components[] = {QUOTE(FaceMaskBase)};\
};\
class FaceMaskGoggles: ace_wardrobe_base {\
class modifiableTo {\
class FaceMaskBase {};\
class FaceMaskBase {\
directionalActionName = ECSTRING(main,RemoveGoggles);\
};\
};\
components[] = {QUOTE(FaceMaskBase),QUOTE(Goggles)};\
}
Expand All @@ -233,20 +277,28 @@ class FaceMaskGoggles: ace_wardrobe_base {\
#define FACEMASK_GOGGLES2(FaceMaskBase,FaceMaskGoggles1,FaceMaskGoggles2,Goggles1,Goggles2)\
class FaceMaskBase: ace_wardrobe_base {\
class modifiableTo {\
class FaceMaskGoggles1 {};\
class FaceMaskGoggles2 {};\
class FaceMaskGoggles1 {\
directionalActionName = ECSTRING(main,AttachGoggles);\
};\
class FaceMaskGoggles2 {\
directionalActionName = ECSTRING(main,AttachGoggles);\
};\
};\
components[] = {QUOTE(FaceMaskBase)};\
};\
class FaceMaskGoggles1: ace_wardrobe_base {\
class modifiableTo {\
class FaceMaskBase {};\
class FaceMaskBase {\
directionalActionName = ECSTRING(main,RemoveGoggles);\
};\
};\
components[] = {QUOTE(FaceMaskBase),QUOTE(Goggles1)};\
};\
class FaceMaskGoggles2: ace_wardrobe_base {\
class modifiableTo {\
class FaceMaskBase {};\
class FaceMaskBase {\
directionalActionName = ECSTRING(main,RemoveGoggles);\
};\
};\
components[] = {QUOTE(FaceMaskBase),QUOTE(Goggles2)};\
}
Expand All @@ -255,13 +307,19 @@ class FaceMaskGoggles2: ace_wardrobe_base {\
#define UNIFORM_SLEEVES2(UniformBase,UniformRolled1,UniformRolled2)\
class UniformBase: ace_wardrobe_base_U_sleeves_down {\
class modifiableTo {\
class UniformRolled1 {};\
class UniformRolled1 {\
directionalActionName = ECSTRING(main,RollSleevesUp);\
};\
};\
};\
class UniformRolled1: ace_wardrobe_base {\
class modifiableTo {\
class UniformBase {};\
class UniformRolled2 {};\
class UniformBase {\
directionalActionName = ECSTRING(main,RollSleevesDown);\
};\
class UniformRolled2 {\
directionalActionName = ECSTRING(main,RollSleevesUpFurther);\
};\
};\
};\
class UniformRolled2: ace_wardrobe_base_U_sleeves_up {\
Expand All @@ -275,14 +333,14 @@ class UniformRolled2: ace_wardrobe_base_U_sleeves_up {\
class HelmetBase: ace_wardrobe_base {\
class modifiableTo {\
class HelmetScrim {\
directionalActionName = "Add Scrim/Foliage to Helmet";\
directionalActionName = ECSTRING(main,AddScrim);\
};\
};\
};\
class HelmetScrim: ace_wardrobe_base {\
class modifiableTo {\
class HelmetBase {\
directionalActionName = "Remove Scrim/Foliage from Helmet";\
directionalActionName = ECSTRING(main,RemoveScrim);\
};\
};\
}
39 changes: 39 additions & 0 deletions addons/main/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<Project name="AWX">
<Package name="Main">
<Key ID="STR_AWX_Main_AddScrim">
<English>Add Scrim/Foliage to Helmet</English>
</Key>
<Key ID="STR_AWX_Main_AttachGoggles">
<English>Attach Goggles</English>
</Key>
<Key ID="STR_AWX_Main_PutGlovesOn">
<English>Put Gloves On</English>
</Key>
<Key ID="STR_AWX_Main_RemoveGoggles">
<English>Remove Goggles</English>
</Key>
<Key ID="STR_AWX_Main_RemoveScrim">
<English>Remove Scrim/Foliage from Helmet</English>
</Key>
<Key ID="STR_AWX_Main_RollDownSides">
<English>Roll Down Sides</English>
</Key>
<Key ID="STR_AWX_Main_RollSleevesDown">
<English>Roll Sleeves Down</English>
</Key>
<Key ID="STR_AWX_Main_RollSleevesUp">
<English>Roll Sleeves Up</English>
</Key>
<Key ID="STR_AWX_Main_RollSleevesUpFurther">
<English>Roll Sleeves Up Further</English>
</Key>
<Key ID="STR_AWX_Main_RollUpSides">
<English>Roll Up Sides</English>
</Key>
<Key ID="STR_AWX_Main_SwitchVariant1">
<English>Switch to Variant 1</English>
</Key>
<Key ID="STR_AWX_Main_SwitchVariant2">
<English>Switch to Variant 2</English>
</Key>
<Key ID="STR_AWX_Main_TakeGlovesOff">
<English>Take Gloves Off</English>
</Key>
<Key ID="STR_AWX_Main_mod_URL">
<English>https://github.com/CVO-Org/ace-wardrobe-extended</English>
</Key>
Expand Down