mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Merge pull request #1550 from acemod/medicalVanillaDamageFix
Attempt to fix #1465 and #1354
This commit is contained in:
commit
9d82b9a1f3
@ -41,17 +41,24 @@ if (vehicle _unit != _unit && {!(vehicle _unit isKindOf "StaticWeapon")} && {isN
|
|||||||
if (GVAR(enableVehicleCrashes)) then {
|
if (GVAR(enableVehicleCrashes)) then {
|
||||||
_selectionName = _hitSelections select (floor(random(count _hitSelections)));
|
_selectionName = _hitSelections select (floor(random(count _hitSelections)));
|
||||||
_projectile = "vehiclecrash";
|
_projectile = "vehiclecrash";
|
||||||
|
_this set [1, _selectionName];
|
||||||
|
_this set [4, _projectile];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
// From AGM medical:
|
// From AGM medical:
|
||||||
// Exclude falling damage to everything other than legs; reduce structural damage.
|
// Exclude falling damage to everything other than legs; reduce structural damage.
|
||||||
if (((velocity _unit) select 2 < -5) && {(vehicle _unit == _unit)}) then {
|
if (((velocity _unit) select 2 < -5) && {(vehicle _unit == _unit)}) then {
|
||||||
_unit setVariable [QGVAR(isFalling), True];
|
_unit setVariable [QGVAR(isFalling), true];
|
||||||
|
_projectile = "falling";
|
||||||
|
_this set [4, "falling"];
|
||||||
};
|
};
|
||||||
|
|
||||||
if (_unit getVariable [QGVAR(isFalling), false] && {!(_selectionName in ["", "leg_l", "leg_r"])}) exitWith {0};
|
if (_unit getVariable [QGVAR(isFalling), false] && {!(_selectionName in ["", "leg_l", "leg_r"])}) exitWith {0};
|
||||||
if (_unit getVariable [QGVAR(isFalling), false]) then {
|
if (_unit getVariable [QGVAR(isFalling), false]) then {
|
||||||
|
if (_selectionName == "") then {
|
||||||
|
_selectionName = ["leg_l", "leg_r"] select (floor(random 2));
|
||||||
|
};
|
||||||
|
_this set [1, _selectionName];
|
||||||
_newDamage = _newDamage * 0.7;
|
_newDamage = _newDamage * 0.7;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user