Added proper positions

2026-09-28 19:15:48 -04:00
parent 1a0e584dd2
commit ec5f38c355
87 changed files with 311 additions and 229 deletions
@@ -0,0 +1,86 @@
+---
+sessionId: session-260928-184444-1lki
+---
+
+# Requirements
+
+### Overview & Goals
+Fix the build error in `ZeroSpace.MapEditor/Services/MapBackground.cs` where invoking `new PlatformImage(buffer)` fails with compilation error `CS7036: There is no argument given that corresponds to the required parameter 'bitmap' of 'PlatformImage.PlatformImage(ICanvasResourceCreator, CanvasBitmap)'`.
+
+### Scope
+- **In Scope:**
+  - Fix the image instantiation logic in `ZeroSpace.MapEditor/Services/MapBackground.cs` to use `Microsoft.Maui.Graphics.Platform.PlatformImage.FromStream(buffer)`.
+  - Ensure compatibility with .NET MAUI Windows (`net10.0-windows10.0.19041.0`) and MacCatalyst (`net10.0-maccatalyst`).
+  - Verify project build and clean diagnostic status.
+- **Out of Scope:**
+  - Modifying the galaxy map raw asset or canvas drawing logic in `MapEditorPage.xaml.cs` and `MapEditorDrawable.cs`.
+  - Introducing external third-party image decoding dependencies.
+
+### Functional Requirements
+- `MapBackground.LoadAsync()` must asynchronously open `galaxymap.png` from app package assets, copy the stream into memory, and return a valid `Microsoft.Maui.Graphics.IImage` instance on supported platforms.
+- If the asset cannot be found or is loaded on an unsupported platform, `MapBackground.LoadAsync()` must catch the exception and return `null` without crashing the application.
+- `MapEditorPage` must continue to display the galaxy map background when enabled.
+
+### Non-Functional Requirements
+- Maintain zero build errors and zero warnings across all supported target frameworks.
+- Preserve memory stream behavior ensuring stream data remains accessible for lazy platform decoders.
+
+# Technical Design
+
+### Current Implementation
+In `ZeroSpace.MapEditor/Services/MapBackground.cs`:
+```csharp
+#if WINDOWS
+    return new Microsoft.Maui.Graphics.Platform.PlatformImage(buffer);
+#elif MACCATALYST
+    return new Microsoft.Maui.Graphics.Platform.PlatformImage(buffer);
+#else
+    return null;
+#endif
+```
+On Windows (`Microsoft.Maui.Graphics.Win2D`), `PlatformImage` has no single-parameter constructor accepting a `Stream`. Its constructor expects `(ICanvasResourceCreator, CanvasBitmap)` or `(byte[], ImageFormat)`.
+
+### Root Cause
+Directly calling the `PlatformImage` constructor with a `MemoryStream` is invalid in Microsoft.Maui.Graphics for Win2D. The supported API to construct an `IImage` from a `Stream` across all MAUI platforms is the static factory method `PlatformImage.FromStream(Stream, ImageFormat)`.
+
+### Key Decisions
+- **Decision:** Use `PlatformImage.FromStream(buffer)` instead of constructor invocation.
+  - **Rationale:** `PlatformImage.FromStream(Stream, ImageFormat)` is the standard Microsoft.Maui.Graphics API designed for stream-based image creation on both Windows and MacCatalyst platforms.
+
+### Proposed Changes
+- In `ZeroSpace.MapEditor/Services/MapBackground.cs`:
+  - Update lines 25–31 to invoke `Microsoft.Maui.Graphics.Platform.PlatformImage.FromStream(buffer)` under `#if WINDOWS || MACCATALYST`.
+  - Maintain the existing try-catch safety wrapper that returns `null` if loading fails.
+
+### File Structure
+- `ZeroSpace.MapEditor/Services/MapBackground.cs` (Modified: update image factory call)
+- `ZeroSpace.MapEditor/Views/MapEditorPage.xaml.cs` (Referenced: consumes `MapBackground.LoadAsync()`)
+
+# Testing
+
+### Validation Approach
+Verify that the compilation error `CS7036` is resolved and `ZeroSpace.MapEditor` builds successfully.
+
+### Key Scenarios
+- **Compilation Check:**
+  - Verify `ZeroSpace.MapEditor/Services/MapBackground.cs` with Rider code analysis to confirm zero compiler errors.
+  - Build `ZeroSpace.MapEditor.csproj` target framework `net10.0-windows10.0.19041.0`.
+- **Image Loading & Fallback Check:**
+  - Ensure `MapBackground.LoadAsync()` returns an `IImage` instance when `galaxymap.png` is available.
+  - Ensure exceptions during loading (e.g. missing asset) are handled cleanly and return `null`.
+
+# Delivery Steps
+
+### ✓ Step 1: Refactor image stream loading to use PlatformImage.FromStream in MapBackground
+`MapBackground.cs` compiles without CS7036 errors across target platforms by using the static factory method `PlatformImage.FromStream`.
+
+- Replace `new Microsoft.Maui.Graphics.Platform.PlatformImage(buffer)` with `Microsoft.Maui.Graphics.Platform.PlatformImage.FromStream(buffer)` in `ZeroSpace.MapEditor/Services/MapBackground.cs`.
+- Consolidate platform conditional directives `#if WINDOWS || MACCATALYST` (or use platform-agnostic graphics loading) while preserving graceful `null` fallback in the `catch` block and unsupported target platforms.
+- Ensure using directives for `Microsoft.Maui.Graphics.Platform` are properly configured.
+
+### ✓ Step 2: Verify compilation and image rendering integration
+`ZeroSpace.MapEditor` builds cleanly without diagnostics or runtime issues when loading raw background assets.
+
+- Run code analysis/diagnostics on `ZeroSpace.MapEditor/Services/MapBackground.cs` to confirm zero compilation errors and warnings.
+- Build the `ZeroSpace.MapEditor` project to ensure proper integration with `Microsoft.Maui.Controls` and `Microsoft.Maui.Graphics`.
+- Validate that `MapEditorPage.xaml.cs` successfully receives the `IImage` instance from `MapBackground.LoadAsync()` and invalidates the map canvas for rendering.
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Storage;
+using IImage = Microsoft.Maui.Graphics.IImage;

 namespace ZeroSpace.MapEditor.Services;

@@ -9,22 +8,21 @@ namespace ZeroSpace.MapEditor.Services;
 /// </summary>
 public static class MapBackground
 {
-    private const string AssetName = "galaxymap.png";
+    private const string AssetName = "Resources\\Raw\\galaxymap.png";

    public static async Task<IImage?> LoadAsync()
    {
        try
        {
            await using var packageStream = await FileSystem.OpenAppPackageFileAsync(AssetName);
+            
            // Copy into memory and leave the buffer undisposed: some platform
            // image implementations read from the stream lazily.
            var buffer = new MemoryStream();
            await packageStream.CopyToAsync(buffer);
            buffer.Position = 0;
-#if WINDOWS
-            return new Microsoft.Maui.Graphics.Platform.PlatformImage(buffer);
-#elif MACCATALYST
-            return new Microsoft.Maui.Graphics.Platform.PlatformImage(buffer);
+#if WINDOWS || MACCATALYST
+            return Microsoft.Maui.Graphics.Platform.PlatformImage.FromStream(buffer);
 #else
            return null;
 #endif
@@ -36,4 +34,4 @@ public static class MapBackground
            return null;
        }
    }
-}
+}
@@ -1,6 +1,7 @@
 using Microsoft.Maui.Graphics;
 using ZeroSpace.MapEditor.Models;
 using ZeroSpace.MapEditor.Services;
+using IImage = Microsoft.Maui.Graphics.IImage;

 namespace ZeroSpace.MapEditor.Views;

@@ -26,7 +26,9 @@
 		<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.110" />
 		<PackageReference Include="CommunityToolkit.Maui.Core" Version="15.0.1" />
 		<!-- In-game galaxy map screenshot shown as the canvas background. -->
-		<MauiAsset Include="Resources\Raw\galaxymap.png" />
+		<MauiAsset Include="Resources\Raw\galaxymap.png">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</MauiAsset>
 	</ItemGroup>

 </Project>
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Igneous Cascade]]"
  - "[[Corundum Dream]]"
  - "[[Sullen Dwarf]]"
-x: 1960.1
-y: 739.2
+x: 728.2
+y: 317.9
 ---
@@ -11,6 +11,6 @@ connectedSystems:
  - "[[Calm Belt]]"
  - "[[Burning Cairn]]"
  - "[[Pleiades Cluster]]"
-x: 1921.8
-y: 774.3
+x: 355.2
+y: 715.7
 ---
@@ -8,6 +8,6 @@ systemMastery: "[[Unit Vision and Attack Range]]"
 connectedSystems:
  - "[[Nexus Prime]]"
  - "[[The High Council]]"
-x: -264.9
-y: 703.8
+x: 148.5
+y: 567.3
 ---
@@ -7,6 +7,6 @@ systemMastery: "[[Unit Health and Shields]]"
 connectedSystems:
  - "[[Eden's Heart]]"
  - "[[Lights Bounty]]"
-x: 665.7
-y: -173.0
+x: 605.5
+y: 65.6
 ---
@@ -8,6 +8,6 @@ connectedSystems:
  - "[[Crystallic Genesis]]"
  - "[[Andus Reach]]"
  - "[[Igneous Cascade]]"
-x: 1024.3
-y: 91.3
+x: 777.5
+y: 255.9
 ---
@@ -8,6 +8,6 @@ connectedSystems:
  - "[[Endless Wastes]]"
  - "[[Beta Clarity]]"
  - "[[Stronghold Nova Centauri]]"
-x: 173.0
-y: -221.7
+x: 319.5
+y: 93.4
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Aurora Vale]]"
  - "[[Solaris Reach]]"
  - "[[Nebulon Drift]]"
-x: 1728.9
-y: 326.2
+x: 337.3
+y: 168.4
 ---
@@ -8,6 +8,6 @@ connectedSystems:
  - "[[Aquila Rift]]"
  - "[[Calm Belt]]"
  - "[[Zeta Horizon]]"
-x: 1896.8
-y: 617.3
+x: 370.4
+y: 783.5
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Burning Cairn]]"
  - "[[Draconis Reach]]"
  - "[[Stronghold Vega]]"
-x: 2098.0
-y: 789.6
+x: 428.7
+y: 751.9
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Sigma Vortex]]"
  - "[[Epsilon Arc]]"
  - "[[Scarlett Ire]]"
-x: 1816.2
-y: 798.6
+x: 382.9
+y: 340.2
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Iotan Tears]]"
  - "[[Idal's Word]]"
  - "[[Sullen Dwarf]]"
-x: 2029.7
-y: 590.5
+x: 726.9
+y: 403.5
 ---
@@ -8,6 +8,6 @@ connectedSystems:
  - "[[Typhon's Call]]"
  - "[[Nucleic Redux]]"
  - "[[Devil's Trident]]"
-x: 2011.6
-y: 903.5
+x: 273.2
+y: 570.4
 ---
@@ -7,6 +7,6 @@ systemMastery: "[[Unit Energy and Regeneration (not heroes)]]"
 connectedSystems:
  - "[[Stronghold Orion]]"
  - "[[Astral Haven]]"
-x: 948.3
-y: 11.6
+x: 763.7
+y: 186.2
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Nucleic Redux]]"
  - "[[Xenon Abyss]]"
  - "[[Void Star]]"
-x: 2142.9
-y: 699.0
+x: 319.4
+y: 600.3
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Xenthic Fields]]"
  - "[[Noxious Energy]]"
  - "[[Gelid Storm]]"
-x: 1848.4
-y: 898.1
+x: 419.9
+y: 825.0
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Vulcan's Breath]]"
  - "[[Helios Crossing]]"
  - "[[Forge of Souls]]"
-x: 1934.3
-y: 539.8
+x: 587.7
+y: 585.6
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Yellow Dawn]]"
  - "[[Proxima Prime]]"
  - "[[Ashes of Revenge]]"
-x: 560.8
-y: -129.8
+x: 524.7
+y: 72.9
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Gamma Swarm]]"
  - "[[Nebulon Drift]]"
  - "[[Aurora Vale]]"
-x: -42.0
-y: -69.3
+x: 251.0
+y: 141.4
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Celestial Forge Stronghold]]"
  - "[[Scarlett Ire]]"
  - "[[Magnetic Folly]]"
-x: 2116.2
-y: 583.9
+x: 312.0
+y: 361.5
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Vulcan's Breath]]"
  - "[[Stronghold Cronus]]"
  - "[[Mercury Forge]]"
-x: 1949.6
-y: 965.2
+x: 591.7
+y: 518.1
 ---
@@ -11,6 +11,6 @@ connectedSystems:
  - "[[Wild's End]]"
  - "[[Obsidian Palace]]"
  - "[[Starless Sky]]"
-x: 1811.4
-y: 561.0
+x: 573.9
+y: 685.4
 ---
@@ -16,6 +16,6 @@ connectedSystems:
  - "[[Shattered Light]]"
  - "[[Magnetic Folly]]"
  - "[[Scarlett Ire]]"
-x: 2195.8
-y: 770.9
+x: 406.0
+y: 460.2
 ---
@@ -11,6 +11,6 @@ connectedSystems:
  - "[[Hyperion Nebula]]"
  - "[[Raider's Reef]]"
  - "[[Occam's Abode]]"
-x: 1760.3
-y: 878.2
+x: 225.8
+y: 262.5
 ---
@@ -8,6 +8,6 @@ connectedSystems:
  - "[[Noxious Energy]]"
  - "[[Draconis Reach]]"
  - "[[Stronghold Vega]]"
-x: 174.8
-y: 1277.2
+x: 489.9
+y: 853.7
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[The High Council]]"
  - "[[Neera's Gift]]"
  - "[[Stronghold Leo]]"
-x: 2086.5
-y: 959.8
+x: 218.1
+y: 684.5
 ---
@@ -7,6 +7,6 @@ systemMastery: "[[Unit Energy and Regeneration (not heroes)]]"
 connectedSystems:
  - "[[Iotan Tears]]"
  - "[[Stronghold Atlas]]"
-x: 1058.6
-y: 579.6
+x: 796.3
+y: 545.9
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Vulcan's Breath]]"
  - "[[Ebony Keep]]"
  - "[[Forge of Souls]]"
-x: 2200.4
-y: 628.2
+x: 555.1
+y: 608.1
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[The Crucible]]"
  - "[[Epsilon Arc]]"
  - "[[Gamma Swarm]]"
-x: 1856.0
-y: 988.0
+x: 291.0
+y: 280.8
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Corundum Dream]]"
  - "[[Iotan Tears]]"
  - "[[Stronghold Atlas]]"
-x: 1867.1
-y: 480.8
+x: 701.9
+y: 470.4
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Andus Reach]]"
  - "[[Corundum Dream]]"
  - "[[Iotan Tears]]"
-x: 1090.9
-y: 256.4
+x: 793.5
+y: 349.9
 ---
@@ -11,6 +11,6 @@ connectedSystems:
  - "[[Tartarus Expanse]]"
  - "[[Void Star]]"
  - "[[Xenon Abyss]]"
-x: 1685.2
-y: 811.7
+x: 415.6
+y: 595.8
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Corundum Dream]]"
  - "[[Idal's Word]]"
  - "[[Heigen Stream]]"
-x: 1073.3
-y: 347.5
+x: 793.8
+y: 476.4
 ---
@@ -8,6 +8,6 @@ systemMastery: "[[Unit Energy and Regeneration (not heroes)]]"
 connectedSystems:
  - "[[Starless Sky]]"
  - "[[Obsidian Palace]]"
-x: 644.1
-y: 1206.4
+x: 645.2
+y: 795.1
 ---
@@ -8,6 +8,6 @@ connectedSystems:
  - "[[Titan's Fall]]"
  - "[[Mercury Forge]]"
  - "[[Sullen Dwarf]]"
-x: 1724.4
-y: 556.6
+x: 552.8
+y: 371.2
 ---
@@ -11,6 +11,6 @@ connectedSystems:
  - "[[Stellar Forge]]"
  - "[[Stronghold Cronus]]"
  - "[[Mercury Forge]]"
-x: 2261.7
-y: 714.2
+x: 500.8
+y: 427.6
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Shattered Light]]"
  - "[[Inferno's Edge Stronghold]]"
  - "[[Tartarus Expanse]]"
-x: 1751.6
-y: 964.6
+x: 454.7
+y: 541.5
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Ashes of Revenge]]"
  - "[[Stronghold Orion]]"
  - "[[The Undergrowth]]"
-x: 686.4
-y: -92.6
+x: 618.2
+y: 170.3
 ---
@@ -8,6 +8,6 @@ connectedSystems:
  - "[[Pleiades Cluster]]"
  - "[[Zeta Horizon]]"
  - "[[Xenthic Fields]]"
-x: -144.2
-y: 1423.5
+x: 261.2
+y: 855.5
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Epsilon Arc]]"
  - "[[Scarlett Ire]]"
  - "[[Galactic Zenith]]"
-x: 1641.5
-y: 709.7
+x: 338.2
+y: 468.1
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Lambda Gateway]]"
  - "[[Ivory Steel]]"
  - "[[Sullen Dwarf]]"
-x: 2218.3
-y: 543.2
+x: 603.5
+y: 414.0
 ---
@@ -11,6 +11,6 @@ connectedSystems:
  - "[[The Crucible]]"
  - "[[Hyperion Nebula]]"
  - "[[Gamma Swarm]]"
-x: 1901.3
-y: 1062.2
+x: 304.2
+y: 223.3
 ---
@@ -8,6 +8,6 @@ connectedSystems:
  - "[[The High Council]]"
  - "[[Glittering Hope]]"
  - "[[Stronghold Leo]]"
-x: -316.3
-y: 1083.0
+x: 159.3
+y: 683.6
 ---
@@ -8,6 +8,6 @@ connectedSystems:
  - "[[Sigma Vortex]]"
  - "[[Orion's Gate]]"
  - "[[The Undergrowth]]"
-x: 2284.5
-y: 828.1
+x: 509.2
+y: 295.9
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Typhon's Call]]"
  - "[[The High Council]]"
  - "[[Artemis Grotto]]"
-x: -180.2
-y: 569.1
+x: 197.1
+y: 514.9
 ---
@@ -8,6 +8,6 @@ connectedSystems:
  - "[[Xenthic Fields]]"
  - "[[Draconis Reach]]"
  - "[[Gelid Storm]]"
-x: 53.6
-y: 1487.3
+x: 427.3
+y: 899.3
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Crimson Expanse]]"
  - "[[Devil's Trident]]"
  - "[[Void Star]]"
-x: 2091.4
-y: 1061.7
+x: 264.7
+y: 613.0
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Forge of Souls]]"
  - "[[Starless Sky]]"
  - "[[Ivory Fields]]"
-x: 719.7
-y: 1024.8
+x: 647.1
+y: 717.6
 ---
@@ -8,6 +8,6 @@ connectedSystems:
  - "[[Uanachian Whirlpool]]"
  - "[[Gamma Swarm]]"
  - "[[Stronghold Tau]]"
-x: -174.3
-y: 249.9
+x: 172.9
+y: 330.2
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Sigma Vortex]]"
  - "[[Negative Ion]]"
  - "[[The Undergrowth]]"
-x: 1778.3
-y: 1049.4
+x: 452.5
+y: 245.8
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Stronghold Leo]]"
  - "[[Aquila Rift]]"
  - "[[Magenta Bloom]]"
-x: -97.6
-y: 1259.1
+x: 277.7
+y: 767.4
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Yellow Dawn]]"
  - "[[Eden's Heart]]"
  - "[[The Undergrowth]]"
-x: 2259.3
-y: 951.7
+x: 478.7
+y: 153.3
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Stronghold Orion]]"
  - "[[Andus Reach]]"
  - "[[Sullen Dwarf]]"
-x: 1592.3
-y: 785.0
+x: 677.9
+y: 281.5
 ---
@@ -7,6 +7,6 @@ systemMastery: "[[Building Health and Shields]]"
 connectedSystems:
  - "[[Gamma Swarm]]"
  - "[[Stronghold Tau]]"
-x: 2202.7
-y: 454.2
+x: 229.9
+y: 339.4
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Celestial Forge Stronghold]]"
  - "[[Magnetic Folly]]"
  - "[[Galactic Zenith]]"
-x: 1973.9
-y: 1116.8
+x: 381.6
+y: 399.9
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Leviathan's Wake]]"
  - "[[Inferno's Edge Stronghold]]"
  - "[[Xenon Abyss]]"
-x: 1692.4
-y: 467.5
+x: 390.7
+y: 537.3
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[The Crucible]]"
  - "[[Orion's Gate]]"
  - "[[Negative Ion]]"
-x: 2344.5
-y: 758.9
+x: 439.2
+y: 313.4
 ---
@@ -7,6 +7,6 @@ systemMastery: "[[Turret Damage]]"
 connectedSystems:
  - "[[Beta Clarity]]"
  - "[[Stronghold Nova Centauri]]"
-x: 1660.7
-y: 986.6
+x: 383.1
+y: 168.6
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Forge of Souls]]"
  - "[[Obsidian Palace]]"
  - "[[Ivory Fields]]"
-x: 486.2
-y: 1123.4
+x: 580.1
+y: 755.3
 ---
@@ -8,6 +8,6 @@ connectedSystems:
  - "[[Obsidian Palace]]"
  - "[[Wild's End]]"
  - "[[Stronghold Atlas]]"
-x: 888.4
-y: 933.2
+x: 714.3
+y: 676.0
 ---
@@ -8,6 +8,6 @@ connectedSystems:
  - "[[Galactic Zenith]]"
  - "[[Lambda Gateway]]"
  - "[[Stronghold Cronus]]"
-x: 1571.6
-y: 649.8
+x: 489.9
+y: 486.8
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Heigen Stream]]"
  - "[[Steel Depths]]"
  - "[[Wild's End]]"
-x: 904.5
-y: 743.4
+x: 718.2
+y: 609.9
 ---
@@ -11,6 +11,6 @@ connectedSystems:
  - "[[Vulcan's Breath]]"
  - "[[Erebus Deep]]"
  - "[[Mercury Forge]]"
-x: 1835.0
-y: 1124.8
+x: 541.4
+y: 459.3
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Glittering Hope]]"
  - "[[Neera's Gift]]"
  - "[[Pleiades Cluster]]"
-x: -246.5
-y: 1198.2
+x: 193.0
+y: 752.7
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Solaris Reach]]"
  - "[[Yellow Dawn]]"
  - "[[Proxima Prime]]"
-x: 322.9
-y: -167.2
+x: 399.2
+y: 109.8
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Lights Bounty]]"
  - "[[Crystallic Genesis]]"
  - "[[Quartzalian Berth]]"
-x: 767.2
-y: 17.7
+x: 670.9
+y: 204.3
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Occam's Abode]]"
  - "[[Raider's Reef]]"
  - "[[Nexus Prime]]"
-x: -181.0
-y: 412.1
+x: 192.3
+y: 438.2
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Calm Belt]]"
  - "[[Gelid Storm]]"
  - "[[Starless Sky]]"
-x: 327.2
-y: 1135.7
+x: 503.4
+y: 767.6
 ---
@@ -11,6 +11,6 @@ connectedSystems:
  - "[[Idal's Word]]"
  - "[[Mercury Forge]]"
  - "[[Ivory Steel]]"
-x: 1603.9
-y: 507.7
+x: 658.7
+y: 368.8
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Inferno's Edge Stronghold]]"
  - "[[Void Star]]"
  - "[[Aquila Rift]]"
-x: 2382.3
-y: 668.8
+x: 456.1
+y: 635.9
 ---
@@ -11,6 +11,6 @@ connectedSystems:
  - "[[Celestial Forge Stronghold]]"
  - "[[Sigma Vortex]]"
  - "[[Orion's Gate]]"
-x: 1694.5
-y: 1078.8
+x: 376.8
+y: 272.0
 ---
@@ -11,6 +11,6 @@ connectedSystems:
  - "[[Typhon's Call]]"
  - "[[Glittering Hope]]"
  - "[[Neera's Gift]]"
-x: -206.0
-y: 863.0
+x: 191.4
+y: 614.1
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Orion's Gate]]"
  - "[[Proxima Prime]]"
  - "[[Lights Bounty]]"
-x: 2279.7
-y: 1037.8
+x: 539.7
+y: 219.8
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Galactic Zenith]]"
  - "[[Lambda Gateway]]"
  - "[[Ivory Steel]]"
-x: 1519.7
-y: 734.9
+x: 474.9
+y: 384.1
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[The High Council]]"
  - "[[Crimson Expanse]]"
  - "[[Nucleic Redux]]"
-x: 2290.0
-y: 442.9
+x: 236.9
+y: 568.9
 ---
@@ -8,6 +8,6 @@ connectedSystems:
  - "[[Endless Wastes]]"
  - "[[Gamma Swarm]]"
  - "[[Occam's Abode]]"
-x: -158.1
-y: 74.5
+x: 185.1
+y: 217.0
 ---
@@ -12,6 +12,6 @@ connectedSystems:
  - "[[Xenon Abyss]]"
  - "[[Inferno's Edge Stronghold]]"
  - "[[Tartarus Expanse]]"
-x: 2273.9
-y: 332.8
+x: 363.7
+y: 653.1
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Erebus Deep]]"
  - "[[Ebony Keep]]"
  - "[[Helios Crossing]]"
-x: 2404.9
-y: 822.4
+x: 547.7
+y: 537.4
 ---
@@ -10,6 +10,6 @@ connectedSystems:
  - "[[Obsidian Palace]]"
  - "[[Steel Depths]]"
  - "[[Stronghold Atlas]]"
-x: 1573.4
-y: 979.9
+x: 650.6
+y: 640.3
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Void Star]]"
  - "[[Inferno's Edge Stronghold]]"
  - "[[Shattered Light]]"
-x: 153.8
-y: 1421.0
+x: 364.1
+y: 582.9
 ---
@@ -9,6 +9,6 @@ connectedSystems:
  - "[[Zeta Horizon]]"
  - "[[Draconis Reach]]"
  - "[[Noxious Energy]]"
-x: -29.7
-y: 1471.5
+x: 334.0
+y: 894.7
 ---
@@ -8,6 +8,6 @@ connectedSystems:
  - "[[Stronghold Nova Centauri]]"
  - "[[Proxima Prime]]"
  - "[[Eden's Heart]]"
-x: 426.5
-y: -199.2
+x: 448.6
+y: 89.8
 ---
@@ -8,6 +8,6 @@ connectedSystems:
  - "[[Burning Cairn]]"
  - "[[Xenthic Fields]]"
  - "[[Magenta Bloom]]"
-x: 2393.6
-y: 565.2
+x: 321.3
+y: 826.1
 ---