Skip to content

Commit

Permalink
Units - Add Combat Uniform (Plaid Dark Blue, Black, Black) (#231)
Browse files Browse the repository at this point in the history 
Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
  • Loading branch information
@JoramD0 @Mike-MF
JoramD0 and Mike-MF authored Sep 22, 2024
1 parent fd1524b commit bd38fd9
Show file tree
Hide file tree
Showing 12 changed files with 60 additions and 4 deletions.
2 changes: 2 additions & 0 deletions addons/units/CfgVehicles_SupplyBox.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
Binary file added addons/units/UI/uniform_combat_ls_cdbs_bp_ca.paa
View file
Binary file not shown.
Binary file added addons/units/UI/uniform_combat_rs_cdbs_bp_ca.paa
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions addons/units/config.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand All @@ -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),
Expand Down
Binary file added addons/units/data/uniform_combat_cdbs_bp_bb_co.paa
View file
Binary file not shown.
6 changes: 6 additions & 0 deletions addons/units/items/combat_long_plaid_helpers.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 4 additions & 0 deletions addons/units/items/combat_long_plaid_item.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
6 changes: 6 additions & 0 deletions addons/units/items/combat_rolled_plaid_helpers.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 4 additions & 0 deletions addons/units/items/combat_rolled_plaid_item.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
10 changes: 10 additions & 0 deletions addons/units/stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@
<Japanese>戦闘服 長袖 (チェック濃紺、緑、黄褐)</Japanese>
<French>Uniforme de combat long (Plaid bleu foncé, Vert, Beige)</French>
</Key>
<Key ID="STR_TACS_Units_Uniform_Combat_LS_CDBS_BP_BB">
<English>Combat Uniform Long (Plaid Dark Blue, Black, Black)</English>
<German>Kampfuniform, lang (Dunkelblau-Kariert, Schwarz, Schwarz)</German>
<French>Uniforme de combat long (Plaid bleu foncé, Noir, Noir)</French>
</Key>
<Key ID="STR_TACS_Units_Uniform_Combat_LS_CLBS_GP_BB">
<English>Combat Uniform Long (Plaid Light Blue, Green, Black)</English>
<German>Kampfuniform, lang (Hellblau-Kariert, Grün, Schwarz)</German>
Expand Down Expand Up @@ -269,6 +274,11 @@
<Japanese>戦闘服 袖まくり (チェック濃紺、緑、黄褐)</Japanese>
<French>Uniforme de combat retroussé (Plaid bleu foncé, Vert, Beige)</French>
</Key>
<Key ID="STR_TACS_Units_Uniform_Combat_RS_CDBS_BP_BB">
<English>Combat Uniform Rolled (Plaid Dark Blue, Black, Black)</English>
<German>Kampfuniform, kurz (Dunkelblau-Kariert, Schwarz, Schwarz)</German>
<French>Uniforme de combat retroussé (Plaid bleu foncé, Noir, Noir)</French>
</Key>
<Key ID="STR_TACS_Units_Uniform_Combat_RS_CLBS_GP_BB">
<English>Combat Uniform Rolled (Plaid Light Blue, Green, Black)</English>
<German>Kampfuniform, kurz (Hellblau-Kariert, Grün, Schwarz)</German>
Expand Down
10 changes: 10 additions & 0 deletions addons/units/uniforms/combat_long_plaid.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
18 changes: 14 additions & 4 deletions addons/units/uniforms/combat_rolled_plaid.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit bd38fd9

Please sign in to comment.