Merge remote-tracking branch 'origin/main'

revert Delete .gitea/workflows/demo.yaml

.gitea/workflows/demo.yaml

@@ -1,6 +1,6 @@
 name: Gitea Actions Demo
 run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
-on: [push]
+on: [pull]
 
 jobs:
   Explore-Gitea-Actions:

.gitea/workflows/quartz-build-publish.yaml

@@ -1,19 +1,80 @@
 name: Quartz Publisher
-run-name: ${{ github.actor }} is testing out Gitea Actions 🚀
+run-name: Quartz Publisher for Obsidian
 on: [push]
 
 jobs:
-  Explore-Gitea-Actions:
+  Quartz-Build-Publish:
     runs-on: ubuntu-latest
     steps:
-      - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
-      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!"
-      - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
       - name: Check out repository code
         uses: actions/checkout@v4
-      - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
+      
-      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
+      - name: Organize content
-      - name: List files in the repository
         run: |
-          ls ${{ github.workspace }}
+            echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
-      - run: echo "🍏 This job's status is ${{ job.status }}."
+            git checkout -b quartz
+            mkdir content &&
+            find . -type d,f -maxdepth 1 -regextype posix-extended ! -regex  '^\.$|\./(\.git|\.obsidian|\.trash|content).*' -exec mv {} content/ \;
+
+      # - parallel:
+      - name: Clone Quartz, move content
+        run: |
+            git clone https://github.com/jackyzha0/quartz.git 
+            mv content/* quartz/content
+            
+      - name: Setup Node
+        uses: actions/setup-node@v6
+        working-directory: quartz/
+        with:
+          node-version: 24
+
+      - name: Cache dependencies
+        uses: actions/cache@v5
+        working-directory: quartz/
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+        
+      - name: Cache Quartz plugins
+        uses: actions/cache@v5
+        working-directory: quartz/
+        with:
+          path: .quartz/plugins
+          key: ${{ runner.os }}-plugins-${{ hashFiles('quartz.lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-plugins-
+
+      - run: npm install && npm install wrangler
+        working-directory: quartz/
+
+      - name: Install Quartz plugins
+        run: npx quartz plugin install
+        working-directory: quartz/
+
+      - name: Quartz Create 
+        run: npx quartz create --template ${{ vars.QUARTZ_CREATE_TEMPLATE }} --baseUrl ${{ vars.QUARTZ_CREATE_BASEURL }}
+        working-directory: quartz/
+
+      - name: Quartz Build 
+        run: npx quartz build
+        working-directory: quartz/
+
+      # - name: Wrangler deploy
+      #   workingDirectory: "quartz"
+      #   uses: cloudflare/wrangler-action@v4
+      #   with:
+      #     apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+      #   command: deploy public --name=test1
+      
+      - name: Get current date
+        id: date
+        run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
+        
+      - name: Wrangler deploy
+        env:
+          # CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+        working-directory: quartz/
+        run: npx wrangler deploy public --name=${{ vars.WRANGLER_PROJECT_NAME }} --compatibility-date=${{ steps.date.outputs.date }}

.obsidian/community-plugins.json

@@ -5,5 +5,5 @@
   "obsidian-text-format",
   "draw-in-canvas",
   "obsidian-livesync",
-  "github-sync"
+  "obsidian-git"
 ]

.obsidian/plugins/github-sync/data.json

@@ -2,8 +2,8 @@
   "remoteURL": "https://gitea.exocomet-frog.ts.net/andus/vaardspace-wiki.git",
   "gitLocation": "",
   "syncinterval": 0,
-  "isSyncOnLoad": true,
+  "isSyncOnLoad": false,
-  "checkStatusOnLoad": true,
+  "checkStatusOnLoad": false,
   "noticeLevel": "ALL",
   "showSyncSuccessNotice": true
 }

.obsidian/plugins/obsidian-git/data.json

@@ -0,0 +1,68 @@
+{
+  "commitMessage": "published: {{date}}",
+  "autoCommitMessage": "published: {{date}}",
+  "commitMessageScript": "",
+  "commitDateFormat": "YYYY-MM-DD HH:mm:ss",
+  "autoSaveInterval": 0,
+  "autoPushInterval": 0,
+  "autoPullInterval": 0,
+  "autoPullOnBoot": false,
+  "autoCommitOnlyStaged": true,
+  "disablePush": false,
+  "pullBeforePush": true,
+  "squashCommitsBeforePush": false,
+  "disablePopups": true,
+  "showErrorNotices": true,
+  "disablePopupsForNoChanges": false,
+  "listChangedFilesInMessageBody": false,
+  "showStatusBar": true,
+  "updateSubmodules": false,
+  "syncMethod": "merge",
+  "mergeStrategy": "none",
+  "customMessageOnAutoBackup": false,
+  "autoBackupAfterFileChange": false,
+  "treeStructure": false,
+  "refreshSourceControl": false,
+  "basePath": "",
+  "differentIntervalCommitAndPush": false,
+  "changedFilesInStatusBar": false,
+  "showedMobileNotice": true,
+  "refreshSourceControlTimer": 7000,
+  "showBranchStatusBar": true,
+  "setLastSaveToLastCommit": false,
+  "submoduleRecurseCheckout": false,
+  "gitDir": "",
+  "showFileMenu": true,
+  "authorInHistoryView": "hide",
+  "dateInHistoryView": false,
+  "diffStyle": "split",
+  "hunks": {
+    "showSigns": false,
+    "hunkCommands": false,
+    "statusBar": "disabled"
+  },
+  "lineAuthor": {
+    "show": false,
+    "followMovement": "inactive",
+    "authorDisplay": "initials",
+    "showCommitHash": false,
+    "dateTimeFormatOptions": "date",
+    "dateTimeFormatCustomString": "YYYY-MM-DD HH:mm",
+    "dateTimeTimezone": "viewer-local",
+    "coloringMaxAge": "1y",
+    "colorNew": {
+      "r": 255,
+      "g": 150,
+      "b": 150
+    },
+    "colorOld": {
+      "r": 120,
+      "g": 160,
+      "b": 255
+    },
+    "textColorCss": "var(--text-muted)",
+    "ignoreWhitespace": false,
+    "lastShownAuthorDisplay": "initials",
+    "lastShownDateTimeFormatOptions": "date"
+  }
+}

.obsidian/plugins/obsidian-livesync/data.json

@@ -6,8 +6,8 @@
   "couchDB_PASSWORD": "",
   "couchDB_DBNAME": "",
   "liveSync": false,
-  "syncOnSave": false,
+  "syncOnSave": true,
-  "syncOnStart": false,
+  "syncOnStart": true,
   "savingDelay": 200,
   "lessInformationInLog": false,
   "gcDelay": 0,
@@ -19,7 +19,7 @@
   "trashInsteadDelete": true,
   "periodicReplication": false,
   "periodicReplicationInterval": 60,
-  "syncOnFileOpen": false,
+  "syncOnFileOpen": true,
   "encrypt": true,
   "passphrase": "",
   "usePathObfuscation": true,
@@ -68,14 +68,14 @@
   "useDynamicIterationCount": false,
   "syncAfterMerge": false,
   "configPassphraseStore": "",
-  "encryptedPassphrase": "%$N0ZUalInU1+u18ErLUrnsIfKQt9sG5SPQP96kSetnJ86TkKppZ83aF/bCAqTRu3pLC/wtqKKRq2XP6VRTzzp4+LNSnygQ59YEqOxDis9AOwnnFNZC9Bj7UOCjuxiUruIjg53jmBNrDt/E+NRuUaU+X4=",
+  "encryptedPassphrase": "%$YF3uCXG2KUpA0RMUGUQBcaUEgO3uAu3M2pt/5dfkNuYqZbKX6TvguteNZc441CUesQW5LoZYnQG4cQD09+PtHsWIEN0ZA2yjIKInfEbNP5sNEm4X1CKznG+13RAiIZJnT3i1eLhP23nxk6HjGwg2Khw=",
-  "encryptedCouchDBConnection": "%$N0ZUalInU1+u18ErLUrnsIfKQt9sG5SPQP96kSetnJ8yCWEkSFTly8KTm0CJqAXsKkZA1qRCBhP/sTdsXwkgwQnnhZLWyKLGr4JR/NTaIX2hVVx8yjH4MRdFn55MUG3eOYqoFPWAJ0fUrvZ3y70oksLyMKr5TOT1zam4AIkqZPcAmHWyKtOs1OEZBiu3QlcdM3uyi3/4zkB/HlwXaQsHfB58poSCI35NJN66cl8DzExFvOSUAvzLoAtpcwXO5LAPHtPDcVdYCER8sQDDncznUzCVs4wxMRfwr4MpbMO4/Y2m0rmo4gX5339nTp5yjp83pcMhb7xwffUhmbBo2QAlfjjmJ+x4Qstk9uSYVXkaeif5TEP2dPNsUiQkIc9oM5a1fNyWSlFWA5bbIzYLzExcl45RpdjFsiTEAVE1RcFJk86MwvUc0YsnWChG4sz/9D8Uoiyq2cqjbkZgwq3cIbEvR3VUxvnpBpAA5PdaGlAwLdn4JHUAHseF/BCntomV1un+bbPuVU5jc03e/fN7FtzMqob3w53SEO2DGkw1/8cv3TdDkWpJ/VAxUjM3VLq8otsJ4P4tlbqKyy3rf6Fpj16BeqnP/2RnnIlQjZY0/3SF6hzZ48pp1JR6SZEqoTkvsX/7UVQDCGanbuUoVjzGvMubTfIaOkrd0CYyL7kDTwpTDpr6R1MVXypmYe1KE8KCaqtvuDcWGKbTS1YoUgxUP3I0Vd2XkA0=",
+  "encryptedCouchDBConnection": "%$YF3uCXG2KUpA0RMUGUQBcaUEgO3uAu3M2pt/5dfkNubRebcKlaqMsziUlOhpZMv9Ck/NtHBOJq5oLd4Z7WjKjccD8zVzA4WmVPfxvW8bzGxvnGz4sRY3yfQwhkxN+cSM7GyHxw7D5sl6LP8ab8vhrGO1YlKsFVgslQPD024lq4s4ux9S0wL54mBx8tmYdgSUbC75l4cSXUDMYWZPbBh1sRciGCRyubDtAXkSjxPvcNNkpLSE2ahBrJRWcz32pNkg77EbrfRQUJyNeHHQgenzjwWGMgbaJPW7Pq33R5tfg91FZvG80Ne70wbXCcqkUMkMSu5oQhtnZais3mClhHqX+ozy6cdv/8N2grvmbz8chx7B98AhyuuEZ4fL/4uysX9vrlIwgSoMKUWapFIFvMbkefl+a6Hxqt6t7vgbJXzhpGkCfBMDt6iVjkw5JKSxuUXCDTi6FlnXxrdHiPLlqv2TvAVgGx0Ut+rk8QvLD13vPMEQJQV3TTRJJp3+8Q0jhDCukrHsezjzwbIz+GKK1B7Nb4Bg+uZyOKqg9DHaC9kcV8rREwrXSx1ioZqiU+mPAhwfqi6m38nAhFhJ9s9cg4gy1/CnCAzNfNA4rXUyf/2A4xGu0A/fP90lN+UxzR6UpRIRQABcAb6hnEsINgxOHBxhU6LQ0WRmYtY977gj4YZxhJoHpYB43gdS/5N52FyTcZEflWsacEVm1coIxzUc6n2EKypqO/s=",
   "permitEmptyPassphrase": false,
   "remoteConfigurations": {
     "legacy-couchdb": {
       "id": "legacy-couchdb",
       "name": "CouchDB Remote",
-      "uri": "%$N0ZUalInU1+u18ErLUrnsIfKQt9sG5SPQP96kSetnJ8BKv3qS0JozOAN+QohpKXWbZCjfUDv2QehXP4ZbfsKmgGfOWiN0v5baX9pOWpTpzC2nOl4zWpBcXxeLxSz2YTnhrtnO/yQrJ0ewDaZYy7hNqLdVfVoQkdN1ZJyyRCHBmTa3vtrXWJ/PfOQre2m1Y/U4Y4Ibcl2urZXfgPrUtXet0tcCf/6wyl6I27tsfkMog==",
+      "uri": "%$YF3uCXG2KUpA0RMUGUQBcaUEgO3uAu3M2pt/5dfkNuZWAErYdOC4c8zwxBTMvQZdPG7ptA195DJrGiTOTLyO5K7OOdGKHr1r/oNw598QHJZrIUdD4zXtq8uB4f7VNMhbh5bO9gzMe5vmLMjFT9gUZA+ZO9h/eAz4o/gaQd8CGG2Uv0peZiTtoaMohPVUBxsQqX2Awl+xY0491LgLtT/ACEg1lYQVL7dRhi0IHVEqhQ==",
       "isEncrypted": true
     }
   },
@@ -94,7 +94,7 @@
   "doNotSuspendOnFetching": false,
   "useIgnoreFiles": false,
   "ignoreFiles": ".gitignore",
-  "syncOnEditorSave": false,
+  "syncOnEditorSave": true,
   "keepReplicationActiveInBackground": false,
   "pluginSyncExtendedSetting": {},
   "syncMaxSizeInMB": 50,

.obsidian/workspace.json

@@ -4,21 +4,21 @@
     "type": "split",
     "children": [
       {
-        "id": "e0b41c7abf7155d9",
+        "id": "c5597d8813b73687",
         "type": "tabs",
         "children": [
           {
-            "id": "d0bc5a7cb21fde1f",
+            "id": "155af9edc1aa9ee9",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Notable Characters/The Heroes of Vaardland/Ernchaït Seawail.md",
+                "file": "Locations/YesAnd.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "Ernchaït Seawail"
+              "title": "YesAnd"
             }
           }
         ]
@@ -89,6 +89,7 @@
       {
         "id": "916174a7ec47dd54",
         "type": "tabs",
+        "dimension": 57.938718662952645,
         "children": [
           {
             "id": "5f9b32759e0fefc2",
@@ -96,6 +97,7 @@
             "state": {
               "type": "backlink",
               "state": {
+                "file": "Notable Characters/Sharzak.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -114,6 +116,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
+                "file": "Notable Characters/Sharzak.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               },
@@ -156,13 +159,13 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "Locations/Vaardland.md",
+                "file": "Notable Characters/Sharzak.md",
                 "followCursor": false,
                 "showSearch": false,
                 "searchQuery": ""
               },
               "icon": "lucide-list",
-              "title": "Outline of Vaardland"
+              "title": "Outline"
             }
           },
           {
@@ -181,18 +184,29 @@
             "state": {
               "type": "file-properties",
               "state": {
-                "file": "Notable Characters/The Heroes of Vaardland/Ernchaït Seawail.md"
+                "file": "Notable Characters/Sharzak.md"
               },
               "icon": "lucide-info",
               "title": "File properties"
             }
+          },
+          {
+            "id": "c4f13d1f990be613",
+            "type": "leaf",
+            "state": {
+              "type": "git-view",
+              "state": {},
+              "icon": "git-pull-request",
+              "title": "Source Control"
+            }
           }
         ],
-        "currentTab": 6
+        "currentTab": 7
       },
       {
         "id": "2caa40b15ae2de5a",
         "type": "tabs",
+        "dimension": 42.061281337047355,
         "children": [
           {
             "id": "f9b5968100fe4d78",
@@ -224,42 +238,40 @@
       "obsidian-livesync:P2P Status": false,
       "obsidian-livesync:Replicate": false,
       "obsidian-livesync:Show Log": false,
-      "obsidian-livesync:Show Customization sync": false,
+      "obsidian-livesync:Show Customization sync": false
-      "quartz-syncer:Quartz Syncer publication center": false,
-      "github-sync:Sync with Remote": false
     }
   },
-  "active": "d0bc5a7cb21fde1f",
+  "active": "155af9edc1aa9ee9",
   "lastOpenFiles": [
-    "Notable Characters/Sharzak.md",
+    "History/Ancient History.md",
-    "Notable Characters/The Heroes of Vaardland/Detective Maletir.md",
+    "History/Recent History.md",
+    "Locations/YesAnd.md",
+    "Factions/Regulators.md",
+    "Factions/Yapa Clan Shipping.md",
+    "Notable Characters/The Heroes of Vaardland/Bilgar of Hilgar.md",
     "Notable Characters/The Heroes of Vaardland/Burgell Schmurgle.md",
-    "flag_rebuild.md",
+    "Notable Characters/The Heroes of Vaardland/Detective Maletir.md",
+    "Notable Characters/The Heroes of Vaardland/Ernchait Seawail.md",
+    "Notable Characters/The Heroes of Vaardland/Yvarie Galanodel.md",
+    "Notable Characters/Adm. Allorienne Arandeiros.md",
+    "Notable Characters/Grubnegrab.md",
+    "Locations/Erythnul.md",
+    "Notable Characters/Sharzak.md",
+    "Locations/The Rock of Bral.md",
+    "Notable Characters/Untitled.md",
     "Cosmology/Untitled.canvas",
+    "Locations/Lithica.md",
+    "Cosmology/The Greater Sagittarian Sphere.md",
+    "flag_rebuild.md",
     "Cosmology/Untitled.md",
     "img/galaxy-background.jpg",
-    "Locations/The Rock of Bral.md",
-    "Notable Characters/The Heroes of Vaardland/Yvarië Galanodel.md",
-    "Notable Characters/The Heroes of Vaardland/Ernchaït Seawail.md",
-    "Notable Characters/The Heroes of Vaardland/Bilgar of Hilgar.md",
-    "Factions/Yapa Clan Shipping.md",
     "Factions/Star Cogs.md",
     "Factions/Neoji Hegemony.md",
     "Factions/Emerald Armada.md",
     "Factions/Dumathoins Prospectors.md",
     "Cosmology/Spelljamming and Travel.md",
     "Untitled.canvas",
-    "Locations/Erythnul.md",
     "Locations/Cornucopia.md",
-    "Locations/Lavos RST.md",
-    "index.md",
-    "Factions/Regulators.md",
-    "Factions/Illithid.md",
-    "Notable Characters/Adm. Allorienne Arandeiros.md",
-    "Locations/Vaardland.md",
-    "History/Recent History.md",
-    "Burgle Schmurgle.md",
-    "History/Ancient History.md",
     "img/NewBurgell.webp",
     "Notable Characters/The Heroes of Vaardland",
     "Notable Characters",

Locations/Erythnul.md

@@ -11,3 +11,6 @@ Erythnul is ruled by an ancient red dragon named Hope Wilts Before Me, who claim
 All settlements on Erythnul lie on its single continent, which stretches from  pole to pole. The lair of Hope Wilts is at its north, pointed towards the star. The south pole is home to some of the most spectacular aurora displays in the galaxy. In between are fabulous resorts and casinos operating in tribute to Hope Wilts. 
 
 Some of the wealthiest--and least savory--individuals in the galaxy have estates there's secured by vast sums of gold, specifically, along with favors and other symbols of wealth. Over it's long dominion of Erythnul, Hope Wilts Before Me  has assed one of the most impressive hordes in recorded history.
+
+lkjhlkjh
+

Locations/YesAnd.md

@@ -0,0 +1 @@
+YesAnd is a sphere in a remote region of the galaxy. It is unaligned and has been ruled by an ancient cosmic greatwyrm since before the Disconcordance. YesAnd came from a different manifold of the material plane before the Disconcordance and appeared when the manifolds fractured.

Notable Characters/Sharzak.md

@@ -1,5 +1,5 @@
-Sharzak is a renowned girhyanki pirate who loves to brag about his deeds. He is wanted by the Emerald Armada, Neoji Hegemony, Nephil, and Dumathoins Prospectors for ceimes relating to piracy.
+Sharzak is a renowned githyanki pirate who loves to brag about his deeds. He is wanted by the Emerald Armada, Neoji Hegemony, Nephil, and Dumathoin's Prospectors for crimes relating to piracy.
 
-He operates a ship called The Calamari Buzzard, which is essentially a large space caring speedboat with overpowered weapons welded to the hull. He and his crew are known for the daring heists of high value objects that tend to be sold at auction on [[The Rock of Bral]].
+He operates a ship called The Calamari Buzzard, which is essentially a large spacefaring speedboat with overpowered weapons welded to the hull. He and his crew are known for the daring heists of high value objects that tend to be sold at auction on [[The Rock of Bral]].
 
-Sharzak has a deep hatred of illithid and has been known to abandon a heist or tram up with an enemy to kill mind flayers.
+Sharzak has a deep hatred of illithid and has been known to abandon a heist or team up with an enemy to kill mind flayers. "There's only one side when it comes to mind flayers."

Notable Characters/The Heroes of Vaardland/Ernchait Seawail.md

@@ -2,7 +2,7 @@ Ernchait Seawail was born in Harborcrown, on the flat world of Vaardland, the so
 
 His faith became something more than childhood instruction on the night that defined the rest of his life.
 
-Returning home with his mother from a holy celebration, the two were attacked in the streets of Waterdeep. His mother was gravely wounded. Ernchait, seized less by fear than by outrage at the injustice before him, struck one attacker in the head with a stone and felled him. Taking up the fallen man's weapon, he drove the second assailant away.
+Returning home with his mother from a holy celebration, the two were attacked in the streets of Harborcrown. His mother was gravely wounded. Ernchait, seized less by fear than by outrage at the injustice before him, struck one attacker in the head with a stone and felled him. Taking up the fallen man's weapon, he drove the second assailant away.
 
 Then he returned to his mother.
 
@@ -14,7 +14,7 @@ Ernchait never regarded this as chance. Tyr had answered him. Courage, righteous
 
 It also left him with one of his most enduring habits: Ernchait sees omens everywhere. The gods are speaking, he believes. The difficulty is getting mortals to listen.
 
-**The Road to Phandalin**
+**The Road to Northern Nook**
 
 Years later, Ernchait's life as a temple cleric gave way to the considerably less orderly existence of an adventurer. By then he was not merely a priest but a capable warrior, comfortable behind a shield and heavy armor and quite willing to enforce divine judgment with a warhammer when words proved insufficient.
 
@@ -26,17 +26,17 @@ Indeed, one of Ernchait's first memorable accomplishments was breaking the heart
 
 It would not be the last occasion on which Ernchait's romantic ambitions became part of the party's history. In time, he would discover that divine favor and personal charm were not necessarily distributed in equal measure.
 
-Yet the party soon became something more than a collection of travelers and troublemakers. Together they returned to Waterdeep, the city of Ernchait's birth, where one of their first encounters with authority nearly went disastrously wrong.
+Yet the party soon became something more than a collection of travelers and troublemakers. Together they returned to Harborcrown, the city of Ernchait's birth, where one of their first encounters with authority nearly went disastrously wrong.
 
 **Trouble with the Watch**
 
-One of Ernchait's companions managed to attract the attention of the Waterdeep City Watch.
+One of Ernchait's companions managed to attract the attention of the Harborcrown City Watch.
 
 What began as trouble became violence. Damage was done on both sides, and for a dangerous moment the adventurers risked becoming enemies of the very city Ernchait considered home.
 
 For Ernchait, that distinction mattered.
 
-The Watch was not some band of brigands to be defeated and forgotten. Whatever misunderstanding, bad judgment, or hot blood had brought the two sides into conflict, the injured watchman was a servant of Waterdeep. Ernchait had no desire to make an enemy of him—or of the city.
+The Watch was not some band of brigands to be defeated and forgotten. Whatever misunderstanding, bad judgment, or hot blood had brought the two sides into conflict, the injured watchman was a servant of Harborcrown. Ernchait had no desire to make an enemy of him—or of the city.
 
 So Ernchait healed him.
 
@@ -50,9 +50,9 @@ The encounter also demonstrated something fundamental about Ernchait's understan
 
 And sometimes the best way to win a confrontation was to heal the man with whom you had just been fighting.
 
-**Truth in Waterdeep**
+**Truth in Harborcrown**
 
-The party's subsequent adventures in Waterdeep carried Ernchait into establishments somewhat removed from the temples and respectable middle-class streets of his youth.
+The party's subsequent adventures in Harborcrown carried Ernchait into establishments somewhat removed from the temples and respectable middle-class streets of his youth.
 
 An investigation led the companions into a brothel and opium den, where they encountered corruption within the city's own institutions.
 
@@ -62,7 +62,7 @@ He invoked a _Zone of Truth_.
 
 Within its influence deception became considerably more difficult, and a crooked member of the guard was exposed.
 
-The two encounters with Waterdeep's authorities revealed the two sides of Ernchait particularly well.
+The two encounters with Harborcrown's authorities revealed the two sides of Ernchait particularly well.
 
 When a watchman was injured in a conflict with his friends, Ernchait healed him and sought reconciliation.
 
@@ -106,7 +106,7 @@ Apparently divine favor had its limits.
 
 Returning to the disc did not mean returning to an ordinary life.
 
-On their way back toward Phandalin, Ernchait and his companions became embroiled in conflicts whose consequences were considerably greater than their earlier exploits.
+On their way back toward Northern Nook, Ernchait and his companions became embroiled in conflicts whose consequences were considerably greater than their earlier exploits.
 
 They thwarted the designs of a powerful drow noble, preventing a dangerous scheme from reaching fruition.
 
@@ -146,7 +146,7 @@ And sometimes he had to be the first person willing to put things right.
 
 **Ernchait Near the End**
 
-Ernchait Seawail approaches the end of his adventuring career as a very different man from the boy who knelt beside his mother on the cobbles of Waterdeep—but not because his fundamental beliefs have changed.
+Ernchait Seawail approaches the end of his adventuring career as a very different man from the boy who knelt beside his mother on the cobbles of Harborcrown—but not because his fundamental beliefs have changed.
 
 If anything, the astonishing events of his life have reinforced them.