Merge branch 'experimental' into f(u)-2025-03-06-Conflict-Update

.codespell.exclude

@@ -1,3 +1,5 @@
+			`	The Korath pause for a minute and look at you, then begin drawing again. "Korath," says one of them, and draws another outline of one of their warships, but much larger, on the northern side of the galactic core. Then they brush away the outline of that big ship and draw several smaller ones, facing each other. "Korath," they say again, "no'lai en vas, certu forgu, mik'lak'nal torq." They rake their fingers through the sand, erasing the outlines of the three ships.`
+			`	Their companion picks up the story. "Vas, certu vas. Minli ka Korath torq. Kem'lor ka forli, ka merru, ka plee. Teka korma ka draki, rekki korath, marre fa long." They draw a bunch of small scorpions, surrounding the Korath ships, then gather the sand from that part of the map and toss it onto the place where the first Korath ship was drawn. "Tarre ta fo'lu korath."`
 		"Ikrehpeb haslrikpeb ikpecem sara nives"      # Stop acting like a child
 		"akmac pano nives ralret umsab lravriv" # a pasta of small snakes with mice meatballs
 		"Yoo no gud fite so gif up."      # You are no good in a fight, so give up. (mispronounced)
@@ -77,7 +79,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.`
@@ -92,4 +93,5 @@ system Currus
             * 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."`
 			`	"Oh yes." He shifts his weight on the stool. "I'm old enough to remember hayipp bread, yur ki bread - you name it. Hayipp is a grain, similar to your human 'corn,' which creates a wholesome ruddy brown flour when milled. The bread was hearty, yet exquisite." You note the wistful look on his face. "Yur ki is a milk, sourced from livestock we raise. You may have seen some on Newhome; I'm told your kind has a similar animal called 'sheep.' Bread made from yur ki is rich and decadent. It is among my favorite foods to have for breakfast." He pauses for a moment and looks a bit downcast. "Acorn bread was once a rare sight in Hai cuisine. Far too sweet. But, since humans have joined us on our planets, all they want is acorn bread. The high demand has displaced all of the traditional breads that I grew up with from high traffic areas such as this spaceport restaurant. I miss having them easily available."`
+			"Vai bin so."
 		"Love's Labour Lost"

.codespell.words.exclude

@@ -1,2 +1,7 @@
+
+aesthetic
+aesthetics
+aesthetically
+brin
 ket
 ser

.github/pull_request_template.md

@@ -33,9 +33,9 @@ This save file can be used to test these changes:
 
 ## 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}}
+ - [ ] I updated the copyright attributions, or decline to claim copyright of any assets produced or modified.
+ - [ ] Include the '@2x' version of any added images alongside the regular image.
+ - [ ] Please upload a zipped file with the necessary image, blend, and texture assets to the main body of your pull request.
 
 ## Wiki Update
 (If this PR adds a new feature or modifies a feature that should be documented in the [GitHub wiki](https://github.com/endless-sky/endless-sky/wiki), open a PR to the [wiki repository](https://github.com/endless-sky/endless-sky-wiki) and provide a link.)

.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,10 @@ on:
     # Run for pushes to master, 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:
     - 'source/**'

.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

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

CMakeLists.txt

@@ -61,7 +61,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT EndlessSky)
 set(CMAKE_VS_JUST_MY_CODE_DEBUGGING ON)
 
-project("Endless Sky" VERSION 0.10.13
+project("Endless Sky" VERSION 0.10.12.1
 	DESCRIPTION "Space exploration, trading, and combat game."
 	HOMEPAGE_URL https://endless-sky.github.io/
 	LANGUAGES CXX)

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...
 
@@ -10,7 +29,8 @@ 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/), 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.
+Releases of Endless Sky Delta are available as direct downloads from [GitHub](https://github.com/endless-sky/Endless-Sky-Delta/releases/latest), while the official vanilla releases are 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
 
@@ -30,10 +50,10 @@ For full installation instructions, consult the [Build Instructions](docs/readme
 
 ## Contributing
 
-As a free and open source game, Endless Sky is the product of many people's work. Contributions of artwork, storylines, and other writing are most in-demand, though there is a loosely defined [roadmap](https://github.com/endless-sky/endless-sky/wiki/DevelopmentRoadmap). Those who wish to [contribute](docs/CONTRIBUTING.md) are encouraged to review the [wiki](https://github.com/endless-sky/endless-sky/wiki), and to post in the [community-run Discord](https://discord.gg/ZeuASSx) beforehand. Those who prefer to use Steam can use its [discussion rooms](https://steamcommunity.com/app/404410/discussions/) as well, or GitHub's [discussion zone](https://github.com/endless-sky/endless-sky/discussions).
+As a free and open source game, Endless Sky is the product of many people's work. Contributions of artwork, storylines, and other writing are most in-demand, though there is a loosely defined [roadmap](https://github.com/endless-sky/endless-sky/wiki/DevelopmentRoadmap). Those who wish to [contribute](docs/CONTRIBUTING.md) are encouraged to review the [wiki](https://github.com/endless-sky/endless-sky/wiki). The best place to ask questions or discuss ideas is GitHub's [discussion zone](https://github.com/endless-sky/Endless-Sky-Delta/discussions).
 
 Endless Sky's main discussion and development area was once [Google Groups](https://groups.google.com/g/endless-sky), but due to factors outside our control, it is now inaccessible to new users, and should not be used anymore.
 
 ## Licensing
 
-Endless Sky is a free, open source game. The [source code](https://github.com/endless-sky/endless-sky/) is available under the GPL v3 license, and all the artwork is either public domain or released under a variety of Creative Commons (and similarly permissive) licenses. (To determine the copyright status of any of the artwork, consult the [copyright file](https://github.com/endless-sky/endless-sky/blob/master/copyright).)
+Endless Sky is a free, open source game. The [source code](https://github.com/endless-sky/Endless-Sky-Delta/) is available under the GPL v3 license, and all the artwork is either public domain or released under a variety of Creative Commons (and similarly permissive) licenses. (To determine the copyright status of any of the artwork, consult the [copyright file](https://github.com/endless-sky/Endless-Sky-Delta/blob/master/copyright).)

copyright

@@ -12,6 +12,13 @@ Files: images/*
 Copyright: Michael Zahniser <[email protected]>
 License: CC-BY-SA-4.0
 
+Files:
+ images/outfit/*reaction?steering*
+ images/outfit/*reaction?thruster*
+Copyright: Michael Zahniser ([email protected])
+License: CC-BY-SA-4.0
+Comment: Originally included in early versions of ES, then replaced by improved and/or retouched images after Michael Zahniser ceased to be actively involved in the project. Now re-included as repurposed imagery.
+
 Files: images/land/*
 Copyright: Various
 License: public-domain
@@ -2589,6 +2596,7 @@ License: CC-BY-SA-4.0
 Comment: Derived from work by Michael Zahniser (under the same licence) and Red-57 (under the same licence).
 
 Files:
+ images/asteroid/ice/*
  images/effect/korath?afterburner*
  images/ship/chaser*
  images/ship/world-ship*
@@ -2598,6 +2606,13 @@ Copyright: Lia Gerty (https://github.com/ravenshining)
 License: CC-BY-SA-4.0
 Comment: Derived from work by Michael Zahniser (under the same licence)
 
+Files:
+ images/outfit/harvested?ice*
+ images/effect/flotsam?ice*
+Copyright: Lia Gerty (https://github.com/ravenshining)
+License: CC-BY-SA-4.0
+Comment: Derived from work by Michael Zahniser (under the same licence) and public domain works from pxhere.com.
+
 Files:
  images/outfit/torpedopod*
  images/outfit/typhoonpod*
@@ -2619,6 +2634,10 @@ Files:
  images/planet/browndwarf-l*
  images/planet/browndwarf-y-rogue*
  images/planet/browndwarf-y*
+ images/ui/tactical/hyperjump*
+ images/ui/tactical/jumpdrivejump*
+ images/ui/tactical/mass*
+ images/ui/tactical/scramjump*
 Copyright: Lia Gerty (https://github.com/ravenshining)
 License: CC-BY-SA-4.0
 
@@ -3979,12 +3998,20 @@ 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/outfit/cockpit?software*
+Copyright: Zitchas
+License: CC-BY-SA-4.0
+Comment: Derived from works by Michael Zahniser (under the same license).
+
 Files:
  images/ui/tactical/crew*
  images/ui/tactical/energy*
@@ -3994,6 +4021,15 @@ Copyright: Michael Zahniser <[email protected]>
 License: CC-BY-SA-4.0
 Comment: Cropped and split into four new files by Zitchas ([email protected])
 
+Files:
+ images/outfit/cockpit?hyperjump?software*
+ images/outfit/cockpit?jumpdrive?software*
+ images/outfit/cockpit?mass?software*
+ images/outfit/cockpit?scramjump?software*
+Copyright: Zitchas & Lia Gerty
+License: CC-BY-SA-4.0
+Comment: Derived from works by Iaz Poolar, Michael Zahniser, and Lia Gerty (under the same license).
+
 Files:
  images/scene/cave?scene*
 Copyright: Gefüllte Taubenbrust <[email protected]>
@@ -4006,6 +4042,39 @@ Copyright: RisingLeaf (https://github.com/RisingLeaf)
 License: CC-BY-SA-4.0
 Comment: Derived from _menu/haze-133 (no copyright given).
 
+Files:
+ images/scene/volcanic-eruption-at-night*
+Copyright: N/A (public domain)
+License: public-domain
+ Taken from https://archive.is/I6L1t. From the US National Park Service, and therefore in the public domain because it was created by government employees while doing work for the government.
+
+Files:
+ images/scene/blue-whale*
+Copyright: Mike Baird
+License: CC-BY-2.0
+Comment:
+ Taken from https://archive.is/xDuTQ.
+
+Files:
+ images/scene/purple-lightning*
+ images/land/rough-seas*
+ images/land/monterey-bay-aquarium*
+Copyright: N/A (public domain)
+License: public-domain
+ Taken from https://archive.is/VzbdB, https://archive.is/NmmVG, and https://archive.is/Tr5I7, respectively. From US NOAA, and therefore in the public domain because they were created by government employees while doing work for the government.
+
+Files:
+ images/planet/ocean-rabasot.png
+Copyright: Public Domain
+License: public-domain
+ Created by two anonymous authors in 2022, donated to public domain.
+
+Files:
+ images/planet/lumpy-moon.png
+Copyright: Public Domain
+License: public-domain
+ Created by two anonymous authors in 2022, donated to public domain.
+
 Files:
  images/scene/emerging?ladybug*
 Copyright: RisingLeaf (https://github.com/RisingLeaf)
@@ -4186,6 +4255,12 @@ Copyright: None (placed in public domain by an anonymous author)
 License: CC0
 Comment: Uses public domain textures from texture.ninja. Meshes were made by an anonymous author in 2023-2024.
 
+Files:
+ images/ui/tactical/wind.png
+Copyright: MadisonianX (https://github.com/MadisonianX)
+License: CC-BY-SA-4.0
+Comment: wind icon is acquired from flaticon via paid subscription and, as per site instructions, does not need to be credited. As such all rights pertain to MadisonianX.
+
 License: Depends
  Taken from unsplash.com. Until June 2017, this was a collection of photographs that had been donated and
  placed in the public domain. In June 2017, Unsplash modified their terms and conditions to make all images

credits.txt

@@ -1,5 +1,5 @@
-Welcome to Endless Sky!
-version 0.10.13-alpha
+Welcome to Endless Sky Delta!
+version 0.10.12.1-delta
 
 The player's manual and other
 resources are available at:
@@ -13,6 +13,24 @@ artwork, or programming, visit:
 - The game's Steam forums
 - Discord (invite: ZeuASSx)
 
+Credits Wanted!
+  Over the years many people have
+  contributed indirectly to this
+  game. Some by providing hours of
+  advice, others by writing out
+  missions that they gave to others
+  to formally upload. (GitHub and
+  the PR process have had problems)
+
+  I have added a "Writers" section,
+  as well as a Special Thanks. If
+  you or someone you know has
+  contributed writing or other great
+  efforts towards helping the game,
+  but aren't currently acknowledged,
+  please let me know. They deserve
+  to be recognized.
+
 Creator and Lead Programmer
   Michael Zahniser
 
@@ -55,7 +73,9 @@ Major Programming
   RisingLeaf
   tibetiroka
   TomGoodIdea
+  vitalchip
   warp-core
+  Zitchas
 
 Storyline & Faction Authors
   Amazinite
@@ -73,6 +93,9 @@ Storyline & Faction Authors
   TheUnfetteredOne
   Zitchas
 
+Writers
+  Moonbeam
+
 Editors & Proofreaders
   Arrow2thekn33
   bene-dictator
@@ -93,6 +116,10 @@ Editors & Proofreaders
   W1zrad
   Zearth Goh aka TheMarksman
 
+Special thanks
+  Kiko
+  VitalChip
+
 Artwork
   Michael Zahniser (CC-BY-SA-4.0)
   Maximilian Korber (CC-BY-SA-4.0)
@@ -113,6 +140,7 @@ Artwork
   Saugia (CC-BY-SA-4.0)
   Rising Leaf (CC-BY-SA-4.0)
   Unordered Sigh (CC-BY-SA-3.0)
+  Zitchas (CC-BY-SA-4.0)
 
 Photos from Wikimedia Commons
   Berthold Werner (CC-BY-SA-3.0)
@@ -324,6 +352,7 @@ contributed to Endless Sky:
   lumbar527
   macfreek
   Mach565
+  MadisonianX
   MageKing17
   MagicMuscleMan
   Mailaender