Skip to content

Commit 4b91e60

Browse files
jetelainjetelain
committed
Update USP uniforms : reversed US flags and new models/configs
1 parent 8c17229 commit 4b91e60

2 files changed

Lines changed: 181 additions & 32 deletions

File tree

‎compats/compat_usp/XtdGearInfos.hpp‎

Lines changed: 114 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -282,32 +282,52 @@
282282
PATTERN_USP_SOFTSHELL_G3C_MC(suffix,k,g) \
283283
PATTERN_USP_SOFTSHELL_G3C_RGR(suffix,k,g) \
284284

285-
#define PATTERN_USP_OVERWHITE_G3C(suffix, base, c, k, g) \
285+
#define PATTERN_USP_OVERWHITE_G3C(suffix, c, k, g, t) \
286286
class suffix \
287287
{ \
288288
model = "USP_OVERWHITE_G3C"; \
289289
camo = #c; \
290290
kneepads = #k; \
291291
gloves = #g; \
292+
top = #t; \
292293
};
293294

294295
#define PATTERN_USP_OVERWHITE_G3C_MCA(suffix, k, g) \
295-
PATTERN_USP_OVERWHITE_G3C(suffix, Uniform_Base,BLK, k,g) \
296-
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_AOR1,suffix,AOR1,k,g) \
297-
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_AOR2,suffix,AOR2,k,g) \
298-
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_ATT, suffix,ATT, k,g) \
299-
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_GRY, suffix,GRY, k,g) \
300-
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_KHK, suffix,KHK, k,g) \
301-
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_M81, suffix,M81, k,g) \
302-
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_MC, suffix,MC, k,g) \
303-
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_MCB, suffix,MCB, k,g) \
304-
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_MCD, suffix,MCD, k,g) \
305-
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_MCT, suffix,MCT, k,g) \
306-
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_MCW, suffix,MCW, k,g) \
307-
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_NAV, suffix,NAV, k,g) \
308-
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_RGR, suffix,RGR, k,g) \
309-
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_TSD, suffix,TSD, k,g) \
310-
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_TSW, suffix,TSW, k,g)
296+
PATTERN_USP_OVERWHITE_G3C(suffix, BLK, k,g,MCA) \
297+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_AOR1,AOR1,k,g,MCA) \
298+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_AOR2,AOR2,k,g,MCA) \
299+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_ATT, ATT, k,g,MCA) \
300+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_GRY, GRY, k,g,MCA) \
301+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_KHK, KHK, k,g,MCA) \
302+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_M81, M81, k,g,MCA) \
303+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_MC, MC, k,g,MCA) \
304+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_MCB, MCB, k,g,MCA) \
305+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_MCD, MCD, k,g,MCA) \
306+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_MCT, MCT, k,g,MCA) \
307+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_MCW, MCW, k,g,MCA) \
308+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_NAV, NAV, k,g,MCA) \
309+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_RGR, RGR, k,g,MCA) \
310+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_TSD, TSD, k,g,MCA) \
311+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCA_TSW, TSW, k,g,MCA)
312+
313+
314+
#define PATTERN_USP_OVERWHITE_G3C_OTH(suffix, k,g,t) \
315+
PATTERN_USP_OVERWHITE_G3C(suffix, BLK, k,g,t) \
316+
PATTERN_USP_OVERWHITE_G3C(##suffix##_AOR1,AOR1,k,g,t) \
317+
PATTERN_USP_OVERWHITE_G3C(##suffix##_AOR2,AOR2,k,g,t) \
318+
PATTERN_USP_OVERWHITE_G3C(##suffix##_ATT, ATT, k,g,t) \
319+
PATTERN_USP_OVERWHITE_G3C(##suffix##_GRY, GRY, k,g,t) \
320+
PATTERN_USP_OVERWHITE_G3C(##suffix##_KHK, KHK, k,g,t) \
321+
PATTERN_USP_OVERWHITE_G3C(##suffix##_M81, M81, k,g,t) \
322+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MC, MC, k,g,t) \
323+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCB, MCB, k,g,t) \
324+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCD, MCD, k,g,t) \
325+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCT, MCT, k,g,t) \
326+
PATTERN_USP_OVERWHITE_G3C(##suffix##_MCW, MCW, k,g,t) \
327+
PATTERN_USP_OVERWHITE_G3C(##suffix##_NAV, NAV, k,g,t) \
328+
PATTERN_USP_OVERWHITE_G3C(##suffix##_RGR, RGR, k,g,t) \
329+
PATTERN_USP_OVERWHITE_G3C(##suffix##_TSD, TSD, k,g,t) \
330+
PATTERN_USP_OVERWHITE_G3C(##suffix##_TSW, TSW, k,g,t)
311331

312332
#define PATTERN_USP_TSHIRT_G3C(suffix, base, c, t, k, g, i) \
313333
class suffix \
@@ -628,6 +648,36 @@ class CfgWeapons
628648
PATTERN_USP_G3C(USP_G3C_IST_KP_MX, down,yes,MX, Full, IST)
629649
PATTERN_USP_G3C(USP_G3C_IST_KP_OR, down,yes,OR, Full, IST)
630650

651+
652+
PATTERN_USP_G3C(USP_G3C_CS, down,no, none,Cut,SL)
653+
PATTERN_USP_G3C(USP_G3C_CS_CU, up, no, none,Cut,SL)
654+
PATTERN_USP_G3C(USP_G3C_CS_KP, down,yes,none,Cut,SL)
655+
PATTERN_USP_G3C(USP_G3C_CS_CU_KP, up, yes,none,Cut,SL)
656+
PATTERN_USP_G3C(USP_G3C_CS_MX, down,no, MX, Cut,SL)
657+
PATTERN_USP_G3C(USP_G3C_CS_CU_MX, up, no, MX, Cut,SL)
658+
PATTERN_USP_G3C(USP_G3C_CS_KP_MX, down,yes,MX, Cut,SL)
659+
PATTERN_USP_G3C(USP_G3C_CS_CU_KP_MX, up, yes,MX, Cut,SL)
660+
PATTERN_USP_G3C(USP_G3C_CS_OR, down,no, OR, Cut,SL)
661+
PATTERN_USP_G3C(USP_G3C_CS_CU_OR, up, no, OR, Cut,SL)
662+
PATTERN_USP_G3C(USP_G3C_CS_KP_OR, down,yes,OR, Cut,SL)
663+
PATTERN_USP_G3C(USP_G3C_CS_CU_KP_OR, up, yes,OR, Cut,SL)
664+
665+
PATTERN_USP_G3C(USP_G3C_CS_VQ, down,no, none,Cut,VQ)
666+
PATTERN_USP_G3C(USP_G3C_CS_CU_VQ, up, no, none,Cut,VQ)
667+
PATTERN_USP_G3C(USP_G3C_CS_KP_VQ, down,yes,none,Cut,VQ)
668+
PATTERN_USP_G3C(USP_G3C_CS_CU_KP_VQ, up, yes,none,Cut,VQ)
669+
PATTERN_USP_G3C(USP_G3C_CS_MX_VQ, down,no, MX, Cut,VQ)
670+
PATTERN_USP_G3C(USP_G3C_CS_CU_MX_VQ, up, no, MX, Cut,VQ)
671+
PATTERN_USP_G3C(USP_G3C_CS_KP_MX_VQ, down,yes,MX, Cut,VQ)
672+
PATTERN_USP_G3C(USP_G3C_CS_CU_KP_MX_VQ, up, yes,MX, Cut,VQ)
673+
PATTERN_USP_G3C(USP_G3C_CS_OR_VQ, down,no, OR, Cut,VQ)
674+
PATTERN_USP_G3C(USP_G3C_CS_CU_OR_VQ, up, no, OR, Cut,VQ)
675+
PATTERN_USP_G3C(USP_G3C_CS_KP_OR_VQ, down,yes,OR, Cut,VQ)
676+
PATTERN_USP_G3C(USP_G3C_CS_CU_KP_OR_VQ, up, yes,OR, Cut,VQ)
677+
678+
679+
680+
631681
// USP_PCU_G3
632682
// NOTE: USP_PCU_G3C_*_GRY_BLK are broken in USP Mod itself
633683
PATTERN_USP_PCU_G3C_ALL(USP_PCU_G3C, no, none)
@@ -647,11 +697,19 @@ class CfgWeapons
647697

648698
// USP_OVERWHITE_G3C
649699
PATTERN_USP_OVERWHITE_G3C_MCA(USP_OVERWHITE_G3C, no, none)
650-
PATTERN_USP_OVERWHITE_G3C_MCA(USP_OVERWHITE_G3C_KP, yes,none)
700+
PATTERN_USP_OVERWHITE_G3C_MCA(USP_OVERWHITE_G3C_KP, G3,none)
701+
PATTERN_USP_OVERWHITE_G3C_MCA(USP_OVERWHITE_G3C_KP2, G4,none)
651702
PATTERN_USP_OVERWHITE_G3C_MCA(USP_OVERWHITE_G3C_MX, no, MX)
652-
PATTERN_USP_OVERWHITE_G3C_MCA(USP_OVERWHITE_G3C_KP_MX,yes,MX)
703+
PATTERN_USP_OVERWHITE_G3C_MCA(USP_OVERWHITE_G3C_KP_MX,G3,MX)
653704
PATTERN_USP_OVERWHITE_G3C_MCA(USP_OVERWHITE_G3C_OR, no, OR)
654-
PATTERN_USP_OVERWHITE_G3C_MCA(USP_OVERWHITE_G3C_KP_OR,yes,OR)
705+
PATTERN_USP_OVERWHITE_G3C_MCA(USP_OVERWHITE_G3C_KP_OR,G3,OR)
706+
PATTERN_USP_OVERWHITE_G3C_OTH(USP_OVERWHITE_G3C_TAN, no, none,TAN)
707+
PATTERN_USP_OVERWHITE_G3C_OTH(USP_OVERWHITE_G3C_KP2_TAN,G4, none,TAN)
708+
PATTERN_USP_OVERWHITE_G3C_OTH(USP_OVERWHITE_G3C_GRN, no, none,GRN)
709+
PATTERN_USP_OVERWHITE_G3C_OTH(USP_OVERWHITE_G3C_KP2_GRN,G4, none,GRN)
710+
PATTERN_USP_OVERWHITE_G3C_OTH(USP_OVERWHITE_G3C_BLK, no, none,BLK)
711+
PATTERN_USP_OVERWHITE_G3C_OTH(USP_OVERWHITE_G3C_KP2_BLK,G4, none,BLK)
712+
655713

656714
// USP_TSHIRT_G3C / USP_TSHIRT2_G3C
657715
PATTERN_USP_TSHIRT_G3C_ALL(USP_TSHIRT_G3C, no, none,no)
@@ -660,7 +718,7 @@ class CfgWeapons
660718
PATTERN_USP_TSHIRT_G3C_ALL(USP_TSHIRT_G3C_KP_MX, yes,MX,no)
661719
PATTERN_USP_TSHIRT_G3C_ALL(USP_TSHIRT_G3C_OR, no, OR,no)
662720
PATTERN_USP_TSHIRT_G3C_ALL(USP_TSHIRT_G3C_KP_OR, yes,OR,no)
663-
//PATTERN_USP_TSHIRT_G3C_ALL(USP_TSHIRT2_G3C, no, none,yes) => exists, but private
721+
PATTERN_USP_TSHIRT_G3C_ALL(USP_TSHIRT2_G3C, no, none,yes)
664722
PATTERN_USP_TSHIRT_G3C_ALL(USP_TSHIRT2_G3C_KP, yes,none,yes)
665723
PATTERN_USP_TSHIRT_G3C_ALL(USP_TSHIRT2_G3C_MX, no, MX,yes)
666724
PATTERN_USP_TSHIRT_G3C_ALL(USP_TSHIRT2_G3C_KP_MX,yes,MX,yes)
@@ -2130,6 +2188,41 @@ class CfgWeapons
21302188
PATTERN_OPSCORE_FASTFCV(USP_OPSCORE_FASTMT_FCV_OD_TW,USP_OPSCORE_FASTMT_FCV_TW,none,none,none,TL,CW,OD)
21312189
PATTERN_OPSCORE_FASTFCV(USP_OPSCORE_FASTMT_FCV_OD_W,USP_OPSCORE_FASTMT_FCV_W,none,none,none,none,CW,OD)
21322190

2191+
#define PATTERN_USP_G3F_S(suffix, m, g, p, k) \
2192+
class suffix \
2193+
{ \
2194+
model = "USP_G3F"; \
2195+
camo = #m; \
2196+
gloves = #g; \
2197+
pants = #p; \
2198+
kneepads = #k; \
2199+
};
2200+
2201+
#define PATTERN_USP_G3F(suffix, g, p,k) \
2202+
PATTERN_USP_G3F_S(##suffix##_3CD, 3CD, g,p,k) \
2203+
PATTERN_USP_G3F_S(##suffix##_AOR1,AOR1,g,p,k) \
2204+
PATTERN_USP_G3F_S(##suffix##_AOR2,AOR2,g,p,k) \
2205+
PATTERN_USP_G3F_S(##suffix##_BLK, BLK, g,p,k) \
2206+
PATTERN_USP_G3F_S(##suffix##_KHK, KHK, g,p,k) \
2207+
PATTERN_USP_G3F_S(##suffix##_M81, M81, g,p,k) \
2208+
PATTERN_USP_G3F_S(##suffix##_MC, MC, g,p,k) \
2209+
PATTERN_USP_G3F_S(##suffix##_MCA, MCA, g,p,k) \
2210+
PATTERN_USP_G3F_S(##suffix##_MCB, MCB, g,p,k) \
2211+
PATTERN_USP_G3F_S(##suffix##_MCD, MCD, g,p,k) \
2212+
PATTERN_USP_G3F_S(##suffix##_MCT, MCT, g,p,k) \
2213+
PATTERN_USP_G3F_S(##suffix##_NWU, NWU, g,p,k) \
2214+
PATTERN_USP_G3F_S(##suffix##_RGR, RGR, g,p,k) \
2215+
PATTERN_USP_G3F_S(##suffix##_UCP, UCP, g,p,k)
2216+
2217+
PATTERN_USP_G3F(USP_G3F, none,Field, no)
2218+
PATTERN_USP_G3F(USP_G3F_MX, MX, Field, no)
2219+
PATTERN_USP_G3F(USP_G3F_OR, OR, Field, no)
2220+
PATTERN_USP_G3F(USP_G3F_G3C, none,Combat,no)
2221+
PATTERN_USP_G3F(USP_G3F_G3C_MX, MX, Combat,no)
2222+
PATTERN_USP_G3F(USP_G3F_G3C_OR, OR, Combat,no)
2223+
PATTERN_USP_G3F(USP_G3F_G3C_KP, none,Combat,yes)
2224+
PATTERN_USP_G3F(USP_G3F_G3C_KP_MX,MX, Combat,yes)
2225+
PATTERN_USP_G3F(USP_G3F_G3C_KP_OR,OR, Combat,yes)
21332226
};
21342227

21352228
};

‎compats/compat_usp/XtdGearModels.hpp‎

Lines changed: 67 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ class XtdGearModels
4343
OR_CAMO(MIX)
4444
};
4545

46-
47-
4846
class CfgWeapons
4947
{
5048
class USP_G3C
@@ -82,7 +80,7 @@ class XtdGearModels
8280
};
8381
class sleeves //: SleevesBase
8482
{
85-
values[] = {"Full", "Quarter", "Half"};
83+
values[] = {"Full", "Quarter", "Half", "Cut"};
8684
};
8785
class shoes
8886
{
@@ -167,30 +165,48 @@ class XtdGearModels
167165
FLAG(uk_ref_mc)
168166
FLAG(usa_can_blk)
169167
FLAG(usa_can_ref_mc)
168+
170169
FLAG(usa)
171-
FLAG(usa_flag2)
170+
FLAG(usa_col2_rev)
171+
FLAG(usa_col)
172+
FLAG(usa_col_rev)
172173
FLAG(usa_fog)
173174
FLAG(usa_ir_aor2)
175+
FLAG(usa_ir_aor2_rev)
176+
174177
FLAG(usa_ir_blk_abpos)
175178
FLAG(usa_ir_blk)
179+
FLAG(usa_ir_blk_rev)
176180
FLAG(usa_ir_blk_skull2)
177181
FLAG(usa_ir_blk_skull)
182+
FLAG(usa_ir_blk_skull_rev)
178183
FLAG(usa_ir_grn)
184+
FLAG(usa_ir_grn_rev)
179185
FLAG(usa_ir_mc)
186+
FLAG(usa_ir_mc_rev)
180187
FLAG(usa_ir_mc_skull)
188+
FLAG(usa_ir_mc_skull_rev)
181189
FLAG(usa_ir_rgr)
190+
FLAG(usa_ir_rgr_rev)
182191
FLAG(usa_ir_skull_mc)
183192
FLAG(usa_ir_tan)
193+
FLAG(usa_ir_tan_rev)
184194
FLAG(usa_ref)
195+
FLAG(usa_ref_rev)
185196
FLAG(usa_tan)
197+
FLAG(usa_tan_rev)
186198
FLAG(usa_tx_ir_rgr)
187199
FLAG(usa_uk_ir_blk2)
188200
FLAG(usa_uk_ir_blk)
189201
FLAG(usa_uk_ir_mc)
190202
FLAG(usa_usaf)
191-
FLAG(zea_ir_mc)
192-
#define ALL_FLAGS "aus_ir_mc","bos_ir_mc","bra_ir_mc","can_ir_blk","can_ref_gry","cze_ir_mc","fin_ir_rgr","fra_ref","ger_ir_flk","ger_ir_mc","ger_ir_rgr","isr_ir_blk","isr_ir_mc","isr_ir_tan","isr_ref_blk","jap_ir_mc","nld","nld_ir_mc","nld_sub2","nld_sub","nld_tan","nor_ref","pol_ref","pol_ref_sub","rus_ir_mc","rus_ref","swe_ref_rgr","tur_ir_mc","uk","uk_ir_blk","uk_ir_grn","uk_ir_mc","uk_ref_mc","usa_can_blk","usa_can_ref_mc","usa","usa_flag2","usa_fog","usa_ir_aor2","usa_ir_blk_abpos","usa_ir_blk","usa_ir_blk_skull2","usa_ir_blk_skull","usa_ir_grn","usa_ir_mc","usa_ir_mc_skull","usa_ir_rgr","usa_ir_skull_mc","usa_ir_tan","usa_ref","usa_tan","usa_tx_ir_rgr","usa_uk_ir_blk2","usa_uk_ir_blk","usa_uk_ir_mc","usa_usaf","zea_ir_mc"
193203

204+
FLAG(zea_ir_mc)
205+
#define ALL_FLAGS "aus_ir_mc","bos_ir_mc","bra_ir_mc","can_ir_blk","can_ref_gry","cze_ir_mc","fin_ir_rgr","fra_ref","ger_ir_flk","ger_ir_mc","ger_ir_rgr","isr_ir_blk","isr_ir_mc","isr_ir_tan","isr_ref_blk","jap_ir_mc","nld","nld_ir_mc","nld_sub2","nld_sub","nld_tan","nor_ref","pol_ref","pol_ref_sub","rus_ir_mc","rus_ref","swe_ref_rgr","tur_ir_mc","uk","uk_ir_blk","uk_ir_grn","uk_ir_mc","uk_ref_mc","usa_can_blk","usa_can_ref_mc",\
206+
"usa","usa_col","usa_fog","usa_ir_aor2","usa_ir_blk_abpos","usa_ir_blk","usa_ir_blk_skull2","usa_ir_blk_skull","usa_ir_grn","usa_ir_mc","usa_ir_mc_skull","usa_ir_rgr","usa_ir_skull_mc","usa_ir_tan","usa_ref","usa_tan","usa_tx_ir_rgr","usa_uk_ir_blk2","usa_uk_ir_blk","usa_uk_ir_mc","usa_usaf","zea_ir_mc"
207+
208+
#define ALL_FLAGS_R "aus_ir_mc","bos_ir_mc","bra_ir_mc","can_ir_blk","can_ref_gry","cze_ir_mc","fin_ir_rgr","fra_ref","ger_ir_flk","ger_ir_mc","ger_ir_rgr","isr_ir_blk","isr_ir_mc","isr_ir_tan","isr_ref_blk","jap_ir_mc","nld","nld_ir_mc","nld_sub2","nld_sub","nld_tan","nor_ref","pol_ref","pol_ref_sub","rus_ir_mc","rus_ref","swe_ref_rgr","tur_ir_mc","uk","uk_ir_blk","uk_ir_grn","uk_ir_mc","uk_ref_mc","usa_can_blk","usa_can_ref_mc",\
209+
"usa_col2_rev","usa_col_rev","usa_fog","usa_ir_aor2_rev","usa_ir_blk_rev","usa_ir_blk_skull_rev","usa_ir_grn_rev","usa_ir_mc_rev","usa_ir_mc_skull_rev","usa_ir_rgr_rev","usa_ir_tan_rev","usa_ref_rev","usa_tan_rev","usa_tx_ir_rgr","usa_uk_ir_blk2","usa_uk_ir_blk","usa_uk_ir_mc","usa_usaf","zea_ir_mc"
194210

195211
#define MORALE(N) class N { texture = QUOTE(\usp_gear_core\data\id\morale\##N##_co.paa); image = QUOTE(\usp_gear_core\data\id\morale\##N##_co.paa); label=""; description=#N; };
196212
MORALE(aim_face)
@@ -653,7 +669,37 @@ class XtdGearModels
653669
{
654670
label = "Right Shoulder";
655671
hiddenselection="_FlagRight";
656-
values[] = {"DEFAULT",ALL_FLAGS,ALL_MORALE};
672+
values[] = {"DEFAULT",ALL_FLAGS_R,ALL_MORALE};
673+
};
674+
675+
};
676+
677+
678+
class USP_G3F : USP_G3C
679+
{
680+
label = "Crye G3F";
681+
author = "UnderSiege Productions";
682+
options[] = {"camo", "gloves", "pants"};
683+
textureoptions[] = { "pantscamo", "mxcamo", "orcamo" };
684+
class camo
685+
{
686+
values[] = {"3CD","AOR1","AOR2","BLK","KHK","M81","MC","MCA","MCB","MCD","MCT","NWU","RGR","UCP"};
687+
};
688+
class pants
689+
{
690+
label = "Pants";
691+
changeingame = 0;
692+
values[] = {"Field","Combat"};
693+
class Field {
694+
label="Field";
695+
};
696+
class Combat {
697+
label="Combat";
698+
};
699+
};
700+
class pantscamo : pantscamo
701+
{
702+
requires[]={{"pants","Combat"}};
657703
};
658704

659705
};
@@ -755,17 +801,21 @@ class XtdGearModels
755801
{
756802
label = "Overwhite/Crye G3C";
757803
author = "UnderSiege Productions";
758-
options[] = {"camo", "kneepads", "gloves"};
804+
options[] = {"camo", "top", "kneepads", "gloves"};
759805
textureoptions[] = { "mxcamo", "orcamo" };
760806
class camo //: CamoBase
761807
{
762808
values[] = {"BLK","GRY","KHK","RGR","NAV","M81","MC","MCB","MCD","MCT","MCW","AOR1","AOR2","ATT","TSD","TSW"};
763809
};
810+
class top //: CamoBase
811+
{
812+
values[] = {"MCA","BLK","GRN","TAN"};
813+
};
764814
class kneepads
765815
{
766816
label = "Knee Pads";
767817
changeingame = 0;
768-
values[] = {"no", "yes"};
818+
values[] = {"no", "G3", "G4"};
769819
};
770820
class gloves
771821
{
@@ -778,8 +828,14 @@ class XtdGearModels
778828
description = "Mechanix®";
779829
};
780830
};
781-
class mxcamo : usp_mxcamo {};
782-
class orcamo : usp_orcamo {};
831+
class mxcamo : usp_mxcamo
832+
{
833+
hiddenselection="Camo4";
834+
};
835+
class orcamo : usp_orcamo
836+
{
837+
hiddenselection="Camo3";
838+
};
783839
};
784840

785841
class USP_TSHIRT_G3C

0 commit comments

Comments
 (0)