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

Fix cardiac arrest time scale (#6244)

Browse Source 
This was changed from minutes to seconds at some point, but not
everywhere. Just making it consistent.
This commit is contained in:
SilentSpike 2018-04-18 23:25:44 +01:00 committed by GitHub
parent 895f08a215
commit 535e285c2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/medical/XEH_preInit.sqf
View File

@ -46,9 +46,9 @@ GVAR(STATE_MACHINE) = (configFile >> "ACE_Medical_StateMachine") call CBA_statem
[
QGVAR(cardiacArrestTime),
"SLIDER",
["Cardiac Arrest Time", "Sets how long cardiac arrest will last for on average (in minutes)."], //@todo
["Cardiac Arrest Time", "Sets how long cardiac arrest will last for on average (in seconds)."], //@todo
"ACE Medical", // @todo
[0, 30, 2, 0],
[0, 300, 30, 0],
true
] call CBA_Settings_fnc_init;
*/

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

@ -16,4 +16,4 @@ params ["_unit"];
private _startTime = _unit getVariable [QGVAR(cardiacArrestStart), CBA_missionTime];
private _lifeTime = _unit getVariable [QGVAR(cardiacArrestTime), GVAR(cardiacArrestTime)];
(CBA_missionTime - _startTime) > (_lifeTime * 60)
(CBA_missionTime - _startTime) > _lifeTime

1
addons/medical/functions/fnc_enteredStateCardiacArrest.sqf
View File

@ -14,6 +14,7 @@
params ["_unit"];
// 10% possible variance in cardiac arrest time
private _time = GVAR(cardiacArrestTime);
_time = _time + random [_time*-0.1, 0, _time*0.1];

4
addons/medical/stringtable.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Medical">
<Key ID="STR_ACE_Medical_Injuries">
@ -3514,7 +3514,7 @@
<English>In Cardiac Arrest</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_cardiacArrestTime_DisplayName">
<English>Cardiac Arrest time(s)</English>
<English>Cardiac Arrest time (seconds)</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_cardiacArrestTime_Description">
<English>Defines how long it takes to die from cardiac arrest?</English>