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

removed local diagnose action. Added localization

Browse Source
This commit is contained in:
Glowbal
2015-04-25 12:35:07 +02:00
parent 4cef2a1fa4
commit 1415adc2bd
4 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
addons/medical/XEH_preInit.sqf
View File

@ -8,7 +8,6 @@ PREP(actionCheckPulse);
PREP(actionCheckPulseLocal); PREP(actionCheckPulseLocal);
PREP(actionCheckResponse); PREP(actionCheckResponse);
PREP(actionDiagnose); PREP(actionDiagnose);
PREP(actionDiagnoseLocal);
PREP(actionPlaceInBodyBag); PREP(actionPlaceInBodyBag);
PREP(actionRemoveTourniquet); PREP(actionRemoveTourniquet);
PREP(actionLoadUnit); PREP(actionLoadUnit);

23
addons/medical/functions/fnc_actionDiagnose.sqf
View File

@ -17,4 +17,25 @@
private ["_caller","_target","_title","_content"]; private ["_caller","_target","_title","_content"];
_caller = _this select 0; _caller = _this select 0;
_target = _this select 1; _target = _this select 1;
[[_caller, _target], QUOTE(DFUNC(actionDiagnoseLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */
_genericMessages = ["STR_ACE_MEDICAL_diagnoseMessage"];
_genericMessages pushBack ([_target] call EFUNC(common,getName));
if (alive _target) then {
_genericMessages pushback "STR_ACE_MEDICAL_diagnoseAlive";
} else {
_genericMessages pushback "STR_ACE_MEDICAL_diagnoseDead";
};
if (_target getvariable[QGVAR(hasLostBlood), false]) then {
_genericMessages pushback "STR_ACE_MEDICAL_lostBlood";
} else {
_genericMessages pushback "STR_ACE_MEDICAL_noBloodloss";
};
if (_target getvariable[QGVAR(hasPain), false]) then {
_genericMessages pushback "STR_ACE_MEDICAL_inPain";
} else {
_genericMessages pushback "STR_ACE_MEDICAL_noPain";
};
["displayTextStructured", [_caller], [_genericMessages, 3.0, _caller]] call EFUNC(common,targetEvent);

40
addons/medical/functions/fnc_actionDiagnoseLocal.sqf
View File

@ -1,40 +0,0 @@
/*
* Author: Glowbal
* Local callback for checking the pulse of a patient
*
* Arguments:
* 0: The medic <OBJECT>
* 1: The patient <OBJECT>
*
* Return Value:
* NONE
*
* Public: No
*/
#include "script_component.hpp"
_caller = _this select 0;
_unit = _this select 1;
_genericMessages = ["Patient %1<br/>is %2.<br/>%3.<br/>%4"];
_genericMessages pushBack ([_unit] call EFUNC(common,getName));
if (alive _unit) then {
_genericMessages pushback "alive";
} else {
_genericMessages pushback "dead";
};
if (_target getvariable[QGVAR(hasLostBlood), false]) then {
_genericMessages pushback "He's lost some blood";
} else {
_genericMessages pushback "He hasn't lost blood";
};
if (_target getvariable[QGVAR(hasPain), false]) then {
_genericMessages pushback "He is in pain";
} else {
_genericMessages pushback "He is not in pain";
};
diag_log _genericMessages;
["displayTextStructured", [_caller], [format _genericMessages, 3.0, _caller]] call EFUNC(common,targetEvent);

22
addons/medical/stringtable.xml
View File

@ -1322,6 +1322,28 @@
<Hungarian>Megnézted %1-t</Hungarian> <Hungarian>Megnézted %1-t</Hungarian>
<Italian>Hai controllato %1</Italian> <Italian>Hai controllato %1</Italian>
</Key> </Key>
<Key ID="STR_ACE_MEDICAL_diagnoseMessage">
<English>Patient %1&lt;br/&gt;is %2.&lt;br/&gt;%3.&lt;br/&gt;%4</English>
</Key>
<Key ID="STR_ACE_MEDICAL_diagnoseAlive">
<English>alive</English>
</Key>
<Key ID="STR_ACE_MEDICAL_diagnoseDead">
<English>dead</English>
</Key>
<Key ID="STR_ACE_MEDICAL_lostBlood">
<English>He's lost some blood</English>
</Key>
<Key ID="STR_ACE_MEDICAL_noBloodloss">
<English>He hasn't lost blood</English>
</Key>
<Key ID="STR_ACE_MEDICAL_inPain">
<English>He is in pain</English>
</Key>
<Key ID="STR_ACE_MEDICAL_noPain">
<English>He is not in pain</English>
</Key>
<Key ID="STR_ACE_MEDICAL_BANDAGED"> <Key ID="STR_ACE_MEDICAL_BANDAGED">
<English>Bandaged</English> <English>Bandaged</English>
<French>Bandé</French> <French>Bandé</French>