Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(content): Add new uninhabited landable planets to existing systems in Human space #9879

Merged
Merged
Show file tree
Hide file tree
Changes from 39 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
465792b
Asterus
Quantumshark Feb 27, 2024
d113de2
Add to Nocte
Quantumshark Feb 27, 2024
23bbd72
New Kola
Quantumshark Feb 27, 2024
1371766
Add to Kugel
Quantumshark Feb 27, 2024
94e39a0
Merge branch 'endless-sky:master' into uninhabited-human-landables
Quantumshark Feb 29, 2024
cb8c86b
Asphodel
Quantumshark Feb 29, 2024
8c5060a
Add to Gacrux
Quantumshark Feb 29, 2024
d0367d9
Neriene
Quantumshark Mar 1, 2024
7277587
Add to Alpheratz
Quantumshark Mar 1, 2024
233c36c
Finish Neriene entry
Quantumshark Mar 1, 2024
bfcadad
EN(UK) -> EN(US)
Quantumshark Mar 1, 2024
9081dee
Update map systems.txt
Quantumshark Mar 1, 2024
dc1029c
Update data/map systems.txt
Quantumshark Mar 1, 2024
9b82a27
Apply suggestions from code review
Quantumshark Mar 2, 2024
9955a8c
Asphodel update based on bene-dictator's suggestions
Quantumshark Mar 2, 2024
6c0962d
tweak the wording of the flares bit
Quantumshark Mar 2, 2024
1608ae9
civilisation -> civilization
Quantumshark Mar 2, 2024
53000d1
New Kola
Quantumshark Mar 2, 2024
ccf8c29
Minor tweak
Quantumshark Mar 2, 2024
55eba34
Added pictures (#3)
bene-dictator Mar 5, 2024
035a34d
Uninhabited planet pictures copyright (#4)
bene-dictator Mar 9, 2024
1d1b818
Merge branch 'endless-sky:master' into uninhabited-human-landables
Quantumshark Mar 19, 2024
1bfb53b
Remove uninhabited government from Asterus
Quantumshark Mar 19, 2024
de464ec
Fix copyright?
Quantumshark Mar 19, 2024
80948b4
remove trailing whitespace
Quantumshark Mar 19, 2024
9bd7da4
aaaa
Quantumshark Mar 19, 2024
1364390
Move snow23* to be after snow2* to fix copyright check failure
Quantumshark Mar 19, 2024
df7370c
Merge branch 'endless-sky:master' into uninhabited-human-landables
Quantumshark Mar 24, 2024
f599da1
mention the wind
Quantumshark Mar 24, 2024
9df2f7d
ziproot's copyright adjustments
Quantumshark Mar 24, 2024
f8e18ae
Merge branch 'endless-sky:master' into uninhabited-human-landables
Quantumshark Apr 19, 2024
b1f2b39
Merge branch 'endless-sky:master' into uninhabited-human-landables
Quantumshark Apr 21, 2024
7d2cd67
Unify copyright for iceplains3 and snow23 as they are the same image
Quantumshark Apr 21, 2024
6409871
Update copyright
Quantumshark Apr 22, 2024
5619625
fix whitespace
Quantumshark Apr 22, 2024
d1f9557
Merge branch 'endless-sky:master' into uninhabited-human-landables
Quantumshark May 2, 2024
fa6dfe9
Drop New Kola
Quantumshark May 2, 2024
8da2b8a
also do the planet entry lol
Quantumshark May 2, 2024
5bd2a44
remove almost
Quantumshark May 2, 2024
0d0a081
eons
Quantumshark May 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
53 changes: 42 additions & 11 deletions copyright
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,36 @@ License: public-domain
for the MESSENGER mission. Because it was produced for
a NASA mission, it is in the public domain.

Files:
images/land/haze0*
Copyright: Izaac Hewitt-Lawrence
License: Unsplash
Taken from https://archive.is/LZQbZ and cropped. This image was
uploaded to unsplash.com after June 2017, so it is subject
to the Unsplash License. It was also uploaded after February
2018, so it is subject to an additional restriction limiting
the sale of unaltered copies.

Files:
images/land/haze1*
Copyright: Tobias Rademacher
License: Unsplash
Taken from https://archive.is/Rc9fs and cropped. This image was
uploaded to unsplash.com after June 2017, so it is subject
to the Unsplash License. It was also uploaded after February
2018, so it is subject to an additional restriction limiting
the sale of unaltered copies.

Files:
images/land/haze2*
Copyright: Marek Piwnicki
License: Unsplash
Taken from https://archive.is/iVNGc and cropped. This image was
uploaded to unsplash.com after June 2017, so it is subject
to the Unsplash License. It was also uploaded after February
2018, so it is subject to an additional restriction limiting
the sale of unaltered copies.

Files:
images/land/sea23*
Copyright: Dan Stark
Expand Down Expand Up @@ -3102,17 +3132,6 @@ Comment:
so it is not subject to additional restrictions, as this is
before the additional restrictions were added.

Files:
images/scene/iceplains3*
Copyright: Daniel Frank
License: Unsplash
Comment:
Taken from https://archive.is/xK5Wu. This image was
uploaded to unsplash.com after June 2017, so it is subject
to the Unsplash License. It was also uploaded after
February 2018, so it is subject to an additional restriction
limiting the sale of unaltered copies.

Files:
images/scene/redrocks*
Copyright: Joshua Gresham
Expand Down Expand Up @@ -3458,6 +3477,18 @@ Comment:
so it is subject to an additional restriction limiting the
sale of unaltered copies.

Files:
images/land/snow23*
images/scene/iceplains3*
Copyright: Daniel Frank
License: Unsplash
Comment:
Taken from https://archive.is/xK5Wu. These images were
uploaded to unsplash.com after June 2017, so they are
subject to the Unsplash License. They were also uploaded
after February 2018, so they are subject to an additional
restriction limiting the sale of unaltered copies.

Files:
images/ui/red?alert*
Copyright: Zitchas (zitchas.jma@gmail.com)
Expand Down
18 changes: 18 additions & 0 deletions data/map planets.txt
Original file line number Diff line number Diff line change
Expand Up @@ -249,12 +249,23 @@ planet "Ashy Reach"
"required reputation" 15
security 0.1

planet Asphodel
attributes uninhabited
landscape land/haze0
description `Despite being nominally in the habitable zone, this planet's surface is continually scorched by the stars of Gacrux and their solar flares, steadily blasting away its atmosphere. A joint venture of three major universities from Chiron has placed some small research stations in orbit around Asphodel, and while they provide valuable insights into the nature and behavior of flare stars, the researchers generally avoid descending to the planet's surface unnecessarily. None of the stations appear to have the facilities to service your ship, however.`
Amazinite marked this conversation as resolved.
Show resolved Hide resolved
government Uninhabited

planet Aspiration
attributes pirate
landscape land/sea17-harro
description `The world of Aspiration appears to be a mild, habitable world, but one currently in an advanced ice age now slowly retreating. The equatorial region of the planet is warm and comfortable, a cool temperate at the present time. The native biosphere seems to be mostly grasses and something resembling pine trees. In a few thousand years, it might look similar to Earth before it was paved over. For now, it's a sparse world with a single major town built on a promontory, overlooking a wide river mouth which carries runoff from continental scale glaciers to the sea.`
spaceport `The spaceport on Aspiration is a spaceport in the same way that an airport at a regional town is an airport. It has the most minimal facilities to handle a ship landing without disturbance to the nearby town, and that is it. There are no shops or stalls. Aspiration is not on any trade routes and it does not expect visitors. A lone freighter is parked permanently on the outskirts.`

planet Asterus
attributes moon uninhabited
landscape land/snow23
description `The seas beneath the frozen surface of this ice moon are home to a thriving ecosystem full of species entirely unlike any observed on other, more habitable worlds. The best known of these is a species of large fish-like creatures with flowing bioluminescent fins that glow in ethereal pinks and purples, the beauty of which prompted many citizens of the Paradise Worlds to demand that Parliament designate the entire moon as a nature preserve in the 2900s.`

planet Avalon
landscape land/sea22
description `This is a pristine and perfectly habitable world, with warm oceans and a temperate climate. The land is dominated by large reptiles similar to the dinosaurs that roamed the continents of ancient Earth. Some of the land reptiles are over twenty meters in length, and the sea holds monsters more than twice that size.`
Expand Down Expand Up @@ -2932,6 +2943,13 @@ planet Nepheritis
description ` While these diamonds are unfortunately not economical to collect with current human technology, if you were so inclined you could perhaps make an attempt at catching one as it fell, deep within the atmosphere where they are largest.`
government Uninhabited

planet Neriene
attributes uninhabited
landscape land/haze1
description `While lacking its iconic ferrous-red color, this planet is eerily similar in conditions to the second planet humanity set foot on, Mars. The thin atmosphere of carbon dioxide, the polar ice caps, and the echoes of dried waterways across the surface all tell the tragic tale of the same fate that befell Mars in aeons past.`
Quantumshark marked this conversation as resolved.
Show resolved Hide resolved
description ` Even though humanity eventually triumphed over the adverse conditions and made a home on the Red Planet, this near-identical world has been left totally barren, a mere afterthought in the now interstellar human civilization.`
government Uninhabited

planet "New Argentina"
attributes "dirt belt" farming
landscape land/fields1
Expand Down
12 changes: 6 additions & 6 deletions data/map systems.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4982,7 +4982,7 @@ system Alpheratz
sprite planet/rock14-b
distance 173
period 18.5791
object
object Neriene
sprite planet/dust0
distance 1246.89
period 527.429
Expand Down Expand Up @@ -14848,8 +14848,8 @@ system Gacrux
sprite planet/lava5
distance 316.995
period 98.0619
object
sprite planet/ocean5
object Asphodel
sprite planet/cloud6-b
distance 698.285
period 320.605
object
Expand Down Expand Up @@ -24369,12 +24369,12 @@ system Nocte
sprite planet/gas17
distance 973.25
period 1045.27
object
sprite planet/dust2
object Asterus
sprite planet/europa
distance 219
period 13.075
object
sprite planet/europa
sprite planet/dust2
distance 363
period 27.9019
object
Expand Down
Binary file added images/land/haze0.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/land/haze1.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/land/haze2.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/land/snow23.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.