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

Advanced Fatigue - Various improvements (continuation of #5723) #9714

Merged
merged 25 commits into from
Jun 22, 2024
Merged

Advanced Fatigue - Various improvements (continuation of #5723) #9714

merged 25 commits into from
Jun 22, 2024

Conversation

johnb432
Copy link
Contributor

@johnb432 johnb432 commented Jan 5, 2024 •
edited
Loading

When merged this pull request will:

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

ulteq and others added 10 commits November 8, 2017 10:45
@ulteq
Advanced Fatique - Various improvements
70c8ab1 
* Fixes fatique calculation when walking across structures (bridges, ...)
* Fixes the terrain gradient calculation
* Fixes the 'wattsPerATP' constant
* Implements the respiratory system
* Prevents sprinting on very steep terrain
* Adds more in-depth debug output
* Closes #4492
@ulteq
Remove regular cloth weight from the carried load calculation.
ea29171
@ulteq
Split 'wattsPerATP' calculation into two
82000ce
@ulteq
Oxygen tweak
00305eb
@ulteq
Experimental movement speed limiter
18661eb
@johnb432
Merge branch 'master' into advanced-fatique-improvements
f02c800
@johnb432
Merge branch 'master' into fatigue-continuation
41a8b08
@johnb432
Merge branch 'master' into fatigue-continuation
202a965
@johnb432
Merge branch 'master' into fatigue-continuation
47b83d7
@johnb432
Removed variable speed
ff1c6cb 
- Removed variable speeds
- Added minimum regeneration rate for anReserves
@johnb432 @LinkIsGrim
Update addons/advanced_fatigue/script_component.hpp
e6ea53b 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
@LinkIsGrim
Copy link
Contributor

SPO2 integration

If respiratory rate change is accurate then that can be used directly in SPO2 instead of an/ae reserves to determine oxygen demand. Just needs to be available as GVAR or unit variable.

@LinkIsGrim
Copy link
Contributor

Addresses #6163

How specifically? Minimum an regeneration is good but doesn't cover everything discussed there.

@johnb432
Copy link
Contributor Author

johnb432 commented Jan 5, 2024 •
edited
Loading

How specifically? Minimum an regeneration is good but doesn't cover everything discussed there.

The title of #6163 is part of the design of the system, I don't think that will go away. However, now you can increase the factors in the settings without the system breaking. I forgot to mention, but I raised the caps of the performance and recovery factors to 10 - the system works in all combinations of high and low settings.

@LinkIsGrim LinkIsGrim added the kind/enhancement Release Notes: **IMPROVED:** label Jan 6, 2024
@LinkIsGrim
Copy link
Contributor

Respiratory rate needs a cap based on perceived fatigue to prevent wheezing from jogs where your stamina isn't affected at all:
107410_20240108065303_1

@johnb432
Copy link
Contributor Author

Respiratory rate needs a cap based on perceived fatigue to prevent wheezing from jogs where your stamina isn't affected at all: 107410_20240108065303_1

I will hold off on changing anything until we can get #9360 merged.

@johnb432 johnb432 mentioned this pull request Jan 16, 2024
Merged
3 tasks
@johnb432
Copy link
Contributor Author

johnb432 commented Feb 8, 2024

Respiratory rate needs a cap based on perceived fatigue to prevent wheezing from jogs where your stamina isn't affected at all

Should respiratory rate be linked with perceived fatigue then, as it was before?

If respiratory rate change is accurate then that can be used directly in SPO2 instead of an/ae reserves to determine oxygen demand. Just needs to be available as GVAR or unit variable.

How would this tie into the above, as well as the PR in general?

@LinkIsGrim
Copy link
Contributor

LinkIsGrim commented Mar 24, 2024 •
edited
Loading

Should respiratory rate be linked with perceived fatigue then, as it was before?

Yes

@johnb432 johnb432 added this to the 3.18.0 milestone Apr 19, 2024
@johnb432 johnb432 mentioned this pull request Apr 30, 2024
Open
LinkIsGrim
LinkIsGrim approved these changes Jun 22, 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.

Seems good from testing, but I'm only one person. Add a note in RC for focus testing?

johnb432 and others added 2 commits June 22, 2024 19:44
@LinkIsGrim LinkIsGrim merged commit f86e882 into master Jun 22, 2024
5 checks passed
@LinkIsGrim LinkIsGrim deleted the fatigue-continuation branch June 22, 2024 17:53
@johnb432 johnb432 mentioned this pull request Jun 22, 2024
Closed
blake8090 pushed a commit to blake8090/ACE3 that referenced this pull request Aug 18, 2024
@johnb432 @LinkIsGrim
@ulteq @blake8090
Advanced Fatigue - Various improvements (continuation of acemod#5723) (…
776b961 
…acemod#9714)

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: ulteq <ulteq@web.de>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
@PabstMirror PabstMirror mentioned this pull request Sep 11, 2024
Merged
@johnb432 johnb432 mentioned this pull request Sep 22, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LinkIsGrim LinkIsGrim LinkIsGrim approved these changes

Assignees
No one assigned
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Milestone
3.18.0
Development

Successfully merging this pull request may close these issues.

Advanced Fatigue - Increased performance factor reduces stamina recovery rate.
3 participants
@johnb432 @LinkIsGrim @ulteq