Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Medication rework effects and od #12

Merged
merged 8 commits into from
Nov 16, 2024
Merged

Medication rework effects and od #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c82f006
Merge pull request #11 from Cplhardcore/Medication_Rework
Cplhardcore Oct 30, 2024
f571088
Adds alteplase and effects
Cplhardcore Oct 30, 2024
3459d41
Adds a whole bunch of OD effects
Cplhardcore Nov 12, 2024
91d054b
More stuff
Cplhardcore Nov 13, 2024
e6a9877
fixes
Cplhardcore Nov 13, 2024
25c660e
More fixes
Cplhardcore Nov 13, 2024
780fd5e
Fixes
Cplhardcore Nov 16, 2024
6ca29ab
overwrites and small changes
Cplhardcore Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/breathing/functions/fnc_fullHealLocal.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};
9 changes: 9 additions & 0 deletions addons/feedback/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
7 changes: 7 additions & 0 deletions addons/feedback/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
3 changes: 2 additions & 1 deletion addons/gui/functions/fnc_updateMedications.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ disableSerialization;
"kat_TXA",
"kat_morphineIV",
"kat_adenosineIV",
"kat_atropineIV"
"kat_atropineIV",
"kat_alteplase"
];

private _medicationsFound = {
Expand Down
1 change: 1 addition & 0 deletions addons/main/script_macros.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading