diff --git a/addons/units/CfgVehicles_SupplyBox.hpp b/addons/units/CfgVehicles_SupplyBox.hpp index f158b93..ed9839c 100644 --- a/addons/units/CfgVehicles_SupplyBox.hpp +++ b/addons/units/CfgVehicles_SupplyBox.hpp @@ -26,6 +26,7 @@ class CLASS(Box_Uniforms): B_supplyCrate_F { MACRO_ADDITEM(CLASS(Uniform_Combat_LS_BS_TP_BB),10); MACRO_ADDITEM(CLASS(Uniform_Combat_LS_BS_TP_TB),10); MACRO_ADDITEM(CLASS(Uniform_Combat_LS_CBPS_BP_BB),10); + MACRO_ADDITEM(CLASS(Uniform_Combat_LS_CDBS_BP_BB),10); MACRO_ADDITEM(CLASS(Uniform_Combat_LS_CDBS_GP_TB),10); MACRO_ADDITEM(CLASS(Uniform_Combat_LS_CDES_TP_TB),10); MACRO_ADDITEM(CLASS(Uniform_Combat_LS_CDFS_GP_TB),10); @@ -53,6 +54,7 @@ class CLASS(Box_Uniforms): B_supplyCrate_F { MACRO_ADDITEM(CLASS(Uniform_Combat_RS_BS_TP_BB),10); MACRO_ADDITEM(CLASS(Uniform_Combat_RS_BS_TP_TB),10); MACRO_ADDITEM(CLASS(Uniform_Combat_RS_CBPS_BP_BB),10); + MACRO_ADDITEM(CLASS(Uniform_Combat_RS_CDBS_BP_BB),10); MACRO_ADDITEM(CLASS(Uniform_Combat_RS_CDBS_GP_TB),10); MACRO_ADDITEM(CLASS(Uniform_Combat_RS_CDES_TP_TB),10); MACRO_ADDITEM(CLASS(Uniform_Combat_RS_CDFS_GP_TB),10); diff --git a/addons/units/UI/uniform_combat_ls_cdbs_bp_ca.paa b/addons/units/UI/uniform_combat_ls_cdbs_bp_ca.paa new file mode 100644 index 0000000..0896424 Binary files /dev/null and b/addons/units/UI/uniform_combat_ls_cdbs_bp_ca.paa differ diff --git a/addons/units/UI/uniform_combat_rs_cdbs_bp_ca.paa b/addons/units/UI/uniform_combat_rs_cdbs_bp_ca.paa new file mode 100644 index 0000000..423eb3e Binary files /dev/null and b/addons/units/UI/uniform_combat_rs_cdbs_bp_ca.paa differ diff --git a/addons/units/config.cpp b/addons/units/config.cpp index 989cae9..b9f2bbf 100644 --- a/addons/units/config.cpp +++ b/addons/units/config.cpp @@ -18,6 +18,7 @@ class CfgPatches { QCLASS(Item_Uniform_Combat_LS_BS_TP_BB), QCLASS(Item_Uniform_Combat_LS_BS_TP_TB), QCLASS(Item_Uniform_Combat_LS_CBPS_BP_BB), + QCLASS(Item_Uniform_Combat_LS_CDBS_BP_BB), QCLASS(Item_Uniform_Combat_LS_CDBS_GP_TB), QCLASS(Item_Uniform_Combat_LS_CDES_TP_TB), QCLASS(Item_Uniform_Combat_LS_CDFS_GP_TB), @@ -46,6 +47,7 @@ class CfgPatches { QCLASS(Item_Uniform_Combat_RS_BS_TP_BB), QCLASS(Item_Uniform_Combat_RS_BS_TP_TB), QCLASS(Item_Uniform_Combat_RS_CBPS_BP_BB), + QCLASS(Item_Uniform_Combat_RS_CDBS_BP_BB), QCLASS(Item_Uniform_Combat_RS_CDBS_GP_TB), QCLASS(Item_Uniform_Combat_RS_CDES_TP_TB), QCLASS(Item_Uniform_Combat_RS_CDFS_GP_TB), @@ -188,6 +190,7 @@ class CfgPatches { QCLASS(Uniform_Combat_LS_BS_GP_TB), QCLASS(Uniform_Combat_LS_BS_TP_BB), QCLASS(Uniform_Combat_LS_BS_TP_TB), + QCLASS(Uniform_Combat_LS_CDBS_BP_BB), QCLASS(Uniform_Combat_LS_CDBS_GP_TB), QCLASS(Uniform_Combat_LS_CLBS_GP_BB), QCLASS(Uniform_Combat_LS_CLRS_TP_BB), @@ -211,6 +214,7 @@ class CfgPatches { QCLASS(Uniform_Combat_RS_BS_GP_TB), QCLASS(Uniform_Combat_RS_BS_TP_BB), QCLASS(Uniform_Combat_RS_BS_TP_TB), + QCLASS(Uniform_Combat_RS_CDBS_BP_BB), QCLASS(Uniform_Combat_RS_CDBS_GP_TB), QCLASS(Uniform_Combat_RS_CLBS_GP_BB), QCLASS(Uniform_Combat_RS_CLRS_TP_BB), diff --git a/addons/units/data/uniform_combat_cdbs_bp_bb_co.paa b/addons/units/data/uniform_combat_cdbs_bp_bb_co.paa new file mode 100644 index 0000000..37b9386 Binary files /dev/null and b/addons/units/data/uniform_combat_cdbs_bp_bb_co.paa differ diff --git a/addons/units/items/combat_long_plaid_helpers.hpp b/addons/units/items/combat_long_plaid_helpers.hpp index a77a62e..cae70da 100644 --- a/addons/units/items/combat_long_plaid_helpers.hpp +++ b/addons/units/items/combat_long_plaid_helpers.hpp @@ -36,6 +36,12 @@ class CLASS(Unit_Combat_LS_CDBS_GP_TB): CLASS(Unit_Combat_LS_C_Base) { uniformClass = QCLASS(Uniform_Combat_LS_CDBS_GP_TB); hiddenSelectionsTextures[] = {QPATHTOF(data\uniform_combat_cdbs_gp_tb_co.paa)}; }; +class CLASS(Unit_Combat_LS_CDBS_BP_BB): CLASS(Unit_Combat_LS_C_Base) { + scope = 1; + author = "GilleeDoo"; + uniformClass = QCLASS(Uniform_Combat_LS_CDBS_BP_BB); + hiddenSelectionsTextures[] = {QPATHTOF(data\uniform_combat_cdbs_bp_bb_co.paa)}; +}; class CLASS(Unit_Combat_LS_CLBS_GP_BB): CLASS(Unit_Combat_LS_C_Base) { scope = 1; author = "Pomigit, Jonpas"; diff --git a/addons/units/items/combat_long_plaid_item.hpp b/addons/units/items/combat_long_plaid_item.hpp index a3c65e6..e062169 100644 --- a/addons/units/items/combat_long_plaid_item.hpp +++ b/addons/units/items/combat_long_plaid_item.hpp @@ -22,6 +22,10 @@ class CLASS(Item_Uniform_Combat_LS_CDBS_GP_TB): Item_Base_F { MACRO_ITEM_COMMON(Uniform_Combat_LS_CDBS_GP_TB); author = "Jonpas"; }; +class CLASS(Item_Uniform_Combat_LS_CDBS_BP_BB): Item_Base_F { + MACRO_ITEM_COMMON(Uniform_Combat_LS_CDBS_GP_BB); + author = "GilleeDoo"; +}; class CLASS(Item_Uniform_Combat_LS_CLBS_GP_BB): Item_Base_F { MACRO_ITEM_COMMON(Uniform_Combat_LS_CLBS_GP_BB); author = "Jonpas"; diff --git a/addons/units/items/combat_rolled_plaid_helpers.hpp b/addons/units/items/combat_rolled_plaid_helpers.hpp index 345299f..a2f6aed 100644 --- a/addons/units/items/combat_rolled_plaid_helpers.hpp +++ b/addons/units/items/combat_rolled_plaid_helpers.hpp @@ -36,6 +36,12 @@ class CLASS(Unit_Combat_RS_CDBS_GP_TB): CLASS(Unit_Combat_RS_C_Base) { uniformClass = QCLASS(Uniform_Combat_RS_CDBS_GP_TB); hiddenSelectionsTextures[] = {QPATHTOF(data\uniform_combat_cdbs_gp_tb_co.paa)}; }; +class CLASS(Unit_Combat_RS_CDBS_BP_BB): CLASS(Unit_Combat_RS_C_Base) { + scope = 1; + author = "GilleeDoo"; + uniformClass = QCLASS(Uniform_Combat_RS_CDBS_BP_BB); + hiddenSelectionsTextures[] = {QPATHTOF(data\uniform_combat_cdbs_bp_bb_co.paa)}; +}; class CLASS(Unit_Combat_RS_CLBS_GP_BB): CLASS(Unit_Combat_RS_C_Base) { scope = 1; author = "Pomigit, Jonpas"; diff --git a/addons/units/items/combat_rolled_plaid_item.hpp b/addons/units/items/combat_rolled_plaid_item.hpp index 0b3f2a6..243868a 100644 --- a/addons/units/items/combat_rolled_plaid_item.hpp +++ b/addons/units/items/combat_rolled_plaid_item.hpp @@ -22,6 +22,10 @@ class CLASS(Item_Uniform_Combat_RS_CDBS_GP_TB): Item_Base_F { MACRO_ITEM_COMMON(Uniform_Combat_RS_CDBS_GP_TB); author = "Jonpas"; }; +class CLASS(Item_Uniform_Combat_RS_CDBS_BP_BB): Item_Base_F { + MACRO_ITEM_COMMON(Uniform_Combat_RS_CDBS_BP_BB); + author = "GilleeDoo"; +}; class CLASS(Item_Uniform_Combat_RS_CLBS_GP_BB): Item_Base_F { MACRO_ITEM_COMMON(Uniform_Combat_RS_CLBS_GP_BB); author = "Jonpas"; diff --git a/addons/units/stringtable.xml b/addons/units/stringtable.xml index 9d3dfa9..c24061d 100644 --- a/addons/units/stringtable.xml +++ b/addons/units/stringtable.xml @@ -126,6 +126,11 @@ 戦闘服 長袖 (チェック濃紺、緑、黄褐) Uniforme de combat long (Plaid bleu foncé, Vert, Beige) + + Combat Uniform Long (Plaid Dark Blue, Black, Black) + Kampfuniform, lang (Dunkelblau-Kariert, Schwarz, Schwarz) + Uniforme de combat long (Plaid bleu foncé, Noir, Noir) + Combat Uniform Long (Plaid Light Blue, Green, Black) Kampfuniform, lang (Hellblau-Kariert, Grün, Schwarz) @@ -269,6 +274,11 @@ 戦闘服 袖まくり (チェック濃紺、緑、黄褐) Uniforme de combat retroussé (Plaid bleu foncé, Vert, Beige) + + Combat Uniform Rolled (Plaid Dark Blue, Black, Black) + Kampfuniform, kurz (Dunkelblau-Kariert, Schwarz, Schwarz) + Uniforme de combat retroussé (Plaid bleu foncé, Noir, Noir) + Combat Uniform Rolled (Plaid Light Blue, Green, Black) Kampfuniform, kurz (Hellblau-Kariert, Grün, Schwarz) diff --git a/addons/units/uniforms/combat_long_plaid.hpp b/addons/units/uniforms/combat_long_plaid.hpp index 2d25cd9..613fd3f 100644 --- a/addons/units/uniforms/combat_long_plaid.hpp +++ b/addons/units/uniforms/combat_long_plaid.hpp @@ -60,6 +60,16 @@ class CLASS(Uniform_Combat_LS_CDBS_GP_TB): CLASS(Uniform_Base) { // CDB = Plaid uniformClass = QCLASS(Unit_Combat_LS_CDBS_GP_TB); }; }; +class CLASS(Uniform_Combat_LS_CDBS_BP_BB): CLASS(Uniform_Base) { // CDB = Plaid Dark Blue + scope = 2; + author = "GilleeDoo"; + displayName = CSTRING(Uniform_Combat_LS_CDBS_BP_BB); + picture = QPATHTOF(UI\uniform_combat_ls_cdbs_bp_ca.paa); + + class ItemInfo: ItemInfo { + uniformClass = QCLASS(Unit_Combat_LS_CDBS_BP_BB); + }; +}; class CLASS(Uniform_Combat_LS_CLBS_GP_BB): CLASS(Uniform_Base) { // CLB = Plaid Light Blue scope = 2; author = "Pomigit, Jonpas"; diff --git a/addons/units/uniforms/combat_rolled_plaid.hpp b/addons/units/uniforms/combat_rolled_plaid.hpp index 62caffc..4da5164 100644 --- a/addons/units/uniforms/combat_rolled_plaid.hpp +++ b/addons/units/uniforms/combat_rolled_plaid.hpp @@ -50,7 +50,7 @@ class CLASS(Uniform_Combat_RS_CLFS_GP_BB): CLASS(Uniform_Base) { // CLF = Plaid uniformClass = QCLASS(Unit_Combat_RS_CLFS_GP_BB); }; }; -class CLASS(Uniform_Combat_RS_CDBS_GP_TB): CLASS(Uniform_Base) { +class CLASS(Uniform_Combat_RS_CDBS_GP_TB): CLASS(Uniform_Base) { // CDB = Plaid Dark Blue scope = 2; author = "Pomigit, Jonpas"; displayName = CSTRING(Uniform_Combat_RS_CDBS_GP_TB); @@ -60,7 +60,17 @@ class CLASS(Uniform_Combat_RS_CDBS_GP_TB): CLASS(Uniform_Base) { uniformClass = QCLASS(Unit_Combat_RS_CDBS_GP_TB); }; }; -class CLASS(Uniform_Combat_RS_CLBS_GP_BB): CLASS(Uniform_Base) { +class CLASS(Uniform_Combat_RS_CDBS_BP_BB): CLASS(Uniform_Base) { // CDB = Plaid Dark Blue + scope = 2; + author = "GilleeDoo"; + displayName = CSTRING(Uniform_Combat_RS_CDBS_BP_BB); + picture = QPATHTOF(UI\uniform_combat_rs_cdbs_bp_ca.paa); + + class ItemInfo: ItemInfo { + uniformClass = QCLASS(Unit_Combat_RS_CDBS_BP_BB); + }; +}; +class CLASS(Uniform_Combat_RS_CLBS_GP_BB): CLASS(Uniform_Base) { // CLB = Plaid Light Blue scope = 2; author = "Pomigit, Jonpas"; displayName = CSTRING(Uniform_Combat_RS_CLBS_GP_BB); @@ -70,7 +80,7 @@ class CLASS(Uniform_Combat_RS_CLBS_GP_BB): CLASS(Uniform_Base) { uniformClass = QCLASS(Unit_Combat_RS_CLBS_GP_BB); }; }; -class CLASS(Uniform_Combat_RS_CLRS_TP_BB): CLASS(Uniform_Base) { +class CLASS(Uniform_Combat_RS_CLRS_TP_BB): CLASS(Uniform_Base) { // CLR = Plaid Light Red scope = 2; author = "Pomigit, Jonpas"; displayName = CSTRING(Uniform_Combat_RS_CLRS_TP_BB); @@ -80,7 +90,7 @@ class CLASS(Uniform_Combat_RS_CLRS_TP_BB): CLASS(Uniform_Base) { uniformClass = QCLASS(Unit_Combat_RS_CLRS_TP_BB); }; }; -class CLASS(Uniform_Combat_RS_CPS_BP_BB): CLASS(Uniform_Base) { +class CLASS(Uniform_Combat_RS_CPS_BP_BB): CLASS(Uniform_Base) { // CP = Plaid Purple scope = 2; author = "Pomigit, Jonpas"; displayName = CSTRING(Uniform_Combat_RS_CPS_BP_BB);