Merge pull request #12 from Cplhardcore/Medication-Rework-Effects-and-OD

Medication rework effects and od
Cplhardcore · Nov 16, 2024 · 4c5f7b6 · 4c5f7b6
2 parents 2d717f9 + 6ca29ab
commit 4c5f7b6
Show file tree

Hide file tree

Showing 48 changed files with 1,091 additions and 107 deletions.
diff --git a/addons/breathing/functions/fnc_fullHealLocal.sqf b/addons/breathing/functions/fnc_fullHealLocal.sqf
@@ -28,7 +28,7 @@ _patient setVariable [QGVAR(etco2Monitor), [], true];
 _patient setVariable [QGVAR(breathRate), 15, true];
 _patient setVariable [QGVAR(nasalCannula), false, true];
 _patient setVariable [QGVAR(lungSurfaceArea), 400];
-
+_patient setvariable [QGVAR(respiratoryRateMultiplier), 1];
 if (ACEGVAR(advanced_fatigue,enabled)) then {
     ["kat_LSDF"] call ACEFUNC(advanced_fatigue,removeDutyFactor);
 };
diff --git a/addons/feedback/XEH_preInit.sqf b/addons/feedback/XEH_preInit.sqf
@@ -27,4 +27,13 @@ PREP_RECOMPILE_END;
     true
 ] call CBA_Settings_fnc_init;
 
+[
+    QGVAR(effectOverdose),
+    "CHECKBOX",
+    [LLSTRING(SETTING_overdoseEffect_display), LLSTRING(SETTING_overdoseEffect_DESC)],
+    CBA_SETTINGS_CAT,
+    [false],
+    true
+] call CBA_Settings_fnc_init;
+
 ADDON = true;
diff --git a/addons/feedback/stringtable.xml b/addons/feedback/stringtable.xml
@@ -37,5 +37,12 @@
             <English>Enables opioid effect on ketamine, fentanyl and pervitin</English>
             <Japanese>ケタミン、フェンタニル、ペルビチンなどでオピオイドの効果を有効にします</Japanese>
         </Key>
+        <Key ID="STR_KAT_Feedback_SETTING_effectOverdose_display">
+            <English>Enable Overdose effects</English>
+            <Japanese>オピオイド効果を有効化</Japanese>
+        </Key>
+        <Key ID="STR_KAT_Feedback_SETTING_effectOverdose_DESC">
+            <English>Enables Overdose effects on certain medications</English>
+        </Key>
     </Package>
 </Project>
diff --git a/addons/gui/functions/fnc_updateMedications.sqf b/addons/gui/functions/fnc_updateMedications.sqf
@@ -36,7 +36,8 @@ disableSerialization;
     "kat_TXA",
     "kat_morphineIV",
     "kat_adenosineIV",
-    "kat_atropineIV"
+    "kat_atropineIV",
+    "kat_alteplase"
 ];
 
 private _medicationsFound = {

diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp
@@ -189,6 +189,7 @@
 #undef GET_BLOOD_VOLUME             
 
 #define GET_OPIOID_FACTOR(unit)           (unit getVariable [QEGVAR(pharma,opioidFactor), 0])
+#define GET_OPIOID_DEPRESSION(unit)           (unit getVariable [QEGVAR(pharma,opioidDepression), 0])
 #define GET_PAIN_PERCEIVED(unit)    (0 max ((GET_PAIN(unit) - GET_PAIN_SUPPRESS(unit)) min 1))
 
 #undef GET_DAMAGE_THRESHOLD