Skip to content

Commit 970a68a

Browse files
Apricot-aleApricot-ale
authored
General - Improve Item Boxes (KAT-Advanced-Medical#762)
**When merged this pull request will:** - _Minor config tweaks (fix some style)_ - _Remove old configs (Attachable_Helistretcher)_ - _Adds box configs to Vitals, Ophthalmology, Hypothermia, Misc._ - _Sort item configs_ - _Adds missing items to ACE advanced medical box._ - _Adds missing items to each KAM boxes._ - _Move KAM General Item box from breathing to misc._ - _Add Misc Item Box include some items that not in the other boxes (Armbands, Watches, FAKs...)_ - _Tweak Items and item counts_ ### IMPORTANT - [Development Guidelines](https://ace3.acemod.org/wiki/development/) are read, understood and applied. - Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`.
1 parent b71dc6d commit 970a68a

21 files changed

Lines changed: 224 additions & 118 deletions

‎addons/airway/CfgVehicles.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ class CfgVehicles {
5252
class TransportItems {
5353
MACRO_ADDITEM(kat_larynx,15);
5454
MACRO_ADDITEM(kat_guedel,15);
55-
MACRO_ADDITEM(kat_suction,15);
5655
MACRO_ADDITEM(kat_accuvac,1);
56+
MACRO_ADDITEM(kat_suction,10);
5757
};
5858
};
5959
};

‎addons/breathing/CfgVehicles.hpp‎

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -37,45 +37,19 @@ class CfgVehicles {
3737
class ACE_medicalSupplyCrate;
3838
class ACE_medicalSupplyCrate_advanced: ACE_medicalSupplyCrate {
3939
class TransportItems {
40-
MACRO_ADDITEM(kat_Pulseoximeter,3);
40+
MACRO_ADDITEM(kat_Pulseoximeter,5);
41+
MACRO_ADDITEM(kat_nasal,10);
4142
MACRO_ADDITEM(kat_chestSeal,25);
4243
MACRO_ADDITEM(kat_aatKit,10);
43-
MACRO_ADDITEM(kat_stethoscope,5);
44-
MACRO_ADDITEM(kat_BVM,5);
45-
MACRO_ADDITEM(kat_pocketBVM,5);
46-
MACRO_ADDITEM(kat_nasal,10);
47-
};
48-
class TransportMagazines {
49-
MACRO_ADDMAGAZINE(kat_oxygenTank_150,2);
50-
MACRO_ADDMAGAZINE(kat_oxygenTank_300,2);
51-
};
52-
};
53-
class kat_basicSupplyCrate: ACE_medicalSupplyCrate {
54-
displayName = CSTRING(basicSupplyCrate_display);
55-
class TransportItems {
56-
MACRO_ADDITEM(Attachable_Helistretcher,5);
57-
MACRO_ADDITEM(kat_stretcherBag,5);
58-
MACRO_ADDITEM(kat_accuvac,2);
59-
MACRO_ADDITEM(kat_suction,15);
60-
MACRO_ADDITEM(kat_guedel,15);
61-
MACRO_ADDITEM(kat_larynx,15);
62-
MACRO_ADDITEM(kat_aatKit,15);
63-
MACRO_ADDITEM(kat_chestSeal,15);
64-
MACRO_ADDITEM(kat_Pulseoximeter,2);
44+
MACRO_ADDITEM(kat_ncdKit,10);
6545
MACRO_ADDITEM(kat_stethoscope,2);
66-
MACRO_ADDITEM(kat_IO_FAST,15);
67-
MACRO_ADDITEM(kat_IV_16,15);
68-
MACRO_ADDITEM(kat_crosspanel,2);
69-
MACRO_ADDITEM(KAT_Empty_bloodIV_250,7);
70-
MACRO_ADDITEM(KAT_Empty_bloodIV_500,7);
71-
MACRO_ADDITEM(kat_AED,2);
72-
MACRO_ADDITEM(kat_X_AED,2);
73-
MACRO_ADDITEM(kat_BVM,5);
74-
MACRO_ADDITEM(kat_pocketBVM,5);
46+
MACRO_ADDITEM(kat_BVM,2);
47+
MACRO_ADDITEM(kat_pocketBVM,2);
7548
};
7649
class TransportMagazines {
7750
MACRO_ADDMAGAZINE(kat_oxygenTank_150,2);
7851
MACRO_ADDMAGAZINE(kat_oxygenTank_300,2);
52+
MACRO_ADDMAGAZINE(kat_personal_oxygen,2);
7953
};
8054
};
8155

‎addons/breathing/CfgWeapons.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class CfgWeapons {
6969
mass = 2;
7070
};
7171
};
72-
class kat_stethoscope: ACE_ItemCore {
72+
class kat_stethoscope: ACE_ItemCore {
7373
scope = 2;
7474
scopeCurator = 2;
7575
scopeArsenal = 2;

‎addons/breathing/stringtable.xml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2593,23 +2593,6 @@
25932593
<Finnish>Kuuntele keuhkojen ääniä</Finnish>
25942594
<Dutch>Beluister de longen</Dutch>
25952595
</Key>
2596-
<Key ID="STR_KAT_Breathing_basicSupplyCrate_display">
2597-
<English>[KAM] General Items</English>
2598-
<Czech>[KAM] Obecné předměty</Czech>
2599-
<French>[KAM] Objets généraux</French>
2600-
<Spanish>[KAM] Objetos Generales</Spanish>
2601-
<Italian>[KAM] Oggetti generali</Italian>
2602-
<Polish>[KAM] Podstawowe przedmioty</Polish>
2603-
<Portuguese>[KAM] Itens gerais</Portuguese>
2604-
<Russian>[КАМ] Общие пункты</Russian>
2605-
<German>[KAM] Allgemeine Gegenstände</German>
2606-
<Korean>[KAM] 일반 아이템</Korean>
2607-
<Japanese>[KAM] 一般物資箱</Japanese>
2608-
<Chinese>[KAM] 一般物品</Chinese>
2609-
<Chinesesimp>[KAM]一般项目</Chinesesimp>
2610-
<Finnish>[KAM] Yleiset kohteet</Finnish>
2611-
<Dutch>[KAM] Algemene items</Dutch>
2612-
</Key>
26132596
<Key ID="STR_KAT_Breathing_breath_mild">
26142597
<English>, slightly fruity</English>
26152598
<Czech>, lehce nasládlý zápach</Czech>

‎addons/chemical/CfgAmmo.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ class CfgAmmo {
106106
triggerDistance = 250;
107107
triggerSpeedCoef[] = {0.8,1};
108108
submunitionAmmo="KAT_CAS_M43_Ammo_sub";
109-
class CamShakeExplode
110-
{
109+
class CamShakeExplode {
111110
power = 20;
112111
duration = 2;
113112
frequency = 5;

‎addons/chemical/CfgMagazines.hpp‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,30 @@
1-
class CfgMagazines
2-
{
1+
class CfgMagazines {
32
class ACE_1Rnd_82mm_Mo_HE;
4-
class KAT_1Rnd_82mm_Mo_Type0: ACE_1Rnd_82mm_Mo_HE
5-
{
3+
class KAT_1Rnd_82mm_Mo_Type0: ACE_1Rnd_82mm_Mo_HE {
64
author="DiGii";
75
ammo="Sh_82mm_AMOS_Type0";
86
displayNameMFDFormat= CSTRING(ToxicGas_MFDNAME);
97
displayNameShort= CSTRING(ToxicGas_MFDNAME);
108
displayName= CSTRING(ToxicGas_DisplayName);
119
};
12-
class KAT_5Rnd_82mm_Mo_Type0_AI: KAT_1Rnd_82mm_Mo_Type0
13-
{
10+
class KAT_5Rnd_82mm_Mo_Type0_AI: KAT_1Rnd_82mm_Mo_Type0 {
1411
scope = 1;
1512
count = 5;
1613
};
17-
class KAT_1Rnd_82mm_Mo_TypeCS: ACE_1Rnd_82mm_Mo_HE
18-
{
14+
class KAT_1Rnd_82mm_Mo_TypeCS: ACE_1Rnd_82mm_Mo_HE {
1915
author="DiGii";
2016
ammo="Sh_82mm_AMOS_TypeCS";
2117
displayNameMFDFormat= CSTRING(CSGas_MFDNAME);
2218
displayNameShort= CSTRING(CSGas_MFDNAME);
2319
displayName= CSTRING(CSGas_DisplayName);
2420
};
25-
class KAT_3Rnd_82mm_Mo_TypeCS_AI: KAT_1Rnd_82mm_Mo_TypeCS
26-
{
21+
class KAT_3Rnd_82mm_Mo_TypeCS_AI: KAT_1Rnd_82mm_Mo_TypeCS {
2722
scope = 1;
2823
count = 3;
2924
};
3025

3126
class HandGrenade;
32-
class KAT_M7A3: HandGrenade
33-
{
27+
class KAT_M7A3: HandGrenade {
3428
author = "DiGi";
3529
displayname = CSTRING(M7A3_CSGrenade_DisplayName);
3630
descriptionShort = CSTRING(M7A3_DcsShort);
@@ -69,8 +63,7 @@ class CfgMagazines
6963
pylonWeapon = "KAT_CAS_M43_Bomb";
7064
};
7165

72-
class KAT_CAS_M43_Mag_x2 : PylonRack_Bomb_GBU12_x2
73-
{
66+
class KAT_CAS_M43_Mag_x2 : PylonRack_Bomb_GBU12_x2 {
7467
ammo = "KAT_CAS_M43_Ammo";
7568
author = "DiGii";
7669
count = 2;

‎addons/circulation/CfgVehicles.hpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,13 @@ class CfgVehicles {
184184

185185
class ACE_medicalSupplyCrate_advanced: ACE_medicalSupplyCrate {
186186
class TransportItems {
187-
MACRO_ADDITEM(kat_X_AED,1);
188187
MACRO_ADDITEM(kat_AED,1);
188+
MACRO_ADDITEM(kat_X_AED,1);
189+
MACRO_ADDITEM(kat_BPCuff,2);
189190
MACRO_ADDITEM(KAT_Empty_bloodIV_500,10);
190191
MACRO_ADDITEM(KAT_Empty_bloodIV_250,20);
191192
MACRO_ADDITEM(kat_crossPanel,5);
192193
};
193-
class TransportMagazines {
194-
MACRO_ADDMAGAZINE(kat_Painkiller,10);
195-
};
196194
};
197195
class kat_medicalSupplyCrate: ACE_medicalSupplyCrate {
198196
displayName = CSTRING(bloodbank);
@@ -227,6 +225,9 @@ class CfgVehicles {
227225
MACRO_ADDITEM(kat_bloodIV_AB_250,7);
228226
MACRO_ADDITEM(kat_bloodIV_AB_N_250,7);
229227
};
228+
class TransportMagazines {
229+
MACRO_ADDMAGAZINE(kat_Painkiller,5);
230+
};
230231
};
231232

232233
class LandVehicle;

‎addons/circulation/CfgWeapons.hpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@ class CfgWeapons {
9696
class kat_bloodIV_AB_N_250: kat_bloodIV_O_250 {
9797
displayName = CSTRING(BloodIV_AB_250_N);
9898
};
99-
class KAT_Empty_bloodIV_500: ACE_bloodIV
100-
{
99+
class KAT_Empty_bloodIV_500: ACE_bloodIV {
101100
displayName = CSTRING(FieldBloodTK500_Display);
102101
descriptionShort = CSTRING(FieldBloodTK_Desc);
103102
picture = QPATHTOF(ui\bloodIV_empty_ca.paa);
@@ -108,8 +107,7 @@ class CfgWeapons {
108107
mass = 2;
109108
};
110109
};
111-
class KAT_Empty_bloodIV_250: ACE_bloodIV
112-
{
110+
class KAT_Empty_bloodIV_250: ACE_bloodIV {
113111
displayName = CSTRING(FieldBloodTK250_Display);
114112
descriptionShort = CSTRING(FieldBloodTK_Desc);
115113
picture = QPATHTOF(ui\bloodIV_empty_ca.paa);

‎addons/hypothermia/CfgVehicles.hpp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
class CfgVehicles {
2+
class ACE_medicalSupplyCrate;
3+
class ACE_medicalSupplyCrate_advanced: ACE_medicalSupplyCrate {
4+
class TransportItems {
5+
MACRO_ADDITEM(kat_fluidWarmer,5);
6+
MACRO_ADDITEM(kat_handWarmer,15);
7+
};
8+
};
9+
210
class Man;
311

412
class CAManBase: Man {

‎addons/misc/CfgVehicles.hpp‎

Lines changed: 96 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,101 @@ class CfgVehicles {
7070
model = QPATHTOF(models\armband\Armband.p3d);
7171
hiddenSelectionsTextures[] = {QPATHTOF(models\armband\ArmbandKAT.paa)};
7272
};
73+
74+
class ACE_medicalSupplyCrate;
75+
class ACE_medicalSupplyCrate_advanced: ACE_medicalSupplyCrate {
76+
class TransportMagazines {
77+
MACRO_ADDMAGAZINE(kat_Bubble_Wrap,15);
78+
};
79+
};
80+
class kat_miscSupplyCrate: ACE_medicalSupplyCrate {
81+
displayName = CSTRING(miscSupplyCrate_display);
82+
class TransportItems {
83+
//chemical
84+
MACRO_ADDITEM(kat_gasmaskFilter,15);
85+
MACRO_ADDITEM(kat_sealant,15);
86+
MACRO_ADDITEM(KAT_ChemicalDetector,15);
87+
//misc.FAK
88+
MACRO_ADDITEM(kat_IFAK,15);
89+
MACRO_ADDITEM(kat_AFAK,15);
90+
MACRO_ADDITEM(kat_MFAK,15);
91+
//misc.Armband
92+
MACRO_ADDITEM(kat_Armband_Red_Cross_Item,5);
93+
MACRO_ADDITEM(kat_Armband_Medic_Item,5);
94+
MACRO_ADDITEM(kat_Armband_Doctor_Item,5);
95+
MACRO_ADDITEM(kat_Armband_Kat_Item,5);
96+
MACRO_ADDITEM(kat_Armband_Red_Cross_NVG,5);
97+
MACRO_ADDITEM(kat_Armband_Medic_NVG,5);
98+
MACRO_ADDITEM(kat_Armband_Doctor_NVG,5);
99+
MACRO_ADDITEM(kat_Armband_Kat_NVG,5);
100+
//stretcher
101+
MACRO_ADDITEM(kat_helistretcher,5);
102+
MACRO_ADDITEM(kat_stretcherBag,5);
103+
MACRO_ADDITEM(kat_CarryStretcherBag,5);
104+
//watch
105+
MACRO_ADDITEM(KAT_Katmin,15);
106+
MACRO_ADDITEM(KAT_Cavmin,15);
107+
MACRO_ADDITEM(KAT_STS,15);
108+
MACRO_ADDITEM(KAT_Ranger,15);
109+
};
110+
class TransportMagazines {
111+
//misc
112+
MACRO_ADDMAGAZINE(kat_Bubble_Wrap,15);
113+
//breathing
114+
MACRO_ADDMAGAZINE(kat_personal_oxygen,15);
115+
};
116+
};
117+
class kat_basicSupplyCrate: ACE_medicalSupplyCrate {
118+
displayName = CSTRING(basicSupplyCrate_display);
119+
class TransportItems {
120+
//airway
121+
MACRO_ADDITEM(kat_larynx,15);
122+
MACRO_ADDITEM(kat_guedel,15);
123+
MACRO_ADDITEM(kat_accuvac,2);
124+
MACRO_ADDITEM(kat_suction,10);
125+
//breathing
126+
MACRO_ADDITEM(kat_Pulseoximeter,5);
127+
MACRO_ADDITEM(kat_chestSeal,15);
128+
MACRO_ADDITEM(kat_aatKit,10);
129+
MACRO_ADDITEM(kat_ncdKit,10);
130+
MACRO_ADDITEM(kat_stethoscope,2);
131+
MACRO_ADDITEM(kat_BVM,5);
132+
MACRO_ADDITEM(kat_pocketBVM,5);
133+
//circulation
134+
MACRO_ADDITEM(KAT_Empty_bloodIV_250,7);
135+
MACRO_ADDITEM(KAT_Empty_bloodIV_500,7);
136+
MACRO_ADDITEM(kat_AED,2);
137+
MACRO_ADDITEM(kat_X_AED,2);
138+
MACRO_ADDITEM(kat_crosspanel,5);
139+
MACRO_ADDITEM(kat_BPCuff,5);
140+
//stretcher
141+
MACRO_ADDITEM(kat_helistretcher,5);
142+
MACRO_ADDITEM(kat_stretcherBag,5);
143+
//ophthalmology
144+
MACRO_ADDITEM(kat_eyecovers,15);
145+
//pharma
146+
MACRO_ADDITEM(kat_IO_FAST,15);
147+
MACRO_ADDITEM(kat_IV_16,15);
148+
//surgery
149+
MACRO_ADDITEM(kat_ultrasound,15);
150+
//vitals
151+
MACRO_ADDITEM(kat_basicDiagnostic,5);
152+
};
153+
class TransportMagazines {
154+
//breathing
155+
MACRO_ADDMAGAZINE(kat_oxygenTank_150,2);
156+
MACRO_ADDMAGAZINE(kat_oxygenTank_300,2);
157+
//misc
158+
MACRO_ADDMAGAZINE(kat_Bubble_Wrap,15);
159+
//ophthalmology
160+
MACRO_ADDMAGAZINE(KAT_Eyewasher,15);
161+
//pharmacy
162+
MACRO_ADDMAGAZINE(kat_Carbonate,15);
163+
MACRO_ADDMAGAZINE(kat_Painkiller,15);
164+
MACRO_ADDMAGAZINE(kat_Caffeine,15);
165+
};
166+
};
167+
73168
class Man;
74169
class CAManBase: Man {
75170
class ACE_Actions {
@@ -436,8 +531,7 @@ class CfgVehicles {
436531
};
437532
};
438533
};
439-
class ACE_SelfActions
440-
{
534+
class ACE_SelfActions {
441535
class KAT_Equipment {
442536
displayName = CSTRING(Kat_Equipment);
443537
icon = QPATHTOF(ui\KAM_Iteraction_Logo.paa);

0 commit comments

Comments
 (0)