Skip to content

Commit b8cc1bb

Browse files
AtrixZocktAtrixZockt
committed
Implemented requested Changes
1 parent 81f5b55 commit b8cc1bb

13 files changed

Lines changed: 51 additions & 83 deletions

‎addons/chemical/ACE_Medical_Injuries.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77

88
class ACE_Medical_Injuries {
99
class wounds {
10-
class ChemicalBurn {
10+
class KAT_ChemicalBurn {
1111
bleeding = 0.005; // mustard blisters weep — slow but persistent
1212
pain = 0.6;
1313
minDamage = 0;
1414
};
1515
};
1616

1717
class damageTypes {
18-
class chemicalBurn {
18+
class KAT_chemicalBurn {
1919
thresholds[] = {{0, 1}};
2020
selectionSpecific = 0;
21-
class ChemicalBurn {
21+
class KAT_ChemicalBurn {
2222
weighting[] = {{0, 1}};
2323
};
2424
};

‎addons/chemical/ACE_Medical_Treatment_Actions.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class ACE_Medical_Treatment_Actions {
22
class Diagnose;
3-
class PutOnGasMask: Diagnose {
3+
class KAT_PutOnGasMask: Diagnose {
44
displayName = CSTRING(giveGasMask_action);
55
displayNameProgress = CSTRING(giveGasMask_progress);
66
allowedSelections[] = {"Head"};
@@ -9,7 +9,7 @@ class ACE_Medical_Treatment_Actions {
99
condition = QUOTE([ARR_2(_player,_patient)] call FUNC(canPutGasMask));
1010
icon = QPATHTOF(ui\Gasmask_icon.paa);
1111
};
12-
class Decontaminate: Diagnose {
12+
class KAT_Decontaminate: Diagnose {
1313
displayName = CSTRING(UseDecon);
1414
displayNameProgress = CSTRING(UseDecon_Progress);
1515
allowedSelections[] = {"Body", "LeftArm", "RightArm", "LeftLeg", "RightLeg"};

‎addons/chemical/CfgAmmo.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class CfgAmmo {
66
};
77

88
class Smoke_82mm_AMOS_White;
9-
class Sh_82mm_AMOS_Type0: Smoke_82mm_AMOS_White {
9+
class KAT_Sh_82mm_AMOS_Type0: Smoke_82mm_AMOS_White {
1010
KAT_projectile = 1;
1111
KAT_lifetime = 200;
1212
KAT_radius = 15;
@@ -21,7 +21,7 @@ class CfgAmmo {
2121
submunitionAmmo = "KAT_SmokeShellArty";
2222
};
2323

24-
class Sh_82mm_AMOS_Type0_Cluster: Smoke_82mm_AMOS_White {
24+
class KAT_Sh_82mm_AMOS_Type0_Cluster: Smoke_82mm_AMOS_White {
2525
soundFakeFall[] = {"soundFakeFall0",0.25,"soundFakeFall1",0.25,"soundFakeFall2",0.25,"soundFakeFall3",0.25};
2626
soundFakeFall0[] = {"a3\Sounds_F\weapons\falling_bomb\fall_01.wss",3.16228,1,1000};
2727
soundFakeFall1[] = {"a3\Sounds_F\weapons\falling_bomb\fall_02.wss",3.16228,1,1000};
@@ -35,35 +35,35 @@ class CfgAmmo {
3535
submunitionAmmo="KAT_CAS_M43_Ammo_sub";
3636
};
3737

38-
class Sh_82mm_AMOS_TypeCS: Sh_82mm_AMOS_Type0 {
38+
class KAT_Sh_82mm_AMOS_TypeCS: KAT_Sh_82mm_AMOS_Type0 {
3939
KAT_projectile = 1;
4040
KAT_lifetime = 60;
4141
KAT_radius = 10;
4242
KAT_toxicLvL = 0; //cs
4343
};
4444

45-
class Sh_82mm_AMOS_Type2: Sh_82mm_AMOS_Type0 {
45+
class KAT_Sh_82mm_AMOS_Type2: KAT_Sh_82mm_AMOS_Type0 {
4646
KAT_projectile = 1;
4747
KAT_lifetime = 90;
4848
KAT_radius = 10;
4949
KAT_toxicLvL = 2; //phosgene
5050
};
5151

52-
class Sh_82mm_AMOS_Type3: Sh_82mm_AMOS_Type0 {
52+
class KAT_Sh_82mm_AMOS_Type3: KAT_Sh_82mm_AMOS_Type0 {
5353
KAT_projectile = 1;
5454
KAT_lifetime = 120;
5555
KAT_radius = 10;
5656
KAT_toxicLvL = 3; //mustard
5757
};
5858

59-
class Sh_82mm_AMOS_Type4: Sh_82mm_AMOS_Type0 {
59+
class KAT_Sh_82mm_AMOS_Type4: KAT_Sh_82mm_AMOS_Type0 {
6060
KAT_projectile = 1;
6161
KAT_lifetime = 90;
6262
KAT_radius = 10;
6363
KAT_toxicLvL = 4; //sarin
6464
};
6565

66-
class Sh_82mm_AMOS_Type5: Sh_82mm_AMOS_Type0 {
66+
class KAT_Sh_82mm_AMOS_Type5: KAT_Sh_82mm_AMOS_Type0 {
6767
KAT_projectile = 1;
6868
KAT_lifetime = 600;
6969
KAT_radius = 10;

‎addons/chemical/CfgMagazines.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ class CfgMagazines {
22
class ACE_1Rnd_82mm_Mo_HE;
33
class KAT_1Rnd_82mm_Mo_Type0: ACE_1Rnd_82mm_Mo_HE {
44
author="DiGii";
5-
ammo="Sh_82mm_AMOS_Type0";
5+
ammo="KAT_Sh_82mm_AMOS_Type0";
66
displayNameMFDFormat= CSTRING(ToxicGas_MFDNAME);
77
displayNameShort= CSTRING(ToxicGas_MFDNAME);
88
displayName= CSTRING(ToxicGas_DisplayName);
@@ -13,7 +13,7 @@ class CfgMagazines {
1313
};
1414
class KAT_1Rnd_82mm_Mo_Type0_Cluser: ACE_1Rnd_82mm_Mo_HE {
1515
author="DiGii";
16-
ammo="Sh_82mm_AMOS_Type0_Cluster";
16+
ammo="KAT_Sh_82mm_AMOS_Type0_Cluster";
1717
displayNameMFDFormat= CSTRING(ToxicGas_cluster_MFDNAME);
1818
displayNameShort= CSTRING(ToxicGas_cluster_MFDNAME);
1919
displayName= CSTRING(ToxicGas_cluster_DisplayName);
@@ -24,7 +24,7 @@ class CfgMagazines {
2424
};
2525
class KAT_1Rnd_82mm_Mo_TypeCS: ACE_1Rnd_82mm_Mo_HE {
2626
author="DiGii";
27-
ammo="Sh_82mm_AMOS_TypeCS";
27+
ammo="KAT_Sh_82mm_AMOS_TypeCS";
2828
displayNameMFDFormat= CSTRING(CSGas_MFDNAME);
2929
displayNameShort= CSTRING(CSGas_MFDNAME);
3030
displayName= CSTRING(CSGas_DisplayName);
@@ -36,7 +36,7 @@ class CfgMagazines {
3636

3737
class KAT_1Rnd_82mm_Mo_Type2: ACE_1Rnd_82mm_Mo_HE {
3838
author="DiGii";
39-
ammo="Sh_82mm_AMOS_Type2";
39+
ammo="KAT_Sh_82mm_AMOS_Type2";
4040
displayNameMFDFormat= CSTRING(Phosgene_MFDNAME);
4141
displayNameShort= CSTRING(Phosgene_MFDNAME);
4242
displayName= CSTRING(Phosgene_DisplayName);
@@ -48,7 +48,7 @@ class CfgMagazines {
4848

4949
class KAT_1Rnd_82mm_Mo_Type3: ACE_1Rnd_82mm_Mo_HE {
5050
author="DiGii";
51-
ammo="Sh_82mm_AMOS_Type3";
51+
ammo="KAT_Sh_82mm_AMOS_Type3";
5252
displayNameMFDFormat= CSTRING(Mustard_MFDNAME);
5353
displayNameShort= CSTRING(Mustard_MFDNAME);
5454
displayName= CSTRING(Mustard_DisplayName);
@@ -60,7 +60,7 @@ class CfgMagazines {
6060

6161
class KAT_1Rnd_82mm_Mo_Type4: ACE_1Rnd_82mm_Mo_HE {
6262
author="DiGii";
63-
ammo="Sh_82mm_AMOS_Type4";
63+
ammo="KAT_Sh_82mm_AMOS_Type4";
6464
displayNameMFDFormat= CSTRING(Sarin_MFDNAME);
6565
displayNameShort= CSTRING(Sarin_MFDNAME);
6666
displayName= CSTRING(Sarin_DisplayName);
@@ -72,7 +72,7 @@ class CfgMagazines {
7272

7373
class KAT_1Rnd_82mm_Mo_Type5: ACE_1Rnd_82mm_Mo_HE {
7474
author="DiGii";
75-
ammo="Sh_82mm_AMOS_Type5";
75+
ammo="KAT_Sh_82mm_AMOS_Type5";
7676
displayNameMFDFormat= CSTRING(VX_MFDNAME);
7777
displayNameShort= CSTRING(VX_MFDNAME);
7878
displayName= CSTRING(VX_DisplayName);

‎addons/chemical/XEH_PREP.hpp‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
PREP(addToExposureWatcher);
2+
PREP(applyDelayedEffect);
3+
PREP(applyMustardDamage);
14
PREP(AttributeRadius);
25
PREP(breathing);
36
PREP(canPutGasMask);
@@ -7,10 +10,21 @@ PREP(canTakeOffGasMask);
710
PREP(CASCreateGas);
811
PREP(changeGasMaskFilter);
912
PREP(checkGasMaskDur);
13+
PREP(clearContamination);
14+
PREP(contaminationTickPFH);
1015
PREP(createSealAction);
1116
PREP(csGrenade);
17+
PREP(decontaminate);
1218
PREP(displayGasMaskDur);
19+
PREP(effect_chlorine);
20+
PREP(effect_cs);
21+
PREP(effect_mustard);
22+
PREP(effect_phosgene);
23+
PREP(effect_sarin);
24+
PREP(effect_vx);
25+
PREP(emitSmellHint);
1326
PREP(enableChemDetector);
27+
PREP(exposureWatcherPFH);
1428
PREP(fullHealLocal);
1529
PREP(gasManagerPFH);
1630
PREP(gasmodule);
@@ -22,40 +36,24 @@ PREP(gui_updateInjuryListGeneral);
2236
PREP(handleFired);
2337
PREP(handleGasMaskDur);
2438
PREP(handleRespawn);
39+
PREP(hasCBRNProtection);
2540
PREP(hasDetector);
2641
PREP(hasGasmask);
2742
PREP(hasGasMaskON);
2843
PREP(hideChemDetector);
2944
PREP(init);
45+
PREP(initGasRegistry);
3046
PREP(initModule);
3147
PREP(poison);
3248
PREP(putOnGasMask);
49+
PREP(scheduleAirPoisoningOnset);
50+
PREP(scheduleNerveSymptomChain);
3351
PREP(showChemDetector);
3452
PREP(spawnSmoke);
53+
PREP(startContaminationTick);
3554
PREP(takeOffGasMask);
3655
PREP(throwGrenade);
37-
PREP(treatmentAdvanced_AtropineLocal);
3856
PREP(treatmentAdvanced_AtnaaLocal);
57+
PREP(treatmentAdvanced_AtropineLocal);
3958
PREP(ui_gasModule);
40-
41-
// New chemical-warfare refactor
42-
PREP(initGasRegistry);
43-
PREP(hasCBRNProtection);
44-
PREP(emitSmellHint);
45-
PREP(scheduleAirPoisoningOnset);
46-
PREP(scheduleNerveSymptomChain);
47-
PREP(addToExposureWatcher);
48-
PREP(exposureWatcherPFH);
49-
PREP(contaminationTickPFH);
50-
PREP(startContaminationTick);
51-
PREP(applyDelayedEffect);
52-
PREP(effect_cs);
53-
PREP(effect_chlorine);
54-
PREP(effect_phosgene);
55-
PREP(effect_mustard);
56-
PREP(applyMustardDamage);
57-
PREP(effect_sarin);
58-
PREP(effect_vx);
5959
PREP(useM8Paper);
60-
PREP(decontaminate);
61-
PREP(clearContamination);

‎addons/chemical/functions/fnc_applyDelayedEffect.sqf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ switch (_effect) do {
4747
};
4848
case "vomit": {
4949
private _sounds = [
50-
"\x\kat\addons\airway\sounds\puking1.wav",
51-
"\x\kat\addons\airway\sounds\puking2.wav",
52-
"\x\kat\addons\airway\sounds\puking3.wav"
50+
QPATHTOEF_SOUND(airway,sounds\puking1.wav),
51+
QPATHTOEF_SOUND(airway,sounds\puking2.wav),
52+
QPATHTOEF_SOUND(airway,sounds\puking1.wav)
5353
];
5454
playSound3D [selectRandom _sounds, _unit, false, getPosASL _unit, 8, 1, 15];
5555
};

‎addons/chemical/functions/fnc_applyMustardDamage.sqf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ _unit setVariable [QEGVAR(breathing,activeChestSeal), false, true];
3333
// Start deteriorating after delay
3434
[_unit] call EFUNC(breathing,handlePneumothoraxDeterioration);
3535

36-
if (GVAR(advPtxEnable)) then {
36+
if (EGVAR(breathing,advPtxEnable)) then {
3737
[_unit, 30, true] call EFUNC(breathing,inflictAdvancedPneumothorax);
3838
};
3939

@@ -47,7 +47,7 @@ _unit setVariable [VAR_PAIN, (_currentPain + 0.3) min 1, true];
4747
for "_i" from 1 to 6 do {
4848
private _bodyPart = selectRandom ["Body", "LeftArm", "RightArm", "LeftLeg", "RightLeg", "Head"];
4949
private _dmg = 0.1 + random 0.8;
50-
[_unit, _dmg, _bodyPart, "chemicalBurn", _unit] call ACEFUNC(medical,addDamageToUnit);
50+
[_unit, _dmg, _bodyPart, "KAT_chemicalBurn", _unit] call ACEFUNC(medical,addDamageToUnit);
5151

5252
// Cough sound (audible signal, helps medics locate)
5353
[QEGVAR(breathing,playCough), [_unit], _unit] call CBA_fnc_targetEvent;

‎addons/chemical/stringtable.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,19 +1349,19 @@
13491349
<English>Seconds the M8 paper result UI stays on screen.</English>
13501350
<German>Sekunden, die das M8-Papier-Ergebnis auf dem Bildschirm bleibt.</German>
13511351
</Key>
1352-
<Key ID="STR_ACE_Medical_Damage_ChemicalBurn">
1352+
<Key ID="STR_ACE_Medical_Damage_KAT_ChemicalBurn">
13531353
<English>Chemical Burn</English>
13541354
<German>Chemische Verätzung</German>
13551355
</Key>
1356-
<Key ID="STR_ACE_Medical_Damage_ChemicalBurn_Minor">
1356+
<Key ID="STR_ACE_Medical_Damage_KAT_ChemicalBurn_Minor">
13571357
<English>Minor Chemical Burn</English>
13581358
<German>Leichte chemische Verätzung</German>
13591359
</Key>
1360-
<Key ID="STR_ACE_Medical_Damage_ChemicalBurn_Medium">
1360+
<Key ID="STR_ACE_Medical_Damage_KAT_ChemicalBurn_Medium">
13611361
<English>Medium Chemical Burn</English>
13621362
<German>Mittlere chemische Verätzung</German>
13631363
</Key>
1364-
<Key ID="STR_ACE_Medical_Damage_ChemicalBurn_Large">
1364+
<Key ID="STR_ACE_Medical_Damage_KAT_ChemicalBurn_Large">
13651365
<English>Major Chemical Burn</English>
13661366
<German>Schwere chemische Verätzung</German>
13671367
</Key>

‎addons/main/script_macros.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@
270270

271271
#define QPATHTOF_SOUND(var1) QUOTE(PATHTOF2_SYS(PREFIX,COMPONENT,var1))
272272
#define QQPATHTOF_SOUND(var1) QUOTE(QPATHTOF_SOUND(var1))
273+
#define QPATHTOEF_SOUND(var1,var2) QUOTE(PATHTOF2_SYS(PREFIX,var1,var2))
273274

274275
#include "script_debug.hpp"
275276

‎addons/pharma/ACE_Medical_Treatment_Actions.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ class ACE_Medical_Treatment_Actions {
252252
sounds[] = {};
253253
};
254254
class ATNAA: Atropine {
255-
displayName = "$STR_KAT_Chemical_Take_ATNAA";
255+
displayName = ECSTRING(chemical,Take_ATNAA);
256256
items[] = {"kat_atnaa"};
257257
};
258258
class Ketamine: EACA {

0 commit comments

Comments
 (0)