Medical - Add medication dosage support & improve overdose

addons/medical_status/XEH_PREP.hpp

@@ -5,6 +5,7 @@ PREP(getBloodLoss);
 PREP(getBloodPressure);
 PREP(getBloodVolumeChange);
 PREP(getCardiacOutput);
+PREP(getAllMedicationCount);
 PREP(getMedicationCount);
 PREP(handleKilled);
 PREP(handleKilledMission);

addons/medical_status/functions/fnc_addMedicationAdjustment.sqf

@@ -1,34 +1,34 @@
 #include "..\script_component.hpp"
 /*
- * Author: BaerMitUmlaut, PabstMirror
+ * Author: BaerMitUmlaut, PabstMirror, Cplhardcore
  * Adds a medication and it's effects
  *
  * Arguments:
  * 0: The Unit <OBJECT>
- * 1: Medication <STRING>
+ * 1: Medication <STRING> 
  * 2: Time in system for the adjustment to reach its peak <NUMBER>
  * 3: Duration the adjustment will have an effect <NUMBER>
  * 4: Heart Rate Adjust <NUMBER>
  * 5: Pain Suppress Adjust <NUMBER>
  * 6: Flow Adjust <NUMBER>
+ * 7: Dose of medication <NUMBER>
  *
  * Return Value:
  * None
  *
  * Example:
- * [player, "Morphine", 120, 60, -10, 0.8, -10] call ace_medical_status_fnc_addMedicationAdjustment
+ * [player, "Morphine", 1, 120, 60, -10, 0.8, -10] call ace_medical_status_fnc_addMedicationAdjustment
  *
  * Public: No
  */
-params ["_unit", "_medication", "_timeToMaxEffect", "_maxTimeInSystem", "_hrAdjust", "_painAdjust", "_flowAdjust"];
-TRACE_7("addMedicationAdjustment",_unit,_medication,_timeToMaxEffect,_maxTimeInSystem,_hrAdjust,_painAdjust,_flowAdjust);
+params ["_unit", "_medication", "_timeToMaxEffect", "_maxTimeInSystem", "_hrAdjust", "_painAdjust", "_flowAdjust", "_dose"];
+TRACE_8("addMedicationAdjustment",_unit,_medication,_timeToMaxEffect,_maxTimeInSystem,_hrAdjust,_painAdjust,_flowAdjust,_dose);
 
 if (_maxTimeInSystem <= 0) exitWith { WARNING_1("bad value for _maxTimeInSystem - %1",_this); };
 _timeToMaxEffect = _timeToMaxEffect max 1;
 
 
 private _adjustments = _unit getVariable [VAR_MEDICATIONS, []];
 
-_adjustments pushBack [_medication, CBA_missionTime, _timeToMaxEffect, _maxTimeInSystem, _hrAdjust, _painAdjust, _flowAdjust];
-
+_adjustments pushBack [_medication, CBA_missionTime, _timeToMaxEffect, _maxTimeInSystem, _hrAdjust, _painAdjust, _flowAdjust, _dose];
 _unit setVariable [VAR_MEDICATIONS, _adjustments, true];

addons/medical_status/functions/fnc_getAllMedicationCount.sqf

@@ -0,0 +1,27 @@
+#include "..\script_component.hpp"
+/*
+ * Author: PabstMirror, Cplhardcore
+ * Gets effective count of all medications in a unit's system
+ * (each medication dose is scaled from 0..1 based on time till max effect and max time in system)
+ *
+ * Arguments:
+ * 0: The patient <OBJECT>
+ * 1: Get raw count (true) or effect ratio (false) <BOOL> (default: true)
+ *
+ * Return Value:
+ * Array of medication counts <ARRAY of ARRAY>:
+ *   0: Medication Name <String>
+ *   1: Dose Count <NUMBER>
+ *   2: Medication effectiveness (0-1) <NUMBER>
+ *
+ * Example:
+ * [player] call ace_medical_status_fnc_getAllMedicationCount
+ *
+ * Public: Yes
+ */
+
+params ["_target", ["_getCount", true]];
+
+private _medicationClasses = (_target getVariable [VAR_MEDICATIONS, []]) apply {_x select 0};
+_medicationClasses = _medicationClasses arrayIntersect _medicationClasses;
+_medicationClasses apply {[_target, _x, _getCount] call FUNC(getMedicationCount)} // return

addons/medical_status/functions/fnc_getMedicationCount.sqf

@@ -1,6 +1,6 @@
 #include "..\script_component.hpp"
 /*
- * Author: PabstMirror
+ * Author: PabstMirror, Cplhardcore
  * Gets effective count of medications in a unit's system
  * (each medication dose is scaled from 0..1 based on time till max effect and max time in system)
  *
@@ -9,8 +9,11 @@
  * 1: Medication (not case sensitive) <STRING>
  * 2: Get raw count (true) or effect ratio (false) <BOOL>(default: true)
  *
- * Return Value:
- * Medication count (float) <NUMBER>
+ * Returns Value:
+ *  0: Medication Name <String>
+ *  1: Dose Count <NUMBER>
+ *  2: Medication effectiveness (0-1) <NUMBER>
+ *
  *
  * Example:
  * [player, "Epinephrine"] call ace_medical_status_fnc_getMedicationCount
@@ -20,20 +23,23 @@
 
 params ["_target", "_medication", ["_getCount", true]];
 
-private _return = 0;
+private _effectivness = 0;
+private _medDose = 0;
 {
-    _x params ["_xMed", "_timeAdded", "_timeTillMaxEffect", "_maxTimeInSystem"];
+    _x params ["_xMed", "_timeAdded", "_timeTillMaxEffect", "_maxTimeInSystem", "", "", "", "_dose"];
     if (_xMed == _medication) then {
         private _timeInSystem = CBA_missionTime - _timeAdded;
+        _medDose = _medDose + _dose;
         if (_getCount) then {
-            // just return effective count, a medication will always start at 1 and only drop after reaching timeTilMaxEffect
-            _return = _return + linearConversion [_timeTillMaxEffect, _maxTimeInSystem, _timeInSystem, 1, 0, true];
+            // just effectivness effective count, a medication will always start at 1 and only drop after reaching timeTilMaxEffect
+            _effectivness = _effectivness + linearConversion [_timeTillMaxEffect, _maxTimeInSystem, _timeInSystem, 1, 0, true];
         } else {
             // as used in handleUnitVitals, a medication effectiveness will start low, ramp up to timeTillMaxEffect, and then drop off
-            _return = _return + (((_timeInSystem / _timeTillMaxEffect) ^ 2) min 1) * (_maxTimeInSystem - _timeInSystem) / _maxTimeInSystem;
+            _effectivness = _effectivness + (((_timeInSystem / _timeTillMaxEffect) ^ 2) min 1) * (_maxTimeInSystem - _timeInSystem) / _maxTimeInSystem;
         };
     };
 } forEach (_target getVariable [VAR_MEDICATIONS, []]);
 
-TRACE_4("getMedicationCount",_target,_medication,_getCount,_return);
-_return
+TRACE_5("getMedicationCount",_target,_medication,_getCount,_effectivness,_medDose);
+
+[_medication, _medDose, _effectivness]

addons/medical_treatment/ACE_Medical_Treatment.hpp

@@ -584,6 +584,7 @@ class ADDON {
             timeInSystem = 1800;
             timeTillMaxEffect = 30;
             maxDose = 4;
+            dose = 1;
             incompatibleMedication[] = {};
             viscosityChange = -10;
         };
@@ -595,6 +596,7 @@ class ADDON {
             timeInSystem = 120;
             timeTillMaxEffect = 10;
             maxDose = 9;
+            dose = 1;
             incompatibleMedication[] = {};
         };
         class Adenosine {
@@ -605,6 +607,7 @@ class ADDON {
             timeInSystem = 120;
             timeTillMaxEffect = 15;
             maxDose = 5;
+            dose = 1;
             incompatibleMedication[] = {};
         };
         class PainKillers {
@@ -615,6 +618,7 @@ class ADDON {
             timeInSystem = 420;
             timeTillMaxEffect = 60;
             maxDose = 5;
+            dose = 1;
             incompatibleMedication[] = {};
             viscosityChange = 5;
         };

addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp

@@ -114,10 +114,12 @@ class GVAR(actions) {
     class Morphine: FieldDressing {
         displayName = CSTRING(Inject_Morphine);
         displayNameProgress = CSTRING(Injecting_Morphine);
+        medicRequired = QGVAR(medicMorphine);
         icon = QPATHTOEF(medical_gui,ui\auto_injector.paa);
         allowedSelections[] = {"LeftArm", "RightArm", "LeftLeg", "RightLeg"};
         category = "medication";
         items[] = {"ACE_morphine"};
+        treatmentLocations = QGVAR(locationMorphine);
         condition = "";
         treatmentTime = QGVAR(treatmentTimeAutoinjector);
         callbackSuccess = QFUNC(medication);
@@ -128,8 +130,10 @@ class GVAR(actions) {
     class Adenosine: Morphine {
         displayName = CSTRING(Inject_Adenosine);
         displayNameProgress = CSTRING(Injecting_Adenosine);
+        medicRequired = QGVAR(medicAdenosine);
         condition = QGVAR(advancedMedication);
         items[] = {"ACE_adenosine"};
+        treatmentLocations = QGVAR(locationAdenosine);
         litter[] = {{"ACE_MedicalLitter_adenosine"}};
     };
     class Epinephrine: Morphine {

addons/medical_treatment/XEH_PREP.hpp

@@ -48,6 +48,7 @@ PREP(loadUnit);
 PREP(medication);
 PREP(medicationLocal);
 PREP(onMedicationUsage);
+PREP(overDose);
 PREP(placeBodyBagInGrave);
 PREP(placeInBodyBag);
 PREP(placeInBodyBagOrGrave);

addons/medical_treatment/functions/fnc_medicationLocal.sqf

@@ -1,6 +1,6 @@
 #include "..\script_component.hpp"
 /*
- * Author: Glowbal, mharis001
+ * Author: Glowbal, mharis001, Cplhardcore
  * Local callback for administering medication to a patient.
  *
  * Arguments:
@@ -65,13 +65,12 @@ private _medicationConfig = _defaultConfig >> _classname;
 private _painReduce             = GET_NUMBER(_medicationConfig >> "painReduce",getNumber (_defaultConfig >> "painReduce"));
 private _timeInSystem           = GET_NUMBER(_medicationConfig >> "timeInSystem",getNumber (_defaultConfig >> "timeInSystem"));
 private _timeTillMaxEffect      = GET_NUMBER(_medicationConfig >> "timeTillMaxEffect",getNumber (_defaultConfig >> "timeTillMaxEffect"));
-private _maxDose                = GET_NUMBER(_medicationConfig >> "maxDose",getNumber (_defaultConfig >> "maxDose"));
-private _maxDoseDeviation       = GET_NUMBER(_medicationConfig >> "maxDoseDeviation",getNumber (_defaultConfig >> "maxDoseDeviation"));
 private _viscosityChange        = GET_NUMBER(_medicationConfig >> "viscosityChange",getNumber (_defaultConfig >> "viscosityChange"));
 private _hrIncreaseLow          = GET_ARRAY(_medicationConfig >> "hrIncreaseLow",getArray (_defaultConfig >> "hrIncreaseLow"));
 private _hrIncreaseNormal       = GET_ARRAY(_medicationConfig >> "hrIncreaseNormal",getArray (_defaultConfig >> "hrIncreaseNormal"));
 private _hrIncreaseHigh         = GET_ARRAY(_medicationConfig >> "hrIncreaseHigh",getArray (_defaultConfig >> "hrIncreaseHigh"));
 private _incompatibleMedication = GET_ARRAY(_medicationConfig >> "incompatibleMedication",getArray (_defaultConfig >> "incompatibleMedication"));
+private _dose                   = GET_NUMBER(_medicationConfig >> "dose",getNumber (_defaultConfig >> "dose"));
 
 private _heartRate = GET_HEART_RATE(_patient);
 private _hrIncrease = [_hrIncreaseLow, _hrIncreaseNormal, _hrIncreaseHigh] select (floor ((0 max _heartRate min 110) / 55));
@@ -80,7 +79,7 @@ private _heartRateChange = _minIncrease + random (_maxIncrease - _minIncrease);
 
 // Adjust the medication effects and add the medication to the list
 TRACE_3("adjustments",_heartRateChange,_painReduce,_viscosityChange);
-[_patient, _className, _timeTillMaxEffect, _timeInSystem, _heartRateChange, _painReduce, _viscosityChange] call EFUNC(medical_status,addMedicationAdjustment);
+[_patient, _className, _timeTillMaxEffect, _timeInSystem, _heartRateChange, _painReduce, _viscosityChange, _dose] call EFUNC(medical_status,addMedicationAdjustment);
 
 // Check for medication compatiblity
-[_patient, _className, _maxDose, _maxDoseDeviation, _incompatibleMedication] call FUNC(onMedicationUsage);
+[_patient, _className, _incompatibleMedication] call FUNC(onMedicationUsage);

addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

@@ -1,40 +1,40 @@
 #include "..\script_component.hpp"
 /*
- * Author: Glowbal
+ * Author: Glowbal, Cplhardcore
  * Handles the medication given to a patient.
  *
  * Arguments:
  * 0: The patient <OBJECT>
  * 1: Medication Treatment classname <STRING>
- * 2: Max dose (0 to ignore) <NUMBER>
- * 3: Max dose deviation <NUMBER>
- * 3: Incompatable medication <ARRAY<STRING>>
+ * 2: Incompatible medication <ARRAY<STRING>>
  *
  * Return Value:
  * None
  *
  * Example:
- * [player, "morphine", 4, 2, [["x", 1]]] call ace_medical_treatment_fnc_onMedicationUsage
+ * [player, "morphine", [["x", 1]]] call ace_medical_treatment_fnc_onMedicationUsage
  *
  * Public: No
  */
 
-params ["_target", "_className", "_maxDose", "_maxDoseDeviation", "_incompatibleMedication"];
-TRACE_5("onMedicationUsage",_target,_className,_maxDose,_maxDoseDeviation,_incompatibleMedication);
-
-private _overdosedMedications = [];
+params ["_target", "_className", "_incompatibleMedication"];
+TRACE_3("onMedicationUsage",_target,_className,_incompatibleMedication);
 
 // Check for overdose from current medication
+private _defaultConfig    = configFile >> QUOTE(ADDON) >> "Medication";
+private _medicationConfig = _defaultConfig >> _classname;
+private _maxDose          = GET_NUMBER(_medicationConfig >> "maxDose",getNumber (_defaultConfig >> "maxDose"));
+private _maxDoseDeviation = GET_NUMBER(_medicationConfig >> "maxDoseDeviation",getNumber (_defaultConfig >> "maxDoseDeviation"));
 if (_maxDose > 0) then {
-    private _currentDose = [_target, _className] call EFUNC(medical_status,getMedicationCount);
+    private _currentDose = [_target, _className] call EFUNC(medical_status,getMedicationCount) select 1;
     // Because both {floor random 0} and {floor random 1} return 0
     if (_maxDoseDeviation > 0) then {
         _maxDoseDeviation = _maxDoseDeviation + 1;
     };
 
     if (_currentDose > _maxDose + (floor random _maxDoseDeviation)) then {
         TRACE_1("exceeded max dose",_currentDose);
-        _overdosedMedications pushBackUnique _className;
+        [_target, _classname] call FUNC(overDose);
     };
 };
 
@@ -43,26 +43,6 @@ if (_maxDose > 0) then {
     _x params ["_xMed", "_xLimit"];
     private _inSystem = [_target, _xMed] call EFUNC(medical_status,getMedicationCount);
     if (_inSystem> _xLimit) then {
-        _overdosedMedications pushBackUnique _xMed;
+        [_target, _classname] call FUNC(overDose);
     };
 } forEach _incompatibleMedication;
-
-if (_overdosedMedications isNotEqualTo []) then {
-    private _medicationConfig = (configFile >> "ace_medical_treatment" >> "Medication");
-    private _onOverDose = getText (_medicationConfig >> "onOverDose");
-    if (isClass (_medicationConfig >> _className)) then {
-        _medicationConfig = (_medicationConfig >> _className);
-        if (isText (_medicationConfig  >> "onOverDose")) then { _onOverDose = getText (_medicationConfig >> "onOverDose"); };
-    };
-    TRACE_2("overdose",_overdosedMedications,_onOverDose);
-    if (_onOverDose == "") exitWith {
-        TRACE_1("CriticalVitals Event",_target); // make unconscious
-        [QEGVAR(medical,CriticalVitals), _target] call CBA_fnc_localEvent;
-    };
-    if (isNil _onOverDose) then {
-        _onOverDose = compile _onOverDose;
-    } else {
-        _onOverDose = missionNamespace getVariable _onOverDose;
-    };
-    [_target, _className, _overdosedMedications] call _onOverDose;
-};

addons/medical_treatment/functions/fnc_overDose.sqf

@@ -0,0 +1,43 @@
+#include "..\script_component.hpp"
+/*
+ * Author: Cplhardcore
+ * Handles the overdose effects of a medication.
+ *
+ * Arguments:
+ * 0: The patient <OBJECT>
+ * 1: Medication classname <STRING>
+ * 2: Incompatible medication <ARRAY of STRING>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [player, "morphine"] call ace_medical_treatment_fnc_overDose
+ * Public: No
+ */
+
+params ["_unit", "_classname"];
+
+private _medicationConfig = configFile >> QUOTE(ADDON) >> "Medication";
+private _onOverDose = getText (_medicationConfig >> "onOverDose");
+
+if (isClass _medicationConfig) then {
+    _medicationConfig = _medicationConfig >> _classname;
+    if (isText (_medicationConfig >> "onOverDose")) then { 
+        _onOverDose = getText (_medicationConfig >> "onOverDose"); 
+    };
+};
+TRACE_2("overdose",_classname,_onOverDose);
+
+if (_onOverDose == "") exitWith {
+    TRACE_1("CriticalVitals Event",_unit);
+    [QEGVAR(medical,CriticalVitals), _unit] call CBA_fnc_localEvent;
+};
+
+if (isNil _onOverDose) then {
+    _onOverDose = compile _onOverDose;
+} else {
+    _onOverDose = missionNamespace getVariable _onOverDose;
+};
+
+[_target, _className] call _onOverDose

addons/medical_treatment/initSettings.inc.sqf

@@ -154,6 +154,42 @@
     true
 ] call CBA_fnc_addSetting;
 
+[
+    QGVAR(medicMorphine),
+    "LIST",
+    [LSTRING(MedicMorphine_DisplayName), LSTRING(MedicMorphine_Description)],
+    [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
+    [[0, 1, 2], [LSTRING(Anyone), LSTRING(Medics), LSTRING(Doctors)], 0],
+    true
+] call CBA_fnc_addSetting;
+
+[
+    QGVAR(locationMorphine),
+    "LIST",
+    [LSTRING(LocationMorphine_DisplayName), LSTRING(LocationMorphine_Description)],
+    [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
+    [[0, 1, 2, 3, 4], [ELSTRING(common,Anywhere), ELSTRING(common,Vehicle), LSTRING(MedicalFacilities), LSTRING(VehiclesAndFacilities), ELSTRING(common,Disabled)], 0],
+    true
+] call CBA_fnc_addSetting;
+
+[
+    QGVAR(medicAdenosine),
+    "LIST",
+    [LSTRING(MedicAdenosine_DisplayName), LSTRING(MedicAdenosine_Description)],
+    [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
+    [[0, 1, 2], [LSTRING(Anyone), LSTRING(Medics), LSTRING(Doctors)], 0],
+    true
+] call CBA_fnc_addSetting;
+
+[
+    QGVAR(locationAdenosine),
+    "LIST",
+    [LSTRING(LocationAdenosine_DisplayName), LSTRING(LocationAdenosine_Description)],
+    [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
+    [[0, 1, 2, 3, 4], [ELSTRING(common,Anywhere), ELSTRING(common,Vehicle), LSTRING(MedicalFacilities), LSTRING(VehiclesAndFacilities), ELSTRING(common,Disabled)], 0],
+    true
+] call CBA_fnc_addSetting;
+
 [
     QGVAR(medicPAK),
     "LIST",