diff --git a/addons/units/UI/uniform_combat_ls_auscam_khk_ca.paa b/addons/units/UI/uniform_combat_ls_auscam_khk_ca.paa new file mode 100644 index 0000000..7e38c7d Binary files /dev/null and b/addons/units/UI/uniform_combat_ls_auscam_khk_ca.paa differ diff --git a/addons/units/config.cpp b/addons/units/config.cpp index b9f2bbf..a00e50f 100644 --- a/addons/units/config.cpp +++ b/addons/units/config.cpp @@ -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), @@ -40,6 +41,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), @@ -184,6 +186,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), @@ -208,6 +211,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), diff --git a/addons/units/data/uniform_combat_auscam_co.paa b/addons/units/data/uniform_combat_auscam_co.paa index 3f90fb8..e0fde07 100644 Binary files a/addons/units/data/uniform_combat_auscam_co.paa and b/addons/units/data/uniform_combat_auscam_co.paa differ diff --git a/addons/units/data/uniform_combat_auscam_khk_co.paa b/addons/units/data/uniform_combat_auscam_khk_co.paa new file mode 100644 index 0000000..0d12179 Binary files /dev/null and b/addons/units/data/uniform_combat_auscam_khk_co.paa differ diff --git a/addons/units/items/combat_long_auscam_helpers.hpp b/addons/units/items/combat_long_auscam_helpers.hpp index a1b8db7..0fe24d2 100644 --- a/addons/units/items/combat_long_auscam_helpers.hpp +++ b/addons/units/items/combat_long_auscam_helpers.hpp @@ -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)}; +}; diff --git a/addons/units/items/combat_long_auscam_item.hpp b/addons/units/items/combat_long_auscam_item.hpp index d192e4a..035c860 100644 --- a/addons/units/items/combat_long_auscam_item.hpp +++ b/addons/units/items/combat_long_auscam_item.hpp @@ -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"; +}; diff --git a/addons/units/items/combat_rolled_auscam_helpers.hpp b/addons/units/items/combat_rolled_auscam_helpers.hpp index 692b2d4..2c604cf 100644 --- a/addons/units/items/combat_rolled_auscam_helpers.hpp +++ b/addons/units/items/combat_rolled_auscam_helpers.hpp @@ -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)}; +}; diff --git a/addons/units/items/combat_rolled_auscam_item.hpp b/addons/units/items/combat_rolled_auscam_item.hpp index 11a5411..cc87e61 100644 --- a/addons/units/items/combat_rolled_auscam_item.hpp +++ b/addons/units/items/combat_rolled_auscam_item.hpp @@ -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"; +}; diff --git a/addons/units/stringtable.xml b/addons/units/stringtable.xml index c24061d..327093b 100644 --- a/addons/units/stringtable.xml +++ b/addons/units/stringtable.xml @@ -22,6 +22,9 @@ Combat Uniform Long (AUSCAM) + + Combat Uniform Long (AUSCAM, Khaki) + Combat Uniform Long (Black, Black, Black) Kampfuniform, lang (Schwarz, Schwarz, Schwarz) @@ -170,6 +173,9 @@ Combat Uniform Rolled (AUSCAM) + + Combat Uniform Rolled (AUSCAM, Khaki) + Combat Uniform Rolled (Black, Black, Black) Kampfuniform, kurz (Schwarz, Schwarz, Schwarz) diff --git a/addons/units/uniforms/combat_long_auscam.hpp b/addons/units/uniforms/combat_long_auscam.hpp index 99a4b0c..339f92e 100644 --- a/addons/units/uniforms/combat_long_auscam.hpp +++ b/addons/units/uniforms/combat_long_auscam.hpp @@ -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); + }; +}; diff --git a/addons/units/uniforms/combat_rolled_auscam.hpp b/addons/units/uniforms/combat_rolled_auscam.hpp index b9fbe2f..babe681 100644 --- a/addons/units/uniforms/combat_rolled_auscam.hpp +++ b/addons/units/uniforms/combat_rolled_auscam.hpp @@ -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); + }; +};