Update

.codespell.exclude

@@ -30,6 +30,7 @@
 		"rasi it maka makpes"                   # fish en papillote
 		"Far Upugf Enrel Ugt"                 # Nam Myoho Renge Kyo (Buddhist religious chant)
 		"Far Uhudf Elrep Uds"                  # Nam Myoho Renge Kyo (Buddhist religious chant)
+			"Capitalise that proper noun. Use American English for consistency. For goodness' sake, that needs a comma!"
 		"Woh"
 		"Yot"
 		"mor"
@@ -42,7 +43,6 @@
 		"Diamond Grey"
 		"Grey Wolf"
 				`	"The Grey Goose."`
-			`	He stops and frowns. "Look at me, rambling like an ol' man. Ser, Captain, I'd like to pay you <payment> to take me home, to <destination>."`
 			`	He smiles sadly. "Skaldgar always had a nose for good folks. Anyways, he told me he had a nephew named Helm who worked at the Norn spaceport. Find 'im and he can get'cha and this stone where it needs to go." The young man than looks you in the eye and gives a slow respectful nod, "For Ol' Skaldgar, may he be findin' ore in hel."`
 			`	Cygnet strokes his mustache. "Tod Copper. Tod Copper. Tell you what, that name doesn' ring a bell. Heck, I don' even keep track of names 'less I get someone impor'ant. If ya lookin' for someone in particular to buy, can I get a description?"`
 					goto shotdown
@@ -52,12 +52,6 @@
 		"oder"
 		" Grat"
 			`	"Fantastic, you understand the situation," she says, though her tone is much more businesslike than the wording would imply. "In that case, if you could please take this to Earth and communicate with your various governments we can begin a dialogue on how best to deal with this current scenario."`
-			`	"Hello, ser! I hope you've been enjoying your stay in our state of the art spaceport! But why stay cooped up in here, when you could be out there?" She gestures toward the windows.`
-			`	"So ser," she continues, "what do you say? Should I sign you up for the VIP Winter-Wonder Excursion Package for a special time limited-only offer of 2,000 credits?"`
-			`	The woman frowns, but nods knowingly. "I am afraid, ser, most seem to think the way you do. Still, if you ever run into anyone out there who might be interested, let them know. We could really use the work." With that, she turns and walks briskly back to her booth.`
-			`	The woman's face lights up, and you get the sense that she isn't used to hearing "yes" very often. "Oh, that is wonderful ser, just wonderful!"`
-			`	She puts her finger to her ear and says, "Hjlod, we have a customer! Get the crawler warmed up!" The woman then drops her hand and waves to you. "Right this way, ser! And might I add - you will not be disappointed." She chatters excitedly about the cultural, artistic and scientific merits of the trip as she leads you toward a large pressure hatch.`
-			`	The woman's face, red with the cold, looks crest-fallen, but unsurprised, like she was half expecting this outcome. "Brunhilda can be an... intimidating vehicle, it's true. But she is safe ser, I assure you. Either way, I'll take you back to the spaceport."`
 			`	The uneventful journey to the boiling ice river of Slidr is suddenly interrupted when a deep tremor followed by a thunderous boom shakes the Ice-Crawler to its core and causes it to slip on the disturbed ice and snow. Somewhere outside, subsequent rumble starts to build rapidly. After Hjlod regains control of the crawler, she immediately veers away from the noise. "That vas Nifel-quake, and loud noise was avalanche, or landslide, maybe both. This is not good."`
 			`	By the time you are on your feet, Hjlod has already gathered up numerous supplies and is preparing to open the hatch and dig her way to the surface. She looks at you. "Nothing to vorry about. Happens all time. Vell, not really. First time this happen, but Hjlod not let you die, probably. I can lead us to settlement not far from here."`
 			`	Hjlod abruptly stops and glares at you. "You are fool. You vill certainly die, and you endanger me in process. This is no game, valk only vhere I valk or die."`
@@ -69,9 +63,10 @@
 			`	Hjlod nods. "Hrithfjall sounds like good place. I vill tell Ondurdis.`
 			`	Hjlod nods. "The Skadenga have alvays been guides, pathfinders. I vill tell Ondurdis.`
 			`	"Vhen you were gone, thing, or assembly, vas held. Ondurdis called in all Skadenga from all villages across Nifel. You must find transportation for 2,200 folk. That is what Onderduis told me to tell you."`
-			`	Hjlod takes a deep, calming breath. "I call because you are our only hope. They vill not let us leave. They vill not let us be. They will steal our souls." She points a shaky finger at you. "Take us back to Nifel. All those who are left. Take us home. Ve know the cold vill get us eventually. But better to live on a dying vorld as Skadenga than to live here as nothing."`
+			`	Hjlod takes a deep, calming breath. "I call because you are our only hope. They vill not let us leave. They vill not let us be. They vill steal our souls." She points a shaky finger at you. "Take us back to Nifel. All those who are left. Take us home. Ve know the cold vill get us eventually. But better to live on a dying vorld as Skadenga than to live here as nothing."`
 			`	Hjlod grimaces. "Once they know you are here, they vill collect us. Come back here in an hour. Any longer than that, and ve vill be gone." She slumps down on the ground as you exit the dark, dirty tunnel where the remaining Skadenga cling to their fleeting identity.`
-			`	"Ve have 52 people that need off this vorld right now." Hjlod hesitates a moment, and then adds, "I know how much you like money. Ve have pooled all our savings together and will pay you <payment> for this job." She grabs a ragged duffle bag and a group gather around her. "The rest vill meet us at your ship. Ve move now."`
+			`	"Ve have 52 people that need off this vorld right now." Hjlod hesitates a moment, and then adds, "I know how much you like money. Ve have pooled all our savings together and vill pay you <payment> for this job." She grabs a ragged duffle bag and a group gather around her. "The rest vill meet us at your ship. Ve move now."`
+			`	Hjlod frowns. "It's Arnson's family isn't it? I told him he vas too far."`
 			`	"I do not know vhy you sent us to that place. But I am happy to be home. So go, and maybe one day I vill not hate to see you again."`
 			`A familiar woman is waiting for you outside your ship. Although it's been more than seven years since you've last seen her, you recognize Hjlod instantly. Her eyes are brighter than when last you parted, and she has the same lopsided grin that you remember. "<first>, I saw your ship landing, and thought I vould say hello."`
 			`	She reaches into her pocket and pulls out a small wooden box, similar to the one you saw displayed at Asgard years ago. "I have been thinking," Hjlod says. "Maybe all this vas vill of Skade. Maybe you took us to Asgard to make us stronger, to make us better. It is bitter lesson, but I understand it now."`
@@ -81,12 +76,12 @@
 system Nnaug
 	object "Sies Upi"
 planet "Sies Upi"
-	description `Sies Upi is one of the most recently colonized planets of the Gegno Vi. This hot, dry world with harsh living environments serves as more of an outpost than it does a colony, but nevertheless the Vi found ways to create manageable living conditions.`
+	description `Sies Upi is one of the most recently colonized planets of the Gegno Vi. This hot, dry, and harsh world serves as more of an outpost than it does a colony, but nevertheless the Vi have found ways to create manageable living conditions for their settlers.`
 		"Brocken"
 			`	"What part of non-negotiable did you not understand? You're pushing your luck, Captain <last>. I didn't expect you to be such a petty money pincher."`
 		"Shepard"
-			`	She gives you a little smile and nods. "If you come across someone and have difficulty getting them to trust you, try telling them 'Luf e ow, vai, luf e eh'."`
-			`	She gives you a very serious look and nods. "If you come across any others and have difficulty getting them to trust you, try telling them 'Luf e ow, vai, luf e eh'."`
+			`	She gives you a little smile and nods. "If you come across someone and have difficulty getting them to trust you, try telling them 'Luf e ow, vai, luf e eh.'"`
+			`	She gives you a very serious look and nods. "If you come across any others and have difficulty getting them to trust you, try telling them 'Luf e ow, vai, luf e eh.'"`
 		ship Geocoris "Vai e Lur"
 				`	"Uh, luf e ow, vai, luf e eh?"`
 				`	"No wait! Luf e ow, vai, luf e eh?"`

.codespell.words.exclude

@@ -1,2 +1,3 @@
 aesthetic
 aesthetics
+aesthetically

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -68,6 +68,7 @@ body:
       description: From where did you obtain your current game version?
       options:
         - Steam
+        - GOG
         - ESLauncher2
         - Built from source
         - GitHub Releases

.github/path-filters.yml

@@ -37,6 +37,7 @@ cmake_files:
   - source/CMakeLists.txt
   - tests/CMakeLists.txt
   - tests/integration/IntegrationTests.cmake
+  - tests/integration/RunIntegrationTest.cmake
   - utils/vcpkg_bootstrap.cmake
   - utils/check_cmake.sh
   - CMakePresets.json

.github/pull_request_template.md

@@ -1,67 +1,39 @@
-NOTICE: Delete the sections that do not apply to your PR, and fill out the section that does.
-(You can open a PR to add or improve a section, if you find them lacking!)
+(The lines in parentheses (like this one) are instructions for filling out this template. These lines can be deleted.)
+(The lines in double curly brackets ({{}}) should be replaced as it describes.)
+(You can open a PR to add or improve this template, if you find it lacking!)
 
-----------------------
+(Choose one heading, or add your own.)
 **Content (Artwork / Missions / Jobs)**
+**Balance**
+**Feature**
+**Bug fix**
+**CI/CD/Testing**
+**Documentation**
 
-## Summary
-{{summarize your content! Include links to related issues, in-game screenshots, etc.}}
-
-## Save File
-This save file can be used to play through the new mission content:
-{{attach a save file that allows people to easily test your added mission content or see your new in-game art}}
-
-## Artwork Checklist
- - [ ] I updated the copyright attributions, or decline to claim copyright of any assets produced or modified
- - [ ] I created a PR to the [endless-sky-assets repo](https://github.com/endless-sky/endless-sky-assets) with the necessary image, blend, and texture assets: {{insert PR link}}
- - [ ] I created a PR to the [endless-sky-high-dpi repo](https://github.com/endless-sky/endless-sky-high-dpi) with the `@2x` versions of these art assets: {{insert PR link}}
+This PR addresses the bug/feature described in issue #{{insert number}}
 
+## Summary
+{{Describe and explain your changes. Include links to related issues.}}
 
------------------------
-**Bugfix:** This PR addresses issue #{{insert number}}
+## Screenshots
+{{Include before and after screenshots demonstrating your changes, if applicable.}}
 
-## Fix Details
-{{add details}}
+## Usage examples
+{{If your changes affect how game data can be defined, provide examples demonstrating the changes here.}}
 
 ## Testing Done
-{{describe how you tested that the fix doesn't introduce other issues}}
+{{Describe how you tested these changes. Ensure that new issues aren't introduced.}}
+{{If this is a new feature, have you added any automated tests using the unit or integration testing framework?}}
 
 ## Save File
-This save file can be used to verify the bugfix. The bug will occur when using {{insert commit hash / version}}, and will not occur when using this branch's build.
-{{attach a save file that can be used to verify your bugfix. It MUST have no plugin requirements}}
-
-
------------------------
-**Balance:**
-
-## Summary
-{{summarize all the changes you made}}
-
-## Reasoning
-{{explain why you think your balance changes are an improvement, including links to any issues you think your balance changes are addressing}}
+This save file can be used to test these changes:
+{{Attach a save file that allows people to easily test your added mission content or see your new in-game art.}}
 
-## Save File
-This save file can be used to test the balance changes.
-{{attach a save file that allows people to easily test the results of your balance changes, if one is useful}}
-
-
------------------------
-**Feature:** This PR implements the feature request detailed and discussed in issue #{{insert number}}
-
-## Feature Details
-{{add details about the feature you implemented}}
-
-## UI Screenshots
-{{attach before + after screenshots of any changes to UI, or replace this line with "N/A"}}
-
-## Usage Examples
-{{if this feature is used in the data files, provide examples!}}
-
-## Testing Done
-{{describe how you tested the new feature}}
-
-### Automated Tests Added
-{{describe the automated tests you added (using the unit-test framework, integration-test framework or otherwise) to reduce the risk of regressions in the future. "N/A" if this PR is not for an in-game feature that needs to remain functional in the future. }}
+## Artwork Checklist
+(If any artwork was added or changed by this PR, the following must be provided.)
+ - [ ] I updated the copyright attributions, or decline to claim copyright of any assets produced or modified
+ - [ ] I created a PR to the [endless-sky-assets repo](https://github.com/endless-sky/endless-sky-assets) with the necessary image, blend, and texture assets: {{insert PR link}}
+ - [ ] I created a PR to the [endless-sky-high-dpi repo](https://github.com/endless-sky/endless-sky-high-dpi) with the `@2x` versions of these art assets: {{insert PR link}}
 
 ## Performance Impact
-{{describe any performance impact (positive or negative). "N/A" if no performance-critical code is changed. }}
+{{If this PR changed code, describe any performance impact (positive or negative). "N/A" if no performance-critical code is changed.}}

.github/workflows/cd.yaml

@@ -10,7 +10,7 @@ on:
       - opened
 
 concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

.github/workflows/cd_release.yaml

@@ -2,14 +2,18 @@ name: Release CD
 
 on:
   workflow_dispatch:
+    inputs:
+      release_version:
+        required: true
+        type: string
 
 jobs:
   release_appimage_x64:
     name: AppImage x64
     runs-on: ubuntu-20.04
     env:
       ARCH: x86_64
-      OUTPUT: Endless_Sky-${{ github.ref_name }}-x86_64.AppImage
+      OUTPUT: Endless_Sky-${{ inputs.release_version  }}-x86_64.AppImage
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v4
@@ -38,49 +42,12 @@ jobs:
           name: ${{ env.OUTPUT }}
           path: ${{ env.OUTPUT }}
 
-  release_windows_x86:
-    name: Windows x86
-    runs-on: windows-2022
-    env:
-      OUTPUT: EndlessSky-win32-${{ github.ref_name }}.zip
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-      - name: Install x86 MinGW
-        run: choco install mingw --forcex86 --force
-      - uses: lukka/get-cmake@latest
-      - uses: lukka/run-vcpkg@v11
-        with:
-          vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9'
-      - uses: lukka/run-cmake@v10
-        with:
-          configurePreset: 'mingw32-release'
-          buildPreset: 'mingw32-ci-release'
-      - name: Package Application
-        run: |
-          cmake --install build/release
-          7z a ${{ env.OUTPUT }} "./install/release/*"
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.OUTPUT }}
-          path: ${{ env.OUTPUT }}
-      - name: Upload Steam Depot
-        uses: actions/upload-artifact@v3
-        with:
-          name: steam-win32-depot
-          path: |
-            ./install/release/Endless Sky.exe
-            ./install/release/*.dll
-
 
   release_windows_x64:
     name: Windows x64
     runs-on: windows-2022
     env:
-      OUTPUT: EndlessSky-win64-${{ github.ref_name }}.zip
+      OUTPUT: EndlessSky-win64-${{ inputs.release_version }}.zip
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v4
@@ -119,7 +86,7 @@ jobs:
     runs-on: macos-12
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      OUTPUT: Endless-Sky-${{ github.ref_name }}
+      OUTPUT: Endless-Sky-${{ inputs.release_version }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -179,35 +146,31 @@ jobs:
   release_steam_linux:
     name: Steam Linux
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        arch: [x64, x86]
     steps:
     - uses: actions/checkout@v4
       with:
         show-progress: false
     - name: Build Endless Sky
       run: |
         cd steam
-        docker-compose run steam-${{ matrix.arch }}
+        docker-compose run steam-x64
     - name: Prepare binary
-      run: cp build/steam-${{ matrix.arch }}/endless-sky .
+      run: cp build/steam-x64/endless-sky .
     - name: Upload Steam Depot
       uses: actions/upload-artifact@v3
       with:
-        name: steam-linux${{ matrix.arch == 'x64' && '64' || '32' }}-depot
+        name: steam-linux64-depot
         path: endless-sky
 
 
   deploy_steam:
     name: Deploy Steam
-    needs: [release_steam_linux, release_windows_x64, release_windows_x86, release_macos_universal]
+    needs: [release_steam_linux, release_windows_x64, release_macos_universal]
     runs-on: ubuntu-latest
     # environment: steam
     env:
       data: steam-data-depot
-      linux32: steam-linux-x86
-      linux64: steam-linux-x64
+      linux: steam-linux-x64
       win32: steam-win32
       win64: steam-win64
       macos: steam-macos
@@ -243,6 +206,5 @@ jobs:
     #     depot3Path: ${{ env.win32 }}
     #     depot4Path: ${{ env.win64 }}
     #     depot5Path: ${{ env.macos }}
-    #     depot6Path: ${{ env.linux32 }}
-    #     depot7Path: ${{ env.linux64 }}
+    #     depot7Path: ${{ env.linux }}
     #     releaseBranch: canary

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ on:
 
 
 concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -200,6 +200,8 @@ jobs:
       with:
         name: windows-dlls
     - name: Parse Datafiles
-      run: .\utils\test_parse.ps1 'Endless Sky.exe'
+      run: "'./Endless Sky.exe' -p"
+      shell: bash
     - name: Parse Integration Test Data
-      run: .\utils\test_parse.ps1 'Endless Sky.exe' tests/integration/config
+      run: "'./Endless Sky.exe' -p --config 'tests/integration/config'"
+      shell: bash

.github/workflows/projects_check.yml

@@ -9,7 +9,7 @@ on:
     types: [opened, synchronize]
 
 concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -33,7 +33,7 @@ jobs:
   check_cmake:
     name: CMake
     needs: changed
-    if: ${{ needs.changed.outputs.cmake_files == 'true' || needs.changed.outputs.game_code == 'true' || needs.changed.outputs.unit_tests == 'true' }}
+    if: ${{ needs.changed.outputs.cmake_files == 'true' || needs.changed.outputs.game_code == 'true' || needs.changed.outputs.unit_tests == 'true' || needs.changed.outputs.integration_tests == 'true' }}
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4

.github/workflows/steam.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -65,9 +65,9 @@ jobs:
     - name: Verify executable
       run: ./steam-container-runtime/depot/run-in-sniper ./build/steam-${{ matrix.arch }}/endless-sky -- -v
     - name: Execute data parsing test
-      run: ./steam-container-runtime/depot/run-in-sniper ./utils/test_parse.sh -- ./build/steam-${{ matrix.arch }}/endless-sky
+      run: ./steam-container-runtime/depot/run-in-sniper ./build/steam-${{ matrix.arch }}/endless-sky -- -p
     - name: Execute integration data parsing test
-      run: ./steam-container-runtime/depot/run-in-sniper ./utils/test_parse.sh -- ./build/steam-${{ matrix.arch }}/endless-sky tests/integration/config
+      run: ./steam-container-runtime/depot/run-in-sniper ./build/steam-${{ matrix.arch }}/endless-sky -- -p --config tests/integration/config
     - name: Execute tests
       run: |
         cd steam