Resolve conflict & update to latest dev branch including YRPP #7
Conversation
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
NetsuNegi
merged commit 6dd74ad
into
NetsuNegi:origin/branch/exclusive-sw-sidebar
2 of 4 checks passed
NetsuNegi
pushed a commit
that referenced
this pull request
Sep 20, 2025
@Metadorius asked if this is doable and I am delivering. Basically exactly what it says in the title, all currently active TeamClass instances will have some info about them printed at the end of the sync log. Because the TeamClass array already effectively functions as a storage for this info there was no need to add any new sync events to record. Additionally I tried to make it bit more readable by adjusting the padding used dynamically but this does add little bit of extra runtime on writing the logs (which is only done once unless you have -MPDEBUG parameter on) I suppose. If there is some other relevant info about teams that should be recorded, let it be known in this PR. I tried to include the most relevant parts. An example of what such a log may look like: ``` AI Teams: #00000: Type: 07C2D662-CTMBDFLab01-G | Script: 06DAB27C-SCCoalBDFLab-G | Line: 1 | Owner: 2 (Computer) | OwnerHouse: Coalition #1: Type: 065D29C6-DTMBDFPow01-G | Script: 06C0F679-SCDomiBDFPow-G | Line: 3 | Owner: 3 (Computer) | OwnerHouse: Dominion #2: Type: 04F1F694-CTMBDFPow01-G | Script: 05728DCA-SCCoalBDFPow-G | Line: 1 | Owner: 2 (Computer) | OwnerHouse: Coalition #3: Type: 0448FEAF-DTMBDFLab01-G | Script: 0511D07E-SCDomiBDFLab-G | Line: 1 | Owner: 3 (Computer) | OwnerHouse: Dominion #4: Type: 05DB3227-CTMBDFRef01-G | Script: 06930A62-SCCoalBDFRef-G | Line: 1 | Owner: 2 (Computer) | OwnerHouse: Coalition #5: Type: 05E743F3-DTMRavager01-G | Script: 079C95F4-SCDomiRavg-G | Line: 4 | Owner: 3 (Computer) | OwnerHouse: Dominion | TargetRTTI: 11 (Cell) | TargetID: 01078752 | MissionTargetRTTI: 11 (Cell) | MissionTargetID: 01078752 #6: Type: 05DAB9F5-CTMBaseGen01-G | Script: 07FA9250-SCCoalBDFGen-G | Line: 7 | Owner: 2 (Computer) | OwnerHouse: Coalition #7: Type: 04ABA9BD-DTMBaseGen01-G | Script: 06A89E7D-SCDomiBDFGen-G | Line: 5 | Owner: 3 (Computer) | OwnerHouse: Dominion #8: Type: 0720B95E-DTMBDFRef01-G | Script: 07DB1BDD-SCDomiBDFRef-G | Line: 3 | Owner: 3 (Computer) | OwnerHouse: Dominion #9: Type: 07F11555-DTMFVSHarv01-G | Script: 06DF9E54-SCGenFVSHrv-G | Line: 2 | Owner: 3 (Computer) | OwnerHouse: Dominion ```
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.
Also removed an Ares initial payload fix that was destroyed by chaserli.