diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index 7112c82fc5..4e73e77ee1 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -426,8 +426,8 @@ class CfgVehicles { }; }; - #define ARM_LEG_ARMOR_DEFAULT 2 - #define ARM_LEG_ARMOR_BETTER 4 + #define ARM_LEG_ARMOR_DEFAULT 3 + #define ARM_LEG_ARMOR_BETTER 5 #define ARM_LEG_ARMOR_CSAT 4 class Land; diff --git a/addons/medical/functions/fnc_handleDamage.sqf b/addons/medical/functions/fnc_handleDamage.sqf index fe06a47e9a..1a58e2ed01 100644 --- a/addons/medical/functions/fnc_handleDamage.sqf +++ b/addons/medical/functions/fnc_handleDamage.sqf @@ -1,4 +1,4 @@ -/* + /* * Author: KoffeinFlummi, Glowbal, commy2 * Main HandleDamage EH function. * @@ -33,7 +33,7 @@ if (typeName _projectile == "OBJECT") then { _this set [4, _projectile]; }; -TRACE_3("ACE_DEBUG: HandleDamage",_selection,_damage, _unit); +TRACE_3("ACE_DEBUG: HandleDamage",_selection,_damage,_unit); // If damage is in dummy hitpoints, "hands" and "legs", don't change anything if (_selection == "hands") exitWith {_unit getHit "hands"}; @@ -44,7 +44,7 @@ if (_selection != "" && {!(_selection in GVAR(SELECTIONS))}) exitWith {0}; //@to // Exit if we disable damage temporarily if !(_unit getVariable [QGVAR(allowDamage), true]) exitWith { - TRACE_3("ACE_DEBUG: HandleDamage damage disabled.",_selection,damage _unit, _unit); + TRACE_3("ACE_DEBUG: HandleDamage damage disabled.",_selection,damage _unit,_unit); if (_selection == "") then { damage _unit } else { @@ -59,6 +59,8 @@ _newDamage = _this call FUNC(handleDamage_caching); // handleDamage_caching may have modified the projectile string _typeOfDamage = [_projectile] call FUNC(getTypeOfDamage); +TRACE_3("ACE_DEBUG: HandleDamage caching new damage",_selection,_newDamage,_unit); + _typeIndex = (GVAR(allAvailableDamageTypes) find _typeOfDamage); _minLethalDamage = if (_typeIndex >= 0) then { GVAR(minLethalDamages) select _typeIndex @@ -126,4 +128,6 @@ if (((_unit getVariable [QGVAR(enableRevive), GVAR(enableRevive)]) > 0) && {_dam 0.89; }; +TRACE_3("ACE_DEBUG: HandleDamage damage return",_selection,_damageReturn,_unit); + _damageReturn