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

Jump to bottom

Medical - Add medication dosage support & improve overdose #10393

Merged
merged 60 commits into from
Nov 15, 2024
Merged

Medical - Add medication dosage support & improve overdose #10393

merged 60 commits into from
Nov 15, 2024

Conversation

Cplhardcore
Copy link
Contributor

When merged this pull request will:

  • Rework overdose slightly, for better handling with external mods with multiple dose levels for one kind of medication
  • splits overdose into its own function
  • adds the getAllMedicationCount function, which gets all medications in a unit and outputs them in an array of arrays containing the medication's name, the dose, and the effectiveness

IMPORTANT

  • If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

@LinkIsGrim LinkIsGrim self-assigned this Oct 11, 2024
@Cplhardcore Cplhardcore mentioned this pull request Oct 12, 2024
Open
@LinkIsGrim LinkIsGrim added the kind/enhancement Release Notes: **IMPROVED:** label Oct 12, 2024
LinkIsGrim
LinkIsGrim requested changes Oct 12, 2024
View reviewed changes
addons/medical_status/functions/fnc_getAllMedicationCount.sqf Outdated Show resolved Hide resolved
addons/medical_status/functions/fnc_getAllMedicationCount.sqf Outdated Show resolved Hide resolved
addons/medical_status/functions/fnc_getAllMedicationCount.sqf Outdated Show resolved Hide resolved
addons/medical_status/functions/fnc_getAllMedicationCount.sqf Outdated Show resolved Hide resolved
addons/medical_status/functions/fnc_getAllMedicationCount.sqf Show resolved Hide resolved
addons/medical_treatment/functions/fnc_Overdose.sqf Outdated Show resolved Hide resolved
addons/medical_treatment/functions/fnc_Overdose.sqf Outdated Show resolved Hide resolved
addons/medical_treatment/initSettings.inc.sqf Outdated Show resolved Hide resolved
addons/medical_treatment/initSettings.inc.sqf Outdated Show resolved Hide resolved
addons/medical_vitals/functions/fnc_handleUnitVitals.sqf Outdated Show resolved Hide resolved
Cplhardcore and others added 5 commits October 12, 2024 08:22
@Cplhardcore @LinkIsGrim
Update addons/medical_status/functions/fnc_addMedicationAdjustment.sqf
70f8f0d 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
@Cplhardcore @LinkIsGrim
Update addons/medical_status/functions/fnc_getAllMedicationCount.sqf
8c5716b 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
@Cplhardcore @LinkIsGrim
Update addons/medical_status/functions/fnc_getAllMedicationCount.sqf
684d8ec 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
@Cplhardcore
Fixes, maybe?
2e22795
@Cplhardcore
Overdose fixes
40abd2a
@LinkIsGrim
Copy link
Contributor

Don't worry about the failing pboProject build. Do worry about HEMTT warnings/errors though.

Cplhardcore and others added 2 commits October 23, 2024 01:07
@Cplhardcore @johnb432
Update addons/medical_treatment/functions/fnc_overDose.sqf
47c155f 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@Cplhardcore
Update fnc_overDose.sqf
b653251
johnb432
johnb432 reviewed Oct 23, 2024
View reviewed changes
Copy link
Contributor

@johnb432 johnb432 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I can tell, there no mention anywhere in the title or description about drugs getting CBA settings for their usage. IMO that part should be split off of this PR and made into a new one.

addons/medical_status/XEH_PREP.hpp Outdated Show resolved Hide resolved
addons/medical_status/functions/fnc_addMedicationAdjustment.sqf Outdated Show resolved Hide resolved
addons/medical_status/functions/fnc_addMedicationAdjustment.sqf Outdated Show resolved Hide resolved
addons/medical_status/functions/fnc_getMedicationCount.sqf Outdated Show resolved Hide resolved
addons/medical_status/functions/fnc_getMedicationCount.sqf Outdated Show resolved Hide resolved
addons/medical_status/functions/fnc_getMedicationCount.sqf Outdated Show resolved Hide resolved
addons/medical_treatment/functions/fnc_onMedicationUsage.sqf Outdated Show resolved Hide resolved
addons/medical_treatment/functions/fnc_overDose.sqf Outdated Show resolved Hide resolved
addons/medical_treatment/functions/fnc_overDose.sqf Show resolved Hide resolved
Cplhardcore and others added 13 commits October 23, 2024 17:51
@Cplhardcore @johnb432
Update addons/medical_status/functions/fnc_addMedicationAdjustment.sqf
d0e5ab4 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@Cplhardcore @johnb432
Update addons/medical_treatment/functions/fnc_overDose.sqf
6f1a5d9 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@Cplhardcore @johnb432
Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf
e21c4b9 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@Cplhardcore @johnb432
Update addons/medical_status/functions/fnc_addMedicationAdjustment.sqf
abe46c4 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@Cplhardcore @johnb432
Update addons/medical_status/functions/fnc_getMedicationCount.sqf
fd78fd7 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@Cplhardcore
Fixes
d951f22
@Cplhardcore
Moving med settings to different PR
91a36ae
@Cplhardcore
oopps
5ff69a7
@Cplhardcore
Stringtable
f692271
@johnb432
Misc fixes & cleanup
876485d
@johnb432
Update fnc_onMedicationUsage.sqf
bb3da04
@johnb432
Fix nonsensical code
4cfbc8a
@LinkIsGrim
add API event and doc
7f2fa8a
LinkIsGrim
LinkIsGrim previously approved these changes Oct 25, 2024
View reviewed changes
Copy link
Contributor

@LinkIsGrim LinkIsGrim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added listenable API event and additional args so hopefully there's no reason to overwrite this ever, but KAM uh, finds a way. Also fixed an undefined variable.

Not gonna ask for doc on the function call because it's not really done elsewhere, but would be nice.

@LinkIsGrim LinkIsGrim added this to the 3.18.2 milestone Oct 25, 2024
@LinkIsGrim LinkIsGrim dismissed their stale review October 25, 2024 19:52

Issues found

@LinkIsGrim
Copy link
Contributor

@Cplhardcore making requested changes left as an exercise to the reader, please don't make me fix EOF newlines and headers again

Cplhardcore and others added 2 commits November 3, 2024 10:22
@Cplhardcore @johnb432
Update addons/medical_treatment/ACE_Medical_Treatment.hpp
88a17c7 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@Cplhardcore
Update ACE_Medical_Treatment.hpp
38cd859
@LinkIsGrim LinkIsGrim merged commit e31aba5 into acemod:master Nov 15, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rautamiekka rautamiekka rautamiekka requested changes

@LinkIsGrim LinkIsGrim LinkIsGrim approved these changes

@johnb432 johnb432 johnb432 approved these changes

Assignees

@LinkIsGrim LinkIsGrim

Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Milestone
3.18.2
Development

Successfully merging this pull request may close these issues.
4 participants
@Cplhardcore @LinkIsGrim @rautamiekka @johnb432