Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite

This commit is contained in:
ulteq 2016-12-09 12:57:42 +01:00
commit a809047ac4
3 changed files with 14 additions and 1 deletions

View File

@ -230,4 +230,11 @@ class ACE_Settings {
values[] = {CSTRING(useSelection), CSTRING(useRadial), "Disabled"};
isClientSettable = 1;
};
class GVAR(ivFlowRate) {
category = CSTRING(Category_Medical);
displayName = CSTRING(MedicalSettings_ivFlowRate_DisplayName);
description = CSTRING(MedicalSettings_ivFlowRate_Description);
typeName = "SCALAR";
value = 1;
};
};

View File

@ -25,7 +25,7 @@ if (!isNil {_unit getVariable QGVAR(ivBags)}) then {
_bloodBags = _bloodBags apply {
_x params ["_bagVolumeRemaining"];
private _bagChange = _deltaT * (IV_CHANGE_PER_SECOND min _bagVolumeRemaining); // absolute value of the change in miliLiters
private _bagChange = (_deltaT * GVAR(ivFlowRate) * IV_CHANGE_PER_SECOND) min _bagVolumeRemaining; // absolute value of the change in miliLiters
_bagVolumeRemaining = _bagVolumeRemaining - _bagChange;
_bloodVolumeChange = _bloodVolumeChange + (_bagChange / 1000);

View File

@ -2931,6 +2931,12 @@
<Italian>Fornisce un sistema medico sia per giocatori che IA.</Italian>
<Japanese>プレイヤーと AI の両方へ医療システムを提供します。</Japanese>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_ivFlowRate_DisplayName">
<English>IV Transfusion Flow Rate</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_ivFlowRate_Description">
<English>Effects how quickly IV Bags will have effect</English>
</Key>
<Key ID="STR_ACE_Medical_BasicMedicalSettings_Module_DisplayName">
<English>Basic Medical Settings [ACE]</English>
<German>Standard Sanitätseinstellungen [ACE]</German>