mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Reverted handleDamage_advanced
This commit is contained in:
@ -29,14 +29,11 @@ _newDamage = _this select 5;
|
|||||||
|
|
||||||
// Most likely taking exessive fire damage. Lets exit.
|
// Most likely taking exessive fire damage. Lets exit.
|
||||||
if (isNull _sourceOfDamage && {_typeOfProjectile == ""} && {vehicle _unit == _unit} && {(_selectionName == "head" || isBurning _unit)}) exitwith {
|
if (isNull _sourceOfDamage && {_typeOfProjectile == ""} && {vehicle _unit == _unit} && {(_selectionName == "head" || isBurning _unit)}) exitwith {
|
||||||
[_unit] call FUNC(handleDamage_advancedSetDamage);
|
|
||||||
0
|
0
|
||||||
};
|
};
|
||||||
|
_typeOfDamage = [_typeOfProjectile] call FUNC(getTypeOfDamage);
|
||||||
_part = [_selectionName] call FUNC(selectionNameToNumber);
|
_part = [_selectionName] call FUNC(selectionNameToNumber);
|
||||||
if (_part < 0) exitwith {
|
if (_part < 0) exitwith {};
|
||||||
[_unit] call FUNC(handleDamage_advancedSetDamage);
|
|
||||||
0
|
|
||||||
};
|
|
||||||
|
|
||||||
_hitPoints = ["HitHead", "HitBody", "HitLeftArm", "HitRightArm", "HitLeftLeg", "HitRightLeg"];
|
_hitPoints = ["HitHead", "HitBody", "HitLeftArm", "HitRightArm", "HitLeftLeg", "HitRightLeg"];
|
||||||
// Sorting out the damage
|
// Sorting out the damage
|
||||||
@ -47,7 +44,6 @@ _unit setvariable [QGVAR(bodyPartStatus), _damageBodyParts, true];
|
|||||||
|
|
||||||
[_unit] call FUNC(handleDamage_advancedSetDamage);
|
[_unit] call FUNC(handleDamage_advancedSetDamage);
|
||||||
|
|
||||||
_typeOfDamage = [_typeOfProjectile] call FUNC(getTypeOfDamage);
|
|
||||||
[_unit, _selectionName, _newDamage, _typeOfProjectile, _typeOfDamage] call FUNC(handleDamage_wounds);
|
[_unit, _selectionName, _newDamage, _typeOfProjectile, _typeOfDamage] call FUNC(handleDamage_wounds);
|
||||||
|
|
||||||
// TODO Disabled until implemented fully
|
// TODO Disabled until implemented fully
|
||||||
@ -68,4 +64,4 @@ if (alive _unit && {!(_unit getvariable ["ACE_isUnconscious", false])}) then {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
_amountOfDamage;
|
_amountOfDamage;
|
Reference in New Issue
Block a user