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
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.
Summary
Why
Fruma territories had resource metadata but empty connection lists, so tower connection/external calculations and connection rendering had no graph edges to traverse.
Validation
cargo test -p sequoia-server extra_data_loader -- --nocapturecargo check -p sequoia-serverGreptile Summary
This PR populates empty connection lists for Fruma territories, which previously caused tower-connection calculations and graph traversal to find no edges. It adds a new
Royal Gateentry, upgrades three territories to double-emerald resources, and refactors the bundled data into aBundledTerritoryExtrastruct that carries both resources and connections.merge_extra_datanow additively merges connections from source into target (with deduplication and self-edge removal) instead of replacing them wholesale. A newsanitize_extra_datapass additionally cleans up any pre-existing remote connections after the merge.bundled_territory_extra_datagrows from 31 to 32 entries (addsRoyal Gate), and three territories (Espren,Aldwell,Hyloch) switch tosingle_resource_with_emeraldsto reflect Wynnmap's current double-emerald marking.Confidence Score: 5/5
Safe to merge — the changes are additive data and well-guarded logic with no observable regressions on existing code paths.
The merge-semantics change from replace to additive is intentional and covered by new tests. Both the error-recovery path and the happy path call sanitize after merge, so remote data with malformed connections is cleaned up in all scenarios. The static connection graph is validated by reciprocity, self-connection, and external-target tests. No changes touch authentication, persistence, or other sensitive paths.
No files require special attention.
Important Files Changed
Flowchart
%%{init: {'theme': 'neutral'}}%% flowchart TD A[run loop ticks] --> B{fetch remote data} B -- Ok --> C[load_extra_data] B -- Err --> D[write-lock extra_terr] C --> C1[fetch_extra_data from URL\nor empty HashMap] C1 --> C2[merge_extra_data\nbundled into remote] C2 --> C3[sanitize_extra_data\ndedup + remove self-edges] C3 --> C4[replace state.extra_terr] C4 --> E[mark dirty] D --> D1[merge_extra_data\nbundled into cached state] D1 --> D2[sanitize_extra_data] D2 --> E subgraph merge_extra_data M1[for each bundled territory] --> M2{target has resources?} M2 -- No --> M3[copy bundled resources] M2 -- Yes --> M4[keep remote resources] M3 --> M5[merge_connections\nappend + dedup + no self-loops] M4 --> M5 end subgraph sanitize_extra_data S1[for each territory in map] --> S2[drain connections] S2 --> S3[filter self-edges\nand duplicates] S3 --> S4[reassign cleaned list] endReviews (1): Last reviewed commit: "fix(server): add bundled Fruma connectio..." | Re-trigger Greptile