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

fixes #901

Browse Source
This commit is contained in:
Glowbal 2015-04-28 20:47:11 +02:00
parent dbf748ba93
commit f606c24854
6 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,8 +26,12 @@ if (alive _target) then {
} else {
_genericMessages pushback "STR_ACE_MEDICAL_diagnoseDead";
};
if (_target getvariable[QGVAR(hasLostBlood), false]) then {
_genericMessages pushback "STR_ACE_MEDICAL_lostBlood";
if (_target getvariable[QGVAR(hasLostBlood), 0] > 0) then {
if (_target getvariable[QGVAR(hasLostBlood), 0] > 1) then {
_genericMessages pushback "STR_ACE_MEDICAL_lostBloodALot";
} else {
_genericMessages pushback "STR_ACE_MEDICAL_lostBlood";
};
} else {
_genericMessages pushback "STR_ACE_MEDICAL_noBloodloss";
};

2
addons/medical/functions/fnc_displayPatientInformation.sqf
View File

@ -57,7 +57,7 @@ if (_show) then {
if (_target getvariable[QGVAR(isBleeding), false]) then {
_genericMessages pushback [localize "STR_ACE_MEDICAL_STATUS_BLEEDING", [1, 0.1, 0.1, 1]];
};
if (_target getvariable[QGVAR(hasLostBlood), false]) then {
if (_target getvariable[QGVAR(hasLostBlood), 0] > 1) then {
_genericMessages pushback [localize "STR_ACE_MEDICAL_STATUS_LOST_BLOOD", [1, 0.1, 0.1, 1]];
};

18
addons/medical/functions/fnc_handleUnitVitals.sqf
View File

@ -33,13 +33,19 @@ _bloodVolume = _bloodVolume max 0;
_unit setvariable [QGVAR(bloodVolume), _bloodVolume, _syncValues];
// Set variables for synchronizing information across the net
if (_bloodVolume < 90) then {
if !(_unit getvariable [QGVAR(hasLostBlood), false]) then {
_unit setvariable [QGVAR(hasLostBlood), true, true];
};
if (_bloodVolume < 100) then {
if ((_bloodVolume < 90 && (GVAR(level) == 2)) || _bloodVolume <= 30) then {
if (_unit getvariable [QGVAR(hasLostBlood), 0] != 2) then {
_unit setvariable [QGVAR(hasLostBlood), 2, true];
};
} else {
if (_unit getvariable [QGVAR(hasLostBlood), 0] != 1) then {
_unit setvariable [QGVAR(hasLostBlood), 1, true];
};
}
} else {
if (_unit getvariable [QGVAR(hasLostBlood),false]) then {
_unit setvariable [QGVAR(hasLostBlood), false, true];
if (_unit getvariable [QGVAR(hasLostBlood), 0] != 0) then {
_unit setvariable [QGVAR(hasLostBlood), 0, true];
};
};

2
addons/medical/functions/fnc_init.sqf
View File

@ -60,7 +60,7 @@ _unit setvariable [QGVAR(airwayCollapsed), false];
_unit setvariable [QGVAR(addedToUnitLoop), false, true];
_unit setvariable [QGVAR(inCardiacArrest), false, true];
_unit setVariable ["ACE_isUnconscious", false, true];
_unit setvariable [QGVAR(hasLostBlood), false, true];
_unit setvariable [QGVAR(hasLostBlood), 0, true];
_unit setvariable [QGVAR(isBleeding), false, true];
_unit setvariable [QGVAR(hasPain), false, true];
_unit setvariable [QGVAR(amountOfReviveLives), GVAR(amountOfReviveLives), true];

2
addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
View File

@ -55,7 +55,7 @@ if (alive _target) exitwith {
_target setvariable [QGVAR(inCardiacArrest), false, true];
_target setvariable [QGVAR(inReviveState), false, true];
_target setVariable ["ACE_isUnconscious", false, true];
_target setvariable [QGVAR(hasLostBlood), false, true];
_target setvariable [QGVAR(hasLostBlood), 0, true];
_target setvariable [QGVAR(isBleeding), false, true];
_target setvariable [QGVAR(hasPain), false, true];

3
addons/medical/stringtable.xml
View File

@ -1497,6 +1497,9 @@
<French>Il à perdu du sang</French>
<Polish>Stracił trochę krwi</Polish>
</Key>
<Key ID="STR_ACE_MEDICAL_lostBloodALot">
<English>He's lost a lot of blood</English>
</Key>
<Key ID="STR_ACE_MEDICAL_noBloodloss">
<English>He hasn't lost blood</English>
<Russian>Нет кровопотери</Russian>