Skip to content

Commit b67ea85

Browse files
committed
Clean up - Gear: Standardised naming and classnames, including prefix
Issue ID: N/A
1 parent 3f27c23 commit b67ea85

14 files changed

+59
-56
lines changed

addons/gear/config.cpp

+59-56
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ class CfgPatches {
55
author = "2nd Battalion, Nord Brigade";
66
authors[] = {
77
"Ford",
8-
"Arend"
8+
"Arend",
9+
"Sawtes"
910
};
1011
url = "https://discord.gg/DRaWNyf";
1112
version = 1.0.0;
@@ -62,7 +63,7 @@ class CfgWeapons
6263
};
6364
};
6465

65-
class H_HelmetB_TI_tna_Fx : H_HelmetB_TI_tna_F
66+
class BNB_EX_Gear_Super_Stealth_Helmet : H_HelmetB_TI_tna_F
6667
{
6768
author = "Ford";
6869
scope = 2;
@@ -90,7 +91,7 @@ class CfgWeapons
9091
};
9192
};
9293

93-
class V_PlateCarrier2_wdlXXX : V_PlateCarrier2_wdl
94+
class BNB_EX_Gear_Super_Stealth_Platecarrier : V_PlateCarrier2_wdl
9495
{
9596
author = "Ford";
9697
displayName = "SUPAR STEALTH";
@@ -138,12 +139,12 @@ class CfgWeapons
138139

139140
};
140141

141-
class Adidas_Uniform : U_I_CombatUniform //Edited
142+
class BNB_EX_Gear_Adidas_Uniform : U_I_CombatUniform //Edited
142143
{
143144
scope = 2;
144145
displayName = "Adidas Uniform";
145146
author = "Ford";
146-
picture = "\x\bnb_ex\gear\data\adidass.paa";
147+
picture = "\x\bnb_ex\gear\data\adidas_icon.paa";
147148

148149
class ItemInfo : UniformItem {
149150
uniformModel = "-";
@@ -153,16 +154,16 @@ class CfgWeapons
153154
};
154155
};
155156

156-
class Adidas_Vest : ItemCore
157+
class BNB_EX_Gear_Adidas_Vest : ItemCore
157158
{
158159
author = "Ford";
159160
scope = 2;
160161
displayName = "Adidas Light Vest";
161162
allowedSlots[] = {901}; // This means the vest can be put into a backpack.
162-
picture = "\x\bnb_ex\gear\data\adidass.paa";
163+
picture = "\x\bnb_ex\gear\data\adidas_icon.paa";
163164
model = "\A3\Characters_F_EPC\Civil\equip_press_vest_01.p3d";
164165
hiddenSelections[] = {"camo"};
165-
hiddenSelectionsTextures[] = {"\x\bnb_ex\gear\data\adidasV.paa"};
166+
hiddenSelectionsTextures[] = {"\x\bnb_ex\gear\data\adidas_vest.paa"};
166167
editorPreview = "\A3\EditorPreviews_F\Data\add.jpg";
167168
class ItemInfo : VestItem
168169
{
@@ -213,15 +214,15 @@ class CfgWeapons
213214
};
214215
};
215216

216-
class Adidas_Berret : ItemCore
217+
class BNB_EX_Gear_Adidas_Berret : ItemCore
217218
{
218219
author = "Ford";
219220
scope = 2;
220221
displayName = "Adidas Berret";
221-
picture = "\x\bnb_ex\gear\data\adidass.paa";
222+
picture = "\x\bnb_ex\gear\data\adidas_icon.paa";
222223
model = "\A3\Characters_F_EPB\BLUFOR\headgear_beret02";
223224
hiddenSelections[] = { "camo" };
224-
hiddenSelectionsTextures[] = { "\x\bnb_ex\gear\data\adidasB.paa" };
225+
hiddenSelectionsTextures[] = { "\x\bnb_ex\gear\data\adidas_berret.paa" };
225226
ace_hearing_protection = 0.75;
226227
ace_hearing_lowerVolume = 0;
227228
class ItemInfo : HeadgearItem
@@ -242,17 +243,17 @@ class CfgWeapons
242243
};
243244
};
244245
};
245-
class Adidas_Helmet : ItemCore
246+
class BNB_EX_Gear_Adidas_Helmet : ItemCore
246247
{
247248
author = "Ford";
248249
scope = 2;
249250
displayName = "Adidas Helmet";
250-
picture = "\x\bnb_ex\gear\data\adidass.paa";
251+
picture = "\x\bnb_ex\gear\data\adidas_icon.paa";
251252
model = "\rhsafrf\addons\rhs_infantry2\gear\head\rhs_altyn_visordown";
252253
ace_hearing_protection = 0.8;
253254
ace_hearing_lowerVolume = 0.25;
254255
hiddenSelections[] = { "Camo1" };
255-
hiddenSelectionsTextures[] = {"\x\bnb_ex\gear\data\adidasH.paa"};
256+
hiddenSelectionsTextures[] = {"\x\bnb_ex\gear\data\adidas_altyn.paa"};
256257
class ItemInfo : HeadgearItem
257258
{
258259
mass = 10;
@@ -277,16 +278,16 @@ class CfgWeapons
277278
};
278279
};
279280
};
280-
class Adidas_BerretX : Adidas_Berret
281+
class BNB_EX_Gear_Adidas_Berret_Muffled : BNB_EX_Gear_Adidas_Berret
281282
{
282283
author = "Ford";
283284
scope = 2;
284-
displayName = "Adidas Berret (Muffeled)";
285-
picture = "\x\bnb_ex\gear\data\adidass.paa";
285+
displayName = "Adidas Berret (Muffled)";
286+
picture = "\x\bnb_ex\gear\data\adidas_icon.paa";
286287
model = "\A3\Characters_F_EPB\BLUFOR\headgear_beret02";
287288
ace_hearing_lowerVolume = 0.80;
288289
hiddenSelections[] = { "camo" };
289-
hiddenSelectionsTextures[] = { "\x\bnb_ex\gear\data\adidasB.paa" };
290+
hiddenSelectionsTextures[] = { "\x\bnb_ex\gear\data\adidas_berret.paa" };
290291
class ItemInfo : ItemInfo
291292
{
292293
class HitpointsProtectionInfo : HitpointsProtectionInfo
@@ -298,11 +299,11 @@ class CfgWeapons
298299
};
299300
};
300301

301-
class 2BNB_Berret : Adidas_Berret
302+
class BNB_EX_Gear_Unit_Berret : BNB_EX_Gear_Adidas_Berret
302303
{
303304
author = "FarGay";
304305
displayName = "2BNB Berret";
305-
picture = "\x\bnb_ex\gear\data\adidass.paa";
306+
picture = "\x\bnb_ex\gear\data\adidas_icon.paa";
306307
model = "\A3\Characters_F_EPB\BLUFOR\headgear_beret02";
307308
hiddenSelections[] = { "camo" };
308309
hiddenSelectionsTextures[] = { "\x\bnb_ex\gear\data\2BNB_Berret.paa" };
@@ -321,14 +322,14 @@ class CfgWeapons
321322
};
322323
};
323324

324-
class RUS1 : Adidas_Berret
325+
class BNB_EX_Gear_Russian_Berret_Flag : BNB_EX_Gear_Adidas_Berret
325326
{
326327
author = "Ford";
327-
displayName = "2BNB RUSB";
328-
picture = "\x\bnb_ex\gear\data\adidass.paa";
328+
displayName = "Russian Berret (Flag)";
329+
picture = "\x\bnb_ex\gear\data\adidas_icon.paa";
329330
model = "\A3\Characters_F_EPB\BLUFOR\headgear_beret02";
330331
hiddenSelections[] = { "camo" };
331-
hiddenSelectionsTextures[] = { "\x\bnb_ex\gear\data\RUSB.paa" };
332+
hiddenSelectionsTextures[] = { "\x\bnb_ex\gear\data\russian_berret_flag.paa" };
332333
class ItemInfo : ItemInfo
333334
{
334335
class HitpointsProtectionInfo : HitpointsProtectionInfo
@@ -340,14 +341,14 @@ class CfgWeapons
340341
};
341342
};
342343

343-
class RUS2 : Adidas_Berret
344+
class BNB_EX_Gear_Russian_Berret_Star : BNB_EX_Gear_Adidas_Berret
344345
{
345346
author = "Ford";
346-
displayName = "2BNB RUSB1";
347-
picture = "\x\bnb_ex\gear\data\adidass.paa";
347+
displayName = "Russian Berret (Star)";
348+
picture = "\x\bnb_ex\gear\data\adidas_icon.paa";
348349
model = "\A3\Characters_F_EPB\BLUFOR\headgear_beret02";
349350
hiddenSelections[] = { "camo" };
350-
hiddenSelectionsTextures[] = { "\x\bnb_ex\gear\data\RUSB1.paa" };
351+
hiddenSelectionsTextures[] = { "\x\bnb_ex\gear\data\russian_berret_star.paa" };
351352
class ItemInfo : ItemInfo
352353
{
353354
class HitpointsProtectionInfo : HitpointsProtectionInfo
@@ -676,60 +677,62 @@ class CfgWeapons
676677
ace_hearing_lowerVolume = 0;
677678
};
678679
class launch_MRAWS_green_rail_f;
679-
class SAW_W_MAAWS0 : launch_MRAWS_green_rail_f
680+
class BNB_EX_Gear_SAW_W_MAAWS0 : launch_MRAWS_green_rail_f
680681
{
682+
author = "Sawtes";
681683
scope = 2;
682-
baseWeapon = "SAW_W_MAAWS0";
684+
baseWeapon = "BNB_EX_Gear_SAW_W_MAAWS0";
683685
displayName = "MAAWS Mk4 Mod 0 (White)";
684-
picture = "\x\bnb_ex\gear\data\whitemaawsicon.paa";
686+
picture = "\x\bnb_ex\gear\data\white_maaws_icon.paa";
685687
hiddenSelections[] = {"camo1"};
686-
hiddenSelectionsTextures[] = {"\x\bnb_ex\gear\data\maaws.paa"};
688+
hiddenSelectionsTextures[] = {"\x\bnb_ex\gear\data\maaws_tube.paa"};
687689
};
688690
class launch_MRAWS_green_F;
689-
class SAW_W_MAAWS1 : launch_MRAWS_green_F
691+
class BNB_EX_Gear_SAW_W_MAAWS1 : launch_MRAWS_green_F
690692
{
693+
author = "Sawtes";
691694
scope = 2;
692-
baseWeapon = "SAW_W_MAAWS1";
695+
baseWeapon = "BNB_EX_Gear_SAW_W_MAAWS1";
693696
displayName = "MAAWS Mk4 Mod 1 (White)";
694-
picture = "\x\bnb_ex\gear\data\whitemaawsicon.paa";
697+
picture = "\x\bnb_ex\gear\data\white_maaws_icon.paa";
695698
hiddenSelections[] = {"camo1"};
696-
hiddenSelectionsTextures[] = {"\x\bnb_ex\gear\data\maaws.paa"};
699+
hiddenSelectionsTextures[] = {"\x\bnb_ex\gear\data\maaws_tube.paa"};
697700
};
698701
class rhs_weap_ak74m;
699-
class SAW_W_AK_Adidas : rhs_weap_ak74m
702+
class BNB_EX_Gear_SAW_W_AK_Adidas : rhs_weap_ak74m
700703
{
701704
scope = 2;
702-
baseWeapon = "SAW_W_AK_Adidas";
705+
baseWeapon = "BNB_EX_Gear_SAW_W_AK_Adidas";
703706
displayName = "AK-74M (Adidas)";
704-
picture = "\x\bnb_ex\gear\data\akadidasicon.paa";
705-
hiddenSelectionsTextures[] = {"\x\bnb_ex\gear\data\akadidas.paa"};
707+
picture = "\x\bnb_ex\gear\data\ak_adidas_icon.paa";
708+
hiddenSelectionsTextures[] = {"\x\bnb_ex\gear\data\ak_adidas.paa"};
706709
};
707710
class rhs_weap_ak74m_npz;
708-
class SAW_W_AK_Adidas_npz : rhs_weap_ak74m_npz
711+
class BNB_EX_Gear_SAW_W_AK_Adidas_npz : rhs_weap_ak74m_npz
709712
{
710713
scope = 2;
711-
baseWeapon = "SAW_W_AK_Adidas_npz";
714+
baseWeapon = "BNB_EX_Gear_SAW_W_AK_Adidas_npz";
712715
displayName = "AK-74M (Adidas/B-13)";
713-
picture = "\x\bnb_ex\gear\data\akadidasicon.paa";
714-
hiddenSelectionsTextures[] = {"\x\bnb_ex\gear\data\akadidas.paa"};
716+
picture = "\x\bnb_ex\gear\data\ak_adidas_icon.paa";
717+
hiddenSelectionsTextures[] = {"\x\bnb_ex\gear\data\ak_adidas.paa"};
715718
};
716719
class rhs_weap_ak74m_gp25;
717-
class SAW_W_AK_Adidas_gp25 : rhs_weap_ak74m_gp25
720+
class BNB_EX_Gear_SAW_W_AK_Adidas_gp25 : rhs_weap_ak74m_gp25
718721
{
719722
scope = 2;
720-
baseWeapon = "SAW_W_AK_Adidas_gp25";
723+
baseWeapon = "BNB_EX_Gear_SAW_W_AK_Adidas_gp25";
721724
displayName = "AK-74M (Adidas/GP-25)";
722-
picture = "\x\bnb_ex\gear\data\akadidasicon.paa";
723-
hiddenSelectionsTextures[] = {"\x\bnb_ex\gear\data\akadidas.paa"};
725+
picture = "\x\bnb_ex\gear\data\ak_adidas_icon.paa";
726+
hiddenSelectionsTextures[] = {"\x\bnb_ex\gear\data\ak_adidas.paa"};
724727
};
725728
class rhs_weap_ak74m_gp25_npz;
726-
class SAW_W_AK_Adidas_gp25_npz : rhs_weap_ak74m_gp25_npz
729+
class BNB_EX_Gear_SAW_W_AK_Adidas_gp25_npz : rhs_weap_ak74m_gp25_npz
727730
{
728731
scope = 2;
729-
baseWeapon = "SAW_W_AK_Adidas_gp25_npz";
732+
baseWeapon = "BNB_EX_Gear_SAW_W_AK_Adidas_gp25_npz";
730733
displayName = "AK-74M (Adidas/GP-25/B-13)";
731-
picture = "\x\bnb_ex\gear\data\akadidasicon.paa";
732-
hiddenSelectionsTextures[] = {"\x\bnb_ex\gear\data\akadidas.paa"};
734+
picture = "\x\bnb_ex\gear\data\ak_adidas_icon.paa";
735+
hiddenSelectionsTextures[] = {"\x\bnb_ex\gear\data\ak_adidas.paa"};
733736
};
734737
};
735738
class CfgGlasses
@@ -1608,7 +1611,7 @@ class CfgVehicles
16081611

16091612
class O_Heli_Light_02_unarmed_F : Heli_Light_02_base_F
16101613
{
1611-
class textureSources
1614+
class TextureSources
16121615
{
16131616
class Black {
16141617
author = "Bohemia Interactive";
@@ -1638,7 +1641,7 @@ class CfgVehicles
16381641
{
16391642
displayName = "Russki";
16401643
author = "Ford";
1641-
textures[] = {"\x\bnb_ex\gear\data\rr.paa"};
1644+
textures[] = {"\x\bnb_ex\gear\data\kasatka_ka60_hull.paa"};
16421645
factions[] = {};
16431646
};
16441647
};
@@ -1650,9 +1653,9 @@ class CfgVehicles
16501653
displayName = "Adidas Warrior";
16511654
author = "Ford";
16521655
nakedUniform = "U_BasicBody";
1653-
uniformClass = "Adidas_Uniform";
1656+
uniformClass = "BNB_EX_Gear_Adidas_Uniform";
16541657
hiddenSelections[] = {"Camo"};
1655-
hiddenSelectionsTextures[] = {"\x\bnb_ex\gear\data\adidas.paa"};
1658+
hiddenSelectionsTextures[] = {"\x\bnb_ex\gear\data\adidas_trousers.paa"};
16561659

16571660
identityTypes[] = {"Head_NATO", "G_NATO_default"};
16581661
side = 1;
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)