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): More new human planets and stations, update Kraken Station landing image #9917

Merged
merged 34 commits into from
May 2, 2024
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
bd7bf97
Add five new spobs and 4 new pictures
bene-dictator Mar 6, 2024
5c24138
Update map planets.txt
bene-dictator Mar 13, 2024
44df60f
Appease CI/CD
bene-dictator Mar 13, 2024
6036287
Appease it some more
bene-dictator Mar 13, 2024
a19b216
It wasn't enough
bene-dictator Mar 14, 2024
b14b123
Update copyright. Thanks Ziproot!
bene-dictator Mar 14, 2024
de94c3b
Update copyright
bene-dictator Mar 14, 2024
c911724
Merge branch 'new-uninhabited-spobs' of https://github.com/bene-dicta…
bene-dictator Mar 14, 2024
6b25479
Update copyright
bene-dictator Mar 14, 2024
06e6978
Updated desc. of Independance, removed gov't from some
bene-dictator Mar 14, 2024
bb158b2
Apply suggestions from code review. Thanks Ziproot!
bene-dictator Mar 14, 2024
6d8086a
Added new picture for Rowark's Roost
bene-dictator Mar 15, 2024
853f8cd
Add new object sprite for Dagon Station
bene-dictator Mar 16, 2024
6e794f7
Update copyright
bene-dictator Mar 16, 2024
ded127b
Update Cassandra's text to make it ambiguous
bene-dictator Mar 17, 2024
76e523e
More updates to Cassandra
bene-dictator Mar 17, 2024
684eb35
Update moon0
bene-dictator Mar 19, 2024
b165a60
Hope shall be the odd one out. Thanks TomGoodIdea!
bene-dictator Mar 19, 2024
c957a44
Update data/map planets.txt. Thanks Quantumshark!
bene-dictator Mar 19, 2024
8f1a701
Update Rowark
bene-dictator Mar 23, 2024
a6ff388
More updates to Rowark
bene-dictator Mar 23, 2024
9565cf3
pirate base -> privateer base
bene-dictator Mar 23, 2024
e33a1e7
Update map planets.txt
bene-dictator Mar 24, 2024
051b0ef
Merge remote-tracking branch 'upstream/master' into new-uninhabited-s…
bene-dictator Mar 24, 2024
fce820b
Update map planets.txt
bene-dictator Mar 24, 2024
d6391d1
Apply suggestions from code review. Thanks Derpy!
bene-dictator Mar 24, 2024
a1292ed
Update data/map planets.txt
bene-dictator Mar 24, 2024
fb0da3a
Fix some repetition
bene-dictator Mar 24, 2024
68fc8bf
Merge branch 'new-uninhabited-spobs' of https://github.com/bene-dicta…
bene-dictator Mar 24, 2024
328a575
Merge remote-tracking branch 'upstream/master' into new-uninhabited-s…
bene-dictator Apr 19, 2024
6e13ba6
Update data/map planets.txt. Thanks tibe!
bene-dictator Apr 20, 2024
17bd5f5
Merge branch 'master' into new-uninhabited-spobs
bene-dictator Apr 30, 2024
bbb922a
Merge branch 'master' into new-uninhabited-spobs
Quantumshark May 1, 2024
1dc9f4d
Merge branch 'master' into new-uninhabited-spobs
roadrunner56 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
4 changes: 4 additions & 0 deletions .codespell.exclude
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,7 @@ planet "Sies Upi"
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"
planet Independance
description `Independance, originally named for a document of emancipation for an ancient nation on old Earth, became of interest to the Confederated Councils when they began to consider plans for a defense against an invasion. One such plan involved deploying "cloud bunkers" into the gas giants of the Outer Rim from which an uprising could be staged against a foreign occupier. Independance, given its fitting name and position near Alvorada, was chosen as the testing site for this project.`
description ` Of the few prototype bunkers that were deployed, none ever survived the surface of Independance; the Councils simply didn't have the technology for such an ambitious project. The official who proposed the plan was shortly shuffled out of the Politburo, and what remained of the bunkers were left quietly in the depths of the gas giant.`
object Independance
42 changes: 42 additions & 0 deletions copyright
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,19 @@ Copyright: 1010todd <1010todd3d@gmail>
License: CC-BY-SA-4.0
Comment: Derived from works by Becca Tommaso, Darcy Manoel, and Michael Zahniser (under the same license). Incorporating texture made with JSPlacement by WindMillArt <https://windmillart.net/>.

Files:
images/land/moon0*
Copyright: NASA/GSFC/Arizona State University
License: public-domain
From NASA, and therefore in the public domain because they were created by
government employees while doing work for the government.

Files:
images/land/enceladus_1*
images/land/enceladus_2*
images/land/enceladus_3*
images/land/enceladus_4*
images/land/moon1*
images/ui/galaxy*
images/ui/pleiades*
images/planet/callisto*
Expand Down Expand Up @@ -603,6 +611,28 @@ Comment:
so it is subject to an additional restriction limiting the
sale of unaltered copies.

Files:
images/land/station49*
Copyright: Andrea De Santis
License: Unsplash
Comment:
Taken from https://archive.is/jIP5x 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/station50*
Copyright: Mariia Ilina
License: Unsplash
Comment:
Taken from https://archive.is/mQO7C, rotated 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/lava11*
Copyright: National Archives and Records Administration
License: public-domain
Expand Down Expand Up @@ -1750,6 +1780,12 @@ Copyright: bene_dictator <benstaples8068@gmail.com>
License: CC-BY-SA-4.0
Comment: Derived from works by Michael Zahniser (under the same license), detailed by Saugia.

Files:
images/planet/station19*
Copyright: bene_dictator <benstaples8068@gmail.com>
License: CC-BY-SA-4.0
Comment: Derived from works by Michael Zahniser (under the same license).

Files:
images/asteroid/*bioroid*
images/effect/acuit?hit*
Expand Down Expand Up @@ -2276,6 +2312,12 @@ Copyright: Daeridanii (https://github.com/Daeridanii1)
License: CC0
Comment: selected and unselected versions of images/ui/find, by Ember369 (https://github.com/Ember369)

Files:
images/land/mars4*
Copyright: NASA
License: public-domain
Derived from works by NASA/JPL-Caltech/Malin Space Science Systems.

License: Unsplash
Unsplash grants you an irrevocable, nonexclusive, worldwide copyright
license to download, copy, modify, distribute, perform, and use photos
Expand Down
45 changes: 42 additions & 3 deletions data/map planets.txt
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,13 @@ planet "Carbuncle Station"
threshold 5500
fleet "Large Republic" 10

planet Cassandra
attributes paradise uninhabited
landscape land/mars4
description `In the late 2300s, Cassandra was the subject of one of the most ambitious terraforming projects performed by humanity until then; an attempt to rapidly modify its biosphere and jumpstart the process of making the planet more than perfect for human habitation.`
bene-dictator marked this conversation as resolved.
Show resolved Hide resolved
description `The project never came to be. For an as-yet-unexplained reason, some collapse or chain of destruction occurred during the terraforming project that made Cassandra uninhabitable, and ever since Cassandra has been discreetly left out of the public record by the terraforming industry.`
bene-dictator marked this conversation as resolved.
Show resolved Hide resolved
description ` This appeared to have been an ocean-covered planet when the terraforming project was initiated; almost everywhere you go is a dry and dead salt flat in every direction, occasionally rising steeply up into pale watersheds and ranges where rivers and islands once were.`

planet "Ceaseless Toil"
attributes factory saryd uninhabited
landscape land/canyon01
Expand Down Expand Up @@ -802,6 +809,12 @@ planet Cyife
description `This lonely, icy moon is the only non-gaseous celestial body within this rather quiet star system. Although there are no signs of life here due to the extremely low temperatures, certain parts of the surface glimmer oddly compared to others, as if to imply something may once have been here before.`
government Uninhabited

planet "Dagon Station"
attributes core station uninhabited
landscape land/station50
description `Originally built in the 25th century as a corporate military outpost, Dagon Station's notoriety stems from its past as a pirate base; its infamous mercenary fleets all but decided the victors in the constant wars of the mid-Core region during the 26th and 27th centuries. Dagon's influence only came to an end in the late 27th century when a fleet from Earth defeated the pirate base for good; after that, it became a military base for the fledgling Republic.`
description ` In the 29th century, control of Dagon Station was passed to the Syndicate, who eventually vacated the station due to its age and no-longer strategic position. Local laws prevent landing on Dagon Station without a permit, but the Syndicate doesn't pay close attention to whether or not anybody lands here anyway.`

planet Dancer
attributes research south
landscape land/nasa7
Expand Down Expand Up @@ -2238,6 +2251,13 @@ planet "Illbo Elo"
bribe 0
security 0

planet Independance
attributes "gas giant" "requires: gaslining" uninhabited
landscape land/nasa20
description `Independance, originally named for a document of emancipation for an ancient nation on old Earth, became of interest to the Confederated Councils when they began to consider plans for a defense against an invasion. One such plan involved deploying "cloud bunkers" into the gas giants of the Outer Rim from which an uprising could be staged against a foreign occupier. Independance, given its fitting name and position near Alvorada, was chosen as the testing site for this project.`
description ` Of the few prototype bunkers that were deployed, none ever survived the surface of Independance; the Councils simply didn't have the technology for such an ambitious project. The official who proposed the plan was shortly shuffled out of the Politburo, and what remained of the bunkers were left quietly in the depths of the gas giant.`
government Uninhabited

planet Ingot
attributes "dirt belt" mining moon volcanic
landscape land/mountain8
Expand Down Expand Up @@ -2429,7 +2449,7 @@ planet "Kort Vek'kri"

planet "Kraken Station"
attributes "near earth" station
landscape land/station8
landscape land/station49
music ambient/machinery
description `Kraken Station is seven centuries old; it was the first space station built outside of the Sol system. The station has been modified and repaired so often since that time that in all likelihood not a single deck panel or bulkhead that was part of the original station remains.`
description ` Four centuries ago it was nearly destroyed by an asteroid impact, but other than that it has been a working deuterium refinery for its entire lifetime.`
Expand Down Expand Up @@ -3647,6 +3667,12 @@ planet "Ring of Wisdom"
bribe 0
security 0.8

planet "Rowark's Roost"
attributes moon uninhabited
landscape land/moon1
description "Rowark's Roost was once the hideout of one of the most famous privateers of the Southern Rim, Rowark Balois. From this remote moon he built an empire in slave and drug running, near-monopolizing the Rim during the early 27th century. The Roost itself was a stronghold of hangars and tunnels that would become the model for pirate cells across human space."
description "In 2655, Rowark was flushed out of his Roost by a combined Rim and Deep fleet in a battle that continues to be studied by every aspirant Navy officer in their tutelage. As you fly over the moon you spy the wrecks of countless ships dotting its surface, but what is most striking is the truly impressive battleship-sized crater that marks the spot where Rowark met his end, doggedly choosing to fight to the very last."

bene-dictator marked this conversation as resolved.
Show resolved Hide resolved
planet Ruelogakk
attributes "gegno quarg" quarg station
landscape land/station5
Expand Down Expand Up @@ -4277,8 +4303,8 @@ planet Sundive
attributes core farming forest frontier research
landscape land/water9
description `Sundive is largely covered in tropical rainforests and savanna, but with enough open plains that it has also become a major agricultural world. For most of the year, the weather here is quite mild, but tornadoes and massive thunderstorms are not uncommon in the summer months.`
description ` Sundive is also home to a large astronomical laboratory with radio telescopes and other devices for studying the galactic core and the massive black hole that resides there.`
spaceport `The spaceport is in a wide, open plain; most of the landing sites are just packed dirt. Surrounding it is nothing but farmland and forests; the laboratory and telescopes are far beyond the horizon, where incoming ships will not interfere with their operation.`
description ` Sundive is also home to a number of research facilities which study the data gathered from the astronomical laboratory on its moon, Taylor.`
spaceport `The spaceport is in a wide, open plain; most of the landing sites are just packed dirt. Surrounding it is nothing but farmland and forests; the nearest cities are kilometers away, presumably so that its inhabitants aren't subjected to the loud commotion of planetary spaceports and the noise pollution of ships coming and going.`
spaceport ` The buildings are short and made of wood; even the roofs are clapboard shingles rather than metal or rubber. Several farmers have brought in goods to sell; most of them came in trucks, but you also see a few horse-drawn wagons.`
security 0.3
tribute 300
Expand Down Expand Up @@ -4327,6 +4353,19 @@ planet Swiftsong
bribe 0.1
security 0.5

planet Taylor
landscape land/moon0
attributes research core moon military
description "Taylor is home to a large astronomical laboratory, with radio telescopes and other devices for studying the galactic core and the massive black hole that resides there. Because of the laboratory, Taylor has strict landing protocols that ensure your ship doesn't cross the path of the telescopes at any time."
description " On the other side of the moon the Syndicate has established a substantial military base, as a guard against the pirates in nearby Alcyone."
description " If you need to repair or refuel in this system, you will need to visit Sundive instead of this moon, as the military base is not open to ships that aren't affiliated with the Syndicate, and the laboratory's small spaceport does not have the facilities to service ships."
bene-dictator marked this conversation as resolved.
Show resolved Hide resolved
"required reputation" 10
bribe 0.05
security 0.1
tribute 1200
threshold 3500
fleet "Large Syndicate" 7

planet "Tebuteb's Table"
attributes arach farming longcows
landscape land/fields11-sfiera
Expand Down
19 changes: 12 additions & 7 deletions data/map systems.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4147,7 +4147,7 @@ system Alkaid
sprite planet/gas0
distance 1927.89
period 1030.31
object
object "Rowark's Roost"
sprite planet/dust3-b
distance 266
period 12.0683
Expand Down Expand Up @@ -8706,7 +8706,7 @@ system Citadelle
sprite planet/desert0-b
distance 2253.29
period 1214.99
object
object Independance
sprite planet/gas14-b
distance 3916.23
period 2783.88
Expand Down Expand Up @@ -14319,10 +14319,11 @@ system Fomalhaut
sprite planet/gas10-b
distance 2203.28
period 1950.10
object
sprite planet/oberon-b
distance 181
period 12.0027
object "Dagon Station"
sprite planet/station19
scale 0.5
distance 204
period 12.003
object
sprite planet/rock0-b
distance 320
Expand Down Expand Up @@ -26780,7 +26781,7 @@ system Procyon
object
sprite star/k3
period 10
object
object Cassandra
sprite planet/rock4
distance 243.06
period 71.4535
Expand Down Expand Up @@ -29777,6 +29778,10 @@ system Sheratan
sprite planet/ocean1
distance 1329.34
period 424.581
object Taylor
sprite planet/dust0
distance 220
period 34.8
object
sprite planet/rhea-b
distance 1632.5
Expand Down
Binary file added images/land/mars4.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/moon0.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/moon1.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/station49.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/station50.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/planet/station19.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.