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

Improve random system generation, load custom systems from JSON #5622

Merged
merged 29 commits into from
Oct 8, 2023
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f0157fa
CustomSystem: load individual system from file
sturnclaw Aug 12, 2023
1d9f28c
CustomSystem: apply generator to individual system
sturnclaw Aug 12, 2023
f5d1538
CustomSystem: don't override root body seed
sturnclaw Aug 12, 2023
7e4a130
Split sector name generation into separate file
sturnclaw Aug 14, 2023
e576361
Replace system index with system seed in procgen
sturnclaw Aug 15, 2023
0a8092d
SystemBody: fully specify orbit
sturnclaw Aug 30, 2023
e66771b
StarSystem: round-trip to JSON
sturnclaw Aug 31, 2023
b01ba87
Fix invalid serialization in from_json<fixed>
sturnclaw Aug 31, 2023
04b5e13
CustomSystem: generate consistent random body seed
sturnclaw Sep 1, 2023
d9e40f3
Add StarSystem dump to Ctrl+I window
sturnclaw Sep 1, 2023
180fe43
SystemGen: separate body gen, improve heuristics
sturnclaw Sep 1, 2023
48bcfc8
Move atmosphere pressure calculation to SystemBody
sturnclaw Sep 2, 2023
a3f1609
SystemGen: consistent body satellite shell density
sturnclaw Sep 2, 2023
2e1a1af
SystemGen: realism + avoid body mass overflow
sturnclaw Sep 4, 2023
130a607
Improve SystemGen documentation comments
sturnclaw Sep 4, 2023
dd8313a
SystemGen: handle other names, rand lawlessness
sturnclaw Sep 6, 2023
1c3a0b9
CustomSystem: clean round-trip to Json for bodies
sturnclaw Sep 6, 2023
9e76c5d
Explicit starting spaceport seeds
sturnclaw Sep 6, 2023
dbee4b4
SystemBody: split underlying data from interface
sturnclaw Sep 13, 2023
47f484b
Remove CustomSystemBody data members
sturnclaw Sep 13, 2023
04af47f
JsonPatch: support patching arrays
sturnclaw Sep 15, 2023
f630554
Galaxy: load Json-format systems
sturnclaw Sep 15, 2023
2e3e958
FileSystem: add recursive enumerator helper
sturnclaw Sep 15, 2023
1423709
CustomSystem: support loading Json partial systems
sturnclaw Sep 15, 2023
56bdbe9
Migrate Sol system to Json system format
sturnclaw Sep 15, 2023
c09da89
Rename fixedp serialization to integer/fractional
sturnclaw Oct 6, 2023
c94fe57
Remove Random::SFixed, improve Random::NormFixed
sturnclaw Oct 7, 2023
74640d0
Cleanup StarSystemGenerator
sturnclaw Oct 7, 2023
c7681e7
Minor additions to system name generation lists
sturnclaw Oct 7, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions data/systems/00_sol.lua
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,15 @@ local mars = CustomSystemBody:new('Mars', 'PLANET_TERRESTRIAL')

local mars_starports = {
CustomSystemBody:new('Bradbury Landing', 'STARPORT_SURFACE')
:seed(201299135)
:latitude(math.deg2rad(-4.5895))
:longitude(math.deg2rad(-137.4417)),
CustomSystemBody:new('Cydonia', 'STARPORT_SURFACE')
:seed(2874781459)
:latitude(math.deg2rad(-29))
:longitude(math.deg2rad(124)),
CustomSystemBody:new('Olympus Mons', 'STARPORT_SURFACE')
:seed(3046926584)
:latitude(math.deg2rad(25.60955))
:longitude(math.deg2rad(-41.35269)),
CustomSystemBody:new('Mars High', 'STARPORT_ORBITAL')
Expand Down
1 change: 1 addition & 0 deletions data/systems/01_epsilon_eridani.lua
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ local newhope = CustomSystemBody:new('New Hope', 'PLANET_TERRESTRIAL')

local newhope_starports = {
CustomSystemBody:new('Itzalean', 'STARPORT_SURFACE')
:seed(795500669)
:latitude(math.deg2rad(0.0))
:longitude(math.deg2rad(45.864)),
CustomSystemBody:new('New Hope', 'STARPORT_SURFACE')
Expand Down
2 changes: 1 addition & 1 deletion data/systems/02_local_stars.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-- Copyright © 2008-2023 Pioneer Developers. See AUTHORS.txt for details
-- Licensed under the terms of the GPL v3. See licenses/GPL-3.txt

CustomSystem:new('GJ 1075',{'STAR_K'}):add_to_sector(2,-1,-4,v(0.451,0.409,0.034))
-- CustomSystem:new('GJ 1075',{'STAR_K'}):add_to_sector(2,-1,-4,v(0.451,0.409,0.034))
CustomSystem:new('NN 3707',{'STAR_M'}):add_to_sector(-1,3,-1,v(0.845,0.512,0.054))
CustomSystem:new('NN 3253',{'STAR_M'}):add_to_sector(3,-2,1,v(0.185,0.023,0.148))
CustomSystem:new('Gliese 766',{'STAR_M','STAR_M'}):add_to_sector(-4,-2,1,v(0.511,0.265,0.998))
Expand Down
Loading
Loading