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

prep for new pain aim sway method

Browse Source
This commit is contained in:
commy2 2016-10-06 23:44:14 +02:00
parent e9586ebccc
commit 56c77fed94
5 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/medical_engine/XEH_PREP.hpp
View File

@ -3,6 +3,5 @@ PREP(handleDamage);
PREP(playInjuredSound); PREP(playInjuredSound);
PREP(damageBodyPart); PREP(damageBodyPart);
PREP(setLimping); PREP(setLimping);
PREP(setPainSway);
PREP(setStructuralDamage); PREP(setStructuralDamage);
PREP(setUnconsciousAnim); PREP(setUnconsciousAnim);

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

@ -29,7 +29,7 @@ if (!local _unit) exitWith {
ERROR("Unit not local or null"); ERROR("Unit not local or null");
}; };
_damage = [0, 0.495] select _damage; _damage = [0, DAMAGED_MIN_THRESHOLD] select _damage;
switch (toLower _selection) do { switch (toLower _selection) do {
case ("head"): { case ("head"): {
@ -39,7 +39,7 @@ switch (toLower _selection) do {
_unit setHitPointDamage ["HitBody", _damage]; _unit setHitPointDamage ["HitBody", _damage];
}; };
case ("arms"): { case ("arms"): {
_unit setHitPointDamage ["HitHands", _damage + ([0, PAIN_MAX_DAMAGE] select (_unit getVariable [QGVAR(isInPain), false]))]; _unit setHitPointDamage ["HitHands", _damage];
}; };
case ("legs"): { case ("legs"): {
_unit setHitPointDamage ["HitLegs", _damage + ([0, LIMPING_MIN_DAMAGE] select (_unit getVariable [QGVAR(isLimping), false]))]; _unit setHitPointDamage ["HitLegs", _damage + ([0, LIMPING_MIN_DAMAGE] select (_unit getVariable [QGVAR(isLimping), false]))];

14
addons/medical_engine/functions/fnc_setLimping.sqf
View File

@ -24,4 +24,16 @@ if (!local _unit) exitWith {
_unit setVariable [QGVAR(isLimping), _isLimping, true]; _unit setVariable [QGVAR(isLimping), _isLimping, true];
[_unit, "Legs", _unit getHitPointDamage "HitLegs" >= DAMAGED_MIN_THRESHOLD + LIMPING_MIN_DAMAGE || _unit getHitPointDamage "HitLegs" <= DAMAGED_MIN_THRESHOLD] call FUNC(damageBodyPart); if (_isLimping) then {
if (_unit getHitPointDamage "HitLegs" >= DAMAGED_MIN_THRESHOLD && {_unit getHitPointDamage "HitLegs" != LIMPING_MIN_DAMAGE}) then {
[_unit, "Legs", true] call FUNC(damageBodyPart);
} else {
[_unit, "Legs", false] call FUNC(damageBodyPart);
};
} else {
if (_unit getHitPointDamage "HitLegs" >= DAMAGED_MIN_THRESHOLD && {_unit getHitPointDamage "HitLegs" != LIMPING_MIN_DAMAGE}) then {
[_unit, "Legs", true] call FUNC(damageBodyPart);
} else {
[_unit, "Legs", false] call FUNC(damageBodyPart);
};
};

27
addons/medical_engine/functions/fnc_setPainSway.sqf
View File

@ -1,27 +0,0 @@
/*
* Author: commy2
* Updates weapon sway caused by pain.
*
* Arguments:
* 0: Unit <OBJECT>
* 1: In pain (optional, default: true) <BOOLEAN>
*
* Return Value:
* None
*
* Example:
* [player, true] call ace_medical_engine_fnc_setPainSway
*
* Public: No
*/
#include "script_component.hpp"
params [["_unit", objNull, [objNull]], ["_isInPain", true, [false]]];
if (!local _unit) exitWith {
ERROR("Unit not local or null");
};
_unit setVariable [GVAR(isInPain), _isInPain, true];
[_unit, "Arms", _unit getHitPointDamage "HitHands" >= DAMAGED_MIN_THRESHOLD] call FUNC(damageBodyPart);

3
addons/medical_engine/script_component.hpp
View File

@ -44,6 +44,5 @@
#define PRIORITY_RIGHT_LEG (1 + random 1) #define PRIORITY_RIGHT_LEG (1 + random 1)
// don't change, these reflect hard coded engine behaviour // don't change, these reflect hard coded engine behaviour
#define DAMAGED_MIN_THRESHOLD 0.495 #define DAMAGED_MIN_THRESHOLD 0.45
#define PAIN_MAX_DAMAGE 0.345
#define LIMPING_MIN_DAMAGE 0.5 #define LIMPING_MIN_DAMAGE 0.5