Field Rations - Improve and add setting for needs consequence#10675
Merged
LinkIsGrim merged 7 commits intoacemod:masterfrom Feb 5, 2025
Merged
Field Rations - Improve and add setting for needs consequence#10675LinkIsGrim merged 7 commits intoacemod:masterfrom
LinkIsGrim merged 7 commits intoacemod:masterfrom
Conversation
Fix unreachable water actions on vehicles with no waterActionOffset Allow water actions from within a vehicle with no waterActionOffset
10 tasks
johnb432
reviewed
Jan 19, 2025
Contributor
johnb432
left a comment
There was a problem hiding this comment.
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>
Contributor
Author
|
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. |
This reverts commit eb1a282.
LinkIsGrim
approved these changes
Feb 5, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When merged this pull request will:
Also fix the cooldown check, as*was already working, my changes broke it.CBA_missionTime > CBA_missionTimecould never be true.Add water actions directly to the vehicle instead of the helper object if the vehicle has no customMoved to Field Rations - Improve Vehicle Watersource Actions #10676."waterActionPosition".