From 0e57d3d97ce33e1a3e789d54947124fee1256fa7 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Sat, 15 Aug 2015 18:25:48 +0200 Subject: [PATCH 1/4] Added assign medic, medicalfacility and medical vehicle curator modules --- addons/zeus/CfgVehicles.hpp | 30 ++++++++++ addons/zeus/XEH_preInit.sqf | 3 + addons/zeus/config.cpp | 5 +- addons/zeus/functions/fnc_moduleSetMedic.sqf | 53 ++++++++++++++++++ .../fnc_moduleSetMedicalFacility.sqf | 52 +++++++++++++++++ .../functions/fnc_moduleSetMedicalVehicle.sqf | 53 ++++++++++++++++++ addons/zeus/stringtable.xml | 17 +++++- addons/zeus/ui/Icon_Module_Zeus_Medic_ca.paa | Bin 0 -> 5625 bytes 8 files changed, 211 insertions(+), 2 deletions(-) create mode 100644 addons/zeus/functions/fnc_moduleSetMedic.sqf create mode 100644 addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf create mode 100644 addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf create mode 100644 addons/zeus/ui/Icon_Module_Zeus_Medic_ca.paa diff --git a/addons/zeus/CfgVehicles.hpp b/addons/zeus/CfgVehicles.hpp index 77273c60b7..35e4c6b1f6 100644 --- a/addons/zeus/CfgVehicles.hpp +++ b/addons/zeus/CfgVehicles.hpp @@ -115,4 +115,34 @@ class CfgVehicles { sync[] = {}; }; }; + class GVAR(moduleSetMedic): GVAR(moduleBase) { + curatorCanAttach = 1; + displayName = CSTRING(moduleSetMedic_displayName); + function = QFUNC(moduleSetMedic); + icon = QUOTE(PATHTOF(UI\Icon_Module_Zeus_Medic_ca.paa)); + class ModuleDescription { + description = ""; + sync[] = {}; + }; + }; + class GVAR(moduleSetMedicalVehicle): GVAR(moduleBase) { + curatorCanAttach = 1; + displayName = CSTRING(moduleSetMedicalVehicle_displayName); + function = QFUNC(moduleSetMedicalVehicle); + icon = QUOTE(PATHTOF(UI\Icon_Module_Zeus_Medic_ca.paa)); + class ModuleDescription { + description = ""; + sync[] = {}; + }; + }; + class GVAR(moduleSetMedicalFacility): GVAR(moduleBase) { + curatorCanAttach = 1; + displayName = CSTRING(moduleSetMedicalFacility_displayName); + function = QFUNC(moduleSetMedicalFacility); + icon = QUOTE(PATHTOF(UI\Icon_Module_Zeus_Medic_ca.paa)); + class ModuleDescription { + description = ""; + sync[] = {}; + }; + }; }; diff --git a/addons/zeus/XEH_preInit.sqf b/addons/zeus/XEH_preInit.sqf index 1b2ac19263..3817db218f 100644 --- a/addons/zeus/XEH_preInit.sqf +++ b/addons/zeus/XEH_preInit.sqf @@ -8,6 +8,9 @@ PREP(bi_moduleProjectile); PREP(bi_moduleRemoteControl); PREP(handleZeusUnitAssigned); PREP(moduleCaptive); +PREP(moduleSetMedic); +PREP(moduleSetMedicalVehicle); +PREP(moduleSetMedicalFacility); PREP(moduleSurrender); PREP(moduleUnconscious); PREP(moduleZeusSettings); diff --git a/addons/zeus/config.cpp b/addons/zeus/config.cpp index 7505f2770e..810ce17396 100644 --- a/addons/zeus/config.cpp +++ b/addons/zeus/config.cpp @@ -19,7 +19,10 @@ class CfgPatches { }; class GVAR(medical): ADDON { units[] = { - QGVAR(moduleUnconscious) + QGVAR(moduleUnconscious), + QGVAR(moduleSetMedic), + QGVAR(moduleSetMedicalVehicle), + QGVAR(moduleSetMedicalFacility) }; }; }; diff --git a/addons/zeus/functions/fnc_moduleSetMedic.sqf b/addons/zeus/functions/fnc_moduleSetMedic.sqf new file mode 100644 index 0000000000..4b3227e8f2 --- /dev/null +++ b/addons/zeus/functions/fnc_moduleSetMedic.sqf @@ -0,0 +1,53 @@ +/* + * Author: SilentSpike, Glowbal + * Assigns a medic role from the medical module to a unit + * + * Arguments: + * 0: The module logic + * 1: units + * 2: activated + * + * ReturnValue: + * nil + * + * Public: no + */ + +#include "script_component.hpp" + +private ["_mouseOver", "_unit", "_medicN"]; + +params ["_logic", "_units", "_activated"]; + +if !(_activated && local _logic) exitWith {}; + +if (isNil QEFUNC(captives,setSurrendered)) then { + [LSTRING(RequiresAddon)] call EFUNC(common,displayTextStructured); +} else { + _mouseOver = GETMVAR(bis_fnc_curatorObjectPlaced_mouseOver,[""]); + + if ((_mouseOver select 0) != "OBJECT") then { + [LSTRING(NothingSelected)] call EFUNC(common,displayTextStructured); + } else { + _unit = effectivecommander (_mouseOver select 1); + + if !(_unit isKindOf "CAManBase") then { + [LSTRING(OnlyInfantry)] call EFUNC(common,displayTextStructured); + } else { + if !(alive _unit) then { + [LSTRING(OnlyAlive)] call EFUNC(common,displayTextStructured); + } else { + if (GETVAR(_unit,EGVAR(captives,isHandcuffed),false)) then { + [LSTRING(OnlyNonCaptive)] call EFUNC(common,displayTextStructured); + } else { + _medicN = GETVAR(_unit,EGVAR(medical,medicClass),0); + if (_medicN < 1) then { + _unit setvariable [QEGVAR(medical,medicClass), 1, true]; + }; + }; + }; + }; + }; +}; + +deleteVehicle _logic; diff --git a/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf b/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf new file mode 100644 index 0000000000..c0f54e0ff2 --- /dev/null +++ b/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf @@ -0,0 +1,52 @@ +/* + * Author: SilentSpike, Glowbal + * Assigns a medic role from the medical module to a unit + * + * Arguments: + * 0: The module logic + * 1: units + * 2: activated + * + * ReturnValue: + * nil + * + * Public: no + */ + +#include "script_component.hpp" + +private ["_mouseOver", "_unit"]; + +params ["_logic", "_units", "_activated"]; + +if !(_activated && local _logic) exitWith {}; + +if (isNil QEFUNC(captives,setSurrendered)) then { + [LSTRING(RequiresAddon)] call EFUNC(common,displayTextStructured); +} else { + _mouseOver = GETMVAR(bis_fnc_curatorObjectPlaced_mouseOver,[""]); + + if ((_mouseOver select 0) != "OBJECT") then { + [LSTRING(NothingSelected)] call EFUNC(common,displayTextStructured); + } else { + _unit = (_mouseOver select 1); + + if (_unit isKindOf "CAManBase") then { + [LSTRING(NoMan)] call EFUNC(common,displayTextStructured); + } else { + if !(alive _unit) then { + [LSTRING(OnlyAlive)] call EFUNC(common,displayTextStructured); + } else { + if (GETVAR(_unit,EGVAR(captives,isHandcuffed),false)) then { + [LSTRING(OnlyNonCaptive)] call EFUNC(common,displayTextStructured); + } else { + if (!(GETVAR(_unit,EGVAR(medical,isMedicalFacility),false))) then { + _unit setvariable [QEGVAR(medical,isMedicalFacility), true, true]; + }; + }; + }; + }; + }; +}; + +deleteVehicle _logic; diff --git a/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf b/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf new file mode 100644 index 0000000000..e45826013b --- /dev/null +++ b/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf @@ -0,0 +1,53 @@ +/* + * Author: SilentSpike, Glowbal + * Assigns a medic role from the medical module to a unit + * + * Arguments: + * 0: The module logic + * 1: units + * 2: activated + * + * ReturnValue: + * nil + * + * Public: no + */ + +#include "script_component.hpp" + +private ["_mouseOver", "_unit", "_medicN"]; + +params ["_logic", "_units", "_activated"]; + +if !(_activated && local _logic) exitWith {}; + +if (isNil QEFUNC(captives,setSurrendered)) then { + [LSTRING(RequiresAddon)] call EFUNC(common,displayTextStructured); +} else { + _mouseOver = GETMVAR(bis_fnc_curatorObjectPlaced_mouseOver,[""]); + + if ((_mouseOver select 0) != "OBJECT") then { + [LSTRING(NothingSelected)] call EFUNC(common,displayTextStructured); + } else { + _unit = (_mouseOver select 1); + + if (_unit isKindOf "CAManBase") then { + [LSTRING(NoMan)] call EFUNC(common,displayTextStructured); + } else { + if !(alive _unit) then { + [LSTRING(OnlyAlive)] call EFUNC(common,displayTextStructured); + } else { + if (GETVAR(_unit,EGVAR(captives,isHandcuffed),false)) then { + [LSTRING(OnlyNonCaptive)] call EFUNC(common,displayTextStructured); + } else { + _medicN = GETVAR(_unit,EGVAR(medical,medicClass),0); + if (_medicN < 1) then { + _unit setvariable [QEGVAR(medical,medicClass), 1, true]; + }; + }; + }; + }; + }; +}; + +deleteVehicle _logic; diff --git a/addons/zeus/stringtable.xml b/addons/zeus/stringtable.xml index 7c70978aa4..824b91129e 100644 --- a/addons/zeus/stringtable.xml +++ b/addons/zeus/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -137,6 +137,15 @@ Bewusstlosigkeit umschalten Alternar inconsciência + + Assign Medic + + + Assign Medical Vehicle + + + Assign Medical Facility + Unit must be alive Utiliser uniquement sur une unité vivante @@ -161,6 +170,12 @@ Si può usare solo su fanteria a piedi Usar somente em infantaria desmontada + + Object must be a vehicle + + + Object must not be a man + Unit must not be captive Jednostka nie może być więźniem diff --git a/addons/zeus/ui/Icon_Module_Zeus_Medic_ca.paa b/addons/zeus/ui/Icon_Module_Zeus_Medic_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..60963046a74724dbff798e0390f06141cd40c8c5 GIT binary patch literal 5625 zcmeHLF-sgl6n>toctzllqzZw92)0+*-W36nE)T1sp3I(Lu4wpRigj zw@hU%T);ymDN^J}T6OZ??7iK&mE&$$6_4z|a{JxBneV-CzS$jSO4sYPmBspM%>w|f zwJ>`{J%8)_%L4BuUfU&r-RA&@F95#d<<c zkNfb0hQ|I}QN?~T*z(sf%sGs!A2nd{cKy9o#`Unv2I0K^NCDPo-1Hdt`KR^iHI&Et zBQDS!jE;+D%HnuO|GV=w3S}sinJ=qfkYDxH@0$N(#{(9h*MHyhKgWKGrc=4%WWBih z!5G+y59fbB&M&L~v-ThN_g`LrqyYQhRgZlBar1{;VAjtpe+TTUcOIY3um78VWhevC z2}9J_rcWK?wrmzAO37z6wJm+<{56r={Hf1+R(>JQB zCpZ7ZSW*1e%^5$({;k*e7h`#@mw(_8j3Lx|9*1D8!o62#R(x7kAwTzx2ePW{`qJ?; zFhj?psuMI{1|P4OChP>y+Q&EF7^{xo`Wn2C(+oR%U)o1W+8(}9QP0ZB^v?9gJIt9+ Hd5G^Hg4uWg literal 0 HcmV?d00001 From c7f47c0b34a5400613ec0faecc8aef05cfdaf3d1 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Sat, 15 Aug 2015 20:31:41 +0200 Subject: [PATCH 2/4] Replaced check for captive module by check for `ACE_medical` --- addons/zeus/functions/fnc_moduleSetMedic.sqf | 2 +- addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf | 2 +- addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/zeus/functions/fnc_moduleSetMedic.sqf b/addons/zeus/functions/fnc_moduleSetMedic.sqf index 4b3227e8f2..656d7b1269 100644 --- a/addons/zeus/functions/fnc_moduleSetMedic.sqf +++ b/addons/zeus/functions/fnc_moduleSetMedic.sqf @@ -21,7 +21,7 @@ params ["_logic", "_units", "_activated"]; if !(_activated && local _logic) exitWith {}; -if (isNil QEFUNC(captives,setSurrendered)) then { +if !(["ACE_Medical"] call EFUNC(common,isModLoaded)) then { [LSTRING(RequiresAddon)] call EFUNC(common,displayTextStructured); } else { _mouseOver = GETMVAR(bis_fnc_curatorObjectPlaced_mouseOver,[""]); diff --git a/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf b/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf index c0f54e0ff2..ae075f8f5f 100644 --- a/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf +++ b/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf @@ -21,7 +21,7 @@ params ["_logic", "_units", "_activated"]; if !(_activated && local _logic) exitWith {}; -if (isNil QEFUNC(captives,setSurrendered)) then { +if !(["ACE_Medical"] call EFUNC(common,isModLoaded)) then { [LSTRING(RequiresAddon)] call EFUNC(common,displayTextStructured); } else { _mouseOver = GETMVAR(bis_fnc_curatorObjectPlaced_mouseOver,[""]); diff --git a/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf b/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf index e45826013b..a50761bba4 100644 --- a/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf +++ b/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf @@ -21,7 +21,7 @@ params ["_logic", "_units", "_activated"]; if !(_activated && local _logic) exitWith {}; -if (isNil QEFUNC(captives,setSurrendered)) then { +if !(["ACE_Medical"] call EFUNC(common,isModLoaded)) then { [LSTRING(RequiresAddon)] call EFUNC(common,displayTextStructured); } else { _mouseOver = GETMVAR(bis_fnc_curatorObjectPlaced_mouseOver,[""]); From c01052e5bf5a16dc53d95b302f6edc1a99bf0635 Mon Sep 17 00:00:00 2001 From: SilentSpike Date: Sat, 15 Aug 2015 21:11:49 +0100 Subject: [PATCH 3/4] Update ace_zeus function headers --- addons/zeus/functions/fnc_moduleCaptive.sqf | 15 +++++++-------- addons/zeus/functions/fnc_moduleSetMedic.sqf | 15 +++++++-------- .../functions/fnc_moduleSetMedicalFacility.sqf | 15 +++++++-------- .../functions/fnc_moduleSetMedicalVehicle.sqf | 15 +++++++-------- addons/zeus/functions/fnc_moduleSurrender.sqf | 15 +++++++-------- addons/zeus/functions/fnc_moduleUnconscious.sqf | 15 +++++++-------- 6 files changed, 42 insertions(+), 48 deletions(-) diff --git a/addons/zeus/functions/fnc_moduleCaptive.sqf b/addons/zeus/functions/fnc_moduleCaptive.sqf index 94e421e8d9..8273c8ba6f 100644 --- a/addons/zeus/functions/fnc_moduleCaptive.sqf +++ b/addons/zeus/functions/fnc_moduleCaptive.sqf @@ -3,21 +3,20 @@ * Flips the capture state of the unit the module is placed on. * * Arguments: - * 0: The module logic - * 1: units - * 2: activated + * 0: The module logic + * 1: Synchronized units + * 2: Activated * - * ReturnValue: - * nil + * Return Value: + * None * - * Public: no + * Public: No */ #include "script_component.hpp" -private ["_mouseOver", "_unit", "_captive"]; - params ["_logic", "_units", "_activated"]; +private ["_mouseOver", "_unit", "_captive"]; if !(_activated && local _logic) exitWith {}; diff --git a/addons/zeus/functions/fnc_moduleSetMedic.sqf b/addons/zeus/functions/fnc_moduleSetMedic.sqf index 656d7b1269..661e33f907 100644 --- a/addons/zeus/functions/fnc_moduleSetMedic.sqf +++ b/addons/zeus/functions/fnc_moduleSetMedic.sqf @@ -3,21 +3,20 @@ * Assigns a medic role from the medical module to a unit * * Arguments: - * 0: The module logic - * 1: units - * 2: activated + * 0: The module logic + * 1: Synchronized units + * 2: Activated * - * ReturnValue: - * nil + * Return Value: + * None * - * Public: no + * Public: No */ #include "script_component.hpp" -private ["_mouseOver", "_unit", "_medicN"]; - params ["_logic", "_units", "_activated"]; +private ["_mouseOver", "_unit", "_medicN"]; if !(_activated && local _logic) exitWith {}; diff --git a/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf b/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf index ae075f8f5f..f032be667f 100644 --- a/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf +++ b/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf @@ -3,21 +3,20 @@ * Assigns a medic role from the medical module to a unit * * Arguments: - * 0: The module logic - * 1: units - * 2: activated + * 0: The module logic + * 1: Synchronized units + * 2: Activated * - * ReturnValue: - * nil + * Return Value: + * None * - * Public: no + * Public: No */ #include "script_component.hpp" -private ["_mouseOver", "_unit"]; - params ["_logic", "_units", "_activated"]; +private ["_mouseOver", "_unit"]; if !(_activated && local _logic) exitWith {}; diff --git a/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf b/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf index a50761bba4..cd6e16a023 100644 --- a/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf +++ b/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf @@ -3,21 +3,20 @@ * Assigns a medic role from the medical module to a unit * * Arguments: - * 0: The module logic - * 1: units - * 2: activated + * 0: The module logic + * 1: Synchronized units + * 2: Activated * - * ReturnValue: - * nil + * Return Value: + * None * - * Public: no + * Public: No */ #include "script_component.hpp" -private ["_mouseOver", "_unit", "_medicN"]; - params ["_logic", "_units", "_activated"]; +private ["_mouseOver", "_unit", "_medicN"]; if !(_activated && local _logic) exitWith {}; diff --git a/addons/zeus/functions/fnc_moduleSurrender.sqf b/addons/zeus/functions/fnc_moduleSurrender.sqf index b5365f8fc9..95f35593a5 100644 --- a/addons/zeus/functions/fnc_moduleSurrender.sqf +++ b/addons/zeus/functions/fnc_moduleSurrender.sqf @@ -3,21 +3,20 @@ * Flips the surrender state of the unit the module is placed on. * * Arguments: - * 0: The module logic - * 1: units - * 2: activated + * 0: The module logic + * 1: Synchronized units + * 2: Activated * - * ReturnValue: - * nil + * Return Value: + * None * - * Public: no + * Public: No */ #include "script_component.hpp" -private ["_mouseOver", "_unit", "_surrendering"]; - params ["_logic", "_units", "_activated"]; +private ["_mouseOver", "_unit", "_surrendering"]; if !(_activated && local _logic) exitWith {}; diff --git a/addons/zeus/functions/fnc_moduleUnconscious.sqf b/addons/zeus/functions/fnc_moduleUnconscious.sqf index eeff54a0f8..d9f9031cee 100644 --- a/addons/zeus/functions/fnc_moduleUnconscious.sqf +++ b/addons/zeus/functions/fnc_moduleUnconscious.sqf @@ -3,21 +3,20 @@ * Flips the unconscious state of the unit the module is placed on. * * Arguments: - * 0: The module logic - * 1: units - * 2: activated + * 0: The module logic + * 1: Synchronized units + * 2: Activated * - * ReturnValue: - * nil + * Return Value: + * None * - * Public: no + * Public: No */ #include "script_component.hpp" -private ["_mouseOver", "_unit", "_conscious"]; - params ["_logic", "_units", "_activated"]; +private ["_mouseOver", "_unit", "_conscious"]; if !(_activated && local _logic) exitWith {}; From 05bf239d8ece819a04ff8b626412b7722f3147dd Mon Sep 17 00:00:00 2001 From: SilentSpike Date: Sat, 15 Aug 2015 21:44:40 +0100 Subject: [PATCH 4/4] Specify zeus setMedic module conditions further --- addons/zeus/CfgVehicles.hpp | 6 +++--- .../functions/fnc_moduleSetMedicalFacility.sqf | 4 ++-- .../zeus/functions/fnc_moduleSetMedicalVehicle.sqf | 4 ++-- addons/zeus/stringtable.xml | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/zeus/CfgVehicles.hpp b/addons/zeus/CfgVehicles.hpp index 35e4c6b1f6..e110970ae3 100644 --- a/addons/zeus/CfgVehicles.hpp +++ b/addons/zeus/CfgVehicles.hpp @@ -117,7 +117,7 @@ class CfgVehicles { }; class GVAR(moduleSetMedic): GVAR(moduleBase) { curatorCanAttach = 1; - displayName = CSTRING(moduleSetMedic_displayName); + displayName = CSTRING(ModuleSetMedic_displayName); function = QFUNC(moduleSetMedic); icon = QUOTE(PATHTOF(UI\Icon_Module_Zeus_Medic_ca.paa)); class ModuleDescription { @@ -127,7 +127,7 @@ class CfgVehicles { }; class GVAR(moduleSetMedicalVehicle): GVAR(moduleBase) { curatorCanAttach = 1; - displayName = CSTRING(moduleSetMedicalVehicle_displayName); + displayName = CSTRING(ModuleSetMedicalVehicle_displayName); function = QFUNC(moduleSetMedicalVehicle); icon = QUOTE(PATHTOF(UI\Icon_Module_Zeus_Medic_ca.paa)); class ModuleDescription { @@ -137,7 +137,7 @@ class CfgVehicles { }; class GVAR(moduleSetMedicalFacility): GVAR(moduleBase) { curatorCanAttach = 1; - displayName = CSTRING(moduleSetMedicalFacility_displayName); + displayName = CSTRING(ModuleSetMedicalFacility_displayName); function = QFUNC(moduleSetMedicalFacility); icon = QUOTE(PATHTOF(UI\Icon_Module_Zeus_Medic_ca.paa)); class ModuleDescription { diff --git a/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf b/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf index f032be667f..22826108e7 100644 --- a/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf +++ b/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf @@ -30,8 +30,8 @@ if !(["ACE_Medical"] call EFUNC(common,isModLoaded)) then { } else { _unit = (_mouseOver select 1); - if (_unit isKindOf "CAManBase") then { - [LSTRING(NoMan)] call EFUNC(common,displayTextStructured); + if (_unit isKindOf "Man" || {!(_unit isKindOf "Building")}) then { + [LSTRING(OnlyStructures)] call EFUNC(common,displayTextStructured); } else { if !(alive _unit) then { [LSTRING(OnlyAlive)] call EFUNC(common,displayTextStructured); diff --git a/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf b/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf index cd6e16a023..9e5e788461 100644 --- a/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf +++ b/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf @@ -30,8 +30,8 @@ if !(["ACE_Medical"] call EFUNC(common,isModLoaded)) then { } else { _unit = (_mouseOver select 1); - if (_unit isKindOf "CAManBase") then { - [LSTRING(NoMan)] call EFUNC(common,displayTextStructured); + if (_unit isKindOf "Man" || {_unit isKindOf "Building"}) then { + [LSTRING(OnlyVehicles)] call EFUNC(common,displayTextStructured); } else { if !(alive _unit) then { [LSTRING(OnlyAlive)] call EFUNC(common,displayTextStructured); diff --git a/addons/zeus/stringtable.xml b/addons/zeus/stringtable.xml index 824b91129e..fd1c978188 100644 --- a/addons/zeus/stringtable.xml +++ b/addons/zeus/stringtable.xml @@ -137,13 +137,13 @@ Bewusstlosigkeit umschalten Alternar inconsciência - + Assign Medic - + Assign Medical Vehicle - + Assign Medical Facility @@ -170,11 +170,11 @@ Si può usare solo su fanteria a piedi Usar somente em infantaria desmontada - - Object must be a vehicle + + Unit must be a structure - - Object must not be a man + + Unit must be a vehicle Unit must not be captive