From 436151d6420a3b32d9d92774d5b78775ed9ca897 Mon Sep 17 00:00:00 2001 From: 6d486f49 Date: Wed, 10 Jun 2026 22:37:25 -0400 Subject: [PATCH] ... --- ET/Console/Program.cs | 5 +++ ET/Web/wwwroot/docs/map.svg | 65 ++++++++++++++++++++++----- ET/Web/wwwroot/docs/notes/forest-3.md | 3 +- ET/Web/wwwroot/docs/notes/water-2.md | 4 +- docs/.obsidian/workspace.json | 13 +++--- docs/Notes/Forest 3.md | 3 +- docs/Notes/Water 2.md | 4 +- 7 files changed, 73 insertions(+), 24 deletions(-) diff --git a/ET/Console/Program.cs b/ET/Console/Program.cs index 59fa2c2..4db2ced 100644 --- a/ET/Console/Program.cs +++ b/ET/Console/Program.cs @@ -117,6 +117,7 @@ static void GenerateMap(string srcDir, string dstDir) regions.Add(new RegionData { Name = name, + Slug = Slugify(name), Terrain = terrain, X = int.Parse(xMatch.Groups[1].Value), Y = int.Parse(yMatch.Groups[1].Value), @@ -163,6 +164,7 @@ static void GenerateMap(string srcDir, string dstDir) var cy = region.Y + pad; var color = terrainColors.GetValueOrDefault(region.Terrain, "#888"); + svg.AppendLine($""""""); svg.AppendLine($""""""); svg.AppendLine($""""""); @@ -177,6 +179,8 @@ static void GenerateMap(string srcDir, string dstDir) svg.Append(System.Text.Encodings.Web.HtmlEncoder.Default.Encode($"\u2605 {lm}")); svg.AppendLine(""); } + + svg.AppendLine(""); } var legendX = maxX - 160; @@ -226,6 +230,7 @@ static string? FindContainingDir(string startDir, string markerFile) class RegionData { public string Name { get; set; } = ""; + public string Slug { get; set; } = ""; public string Terrain { get; set; } = ""; public int X { get; set; } public int Y { get; set; } diff --git a/ET/Web/wwwroot/docs/map.svg b/ET/Web/wwwroot/docs/map.svg index dc4cdf1..6240536 100644 --- a/ET/Web/wwwroot/docs/map.svg +++ b/ET/Web/wwwroot/docs/map.svg @@ -27,15 +27,16 @@ - - + + + - - + + @@ -47,98 +48,140 @@ + Forest 1 + + Forest 2 - - - + + + + + Forest 3 + + Forest 4 + + Forest 5 + + Grass 1 ★ Lone Tree Station + + Grass 2 ★ Spire + + Grass 3 + + Grass 4 + + Grass 5 + + Mountain 1 + + Mountain 2 + + Mountain 3 + + Mountain 4 + + Mountain 5 + + Wasteland 1 + + Water 1 ★ Research Station - - - + + + + + Water 2 - + ★ White Sky + + Water 3 + + Water 4 + + Water 5 + Legend diff --git a/ET/Web/wwwroot/docs/notes/forest-3.md b/ET/Web/wwwroot/docs/notes/forest-3.md index db6e7b0..4211fe2 100644 --- a/ET/Web/wwwroot/docs/notes/forest-3.md +++ b/ET/Web/wwwroot/docs/notes/forest-3.md @@ -2,6 +2,7 @@ category: Region Connections: - "[[Water 2]]" + - "[[Water 3]]" X: 150 -Y: 140 +Y: 125 --- diff --git a/ET/Web/wwwroot/docs/notes/water-2.md b/ET/Web/wwwroot/docs/notes/water-2.md index c6c50df..82a69bd 100644 --- a/ET/Web/wwwroot/docs/notes/water-2.md +++ b/ET/Web/wwwroot/docs/notes/water-2.md @@ -6,8 +6,8 @@ Connections: - "[[Grass 1]]" - "[[Forest 3]]" - "[[Grass 3]]" -X: 150 -Y: 160 +X: 140 +Y: 260 Landmarks: - "[[White Sky]]" --- diff --git a/docs/.obsidian/workspace.json b/docs/.obsidian/workspace.json index 1bf7d90..8dbdef5 100644 --- a/docs/.obsidian/workspace.json +++ b/docs/.obsidian/workspace.json @@ -115,14 +115,13 @@ "id": "a4f3f788b08f3cf9", "type": "leaf", "state": { - "type": "markdown", + "type": "bases", "state": { - "file": "Tasks/Generate a csharp script to do what you did.md", - "mode": "source", - "source": false + "file": "Bases/Regions.base", + "viewName": "Table" }, - "icon": "lucide-file", - "title": "Generate a csharp script to do what you did" + "icon": "lucide-table", + "title": "Regions" } } ], @@ -290,9 +289,9 @@ }, "active": "a4f3f788b08f3cf9", "lastOpenFiles": [ + "Tasks/Generate a csharp script to do what you did.md", "Tasks/Generate a Markdown Website.md", "_Tasks.base", - "Tasks/Generate a csharp script to do what you did.md", "Tasks/Generate a map of regions and how they connect.md", "Bases/_Roles.base", "_Overview.md", diff --git a/docs/Notes/Forest 3.md b/docs/Notes/Forest 3.md index db6e7b0..4211fe2 100644 --- a/docs/Notes/Forest 3.md +++ b/docs/Notes/Forest 3.md @@ -2,6 +2,7 @@ category: Region Connections: - "[[Water 2]]" + - "[[Water 3]]" X: 150 -Y: 140 +Y: 125 --- diff --git a/docs/Notes/Water 2.md b/docs/Notes/Water 2.md index c6c50df..82a69bd 100644 --- a/docs/Notes/Water 2.md +++ b/docs/Notes/Water 2.md @@ -6,8 +6,8 @@ Connections: - "[[Grass 1]]" - "[[Forest 3]]" - "[[Grass 3]]" -X: 150 -Y: 160 +X: 140 +Y: 260 Landmarks: - "[[White Sky]]" ---