server
server copied to clipboard
LandSandBoat
Audit and merge back `feature/amk_missions` into `main`
I affirm:
- [x] I understand that if I do not agree to the following points by completing the checkboxes my PR will be ignored.
- [x] I understand I should leave resolving conversations to the LandSandBoat team so that reviewers won't miss what was said.
- [x] I have read and understood the Contributing Guide and the Code of Conduct.
- [x] I have tested my code and the things my code has changed since the last commit in the PR and will test after any later commits.
What does this pull request do?
I was reminded that this was languishing to the side in a feature branch. There have been a lot of architectural changes while this has been alive, so it'll take some massaging to get into a state that can merge.
Each PR that has gone into here has been reviewed by me, so there shouldn't really be any surprises.
If you would like me or @Flibe-XI to help squash conflicts I don't mind (can't speak for him)
If you would like me or
Flibe-XIto help squash conflicts I don't mind (can't speak for him)
No need, rebase only took like 5 mins 👍
TODO: Just need to run UpdateExtractor to make sure the text IDs aren't shifted (some of them are certainly busted), then this is good for a test runthrough
TODO: Reconcile differences between AMK and base helm: https://github.com/LandSandBoat/server/pull/4579 (Thanks CI!)
ID updates run, amk_helpers & helm changes reconciled - ready for testing if anyone has time (I'm still slammed at work)
ID updates run, amk_helpers & helm changes reconciled - ready for testing if anyone has time (I'm still slammed at work)
I will give it a go in the next few days.
I've rebased and cleaned up any ID collisions etc. This all looks OK and passes sanity checks, once the other CI groups pass I'll merge this, then it's only the BCNMs to do? Which would want to be in the new BCNM file style.
There may or may not be useful bits to take from my old DSP PR: https://github.com/DarkstarProject/darkstar/pull/6053