Merge branch 'experimental' into f(u)-Upstream0-10-7-release

.codespell.exclude

@@ -91,7 +91,6 @@ planet "Sies Upi"
 			`		MSGT IRENE BROWER`
 			`As you step out of your ship, you spot a familiar face: Irene Brower, the gunnery sergeant you delivered a care package to before the war, though she seems to have master sergeant insignia now. She's on crutches, with what looks like a brand-new prosthetic leg. When she spots you, her pained face brightens. "Hey, I know you! You brought me that package from Tor before. Thanks!" She shifts her weight, then winces and shifts it back.`
 		log "Minor People" "Torrey and Irene" `Torrey Dupont, an activist, is friends with SMDP militia NCO Irene Brower. You delivered a package for them.`
-		"Brin"
 		"exis"
 			`	The old man narrows his eyes at you and his mouth falls slightly open like he's trying to make sense of a puzzle. Finally he says, "What's the bits between a fella's legs gotta do with anything? I already said, 'Ser' is just what decent folk call each other; ain't nothing more to it. Don't matter if you're a guy, gal, or anything else. Hel, I reckon I'd even call an elf 'Ser' if they done me a good turn.`
 			`	The old man gives you a gruff nod and says, "Ah, I see. Can be confusing for a newcomer, I s'pose. What's 'tween a fella's legs gots nothing to do with it. Just like I said before, 'Ser' is just what decent folk call each other; ain't nothing more to it. Don't matter if you're a guy, gal, or anything else. Hel, I reckon I'd even call an elf 'Ser' if they done me a good turn.`

.codespell.words.exclude

@@ -2,3 +2,4 @@ aesthetic
 aesthetics
 aesthetically
 ser
+brin

.github/workflows/cd.yaml

@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - master
+      - mirror
+      - main
+      - experimental
   pull_request:
     types:
       - synchronize

.github/workflows/ci.yml

@@ -5,6 +5,9 @@ on:
     # Run for pushes to master or a release branch, e.g. a PR was merged ...
     branches:
       - master
+      - mirror
+      - main
+      - experimental
       - releases/v[0-9]+.[0-9]+.[0-9]+
     # ... and only when we've possibly changed how the game will function.
     paths:

.github/workflows/projects_check.yml

@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - master
+      - mirror
+      - main
+      - experimental
       - releases/v[0-9]+.[0-9]+.[0-9]+
   pull_request:
     types: [opened, synchronize]

.gitignore

@@ -71,3 +71,6 @@ CMakeUserPresets.json
 
 # static code analysis
 /.scannerwork
+
+# Endless Sky Delta Check Fix
+/.github/**

README.md

@@ -1,4 +1,23 @@
-# Endless Sky
+# Endless Sky - Delta
+
+This is the Rapid Development and Experimentation fork of the Endless Sky project, and is colloquially known as "Endless Sky Delta" or "Revamp 2.0." The purpose is to be an area where more changes can be worked on, trialed, and experimented with.
+
+If you are looking for a stable version of Endless Sky to play, you should go to https://github.com/endless-sky/endless-sky instead.
+If you are looking to try out the cutting edge (and possible failures) of our attempts to make Endless Sky better, this is the place to be.
+
+# Development
+
+Look here to find a list of implemented features and to talk about them: https://github.com/endless-sky/Endless-Sky-Delta/discussions/15
+
+This fork has a number of branches, two of which are our primary work environment.
+
+Mirror : This is our base branch, and is kept synchronized with the main Endless Sky "master" branch.
+- Main : This is our long-term branch that will collect all the changes we have tried out and feel should be a permanent part of the game. It is based on "Mirror."
+- - Experimental : This is our experimental working area. All our changes start out here where they can be tested in conjunction with many other changes. It is based on "Main."
+
+**All PRs suggesting changes should be made to the "Experimental" branch.**
+
+------
 
 Explore other star systems. Earn money by trading, carrying passengers, or completing missions. Use your earnings to buy a better ship or to upgrade the weapons and engines on your current one. Blow up pirates. Take sides in a civil war. Or leave human space behind and hope to find some friendly aliens whose culture is more civilized than your own...
 

copyright

@@ -3491,9 +3491,25 @@ Comment:
 
 Files:
  images/ui/red?alert*
+ images/ui/tactical/acceleration*
+ images/ui/tactical/gun?range*
+ images/ui/tactical/ramscoop*
+ images/ui/tactical/solar*
+ images/ui/tactical/turret?range*
+ images/ui/tactical/turn*
+ images/ui/tactical/velocity*
 Copyright: Zitchas ([email protected])
 License: CC-BY-SA-4.0
 
+Files:
+ images/ui/tactical/crew*
+ images/ui/tactical/energy*
+ images/ui/tactical/fuel*
+ images/ui/tactical/thermal*
+Copyright: Zitchas
+License: CC-BY-SA-4.0
+Comment: Derived from works by Michael Zahniser (under the same license).
+
 Files:
  images/_menu/haze-brown*
 Copyright: RisingLeaf (https://github.com/RisingLeaf)

credits.txt

@@ -1,5 +1,5 @@
 Welcome to Endless Sky!
-version 0.10.7
+version 0.10.7-delta
 
 The player's manual and other
 resources are available at:

data/_deprecated/deprecated outfits.txt

@@ -58,6 +58,8 @@ outfit "Korath Ark'torbal Thruster"
 	category "Engines"
 	"cost" 40000
 	thumbnail "outfit/unknown"
+	"thruster slot" -1
+	"engine mod space" 0.81
 	"mass" 17
 	"outfit space" -17
 	"engine capacity" -17
@@ -67,12 +69,19 @@ outfit "Korath Ark'torbal Thruster"
 	"flare sprite" "effect/plasma flare/tiny"
 		"frame rate" 5
 	"flare sound" "plasma tiny"
+	"reverse thrust" 8.9
+	"reverse thrusting energy" 0.11
+	"reverse thrusting heat" 0.1
+	"reverse flare sprite" "effect/korath flare/tiny"
+		"frame rate" 8
+	"reverse flare sound" "plasma tiny"
 	description "This engine is used by Korath fighters."
 
 outfit "Korath Ark'parat Steering"
 	category "Engines"
 	"cost" 36000
 	thumbnail "outfit/unknown"
+	"steering slot" -1
 	"mass" 12
 	"outfit space" -12
 	"engine capacity" -12
@@ -85,6 +94,8 @@ outfit "Korath Jak'torbal Thruster"
 	category "Engines"
 	"cost" 317000
 	thumbnail "outfit/unknown"
+	"thruster slot" -1
+	"engine mod space" 1.42
 	"mass" 89
 	"outfit space" -89
 	"engine capacity" -89
@@ -94,12 +105,19 @@ outfit "Korath Jak'torbal Thruster"
 	"flare sprite" "effect/plasma flare/large"
 		"frame rate" 8
 	"flare sound" "plasma large"
+	"reverse thrust" 6.31
+	"reverse thrusting energy" 0.59
+	"reverse thrusting heat" 1.43
+	"reverse flare sprite" "effect/korath flare/tiny"
+		"frame rate" 8
+	"reverse flare sound" "plasma tiny"
 	description "This engine is used in the Korath capital ships."
 
 outfit "Korath Jak'parat Steering"
 	category "Engines"
 	"cost" 2740000
 	thumbnail "outfit/unknown"
+	"steering slot" -1
 	"mass" 67
 	"outfit space" -67
 	"engine capacity" -67
@@ -126,6 +144,7 @@ outfit "Reverse Thruster"
 	category "Engines"
 	"cost" 140000
 	thumbnail "outfit/reverse thruster"
+	"reverse thruster slot" -1
 	"mass" 22
 	"outfit space" -22
 	"weapon capacity" -22
@@ -223,6 +242,7 @@ outfit "Afterburner"
 	category "Engines"
 	"cost" 70000
 	thumbnail "outfit/afterburner"
+	"engine mod space" -0.76
 	"mass" 10
 	"outfit space" -10
 	"engine capacity" -10

data/_deprecated/deprecated ships.txt

@@ -24,14 +24,17 @@ ship "Korath Dredger"
 		"hull" 16500
 		"required crew" 137
 		"bunks" 357
-		"mass" 2636
-		"drag" 25.6
-		"heat dissipation" .3
+		"mass" 12024
+		"drag" 17.1
+		"heat dissipation" .45
 		"fuel capacity" 900
 		"cargo space" 675
 		"outfit space" 763
 		"weapon capacity" 276
 		"engine capacity" 206
+		"reverse thruster slot" 1
+		"steering slot" 1
+		"thruster slot" 1
 		weapon
 			"blast radius" 300
 			"shield damage" 4600
@@ -101,14 +104,17 @@ ship "Korath Raider"
 		"hull" 9000
 		"required crew" 145
 		"bunks" 250
-		"mass" 1468
-		"drag" 18
-		"heat dissipation" .33
+		"mass" 2880
+		"drag" 12
+		"heat dissipation" .5
 		"fuel capacity" 600
 		"cargo space" 175
 		"outfit space" 777
 		"weapon capacity" 339
 		"engine capacity" 159
+		"reverse thruster slot" 1
+		"steering slot" 1
+		"thruster slot" 1
 		weapon
 			"blast radius" 250
 			"shield damage" 3600
@@ -179,6 +185,9 @@ ship "Korath Chaser"
 		"outfit space" 92
 		"weapon capacity" 25
 		"engine capacity" 30
+		"reverse thruster slot" 1
+		"steering slot" 1
+		"thruster slot" 1
 		weapon
 			"blast radius" 48
 			"shield damage" 320
@@ -212,14 +221,17 @@ ship "Korath World-Ship"
 		hull 34000
 		"required crew" 794
 		"bunks" 1492
-		"mass" 3022
-		"drag" 31.5
-		"heat dissipation" .27
+		"mass" 13880
+		"drag" 21
+		"heat dissipation" .4
 		"fuel capacity" 1000
 		"cargo space" 264
 		"outfit space" 839
 		"weapon capacity" 314
 		"engine capacity" 165
+		"reverse thruster slot" 1
+		"steering slot" 1
+		"thruster slot" 1
 		weapon
 			"blast radius" 400
 			"shield damage" 8000
@@ -333,9 +345,9 @@ ship "Korath Dredger" "Korath Dredger (Crippled)"
 
 		"Reverser (Lunar Class)"
 		"Steering (Lunar Class)"
-		"Steering (Asteroid Class)"
+		# "Steering (Asteroid Class)" # Extra steering
 		"Thruster (Lunar Class)"
-		"Thruster (Asteroid Class)"
+		# "Thruster (Asteroid Class)" # Extra thruster
 		"Hyperdrive"
 		"Jump Drive (Broken)"
 
@@ -502,9 +514,9 @@ ship "Korath Raider" "Korath Raider (Crippled)"
 		"Outfits Expansion"
 
 		"Bow Drive (Meteor Class)"
-		"Thruster (Asteroid Class)"
+		# "Thruster (Asteroid Class)" # Extra thruster
 		"Thruster (Lunar Class)"
-		"Steering (Asteroid Class)"
+		# "Steering (Asteroid Class)" # Extra steering
 		"Steering (Lunar Class)"
 		"Afterburner (Asteroid Class)"
 		"Jump Drive (Broken)"
@@ -683,11 +695,12 @@ ship "Korath Chaser" "Korath Chaser (World-Ship)"
 		"atmosphere scan" 1
 	outfits
 		"Generator (Candle Class)"
-		"Systems Core (Tiny)"
+		# "Systems Core (Tiny)" # To make space for a thruster
 		"Small Bunk Room"
 		"Korath Repeater Rifle" 3
 
 		"Steering (Asteroid Class)"
+		"Thruster (Asteroid Class)"
 		"Afterburner (Asteroid Class)"
 		"Hyperdrive"
 

data/_ui/help.txt

@@ -141,7 +141,7 @@ help "navigation"
 
 help "outfitter"
 	`Here, you can buy new equipment for your ship. Your ship has a limited amount of "outfit space," and most outfits use up some of that space.`
-	`Some types of outfits have other requirements as well. For example, only some of your outfit space can be used for engines or weapons; this is your ship's "engine capacity" and "weapon capacity." Guns and missile launchers also require a free "gun port," and turrets require a free "turret mount." Also, missiles can only be bought if you have the right launcher installed.`
+	`Some types of outfits have other requirements as well. For example, only some of your outfit space can be used for engines or weapons; this is your ship's "engine capacity" and "weapon capacity." Propulsion systems will require an open slot to install them in, and most ships only have 1 slot for thrusters and another for steering. Guns and missile launchers also require a free "gun port," and turrets require a free "turret mount." Also, missiles can only be bought if you have the right launcher installed.`
 	`Use your scroll wheel or click and drag, to scroll the view.`
 	`As in the trading and shipyard panels, you can hold down Shift, Control, or Alt to buy 5, 20, or 500 of an outfit at once, or multiple keys for larger amounts.`
 	`You can also press F to search the outfitter for a specific item.`