Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify and fix medical engine damage

Browse Source
This commit is contained in:
commy2 2016-09-26 19:59:00 +02:00
parent 80232c39cc
commit 8fd7e8335a
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/medical_engine/functions/fnc_damageBodyPart.sqf
View File

@ -23,13 +23,13 @@
*/
#include "script_component.hpp"
params [["_unit", objNull, [objNull]], ["_selection", "", [""]], ["_damage", 1, [0]]];
params [["_unit", objNull, [objNull]], ["_selection", "", [""]], ["_damage", true, [false]]];
if (!local _unit) exitWith {
ACE_LOGERROR("Unit not local or null");
};
_damage = _damage min 0.99;
_damage = [0, 0.99] select _damage;
switch (toLower _selection) do {
case ("head"): {

12
addons/medical_engine/functions/fnc_handleDamage.sqf
View File

@ -32,16 +32,9 @@ if (_hitPointIndex < 0) then {
private _newDamage = _damage - _oldDamage;
_unit setVariable [format [QGVAR($%1), _hitPoint], _newDamage];
// Never kill the unit by the critical hit points of the engine.
// Because Arma now uses TOH 'depends' system, every hitpoint can cause this
_damage = _damage min 0.99;
// These control blood material visuals.
// If damage is in dummy hitpoints, "hands" and "legs", don't change anything
if (_hitPoint in ["hithead", "hitbody", "hithands", "hitlegs"]) exitWith {
TRACE_2("hd exited (hardcoded)",_hitPoint,_oldDamage); // @todo, this no longer works, as 'depends' hitpoints are calculated after each hd call
_oldDamage
};
if (_hitPoint in ["hithead", "hitbody", "hithands", "hitlegs"]) exitWith {_oldDamage};
// Add injury
if (_hitPoint isEqualTo "ace_hdbracket") exitWith {
@ -115,5 +108,4 @@ if (_hitPoint isEqualTo "#structural" && {getOxygenRemaining _unit <= 0.5} && {_
[QGVAR(woundReceived), [_unit, "Body", _newDamage, _unit, "#drowning"]] call CBA_fnc_localEvent;
};
TRACE_2("hd exited",_hitPoint,_damage);
_damage
0