Merge branch 'Jibauni' of https://github.com/Alrodel/endless-sky into Jibauni

Author: TheGiraffe3

.codespell.exclude

@@ -106,3 +106,4 @@ system Currus
 		"Mian"
 		"i' amazin"          # is amazing (mispronounced)
             * Care Package 2a has been replaced with a new mission, FW Deep Memorial, a set of missions and events that offers regardless of the player's choices, but which has a branch if Brower dies during the attack.
+			`	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 then looks you in the eye and gives a slow respectful nod, "For Ol' Skaldgar, may he be findin' ore in hel."`

.github/sccache/action.yml

@@ -29,8 +29,15 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libgles2-mesa-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev libfuse2
+      - name: Setup cached directories
+        uses: actions/cache@v4
+        with:
+          path: /home/runner/.cache/sccache
+          key: ${{ runner.os }}-cd-sccache-${{ github.ref }}
+          restore-keys: |
+            ${{ runner.os }}-cd-sccache-refs/heads/master
       - name: Setup sccache
-        uses: ./.github/sccache
+        uses: Mozilla-Actions/sccache-action@v0.0.5
       - name: Adjust version strings
         run: ./utils/cd_update_versions.sh
       - uses: lukka/get-cmake@latest
@@ -59,8 +66,15 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+      - name: Setup cached directories
+        uses: actions/cache@v4
+        with:
+          path: C:\Users\runneradmin\AppData\Local\Mozilla\sccache\cache
+          key: ${{ runner.os }}-cd-sccache-${{ github.ref }}
+          restore-keys: |
+            ${{ runner.os }}-cd-sccache-refs/heads/master
       - name: Setup sccache
-        uses: ./.github/sccache
+        uses: Mozilla-Actions/sccache-action@v0.0.5
       - name: Adjust version strings
         run: ./utils/cd_update_versions.sh
         shell: bash
@@ -92,8 +106,15 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+      - name: Setup cached directories
+        uses: actions/cache@v4
+        with:
+          path: /Users/runner/Library/Caches/Mozilla.sccache
+          key: ${{ runner.os }}-${{ runner.arch }}-cd-sccache-${{ github.ref }}
+          restore-keys: |
+            ${{ runner.os }}-${{ runner.arch }}-cd-sccache-refs/heads/master
       - name: Setup sccache
-        uses: ./.github/sccache
+        uses: Mozilla-Actions/sccache-action@v0.0.5
       - name: Install pkg-config
         run: type -P pkg-config || brew install pkg-config
       - uses: lukka/get-cmake@latest

.github/workflows/cd.yaml

@@ -24,7 +24,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libgles2-mesa-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev libfuse2
       - name: Setup sccache
-        uses: ./.github/sccache
+        uses: Mozilla-Actions/sccache-action@v0.0.5
       - uses: lukka/get-cmake@latest
       - uses: lukka/run-vcpkg@v11
         with:
@@ -53,7 +53,7 @@ jobs:
         with:
           show-progress: false
       - name: Setup sccache
-        uses: ./.github/sccache
+        uses: Mozilla-Actions/sccache-action@v0.0.5
       - uses: lukka/get-cmake@latest
       - uses: lukka/run-vcpkg@v11
         with:
@@ -91,7 +91,7 @@ jobs:
         with:
           show-progress: false
       - name: Setup sccache
-        uses: ./.github/sccache
+        uses: Mozilla-Actions/sccache-action@v0.0.5
       - name: Install pkg-config
         run: type -P pkg-config || brew install pkg-config
       - uses: lukka/get-cmake@latest
@@ -121,7 +121,7 @@ jobs:
           mkdir "${{ env.OUTPUT }}"
           cp -r "Endless Sky.app" "${{ env.OUTPUT }}"
           ln -s /Applications "${{ env.OUTPUT }}"
-          hdiutil create -ov -fs HFS+ -format UDZO -imagekey zlib-level=9 -srcfolder "${{ env.OUTPUT }}" "${{ github.workspace }}/${{ env.OUTPUT }}.dmg"
+          until hdiutil create -ov -fs HFS+ -format UDZO -imagekey zlib-level=9 -srcfolder "${{ env.OUTPUT }}" "${{ github.workspace }}/${{ env.OUTPUT }}.dmg"; do echo "hdiutil create failed, retrying..."; done
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
@@ -152,7 +152,7 @@ jobs:
     - name: Build Endless Sky
       run: |
         cd steam
-        docker-compose run steam-x64
+        docker compose run steam-x64
     - name: Prepare binary
       run: cp build/steam-x64/endless-sky .
     - name: Upload Steam Depot

.github/workflows/cd_release.yaml

@@ -60,8 +60,15 @@ jobs:
     - name: Disable VM sound card
       run: |
         sudo sh -c 'echo "pcm.!default { type plug slave.pcm \"null\" }"  >> /etc/asound.conf'
+    - name: Setup cached directories
+      uses: actions/cache@v4
+      with:
+        path: /home/runner/.cache/sccache
+        key: ${{ runner.os }}-${{ matrix.os }}-${{ matrix.opengl }}-ci-sccache-${{ github.ref }}
+        restore-keys: |
+          ${{ runner.os }}-${{ matrix.os }}-${{ matrix.opengl }}-ci-sccache-refs/heads/master
     - name: Setup sccache
-      uses: ./.github/sccache
+      uses: Mozilla-Actions/sccache-action@v0.0.5
     - uses: lukka/get-cmake@latest
     - uses: lukka/run-vcpkg@v11
       with:
@@ -86,8 +93,15 @@ jobs:
     - uses: actions/checkout@v4
       with:
         show-progress: false
+    - name: Setup cached directories
+      uses: actions/cache@v4
+      with:
+        path: C:\Users\runneradmin\AppData\Local\Mozilla\sccache\cache
+        key: ${{ runner.os }}-${{ runner.arch }}-ci-sccache-${{ github.ref }}
+        restore-keys: |
+          ${{ runner.os }}-${{ runner.arch }}-ci-sccache-refs/heads/master
     - name: Setup sccache
-      uses: ./.github/sccache
+      uses: Mozilla-Actions/sccache-action@v0.0.5
     - uses: lukka/get-cmake@latest
     - uses: lukka/run-vcpkg@v11
       with:
@@ -122,8 +136,15 @@ jobs:
     - uses: actions/checkout@v4
       with:
         show-progress: false
+    - name: Setup cached directories
+      uses: actions/cache@v4
+      with:
+        path: C:\Users\runneradmin\AppData\Local\Mozilla\sccache\cache
+        key: ${{ runner.os }}-clang-${{ runner.arch }}-ci-sccache-${{ github.ref }}
+        restore-keys: |
+          ${{ runner.os }}-clang-${{ runner.arch }}-ci-sccache-refs/heads/master
     - name: Setup sccache
-      uses: ./.github/sccache
+      uses: Mozilla-Actions/sccache-action@v0.0.5
     - uses: lukka/get-cmake@latest
     - uses: lukka/run-vcpkg@v11
       with:
@@ -148,8 +169,15 @@ jobs:
     - uses: actions/checkout@v4
       with:
         show-progress: false
+    - name: Setup cached directories
+      uses: actions/cache@v4
+      with:
+        path: /Users/runner/Library/Caches/Mozilla.sccache
+        key: ${{ runner.os }}-${{ runner.arch }}-ci-sccache-${{ github.ref }}
+        restore-keys: |
+          ${{ runner.os }}-${{ runner.arch }}-ci-sccache-refs/heads/master
     - name: Setup sccache
-      uses: ./.github/sccache
+      uses: Mozilla-Actions/sccache-action@v0.0.5
     - name: Install pkg-config
       run: type -P pkg-config || brew install pkg-config
     - uses: lukka/get-cmake@latest

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ See the [player's manual](https://github.com/endless-sky/endless-sky/wiki/Player
 
 ## Installing the game
 
-Official releases of Endless Sky are available as direct downloads from [GitHub](https://github.com/endless-sky/endless-sky/releases/latest), on [Steam](https://store.steampowered.com/app/404410/Endless_Sky/), and on [Flathub](https://flathub.org/apps/details/io.github.endless_sky.endless_sky). Other package managers may also include the game, though the specific version provided may not be up-to-date.
+Official releases of Endless Sky are available as direct downloads from [GitHub](https://github.com/endless-sky/endless-sky/releases/latest), on [Steam](https://store.steampowered.com/app/404410/Endless_Sky/), on [GOG](https://gog.com/game/endless_sky), and on [Flathub](https://flathub.org/apps/details/io.github.endless_sky.endless_sky). Other package managers may also include the game, though the specific version provided may not be up-to-date.
 
 ## System Requirements
 

README.md

@@ -11,6 +11,7 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <https://www.gnu.org/licenses/>.
 
+
 # Colors used to reflect the active or hovered interface button.
 color "hover" 1. 1. 1. 0.
 color "active" .75 .75 .75 0.
@@ -194,6 +195,11 @@ color "map wormhole" .5 .2 .9 1.
 color "map orbits fleet destination" 1. 1. 1. 1.
 color "map danger none" .1 .6 0. .4
 
+# Colors used for the routing issue text in the map panel when
+# a route to the selected system cannot be determined.
+color "map route error text" 1. 0. 0. 1.
+color "map route error shadow" 0. 0. 0. 1.
+
 # Miscellaneous colors
 color "wormholes: Ember Waste" .7 .1 .3
 
@@ -1431,6 +1437,16 @@ interface "map"
 	value "max zoom" 2
 	value "min zoom" -2
 
+	anchor top
+	string "route error"
+		center 1 59
+		size 18
+		color "map route error shadow"
+	string "route error"
+		center 0 58
+		size 18
+		color "map route error text"
+
 
 
 interface "info panel"

data/_ui/interfaces.txt

@@ -48,7 +48,7 @@ event "gegno: vi occupy zydee"
 		"required reputation" 1
 	planet "Ghneoe"
 		description `Ghneoe's orbital period is dominated by a very long dry season due to the binary stars at the system's center. However, during a short portion of the year, Ghneoe experiences an intense water cycle that results in a boom of greenery and wildlife activity, developing a short-lived but flourishing ecosystem. Much of the flora and fauna have adapted to such drastic shifts in climate, and return to a dormant state once the intense heat cycle returns.`
-		description `	Unlike its moon, Ghneoe sees little to no colonization efforts from either the Gegno Vi or Scin, perhaps due to the abnormal weather cycles, continued system warfare, or a combination of both.`
+		description `	Unlike its moon, Ghneoe sees few to no colonization efforts from either the Gegno Vi or Scin, perhaps due to the abnormal weather cycles, continued system warfare, or a combination of both.`
 
 
 event "gegno: unified defense"

data/gegno/gegno events.txt

@@ -233,7 +233,7 @@ mission "Hai Rescue: Ooonem"
 			branch nohint
 				and
 					not "Hai Rescue: Ooonem Hint: offered"
-					not "Hai Rescue: Ooonem (defer count)" >= 1
+					not "Hai Rescue: Ooonem (defer count)"
 			`Following reports of the last time the "angel of death" was sighted, you end up loitering in a twisting street parallel to a main thoroughfare. The few people using it hurry by quickly, and rarely seem to travel any great distance down this street. One very surly looking individual gives you a sour glare on his way past, a collection of weapons on full display. He looks a lot like you'd expect a bounty hunter to look, and as he moves out of sight you observe a shadow, previously motionless, detach from a spot on a wall and head back your direction, laser rifle pointed in the direction of the departing individual. As the shadow approaches, you see there's a lot of hair sticking out from their hood. They might be a Hai. Do you want to talk to them?`
 				goto start
 			label nohint

data/hai/hai reveal 2 start.txt

@@ -451,6 +451,15 @@ phrase "friendly hai"
 		"concord."
 		"cooperation."
 
+phrase "friendly hai"
+	word
+		"Do you have any of your human ship cooling systems to trade? Many of us consider them to be more fashionable and exotic than our Williwaws."
+		"Our tenets forbid gambling, but there are a few that fail to resist the temptation."
+		"Please be respectful when handling our quantum keystones. They are a vital cultural treasure of the Hai."
+		"We extol the diversity of human spaceship technology. Some of your more primitive engines, however, must try your patience."
+		"We understand that different species have different diets. However, it is still unnerving to know some humans eat squirrels."
+		"Zero-g cricket is a fascinating human sport. Although, we have found it is much more entertaining to play than to watch."
+
 phrase "friendly disabled hai"
 	word
 		"Fellow peacekeeper"

data/hai/hai.txt

@@ -2608,7 +2608,7 @@ mission "Stone of our Fathers 3"
 				decline
 			label accept
 			`	You're surprised at how cool the smooth stone feels in your palm.`
-			`	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."`
+			`	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 then looks you in the eye and gives a slow respectful nod, "For Ol' Skaldgar, may he be findin' ore in hel."`
 			`	And with that, the man disappears into the crowd.`
 				accept
 	on complete

data/human/deep missions.txt

@@ -6551,6 +6551,14 @@ phrase "hostile disabled pirate"
 		"Fire! Fire! Fire the stupid guns! Why aren't you firing?"
 		"The guns... they've stopped!"
 		"Weapons systems critical! What does that mean?"
+		"No one told us pirates might die!"
+		"I told you guys not to get engines from the scrapyard!"
+		"Okay, okay! We'll pay our taxes."
+		"Wait! I forgot my last words."
+		"We didn't know piracy was bad!"
+		"Get away! My uncle is the CEO of the Syndicate."
+		"Forgive us! These guns were accidentally installed."
+		"Hey, you can't hurt a crew as stylish as ours."
 
 phrase "hostile disabled pirate"
 	word

data/human/hails.txt

@@ -107,14 +107,13 @@ mission "Hunted"
 	to offer
 		"combat rating" > 8103
 		"armament deterrence" >= 2
-		"ship scale" = "ship: Light Warship" + "ship: Medium Warship" * 2 + "ship: Heavy Warship" * 4
 		or
 			and
 				not "Hunted: active"
-				"ship scale" < 32
-				random < 2 + "ship scale" / 4
+				"ship: Light Warship" + "ship: Medium Warship" * 2 + "ship: Heavy Warship" * 4 < 32
+				random < 8
 			and
-				"ship scale" >= 32 + "Hunted: active" * 4
+				"ship: Light Warship" + "ship: Medium Warship" * 2 + "ship: Heavy Warship" * 4 >= 32 + "Hunted: active" * 4
 				random < 10
 		or
 			not "chosen sides"
@@ -5739,7 +5738,7 @@ mission "Quicksilver Mixup 0"
 			`You're looking at some job listings when a man with a harried face approaches you, carrying a package.`
 			`	"Excuse me, Captain," he says. "I need this package delivered in the next four days. Details are on the package. I'll pay you <payment> once it's done." Without waiting for a response, he shoves the package into your hands and runs off to attend to whatever business has gotten him in such a hurry. The package is addressed to a location on <planet>.`
 			branch "can't make it in time"
-				has "hyperjumps to planet: Silver" > 3
+				"hyperjumps to planet: Silver" > 3
 			`	It's going to be close to his deadline, but it's possible.`
 				goto choice
 			label "can't make it in time"

data/human/human missions.txt

@@ -146,7 +146,7 @@ effect "star tail hit"
 	sprite "effect/star tail hit"
 		"no repeat"
 		"frame rate" 40
-	sound "star tail hit"
+	sound "explosion small"
 	"lifetime" 30
 	"velocity scale" 0.
 

data/incipias/incipias outfits.txt

@@ -935,6 +935,7 @@ outfit "Firelight Missile Bank"
 		ammo "Firelight Missile"
 		icon "icon/firelight"
 		"hit effect" "firelight ring" 20
+		"die effect" "piercer fire"
 		"velocity" 4
 		"velocity override" 16
 		"lifetime" 10

data/korath/korath weapons.txt

@@ -506,3 +506,4 @@ phrase "quarg poems on species"
 		"Make strongest neighbor / See through the guise / Let none forget / The curse of the wise"
 		"With skin of stone / Might, meek, guile / Abilities to hone / And wars to pile"
 		"Twice-blessed pilgrims / Myths of the past / Masses preserve / The royal caste"
+		"Adrift by the clouds / Under watchful eyes / Begin now a journey / To the greatest skies"

data/quarg/quarg news.txt

@@ -1182,6 +1182,9 @@ event "remnant: teciimach deployment"
 		add "Teciimach Pod"
 		add "Teciimach Canister"
 		add "Teciimach Canister Rack"
+	outfitter "Remnant Core"
+		remove "EMP Torpedo"
+		add "Teciimach Canister"
 	fleet "Small Remnant"
 		add variant 5
 			"Merganser (II)" 2

data/remnant/remnant events.txt

@@ -405,7 +405,7 @@ outfit "Teciimach Pod"
 		"ion damage" 60
 		"scrambling damage" 60
 		"energy damage" 2000
-		"hit force"135
+		"hit force" 135
 		"missile strength" 95
 	description "While originally developed as a heavy weapon to paralyze enemy capital ships, the Remnant have utilized on-the-spot assembly techniques to support their use on smaller ships. These pods sacrifice multiple assembly systems in order to fit them onto interceptor-class vessels."
 	description "	Despite this explanation, a careful examination of these bays and pods suggest that there is much more here than their volume would suggest."

data/remnant/remnant outfits.txt

@@ -174,7 +174,7 @@ outfit "Dragonflame Cannon"
 		"hull damage" 15000
 		"heat damage" 50000
 		"piercing" 0.4
-		"blast radius" 50
+		"penetration count" 20
 	description "The ancient Sheragi superweapon is simple in concept, but the cost involved in developing something like it is exorbitant. It's hard to envision what could have motivated the creation of such a thing. It uses an obscene amount of energy to trigger an extremely powerful thermonuclear reaction, directing most of the energy from the resulting explosion forwards in a devastatingly powerful beam of gamma radiation."
 
 effect "dragonflame"

data/sheragi/sheragi outfits.txt

@@ -17,6 +17,7 @@ If you are posting a pull request, please:
 * Do not combine multiple unrelated changes.
 * Check the diff and make sure the pull request does not contain unintended changes.
 * If changing the C++ code, follow the [coding standard](https://endless-sky.github.io/styleguide/styleguide.xml).
+* When adding content that could impact the main game, keep in mind the guidelines from the [quality checklist](https://github.com/endless-sky/endless-sky/wiki/QualityChecklist) and [style goals](https://github.com/endless-sky/endless-sky/wiki/StyleGoals) documents.
 
 If proposing a major pull request, start by posting an issue and discussing the best way to implement it. Often the first strategy that occurs to you will not be the cleanest or most effective way to implement a new feature.