Paygrade shorthand defines. #5128
Merged
Conversation
This file contains 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
github-actions
bot
added
Code Improvement
harryob
approved these changes
Dec 6, 2023
cm13-github
added a commit
that referenced
this pull request
Dec 6, 2023
3 tasks
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jan 25, 2024
# About the pull request As title. This PR continues my work from #5128 and adds the defines for PMCs, Mercenaries, VAI and TWE. I have also changed how the global lists for highcommand (both USCM and WY) work and have made a new global list of all USCM officers to allow for easy reference in #5202. To do the above I have added a default_faction var on paygrades, along with a variable to indicate if a paygrade refers to an "officer" or not, and if the officer is a "flag" officer, for senior leadership. I have also updated the Syndicate ID card to work properly. <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> # Explain why it's good for the game # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: add: Adds paygrade defines for PMCs, VAI, Mercenaries and TWE. code: Adds code to populate reference lists for certain paygrades. fix: Fixes PMC synth not using the correct grade. add: Syndicate ID card repathed and works with paygrades. /:cl:
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.
About the pull request
This PR converts all paygrade shorthands (e.g. ME1) into PAY_SHORT_XXX defines. The reason for this is to ensure any changes are reflected across the board, and also to allow the shorthand to carry description of what it is. It can be hard to tell what a paygrade is meant to be based upon arbitrary letters.
Explain why it's good for the game
Makes future code changes easier.
Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the screenshots and the
<details>tags.Changelog
🆑
code: Paygrade shorthands now use defines.
fix: CLF and Survivors are no longer privates.
fix: Civillian Mr/Ms/Mx prefix now works correctly, and is the default for new ID cards.
/:cl: