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

Wardrobe - New Addon - System to modify wearables #10606

Open
wants to merge 126 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 68 commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
ba089d4
init
OverlordZorn Dec 27, 2024
9c35545
compat integration
OverlordZorn Dec 27, 2024
4e3f2eb
Update config.cpp
OverlordZorn Dec 27, 2024
69d7810
Update config.cpp
OverlordZorn Dec 27, 2024
8c13b82
small fixes: Macro's and typo's
OverlordZorn Dec 27, 2024
cd57445
Create readme.md
OverlordZorn Dec 27, 2024
a096f91
fix compat macros
OverlordZorn Dec 28, 2024
90d775c
fix: ignore inherited subclasses
OverlordZorn Dec 28, 2024
f4b7180
reorganised
OverlordZorn Dec 28, 2024
c5bcc11
debug fnc
OverlordZorn Dec 28, 2024
e6ddc21
refactor of sound effects
OverlordZorn Dec 28, 2024
cb191af
purge tab
OverlordZorn Dec 28, 2024
fea7488
temp test mission
OverlordZorn Dec 28, 2024
653a205
Update Turbans.hpp
OverlordZorn Dec 28, 2024
3b7e08a
check for component implemented
OverlordZorn Dec 29, 2024
d8d0390
components fully supported
OverlordZorn Dec 29, 2024
2cdbd7b
wip contextmenu
OverlordZorn Dec 29, 2024
a4456cd
fix sound
OverlordZorn Dec 30, 2024
969051d
added sounds
OverlordZorn Dec 30, 2024
69fe0dd
Update addons/wardrobe/XEH/XEH_preInit.sqf
OverlordZorn Dec 30, 2024
ad8aa11
Update addons/compat_sog/compat_sog_wardrobe_uniform_fix/readme.md
OverlordZorn Dec 30, 2024
86d39b3
Update mission.sqm
OverlordZorn Dec 30, 2024
fc63919
macro conflict
OverlordZorn Dec 30, 2024
551fe63
fine-tuning helmet sound
OverlordZorn Dec 30, 2024
db2f605
wip
OverlordZorn Dec 31, 2024
fa21d31
Update CfgFunctions.hpp
OverlordZorn Jan 1, 2025
62afe5a
wip contextMenu
OverlordZorn Jan 1, 2025
5744936
added icon
OverlordZorn Jan 1, 2025
c3f31c2
Merge remote-tracking branch 'upstream/master' into ace-wardrobe
OverlordZorn Jan 2, 2025
9181352
polish
OverlordZorn Jan 2, 2025
ad9c632
compat facewear
OverlordZorn Jan 2, 2025
f8bd529
compat balaclava black
OverlordZorn Jan 2, 2025
177d48e
Update addons/compat_sog/compat_sog_wardrobe_uniform_fix/readme.md
OverlordZorn Jan 2, 2025
b0e91ad
renamed hemtt Launch preset to Wardrobe
OverlordZorn Jan 2, 2025
f423dbd
Merge branch 'ace-wardrobe' of https://github.com/OverlordZorn/ACE3 i…
OverlordZorn Jan 2, 2025
e2235f7
Update mission.sqm
OverlordZorn Jan 2, 2025
8cacab0
Refactored Components
OverlordZorn Jan 2, 2025
8a53f84
fix for cfgGlasses not having ItemInfo
OverlordZorn Jan 2, 2025
bbc33ac
Update Facewear.hpp
OverlordZorn Jan 2, 2025
13b3342
missed )
OverlordZorn Jan 2, 2025
b5c95e4
forgor "class"
OverlordZorn Jan 2, 2025
7b49f75
zrn macro cleanup
OverlordZorn Jan 3, 2025
3fea934
Update addons/compat_gm/compat_gm_wardrobe/config.cpp
OverlordZorn Jan 3, 2025
39f50cd
Update addons/compat_sog/compat_sog_wardrobe/config.cpp
OverlordZorn Jan 3, 2025
1ba5bd6
Update addons/compat_sog/compat_sog_wardrobe_uniform_fix/config.cpp
OverlordZorn Jan 3, 2025
5cd501f
Update addons/compat_ws/compat_ws_wardrobe/config.cpp
OverlordZorn Jan 3, 2025
45c3471
pvar -> ace_
OverlordZorn Jan 3, 2025
c4a98d9
-> QPATHTOF
OverlordZorn Jan 3, 2025
65da8c0
Merge branch 'ace-wardrobe' of https://github.com/OverlordZorn/ACE3 i…
OverlordZorn Jan 3, 2025
61eae5d
-> root + rename
OverlordZorn Jan 3, 2025
fe85915
comment cleanup
OverlordZorn Jan 3, 2025
4f9482b
comment cleanup
OverlordZorn Jan 3, 2025
a62e45a
wardrobe/config
OverlordZorn Jan 3, 2025
45e3ff0
sog/config
OverlordZorn Jan 3, 2025
dfb35a7
Delete notes.md
OverlordZorn Jan 3, 2025
344df47
Delete notes.md
OverlordZorn Jan 3, 2025
8db68fe
Update script_component.hpp
OverlordZorn Jan 3, 2025
4368ea4
ws\config
OverlordZorn Jan 3, 2025
5e4f12d
cleanup
OverlordZorn Jan 3, 2025
3b13160
gm/config
OverlordZorn Jan 3, 2025
f1063f4
fix path
OverlordZorn Jan 3, 2025
3861365
fixed error_2
OverlordZorn Jan 3, 2025
97b7c37
fixed config
OverlordZorn Jan 3, 2025
5d2bed4
config fix ` :`
OverlordZorn Jan 3, 2025
65a8bb1
tab -> spaces
OverlordZorn Jan 3, 2025
8637bb3
fix formatting
OverlordZorn Jan 3, 2025
e5c0dc1
formatting
OverlordZorn Jan 3, 2025
fd1a4b0
fix ID attribute
OverlordZorn Jan 3, 2025
e15e8e8
Q( -> QUOTE(
OverlordZorn Jan 3, 2025
3d8aa26
pruned SUBCOMPONENT_BEAUTIFIED
OverlordZorn Jan 3, 2025
8506f65
also adapt mass to 70
OverlordZorn Jan 3, 2025
401cd95
compat_vanilla -> root
OverlordZorn Jan 3, 2025
7d65631
-> PREP 💩
OverlordZorn Jan 3, 2025
a632d1d
"../../" -> "../"
OverlordZorn Jan 3, 2025
37c3fff
1 New Line at EOF
OverlordZorn Jan 3, 2025
70b17bb
fnc headers and minor polish here and there
OverlordZorn Jan 4, 2025
93f785d
disabled - to be deleted later
OverlordZorn Jan 4, 2025
978e5cf
WIP - Documentation
OverlordZorn Jan 4, 2025
4c2dad8
postInit -> XEH
OverlordZorn Jan 4, 2025
58cfa25
none -> None
OverlordZorn Jan 4, 2025
835aec0
Update addons/wardrobe/stringtable.xml
OverlordZorn Jan 4, 2025
cc3757c
Update addons/wardrobe/stringtable.xml
OverlordZorn Jan 4, 2025
b9b90a8
Drop Unneeded Description
OverlordZorn Jan 4, 2025
4aea498
ACE_SpareBarrel - needs testing
OverlordZorn Jan 4, 2025
e7781b2
Apply suggestions from code review
OverlordZorn Jan 4, 2025
4b47a02
cleanup
OverlordZorn Jan 4, 2025
769d746
fix
OverlordZorn Jan 5, 2025
972d9b9
Compat for ace_spareBarrel
OverlordZorn Jan 5, 2025
9a7f879
Update launch.toml
OverlordZorn Jan 5, 2025
82bb067
remove fnc_say3d.sqf
OverlordZorn Jan 5, 2025
e7e7f41
remove unused variables
OverlordZorn Jan 5, 2025
848a00d
refactor: goggles as components
OverlordZorn Jan 6, 2025
5ae5b57
remove whitespace
OverlordZorn Jan 6, 2025
d8900d6
more compats
OverlordZorn Jan 6, 2025
288a9e8
getMagIDs -> CBA fnc.
OverlordZorn Jan 6, 2025
9a128e4
added ace intel item
OverlordZorn Jan 6, 2025
d4f9e2f
condense replace functions
OverlordZorn Jan 6, 2025
8b42f50
remove func(cache_db)
OverlordZorn Jan 6, 2025
178e3be
unused function
OverlordZorn Jan 6, 2025
5bb2eb7
macrofied
OverlordZorn Jan 6, 2025
95bd7bc
fix inheritance
OverlordZorn Jan 6, 2025
b29b601
cleanup
OverlordZorn Jan 6, 2025
5518334
cleanup
OverlordZorn Jan 6, 2025
e3b1aa0
remove fnc_db_clear
OverlordZorn Jan 6, 2025
42e97af
reduce fnc clear cache
OverlordZorn Jan 6, 2025
62553d9
ws compats - helmets
OverlordZorn Jan 6, 2025
cfce465
# in macro -> select
OverlordZorn Jan 6, 2025
8911990
missing "class"
OverlordZorn Jan 6, 2025
3a22a5c
Finetuning
OverlordZorn Jan 6, 2025
fc2858d
added zeus module
OverlordZorn Jan 6, 2025
f260f79
moar GM Compats
OverlordZorn Jan 6, 2025
39cca80
ln sort
OverlordZorn Jan 6, 2025
68e0d51
fix mask turban mass config
OverlordZorn Jan 6, 2025
ae85d15
fix base inheritances
OverlordZorn Jan 6, 2025
0abd442
fix validation errors config
OverlordZorn Jan 6, 2025
a8a6526
Update mission.sqm
OverlordZorn Jan 6, 2025
8f11e7b
Update launch.toml
OverlordZorn Jan 6, 2025
883e21c
fixes
OverlordZorn Jan 7, 2025
eab28a7
Update wardrobe-framework.md
OverlordZorn Jan 7, 2025
afbb63e
revision docs
OverlordZorn Jan 7, 2025
ea82508
Update addons/compat_rf/compat_rf_wardrobe/config.cpp
OverlordZorn Jan 8, 2025
16a5edf
common structure
OverlordZorn Jan 8, 2025
0b88f00
restructure .hpp's
OverlordZorn Jan 8, 2025
152d583
fix macro's (;) and linebreaks.
OverlordZorn Jan 8, 2025
4310f97
EOF new line
OverlordZorn Jan 8, 2025
15227e8
macro;
OverlordZorn Jan 8, 2025
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
13 changes: 13 additions & 0 deletions .hemtt/launch.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,16 @@ workshop = [
"843593391", # RHS GREF Workshop ID
"843632231", # RHS SAF Workshop ID
]

[Wardrobe]
extends = "default"
workshop = [
"2369477168", # Advanced Developer Tools
"1779063631", # ZEN
# "623475643", # eden enhanced
]
mission = "Wardrobe.VR"
dlc = [
"Reaction Forces",
"Western Sahara"
]
268 changes: 268 additions & 0 deletions .hemtt/missions/Wardrobe.VR/mission.sqm
Original file line number Diff line number Diff line change
@@ -0,0 +1,268 @@
version=54;
class EditorData
{
moveGridStep=2;
angleGridStep=0.2617994;
scaleGridStep=1;
autoGroupingDist=10;
toggles=517;
class ItemIDProvider
{
nextID=203;
};
class Camera
{
pos[]={6.6224675,9.7580004,-22.782627};
dir[]={0.80753577,-0.42340663,0.4107419};
up[]={0.3774308,0.90591747,0.19197531};
aside[]={0.45338005,3.1408854e-07,-0.89136314};
};
};
binarizationWanted=0;
sourceName="wardrobe";
addons[]=
{
"A3_Weapons_F",
"ace_realisticnames",
"ace_ballistics",
"A3_Characters_F",
"A3_Soft_F_Exp_Offroad_02",
"A3_Weapons_F_Ammoboxes"
};
class AddonsMetaData
{
class List
{
items=4;
class Item0
{
className="A3_Weapons_F";
name="Arma 3 Alpha - Weapons and Accessories";
author="Bohemia Interactive";
url="https://www.arma3.com";
};
class Item1
{
className="A3_Characters_F";
name="Arma 3 Alpha - Characters and Clothing";
author="Bohemia Interactive";
url="https://www.arma3.com";
};
class Item2
{
className="ace_ballistics";
name="ACE3 - Ballistics";
author="ACE-Team";
url="https://ace3.acemod.org/";
};
class Item3
{
className="A3_Soft_F_Exp";
name="Arma 3 Apex - Unarmored Land Vehicles";
author="Bohemia Interactive";
url="https://www.arma3.com";
};
};
};
dlcs[]=
{
"Expansion"
};
randomSeed=4540948;
class ScenarioData
{
author="Overlord Zorn";
};
class Mission
{
class Intel
{
timeOfChanges=1800.0002;
startWeather=0;
startWind=0.1;
startWaves=0.1;
forecastWeather=0;
forecastWind=0.1;
forecastWaves=0.1;
forecastLightnings=0.1;
wavesForced=1;
windForced=1;
year=2035;
day=28;
hour=13;
minute=37;
startFogDecay=0.014;
forecastFogDecay=0.014;
};
class Entities
{
items=5;
class Item0
{
dataType="Object";
class PositionInfo
{
position[]={16,5,-12};
};
side="Empty";
flags=4;
class Attributes
{
};
id=196;
type="Weapon_hgun_Pistol_heavy_01_F";
};
class Item1
{
dataType="Object";
class PositionInfo
{
position[]={17.833,5.2840548,-13.012};
};
side="Empty";
flags=4;
class Attributes
{
init="[this, flatten ([] call ACE_WARDROBE_fnc_getAllWardrobeItems)] call ace_arsenal_fnc_initBox;";
};
id=197;
type="ACE_Box_Ammo";
class CustomAttributes
{
class Attribute0
{
property="ace_arsenal_attribute";
expression="if (!is3DEN) then {[_this, +_value] call ace_arsenal_fnc_attributeInit}";
class Value
{
class data
{
singleType="ARRAY";
class value
{
items=2;
class Item0
{
class data
{
singleType="ARRAY";
};
};
class Item1
{
class data
{
singleType="SCALAR";
value=0;
};
};
};
};
};
};
class Attribute1
{
property="ammoBox";
expression="[_this,_value] call bis_fnc_initAmmoBox;";
class Value
{
class data
{
singleType="STRING";
value="[[[[""hgun_Pistol_heavy_01_green_snds_F""],[1]],[[""11Rnd_45ACP_Mag""],[2]],[[],[]],[[],[]]],false]";
};
};
};
nAttributes=2;
};
};
class Item2
{
dataType="Group";
side="Civilian";
class Entities
{
items=1;
class Item0
{
dataType="Object";
class PositionInfo
{
position[]={15.877691,5.0014391,-20.87595};
};
side="Civilian";
flags=7;
class Attributes
{
isPlayer=1;
class Inventory
{
class uniform
{
typeName="gm_ge_uniform_soldier_rolled_90_flk";
isBackpack=0;
};
map="ItemMap";
compass="ItemCompass";
watch="ItemWatch";
};
};
id=199;
type="C_man_polo_1_F";
};
};
class Attributes
{
};
id=198;
};
class Item3
{
dataType="Object";
class PositionInfo
{
position[]={5,6.5695963,-27.110023};
};
side="Empty";
flags=4;
class Attributes
{
};
id=200;
type="C_Offroad_02_unarmed_F";
class CustomAttributes
{
class Attribute0
{
property="ammoBox";
expression="[_this,_value] call bis_fnc_initAmmoBox;";
class Value
{
class data
{
singleType="STRING";
value="[[[[""FirstAidKit""],[6]],[[],[]],[[],[]],[[],[]]],false]";
};
};
};
nAttributes=1;
};
};
class Item4
{
dataType="Object";
class PositionInfo
{
position[]={18.822828,5,-13.759856};
angles[]={0,1.0776811,0};
};
side="Empty";
flags=4;
class Attributes
{
};
id=202;
type="B_AssaultPack_blk";
};
};
};
17 changes: 17 additions & 0 deletions addons/compat_gm/compat_gm_wardrobe/CfgWardrobe.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Import Base Classes
class EGVAR(wardrobe,base);

class EGVAR(wardrobe,base_H_visor_up);
class EGVAR(wardrobe,base_H_visor_down);

class EGVAR(wardrobe,base_U_sleeves_up);
class EGVAR(wardrobe,base_U_sleeves_down);

class EGVAR(wardrobe,base_U_gloves_on);
class EGVAR(wardrobe,base_U_gloves_off);

class CfgWeapons {
#include "Helmets.hpp"
#include "Uniforms.hpp"
};

38 changes: 38 additions & 0 deletions addons/compat_gm/compat_gm_wardrobe/Helmets.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// CfgWeapons

// Base Classes
class gm_ge_headgear_psh77_cover_down_base;
class gm_ge_headgear_psh77_cover_up_base;
class gm_ge_headgear_psh77_down_base;
class gm_ge_headgear_psh77_up_base;

class gm_ge_bgs_headgear_psh77_cover_down_smp: gm_ge_headgear_psh77_cover_down_base {
class ace_wardrobe: EGVAR(wardrobe,base_H_visor_down) {
modifiableTo[] = { "gm_ge_bgs_headgear_psh77_cover_up_smp" };
};
};
class gm_ge_bgs_headgear_psh77_cover_up_smp: gm_ge_headgear_psh77_cover_up_base {
class ace_wardrobe: EGVAR(wardrobe,base_H_visor_up) {
modifiableTo[] = { "gm_ge_bgs_headgear_psh77_cover_down_smp" };
};
};
class gm_ge_bgs_headgear_psh77_cover_down_str: gm_ge_headgear_psh77_cover_down_base {
class ace_wardrobe: EGVAR(wardrobe,base_H_visor_down) {
modifiableTo[] = { "gm_ge_bgs_headgear_psh77_cover_up_str" };
};
};
class gm_ge_bgs_headgear_psh77_cover_up_str: gm_ge_headgear_psh77_cover_up_base {
class ace_wardrobe: EGVAR(wardrobe,base_H_visor_up) {
modifiableTo[] = { "gm_ge_bgs_headgear_psh77_cover_down_str" };
};
};
class gm_ge_headgear_psh77_down_oli: gm_ge_headgear_psh77_down_base {
class ace_wardrobe: EGVAR(wardrobe,base_H_visor_down) {
modifiableTo[] = { "gm_ge_headgear_psh77_up_oli" };
};
};
class gm_ge_headgear_psh77_up_oli: gm_ge_headgear_psh77_up_base {
class ace_wardrobe: EGVAR(wardrobe,base_H_visor_up) {
modifiableTo[] = { "gm_ge_headgear_psh77_down_oli" };
};
};
Loading
Loading