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

Common/Medical - Change vehicle checks to objectParent (#9281)

Browse Source 
* switch to objectParent

* use objectParent in unloadUnit

* fix derp

* allow unload patient on dead units
This commit is contained in:
Grim 2023-07-22 09:11:58 +03:00 committed by GitHub
parent 9505d4c47e
commit 39e4f9340b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/common/XEH_postInit.sqf
View File

@ -402,11 +402,11 @@ addMissionEventHandler ["PlayerViewChanged", {
params ["_unit", "_target"];
// Players can always interact with himself if not boarded
vehicle _unit == _unit ||
isNull objectParent _unit ||
// Players can always interact with his vehicle
{vehicle _unit == _target} ||
{objectParent _unit isEqualTo _target} ||
// Players can always interact with passengers of the same vehicle
{_unit != _target && {vehicle _unit == vehicle _target}} ||
{_unit isNotEqualTo _target && {!isNull objectParent _target} && {objectParent _unit isEqualTo objectParent _target}} ||
// Players can always interact with connected UAV
{!(isNull (ACE_controlledUAV select 0))}
}] call FUNC(addCanInteractWithCondition);
@ -415,7 +415,7 @@ addMissionEventHandler ["PlayerViewChanged", {
["isNotUnconscious", {
params ["_unit"];
lifeState _unit != "INCAPACITATED"
lifeState _unit isNotEqualTo "INCAPACITATED"
}] call FUNC(addCanInteractWithCondition);
//////////////////////////////////////////////////

6
addons/medical_gui/CfgVehicles.hpp
View File

@ -38,7 +38,7 @@ class CfgVehicles {
};
class ACE_Medical_Radial {
displayName = CSTRING(Medical);
condition = QUOTE((GVAR(enableActions) == 1 || {GVAR(enableActions) != 2 && {vehicle _target != _target && {vehicle _target == vehicle _player}}}));
condition = QUOTE((GVAR(enableActions) == 1 || {GVAR(enableActions) != 2 && {!isNull objectParent _target && {objectParent _target isEqualTo objectParent _player}}}));
exceptions[] = {"isNotInside", "isNotSitting"};
statement = QUOTE([ARR_2(_target,0)] call FUNC(displayPatientInformation));
runOnHover = 1;
@ -49,7 +49,7 @@ class CfgVehicles {
};
class ACE_LoadPatient {
displayName = CSTRING(LoadPatient);
condition = QUOTE(_target getVariable [ARR_2('ACE_isUnconscious',false)] && {alive _target} && {vehicle _target == _target});
condition = QUOTE(_target getVariable [ARR_2('ACE_isUnconscious',false)] && {alive _target} && {isNull objectParent _target} && {(_target call EFUNC(common,nearestVehiclesFreeSeat)) isNotEqualTo []});
exceptions[] = {"isNotDragging", "isNotCarrying"};
statement = QUOTE([ARR_2(_player, _target)] call EFUNC(medical_treatment,loadUnit));
icon = QPATHTOF(ui\cross.paa);
@ -57,7 +57,7 @@ class CfgVehicles {
};
class ACE_UnloadPatient {
displayName = CSTRING(UnloadPatient);
condition = QUOTE(_target getVariable [ARR_2('ACE_isUnconscious',false)] && {vehicle _target != _target} && {vehicle _player == _player});
condition = QUOTE((_target getVariable [ARR_2('ACE_isUnconscious',false)] || {!alive _target}) && {!isNull objectParent _target} && {isNull objectParent _player});
exceptions[] = {"isNotDragging", "isNotCarrying", "isNotInside"};
statement = QUOTE([ARR_2(_player, _target)] call EFUNC(medical_treatment,unloadUnit));
icon = QPATHTOF(ui\cross.paa);

10
addons/medical_treatment/functions/fnc_unloadUnit.sqf
View File

@ -19,7 +19,7 @@
params ["_medic", "_patient"];
TRACE_2("unloadUnit",_medic,_patient);
if (vehicle _patient == _patient) exitWith {
if (isNull objectParent _patient) exitWith {
ERROR_1("Unit %1 is not in a vehicle",_patient);
};
@ -27,18 +27,18 @@ if (_patient call EFUNC(common,isAwake)) exitWith {
ERROR_1("Unit %1 is awake",_patient);
};
["ace_unloadPersonEvent", [_patient, vehicle _patient, _medic], _patient] call CBA_fnc_targetEvent;
["ace_unloadPersonEvent", [_patient, objectParent _patient, _medic], _patient] call CBA_fnc_targetEvent;
[{
params ["_unit", "_vehicle"];
(alive _unit) && {alive _vehicle} && {(vehicle _unit) != _vehicle}
params ["_unit"];
isNull objectParent _unit
}, {
params ["_unit", "_vehicle"];
TRACE_2("success",_unit,_vehicle);
private _patientName = [_unit, false, true] call EFUNC(common,getName);
private _vehicleName = getText (configOf _vehicle >> "displayName");
[[LSTRING(UnloadedFrom), _patientName, _vehicleName], 3] call EFUNC(common,displayTextStructured);
}, [_patient, vehicle _patient], 3, {
}, [_patient, objectParent _patient], 3, {
params ["_unit", "_vehicle"];
WARNING_3("unloadPerson failed to unload %1[local %2] -> %3 ",_unit,local _unit,_vehicle);
}] call CBA_fnc_waitUntilAndExecute;