Fix medkit string, fix overpressure

This commit is contained in:
PabstMirror 2016-12-09 13:48:54 -06:00
parent 05b9208d3c
commit ee864b2c46
3 changed files with 5 additions and 2 deletions

View File

@ -3220,6 +3220,9 @@
<Key ID="STR_ACE_Medical_AdvancedMedicalSettings_useLocation_Medkit_DisplayName">
<English>Locations Medkit</English>
</Key>
<Key ID="STR_ACE_Medical_AdvancedMedicalSettings_useLocation_Medkit_Description">
<English>Where can the Medkit be used?</English>
</Key>
<Key ID="STR_ACE_Medical_AdvancedMedicalSettings_useLocation_PAK_DisplayName">
<English>Locations PAK</English>
<Russian>Место использования аптечки</Russian>

View File

@ -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);

View File

@ -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);