Skip to content

Commit

Permalink
keep world related files close together
Browse files Browse the repository at this point in the history
Update en.json

Update en.json
  • Loading branch information
joonicks committed Sep 26, 2021
1 parent ad4559b commit 21a4b97
Show file tree
Hide file tree
Showing 131 changed files with 17 additions and 3 deletions.
4 changes: 2 additions & 2 deletions data/lang/lore/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
},
"SOL_EARTH_LONDON" : {
"description" : "",
"message" : "Traditional center of civilazation. Has recovered quite well after last centurys flooding disasters, although many of the cultural landmarks will never be restored to their former glory."
"message" : "Traditional center of civilization. Has recovered quite well after last centurys flooding disasters, although many of the cultural landmarks will never be restored to their former glory."
},
"SOL_EARTH_MOSCOW" : {
"description" : "",
"message" : "Moscow Spaceflight museum is a must see!"
"message" : "Moscow Spaceflight museum is a must see! See how it all started, including an actual moon lander recovered from the moon!"
},
"SOL_EARTH_OLYMPUS" : {
"description" : "",
Expand Down
14 changes: 14 additions & 0 deletions data/world/STATIONS.txt → data/world/WORLD.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
world/factions/<##_name>.lua

Contains properties of factions

## determines order of precedence when loading
Name filename only. faction name is determined by contents of the file

world/systems/<##_Name>.lua

Contains manually created layouts of star systems

## determines order of precedence when loading
Name filename only. faction name is determined by contents of the file

world/stations/<system+stationID>.json
world/stations/<system>/<stationID>.json

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/galaxy/GalaxyGenerator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ RefCountedPtr<Galaxy> GalaxyGenerator::Create(const std::string &name, Version v

assert(name == "legacy"); // Once whe have have more, this will become an if switch
// NB : The galaxy density image MUST be in BMP format due to OSX failing to load pngs the same as Linux/Windows
s_galaxy = RefCountedPtr<Galaxy>(new DensityMapGalaxy(galgen, "galaxy_dense.bmp", 50000.0, 25000.0, 0.0, "factions", "systems"));
s_galaxy = RefCountedPtr<Galaxy>(new DensityMapGalaxy(galgen, "galaxy_dense.bmp", 50000.0, 25000.0, 0.0, "world/factions", "world/systems"));
s_galaxy->Init();
return s_galaxy;
} else {
Expand Down

0 comments on commit 21a4b97

Please sign in to comment.