[PORT] Add Compliance Mode status icon, fix button toggle, improve texts#322
Open
zoktiik wants to merge 3 commits intoCausticCove:mainfrom
Open
[PORT] Add Compliance Mode status icon, fix button toggle, improve texts#322zoktiik wants to merge 3 commits intoCausticCove:mainfrom
zoktiik wants to merge 3 commits intoCausticCove:mainfrom
Conversation
…le, clarifies texts screen_alert.dmi states changed: knotted, knotted_stupid, lesser_heal states added: compliance You can also now examine the combat button
Collaborator
|
I had hoped to TM this immediately - but it's unfortunately conflicting with the Upstream Merge. I feared that might be the case but, I can leave another comment when that gets fully merged so the conflicts could be easier to fix! |
Collaborator
|
Alright! It's been fully merged now! Hopefully these might be fairly simple conflicts to resolve? |
Author
Oh yup they should be. I just need to hop on my PC real quick. |
Author
|
@Mario90900 Conflicts resolved. |
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
2 participants
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.
About The Pull Request
Ports these two PRs via cherry-pick:
The changes to screen_alert.dmi were made manually against CausticCove/CC's current copy of the file in the main branch.
I highly encourage seeing PR 906 for the relevant changes. This fixes the issue that makes the middle mouse toggle on the combat button not work anymore.
Developer's checklist
N/A, ported edit to existing code.
Skipped this, because this PR has already been fullmerged on Ratwood and is soon to be merged on Azure.
Compiled without errors against 516.1678. See also original PR.
Testing Evidence
Compiled on this codebase; also see that original PR 906.
Why It's Good For The Game
Compliance mode is my feature (Azure-Peak#3050) and I would like to keep it maintained and working, wherever it is.
Changelog
🆑
fix: Middle-clicking the Combat Mode button now works again (a change to code affecting mouseclicks broke it).
fix: Toggle Compliance Notifs now actually saves in your preferences.
image: Compliance mode now has its own distinct HUD icon, done by Jam (Jamdrawers).
image: Also ported improvements to a few other icons, also done by Jam.
spellcheck: Changed a lot of the text related to compliance mode, for clarity.
qol: Shift-click examining the Combat Mode button provides a detailed description of its interactions.
/:cl: