From ee864b2c4634107161cb76598ccdd5ac148d0c38 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Fri, 9 Dec 2016 13:48:54 -0600 Subject: [PATCH] Fix medkit string, fix overpressure --- addons/medical/stringtable.xml | 3 +++ addons/overpressure/functions/fnc_firedEHBB.sqf | 2 +- addons/overpressure/functions/fnc_overpressureDamage.sqf | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 49b52160f1..4a3013ef25 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -3220,6 +3220,9 @@ Locations Medkit + + Where can the Medkit be used? + Locations PAK Место использования аптечки diff --git a/addons/overpressure/functions/fnc_firedEHBB.sqf b/addons/overpressure/functions/fnc_firedEHBB.sqf index a9a37a0560..101d5f0281 100644 --- a/addons/overpressure/functions/fnc_firedEHBB.sqf +++ b/addons/overpressure/functions/fnc_firedEHBB.sqf @@ -51,7 +51,7 @@ if (_distance < _backblastRange) then { private _damage = _alpha * _beta * _backblastDamage; [_damage * 100] call BIS_fnc_bloodEffect; - if (isClass (configFile >> "CfgPatches" >> "ACE_Medical") && {([_unit] call EFUNC(medical,hasMedicalEnabled))}) then { + if (isClass (configFile >> "CfgPatches" >> "ACE_Medical")) then { [_unit, _damage, "body", "backblast"] call EFUNC(medical,addDamageToUnit); } else { _unit setDamage (damage _unit + _damage); diff --git a/addons/overpressure/functions/fnc_overpressureDamage.sqf b/addons/overpressure/functions/fnc_overpressureDamage.sqf index 75286a968b..4d6e0798f5 100644 --- a/addons/overpressure/functions/fnc_overpressureDamage.sqf +++ b/addons/overpressure/functions/fnc_overpressureDamage.sqf @@ -55,7 +55,7 @@ TRACE_3("cache",_overpressureAngle,_overpressureRange,_overpressureDamage); // If the target is the ACE_player if (_x == ACE_player) then {[_damage * 100] call BIS_fnc_bloodEffect}; - if (isClass (configFile >> "CfgPatches" >> "ACE_Medical") && {([_x] call EFUNC(medical,hasMedicalEnabled))}) then { + if (isClass (configFile >> "CfgPatches" >> "ACE_Medical")) then { [_x, _damage, "body", "backblast"] call EFUNC(medical,addDamageToUnit); } else { _x setDamage (damage _x + _damage);