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.

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

Medical Vitals - Add SPO2 #9360

Merged
merged 29 commits into from
Feb 7, 2024
Merged

Medical Vitals - Add SPO2 #9360

merged 29 commits into from
Feb 7, 2024

Conversation

BrettMayson
Copy link
Member

When merged this pull request will:

  • Adds a function to get oxygen density given weather conditions
  • Adds an SPO2 simulation
    • Advanced fatigue recovery speed is influenced by SPO2
    • SPO2 decrease rate is influenced by demand for fatigue recovery
    • Heart rate is influenced by SPO2 and oxygen demand (fatigue recovery)
    • SPO2 increase rate is influenced by oxygen density, heart rate
    • Allows headgear and facewear to conditially supply oxygen

There are a lot of magic numbers, this is mostly an approximation as there is no way to properly simulate this without simulating the whole human.

Going to do more testing and maybe value tweaking, but I don't plan on adding anything more to this PR. I think #8929 should be fixed up and updated to use this system

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}.

@jonpas jonpas added the kind/feature Release Notes: **ADDED:** label Sep 7, 2023
@jonpas jonpas added this to the 3.16.1 milestone Sep 7, 2023
addons/medical_vitals/config.cpp Outdated Show resolved Hide resolved
@PabstMirror PabstMirror modified the milestones: 3.16.1, Ongoing Oct 18, 2023
@BrettMayson BrettMayson marked this pull request as draft January 16, 2024 01:10
@BrettMayson
Copy link
Member Author

My group is currently playing with the PR merged, problems with respawn and trying to fully heal. Also want more testing on HR.

@LinkIsGrim LinkIsGrim dismissed their stale review January 16, 2024 01:13

Issues found

@johnb432
Copy link
Contributor

@LinkIsGrim Don't you think it's slightly OP to reset oxygen demand when a unit is fully healed, especially if #9714 is going to considered?

@LinkIsGrim
Copy link
Contributor

No. It's a full heal, and resetting oxygen demand to 0 won't change an/ae reserves. It will just be recalculated to an accurate value a few frames later anyway.

@johnb432
Copy link
Contributor

My group is currently playing with the PR merged, problems with respawn and trying to fully heal. Also want more testing on HR.

Apart from that, what else needed fixing?

@BrettMayson
Copy link
Member Author

BrettMayson commented Jan 23, 2024

Maybe some balancing, and we have a compatibilty issue with grad trenches currently, or rather their stamina bug

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
@BrettMayson
Copy link
Member Author

Seems to be working great, no more passing our from a 30 second sprint

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.

Oxygen saturation will tend towards 100 on most maps, but the functionality is fine. I think we should get this merged and tweak the math as necessary.

@BrettMayson BrettMayson marked this pull request as ready for review February 5, 2024 21:14
@johnb432
Copy link
Contributor

johnb432 commented Feb 5, 2024

Do we want to merge this now or wait for another release?

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
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.

LGTM

@LinkIsGrim LinkIsGrim merged commit 1649422 into acemod:master Feb 7, 2024
5 checks passed
@LinkIsGrim LinkIsGrim modified the milestones: Ongoing, 3.16.4 Feb 7, 2024
@BrettMayson BrettMayson deleted the spo2 branch February 8, 2024 22:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature Release Notes: **ADDED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants