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.

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

Units - Add AUSCAM Khaki #235

Merged
merged 3 commits into from
Sep 22, 2024
Merged

Units - Add AUSCAM Khaki #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fed0b3
Units - Update AUSCAM texture
Mike-MF Sep 15, 2024
4657b33
Auscam Khaki
Mike-MF Sep 20, 2024
b35f9db
UI image
Mike-MF Sep 21, 2024
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
Binary file added addons/units/UI/uniform_combat_ls_auscam_khk_ca.paa
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions addons/units/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class CfgPatches {
QCLASS(Item_Uniform_Combat_LS_ATACS_IX),
QCLASS(Item_Uniform_Combat_LS_ATACS_LEX),
QCLASS(Item_Uniform_Combat_LS_AUSCAM),
QCLASS(Item_Uniform_Combat_LS_AUSCAM_Khk),
QCLASS(Item_Uniform_Combat_LS_BS_BP_BB),
QCLASS(Item_Uniform_Combat_LS_BS_DGP_BB),
QCLASS(Item_Uniform_Combat_LS_BS_GP_BB),
Expand Down Expand Up @@ -39,6 +40,7 @@ class CfgPatches {
QCLASS(Item_Uniform_Combat_RS_ATACS_IX),
QCLASS(Item_Uniform_Combat_RS_ATACS_LEX),
QCLASS(Item_Uniform_Combat_RS_AUSCAM),
QCLASS(Item_Uniform_Combat_RS_AUSCAM_Khk),
QCLASS(Item_Uniform_Combat_RS_BS_BP_BB),
QCLASS(Item_Uniform_Combat_RS_BS_DGP_BB),
QCLASS(Item_Uniform_Combat_RS_BS_GP_BB),
Expand Down Expand Up @@ -182,6 +184,7 @@ class CfgPatches {
QCLASS(Uniform_Combat_LS_ATACS_IX),
QCLASS(Uniform_Combat_LS_ATACS_LEX),
QCLASS(Uniform_Combat_LS_AUSCAM),
QCLASS(Uniform_Combat_LS_AUSCAM_Khk),
QCLASS(Uniform_Combat_LS_BS_BP_BB),
QCLASS(Uniform_Combat_LS_BS_DGP_BB),
QCLASS(Uniform_Combat_LS_BS_GP_BB),
Expand All @@ -205,6 +208,7 @@ class CfgPatches {
QCLASS(Uniform_Combat_RS_ATACS_IX),
QCLASS(Uniform_Combat_RS_ATACS_LEX),
QCLASS(Uniform_Combat_RS_AUSCAM),
QCLASS(Uniform_Combat_RS_AUSCAM_Khk),
QCLASS(Uniform_Combat_RS_BS_BP_BB),
QCLASS(Uniform_Combat_RS_BS_DGP_BB),
QCLASS(Uniform_Combat_RS_BS_GP_BB),
Expand Down
Binary file modified addons/units/data/uniform_combat_auscam_co.paa
View file
Open in desktop
Binary file not shown.
Binary file added addons/units/data/uniform_combat_auscam_khk_co.paa
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions addons/units/items/combat_long_auscam_helpers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@ class CLASS(Unit_Combat_LS_AUSCAM): CLASS(Unit_Combat_LS_ATACS_Base) {
uniformClass = QCLASS(Uniform_Combat_LS_AUSCAM);
hiddenSelectionsTextures[] = {QPATHTOF(data\uniform_combat_auscam_co.paa)};
};
class CLASS(Unit_Combat_LS_AUSCAM_Khk): CLASS(Unit_Combat_LS_ATACS_Base) {
scope = 1;
author = "GilleeDoo, Mike";
uniformClass = QCLASS(Uniform_Combat_LS_AUSCAM_Khk);
hiddenSelectionsTextures[] = {QPATHTOF(data\uniform_combat_auscam_khk_co.paa)};
};
4 changes: 4 additions & 0 deletions addons/units/items/combat_long_auscam_item.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@ class CLASS(Item_Uniform_Combat_LS_AUSCAM): Item_Base_F {
MACRO_ITEM_COMMON(Uniform_Combat_LS_AUSCAM);
author = "GilleeDoo, Mike";
};
class CLASS(Item_Uniform_Combat_LS_AUSCAM_Khk): Item_Base_F {
MACRO_ITEM_COMMON(Uniform_Combat_LS_AUSCAM_Khk);
author = "GilleeDoo, Mike";
};
6 changes: 6 additions & 0 deletions addons/units/items/combat_rolled_auscam_helpers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@ class CLASS(Unit_Combat_RS_AUSCAM): CLASS(Unit_Combat_RS_ATACS_Base) {
uniformClass = QCLASS(Uniform_Combat_RS_AUSCAM);
hiddenSelectionsTextures[] = {QPATHTOF(data\uniform_combat_auscam_co.paa)};
};
class CLASS(Unit_Combat_RS_AUSCAM_Khk): CLASS(Unit_Combat_RS_ATACS_Base) {
scope = 1;
author = "GilleeDoo, Mike";
uniformClass = QCLASS(Uniform_Combat_RS_AUSCAM_Khk);
hiddenSelectionsTextures[] = {QPATHTOF(data\uniform_combat_auscam_khk_co.paa)};
};
4 changes: 4 additions & 0 deletions addons/units/items/combat_rolled_auscam_item.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@ class CLASS(Item_Uniform_Combat_RS_AUSCAM): Item_Base_F {
MACRO_ITEM_COMMON(Uniform_Combat_RS_AUSCAM);
author = "GilleeDoo, Mike";
};
class CLASS(Item_Uniform_Combat_RS_AUSCAM_Khk): Item_Base_F {
MACRO_ITEM_COMMON(Uniform_Combat_RS_AUSCAM_Khk);
author = "GilleeDoo, Mike";
};
6 changes: 6 additions & 0 deletions addons/units/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
<Key ID="STR_TACS_Units_Uniform_Combat_LS_AUSCAM">
<English>Combat Uniform Long (AUSCAM)</English>
</Key>
<Key ID="STR_TACS_Units_Uniform_Combat_LS_AUSCAM_Khk">
<English>Combat Uniform Long (AUSCAM, Khaki)</English>
</Key>
<Key ID="STR_TACS_Units_Uniform_Combat_LS_BS_BP_BB">
<English>Combat Uniform Long (Black, Black, Black)</English>
<German>Kampfuniform, lang (Schwarz, Schwarz, Schwarz)</German>
Expand Down Expand Up @@ -165,6 +168,9 @@
<Key ID="STR_TACS_Units_Uniform_Combat_RS_AUSCAM">
<English>Combat Uniform Rolled (AUSCAM)</English>
</Key>
<Key ID="STR_TACS_Units_Uniform_Combat_RS_AUSCAM_Khk">
<English>Combat Uniform Rolled (AUSCAM, Khaki)</English>
</Key>
<Key ID="STR_TACS_Units_Uniform_Combat_RS_BS_BP_BB">
<English>Combat Uniform Rolled (Black, Black, Black)</English>
<German>Kampfuniform, kurz (Schwarz, Schwarz, Schwarz)</German>
Expand Down
10 changes: 10 additions & 0 deletions addons/units/uniforms/combat_long_auscam.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,13 @@ class CLASS(Uniform_Combat_LS_AUSCAM): CLASS(Uniform_Base) {
uniformClass = QCLASS(Unit_Combat_LS_AUSCAM);
};
};
class CLASS(Uniform_Combat_LS_AUSCAM_Khk): CLASS(Uniform_Base) {
scope = 2;
author = "GilleeDoo, Mike";
displayName = CSTRING(Uniform_Combat_LS_AUSCAM_Khk);
picture = QPATHTOF(UI\uniform_combat_ls_auscam_khk_ca.paa);

class ItemInfo: ItemInfo {
uniformClass = QCLASS(Unit_Combat_LS_AUSCAM_Khk);
};
};
10 changes: 10 additions & 0 deletions addons/units/uniforms/combat_rolled_auscam.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,13 @@ class CLASS(Uniform_Combat_RS_AUSCAM): CLASS(Uniform_Base) {
uniformClass = QCLASS(Unit_Combat_RS_AUSCAM);
};
};
class CLASS(Uniform_Combat_RS_AUSCAM_Khk): CLASS(Uniform_Base) {
scope = 2;
author = "GilleeDoo, Mike";
displayName = CSTRING(Uniform_Combat_RS_AUSCAM_Khk);
//picture = QPATHTOF(UI\uniform_combat_ls_auscam_khk_ca.paa);

class ItemInfo: ItemInfo {
uniformClass = QCLASS(Unit_Combat_RS_AUSCAM_Khk);
};
};