Skip to content

Commit 70080ac

Browse files
committed
config.cpp overwrite
1 parent ec1e660 commit 70080ac

File tree

1 file changed

+20
-130
lines changed

1 file changed

+20
-130
lines changed

addons/supply_crates/config.cpp

+20-130
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
class CfgPatches {
22
class bnb_ex_supply_crates {
33
// Addon identity
4-
name = "TF15 Extras - Supply Crates";
5-
author = "Task Force 15";
4+
name = "2BNB - Supply Crates";
5+
author = "2BNB";
66
authors[] = {
7-
"Arend"
7+
"Arend",
8+
"FarCry"
89
};
910
url = "https://discord.gg/rUUsCShkzJ";
1011
version = 1.0.0;
@@ -17,9 +18,6 @@ class CfgPatches {
1718
"ace_medical_treatment",
1819
"ace_grenades",
1920
"ace_explosives",
20-
"free_world_armoury",
21-
"japan_units",
22-
"rhsusaf",
2321
"CUP_Weapons_Ammunition"
2422
};
2523

@@ -57,24 +55,20 @@ class CfgVehicles {
5755
};
5856

5957
class BNB_EX_Resupply_Class_A : BNB_EX_Resupply {
60-
<<<<<<< Updated upstream
61-
displayName = "[TF15] Resupply Crate (Medic) - Class A";
62-
=======
6358
displayName = "[2BNB] Medical Crate";
64-
>>>>>>> Stashed changes
6559
scope = 2;
6660

6761
class TransportItems {
68-
class _xx_ACE_plasmaIV {
69-
name = "ACE_plasmaIV";
62+
class _xx_ACE_bloodIV {
63+
name = "ACE_bloodIV";
7064
count = 10;
7165
};
72-
class _xx_ACE_plasmaIV_500 {
73-
name = "ACE_plasmaIV_500";
66+
class _xx_ACE_bloodIV_500 {
67+
name = "ACE_bloodIV_500";
7468
count = 10;
7569
};
76-
class _xx_ACE_plasmaIV_250 {
77-
name = "ACE_plasmaIV_250";
70+
class _xx_ACE_bloodIV_250 {
71+
name = "ACE_bloodIV_250";
7872
count = 10;
7973
};
8074
class _xx_ACE_elasticBandage {
@@ -113,11 +107,7 @@ class CfgVehicles {
113107
};
114108

115109
class BNB_EX_Resupply_Class_B : BNB_EX_Resupply {
116-
<<<<<<< Updated upstream
117-
displayName = "[TF15] Resupply Crate (Ammo) - Class B";
118-
=======
119110
displayName = "[2BNB] Ammo Crate";
120-
>>>>>>> Stashed changes
121111
scope = 2;
122112

123113
class TransportMagazines {
@@ -133,129 +123,30 @@ class CfgVehicles {
133123
magazine = "ACE_30Rnd_556x45_Stanag_Dim";
134124
count = 15;
135125
};
136-
<<<<<<< Updated upstream
137-
class _xx_CUP_30Rnd_556x45_PMAG_BLACK {
138-
magazine = "CUP_30Rnd_556x45_PMAG_BLACK";
139-
count = 15
140-
};
141-
=======
142-
>>>>>>> Stashed changes
143126
class _xx_rhs_mag_30Rnd_556x45_Mk318_PMAG {
144127
magazine = "rhs_mag_30Rnd_556x45_Mk318_PMAG";
145-
count = 15
128+
count = 15;
146129
};
147130
class _xx_rhs_mag_30Rnd_556x45_Mk262_PMAG {
148131
magazine = "rhs_mag_30Rnd_556x45_Mk262_PMAG";
149-
count = 15
132+
count = 15;
150133
};
151134
class _xx_rhs_mag_30Rnd_556x45_M855A1_PMAG_Tacer_Red {
152135
magazine = "rhs_mag_30Rnd_556x45_M855A1_PMAG_Tacer_Red";
153-
count = 15
136+
count = 15;
154137
};
155138
class _xx_rhs_mag_30Rnd_556x45_M855_PMAG_Tracer_Red {
156139
magazine = "rhs_mag_30Rnd_556x45_M855_PMAG_Tracer_Red";
157-
count = 15
158-
};
159-
<<<<<<< Updated upstream
160-
class _xx_30Rnd_jpa_556x45_T_Stanag {
161-
magazine = "30Rnd_jpa_556x45_T_Stanag";
162-
count = 15
163-
};
164-
class _xx_20Rnd_jpa_762x51_Stanag {
165-
magazine = "20Rnd_jpa_762x51_Stanag";
166-
count = 10
167-
};
168-
class _xx_20Rnd_jpa_762x51_T_Stanag {
169-
magazine = "20Rnd_jpa_762x51_T_Stanag";
170-
count = 10
140+
count = 15;
171141
};
172-
=======
173-
>>>>>>> Stashed changes
174142
class _xx_ACE_20Rnd_762x51_M993_AP_Mag {
175143
magazine = "ACE_20Rnd_762x51_M993_AP_Mag";
176-
count = 10
144+
count = 10;
177145
};
178146
class _xx_ACE_20Rnd_762x51_Mag_Tracer_Dim {
179147
magazine = "ACE_20Rnd_762x51_Mag_Tracer_Dim";
180-
count = 10
181-
};
182-
class _xx_sp_fwa_m67_1rnd_heat {
183-
magazine = "sp_fwa_m67_1rnd_heat";
184-
count = 3
185-
};
186-
class _xx_sp_fwa_m67_1rnd_he {
187-
magazine = "sp_fwa_m67_1rnd_he";
188-
count = 3
189-
};
190-
<<<<<<< Updated upstream
191-
class _xx_sp_fwa_100Rnd_762_mag_ball {
192-
magazine = "sp_fwa_100Rnd_762_mag_ball";
193-
count = 6
194-
};
195-
class _xx_CUP_lmg_m249_pip3 {
196-
magazine = "CUP_lmg_m249_pip3";
197-
count = 8
198-
};
199-
class _xx_CUP_100Rnd_TE4_Red_Tracer_556x45_M249 {
200-
magazine = "CUP_100Rnd_TE4_Red_Tracer_556x45_M249";
201-
count = 8
202-
};
203-
class _xx_CUP_lmg_M240_B {
204-
magazine = "CUP_lmg_M240_B";
205-
count = 6
206-
};
207-
class _xx_CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M {
208-
magazine = "CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M";
209-
count = 6
210-
};
211-
class _xx_rhsusf_100Rnd_762x51_m61_ap {
212-
magazine = "rhsusf_100Rnd_762x51_m61_ap";
213-
count = 6
214-
};
215-
class _xx_rhsusf_100Rnd_762x51_m62_tracer {
216-
magazine = "rhsusf_100Rnd_762x51_m62_tracer";
217-
count = 6
218-
};
219-
class _xx_rhsusf_100Rnd_762x51_m80a1epr {
220-
magazine = "rhsusf_100Rnd_762x51_m80a1epr";
221-
count = 6
222-
};
223-
class _xx_rhsusf_100Rnd_556x45_soft_pouch_coyote {
224-
magazine = "rhsusf_100Rnd_556x45_soft_pouch_coyote";
225-
count = 8
226-
};
227-
class _xx_rhsusf_100Rnd_556x45_mixed_soft_pouch_coyote {
228-
magazine = "rhsusf_100Rnd_556x45_mixed_soft_pouch_coyote";
229-
count = 8
230-
};
231-
class _xx_rhsusf_100Rnd_556x45_M995_soft_pouch_coyote {
232-
magazine = "rhsusf_100Rnd_556x45_M995_soft_pouch_coyote";
233-
count - 8
234-
};
235-
class _xx_10Rnd_338_Mag {
236-
magazine = "10Rnd_338_Mag";
237-
count = 8
238-
};
239-
class _xx_ACE_10Rnd_762x67_Berger_Hybrid_OTM_Mag {
240-
magazine = "ACE_10Rnd_762x67_Berger_Hybrid_OTM_Mag";
241-
count = 8
242-
};
243-
class _xx_rhs_fim92_mag {
244-
magazine = "rhs_fim92_mag";
245-
count = 2
246-
};
247-
class _xx_sp_fwa_20Rnd_762_FAL_Metric_Tracer {
248-
magazine = "sp_fwa_20Rnd_762_FAL_Metric_Tracer";
249-
count = 10
250-
};
251-
class _xx_sp_fwa_20Rnd_762_FAL_Metric {
252-
magazine = "sp_fwa_20Rnd_762_FAL_Metric";
253-
count = 10
148+
count = 10;
254149
};
255-
class _xx_sp_fwa_20Rnd_762_FAL_Metric_Ball {
256-
magazine = "sp_fwa_20Rnd_762_FAL_Metric_Ball";
257-
count = 10
258-
=======
259150
class _xx_UK3CB_BAF_556_200Rnd_T {
260151
magazine = "UK3CB_BAF_556_200Rnd_T";
261152
count = 10;
@@ -303,7 +194,6 @@ class CfgVehicles {
303194
class _xx_UK3CB_BAF_556_30Rnd_T {
304195
magazine = "UK3CB_BAF_556_30Rnd_T";
305196
count = 15;
306-
>>>>>>> Stashed changes
307197
};
308198
class _xx_ACE_HuntIR_M203 {
309199
magazine = "ACE_HuntIR_M203";
@@ -345,15 +235,15 @@ class CfgVehicles {
345235
weapon = "hgun_Pistol_Signal_F";
346236
count = 2;
347237
};
238+
class _xx_rhs_weap_m72a7 {
239+
weapon = "rhs_weap_m72a7";
240+
count = 4;
241+
};
348242
};
349243
};
350244

351245
class BNB_EX_Resupply_Class_C : BNB_EX_Resupply {
352-
<<<<<<< Updated upstream
353-
displayName = "[TF15] Resupply Crate (Explosives) - Class C";
354-
=======
355246
displayName = "[2BNB] Explosive Crate";
356-
>>>>>>> Stashed changes
357247
scope = 2;
358248

359249
class TransportMagazines {

0 commit comments

Comments
 (0)