Skip to content

Field Rations - Improve and add setting for needs consequence#10675

Merged
LinkIsGrim merged 7 commits intoacemod:masterfrom
bagigi-arma:feature/field-rations-consequences
Feb 5, 2025
Merged

Field Rations - Improve and add setting for needs consequence#10675
LinkIsGrim merged 7 commits intoacemod:masterfrom
bagigi-arma:feature/field-rations-consequences

Conversation

@mrschick
Copy link
Contributor

@mrschick mrschick commented Jan 18, 2025

When merged this pull request will:

  • Increase the cooldown of thirst/hunger related loss of consciousness to 45s. Since waking up, finding the interaction and completing it can easily take >20s. Also fix the cooldown check, as CBA_missionTime > CBA_missionTime could never be true. *was already working, my changes broke it.
  • Add medical system "moans" as cues for high thirst/hunger. Their intensity and frequency increases as thirst/hunger grows beyond 75%.
  • Add the option for a less punitive dehydration/starvation consequence, in the form of medical pain.
  • Add water actions directly to the vehicle instead of the helper object if the vehicle has no custom "waterActionPosition". Moved to Field Rations - Improve Vehicle Watersource Actions #10676.

Fix unreachable water actions on vehicles with no waterActionOffset
Allow water actions from within a vehicle with no waterActionOffset
@mrschick mrschick changed the title Field Rations - Consequence Modularity and Vehicle Watersource Fixes Field Rations - Consequence Setting and Vehicle Watersource Fixes Jan 18, 2025
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.

There are two unrelated features being changed/added in this PR. Splitting it in two makes it easier to review (and therefore get merged), as well as having a more extensive changelog.
Make (or adjust #10171) for the interaction changes, whilst the consequence changes remain here (or vice versa).

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@mrschick
Copy link
Contributor Author

mrschick commented Jan 19, 2025

I'll make a new PR for the interaction improvements, as I might still use the old one for the item->magazine change that I was working on, but had left uncommitted.

@mrschick mrschick changed the title Field Rations - Consequence Setting and Vehicle Watersource Fixes Field Rations - Improve and add setting for hunger/thirst consequence Jan 19, 2025
@LinkIsGrim LinkIsGrim added kind/enhancement Release Notes: **IMPROVED:** kind/setting Release Notes: **SETTINGS:** labels Feb 5, 2025
@LinkIsGrim LinkIsGrim added this to the 3.19.1 milestone Feb 5, 2025
@LinkIsGrim LinkIsGrim changed the title Field Rations - Improve and add setting for hunger/thirst consequence Field Rations - Improve and add setting for needs consequence Feb 5, 2025
@LinkIsGrim LinkIsGrim merged commit a00ca9b into acemod:master Feb 5, 2025
3 checks passed
@mrschick mrschick deleted the feature/field-rations-consequences branch February 5, 2025 09:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/enhancement Release Notes: **IMPROVED:** kind/setting Release Notes: **SETTINGS:**

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants