From 21a4b9759d16553fc017a1abd02d5bc9dc69e0d9 Mon Sep 17 00:00:00 2001 From: joonicks Date: Sun, 26 Sep 2021 20:25:08 +0200 Subject: [PATCH] keep world related files close together Update en.json Update en.json --- data/lang/lore/en.json | 4 ++-- data/world/{STATIONS.txt => WORLD.txt} | 14 ++++++++++++++ data/{ => world}/factions/000_Independent.lua | 0 data/{ => world}/factions/001_Solar_Federation.lua | 0 .../002_Commonwealth_of_Independent_Worlds.lua | 0 .../{ => world}/factions/003_Haber_Corporation.lua | 0 data/{ => world}/factions/004_Rim_Alliance.lua | 0 data/{ => world}/factions/005_Rim_Faction.lua | 0 data/{ => world}/factions/006_Rim_League.lua | 0 data/{ => world}/factions/007_Rim_Systems.lua | 0 data/{ => world}/factions/008_Rim_Council.lua | 0 data/{ => world}/factions/009_Rim_Worlds.lua | 0 data/{ => world}/factions/010_Rim_Commonwealth.lua | 0 data/{ => world}/factions/011_Rim_Territories.lua | 0 .../{ => world}/factions/012_Obsidian_Alliance.lua | 0 data/{ => world}/factions/013_Obsidian_Union.lua | 0 data/{ => world}/factions/014_Obsidian_Horde.lua | 0 data/{ => world}/factions/015_Obsidian_Systems.lua | 0 data/{ => world}/factions/016_Obsidian_Worlds.lua | 0 .../factions/017_Obsidian_Commonwealth.lua | 0 data/{ => world}/factions/018_United_Alliance.lua | 0 data/{ => world}/factions/019_United_Union.lua | 0 data/{ => world}/factions/020_United_Network.lua | 0 data/{ => world}/factions/021_United_League.lua | 0 data/{ => world}/factions/022_United_Kingdoms.lua | 0 data/{ => world}/factions/023_United_Systems.lua | 0 data/{ => world}/factions/024_United_Council.lua | 0 .../factions/025_United_Commonwealth.lua | 0 data/{ => world}/factions/026_United_Republic.lua | 0 .../{ => world}/factions/027_Shattered_Network.lua | 0 data/{ => world}/factions/028_Shattered_Empire.lua | 0 .../{ => world}/factions/029_Shattered_Systems.lua | 0 data/{ => world}/factions/030_Shattered_Worlds.lua | 0 data/{ => world}/factions/031_Stellar_Union.lua | 0 data/{ => world}/factions/032_Stellar_Horde.lua | 0 data/{ => world}/factions/033_Stellar_Network.lua | 0 .../factions/034_Stellar_Territories.lua | 0 data/{ => world}/factions/035_Stellar_Republic.lua | 0 data/{ => world}/factions/036_Free_Alliance.lua | 0 data/{ => world}/factions/037_Free_Horde.lua | 0 data/{ => world}/factions/038_Free_Kingdoms.lua | 0 data/{ => world}/factions/039_Free_Systems.lua | 0 data/{ => world}/factions/040_Free_Republic.lua | 0 data/{ => world}/factions/041_Blood_Expanse.lua | 0 data/{ => world}/factions/042_Blood_Faction.lua | 0 data/{ => world}/factions/043_Blood_League.lua | 0 data/{ => world}/factions/044_Blood_Empire.lua | 0 data/{ => world}/factions/045_Blood_Kingdoms.lua | 0 data/{ => world}/factions/046_Blood_Council.lua | 0 data/{ => world}/factions/047_Blood_Worlds.lua | 0 .../{ => world}/factions/048_Blood_Territories.lua | 0 data/{ => world}/factions/049_True_Expanse.lua | 0 data/{ => world}/factions/050_True_League.lua | 0 data/{ => world}/factions/051_True_Empire.lua | 0 data/{ => world}/factions/052_True_Systems.lua | 0 data/{ => world}/factions/053_True_Council.lua | 0 data/{ => world}/factions/054_True_Worlds.lua | 0 .../{ => world}/factions/055_True_Commonwealth.lua | 0 data/{ => world}/factions/056_True_Territories.lua | 0 data/{ => world}/factions/057_True_Republic.lua | 0 data/{ => world}/factions/058_Far_Horde.lua | 0 data/{ => world}/factions/059_Far_Faction.lua | 0 data/{ => world}/factions/060_Far_Republic.lua | 0 data/{ => world}/factions/061_Dagger_Union.lua | 0 data/{ => world}/factions/062_Dagger_Expanse.lua | 0 data/{ => world}/factions/063_Dagger_Kingdoms.lua | 0 data/{ => world}/factions/064_Dagger_Systems.lua | 0 data/{ => world}/factions/065_Dagger_Council.lua | 0 data/{ => world}/factions/066_Dagger_Worlds.lua | 0 data/{ => world}/factions/067_Liberation_Union.lua | 0 data/{ => world}/factions/068_Liberation_Horde.lua | 0 .../factions/069_Liberation_Faction.lua | 0 .../factions/070_Provisional_Expanse.lua | 0 .../factions/071_Provisional_Faction.lua | 0 .../factions/072_Provisional_Empire.lua | 0 .../factions/073_Provisional_Kingdoms.lua | 0 .../factions/074_Provisional_Systems.lua | 0 .../factions/075_Provisional_Commonwealth.lua | 0 .../factions/076_Continuity_Alliance.lua | 0 data/{ => world}/factions/077_Continuity_Horde.lua | 0 .../factions/078_Continuity_Network.lua | 0 .../{ => world}/factions/079_Continuity_Empire.lua | 0 .../factions/080_Continuity_Council.lua | 0 .../{ => world}/factions/081_Continuity_Worlds.lua | 0 .../{ => world}/factions/082_Independent_Union.lua | 0 .../factions/083_Independent_Expanse.lua | 0 .../factions/084_Independent_Faction.lua | 0 .../factions/085_Independent_Network.lua | 0 .../factions/086_Independent_League.lua | 0 .../factions/087_Independent_Commonwealth.lua | 0 .../factions/088_Independent_Territories.lua | 0 .../factions/089_Independent_Republic.lua | 0 data/{ => world}/factions/090_Inner_Expanse.lua | 0 data/{ => world}/factions/091_Inner_Horde.lua | 0 data/{ => world}/factions/092_Inner_Faction.lua | 0 data/{ => world}/factions/093_Inner_Kingdoms.lua | 0 data/{ => world}/factions/094_Inner_Systems.lua | 0 data/{ => world}/factions/095_Inner_Council.lua | 0 .../{ => world}/factions/096_Inner_Territories.lua | 0 data/{ => world}/factions/097_Outer_Expanse.lua | 0 data/{ => world}/factions/098_Outer_League.lua | 0 data/{ => world}/factions/099_Outer_Kingdoms.lua | 0 data/{ => world}/factions/100_Outer_Systems.lua | 0 data/{ => world}/factions/101_Outer_Worlds.lua | 0 data/{ => world}/factions/102_Outer_Republic.lua | 0 data/{ => world}/factions/XX_AutoGenerate.OLD | 0 data/{ => world}/systems/00_sol.lua | 0 data/{ => world}/systems/01_epsilon_eridani.lua | 0 data/{ => world}/systems/02_local_stars.lua | 0 data/{ => world}/systems/03_bright_stars.lua | 0 .../systems/custom/00_barnard_s_star.lua | 0 data/{ => world}/systems/custom/01_werribee.lua | 0 data/{ => world}/systems/custom/02_black_hole.lua | 0 data/{ => world}/systems/custom/03_achernar.lua | 0 data/{ => world}/systems/custom/04_rondel.lua | 0 data/{ => world}/systems/custom/05_trappist-1.lua | 0 data/{ => world}/systems/custom/06_61virginis.lua | 0 data/{ => world}/systems/custom/07_1orionis.lua | 0 data/{ => world}/systems/custom/08_61cygni.lua | 0 .../systems/custom/09_delta_eridani.lua | 0 .../systems/custom/10_ayizan_lacaille8760.lua | 0 .../systems/custom/11_noril_wolf1061.lua | 0 data/{ => world}/systems/custom/12_tau_ceti.lua | 0 data/{ => world}/systems/custom/13_fomalhaut.lua | 0 data/{ => world}/systems/custom/14_sirius.lua | 0 data/{ => world}/systems/custom/15_ross154.lua | 0 .../systems/custom/16_bathlight_55cancri.lua | 0 .../systems/custom/17_delta_pavonis.lua | 0 data/{ => world}/systems/custom/18_wolf359.lua | 0 data/{ => world}/systems/custom/19_starsend.lua | 0 src/galaxy/GalaxyGenerator.cpp | 2 +- 131 files changed, 17 insertions(+), 3 deletions(-) rename data/world/{STATIONS.txt => WORLD.txt} (69%) rename data/{ => world}/factions/000_Independent.lua (100%) rename data/{ => world}/factions/001_Solar_Federation.lua (100%) rename data/{ => world}/factions/002_Commonwealth_of_Independent_Worlds.lua (100%) rename data/{ => world}/factions/003_Haber_Corporation.lua (100%) rename data/{ => world}/factions/004_Rim_Alliance.lua (100%) rename data/{ => world}/factions/005_Rim_Faction.lua (100%) rename data/{ => world}/factions/006_Rim_League.lua (100%) rename data/{ => world}/factions/007_Rim_Systems.lua (100%) rename data/{ => world}/factions/008_Rim_Council.lua (100%) rename data/{ => world}/factions/009_Rim_Worlds.lua (100%) rename data/{ => world}/factions/010_Rim_Commonwealth.lua (100%) rename data/{ => world}/factions/011_Rim_Territories.lua (100%) rename data/{ => world}/factions/012_Obsidian_Alliance.lua (100%) rename data/{ => world}/factions/013_Obsidian_Union.lua (100%) rename data/{ => world}/factions/014_Obsidian_Horde.lua (100%) rename data/{ => world}/factions/015_Obsidian_Systems.lua (100%) rename data/{ => world}/factions/016_Obsidian_Worlds.lua (100%) rename data/{ => world}/factions/017_Obsidian_Commonwealth.lua (100%) rename data/{ => world}/factions/018_United_Alliance.lua (100%) rename data/{ => world}/factions/019_United_Union.lua (100%) rename data/{ => world}/factions/020_United_Network.lua (100%) rename data/{ => world}/factions/021_United_League.lua (100%) rename data/{ => world}/factions/022_United_Kingdoms.lua (100%) rename data/{ => world}/factions/023_United_Systems.lua (100%) rename data/{ => world}/factions/024_United_Council.lua (100%) rename data/{ => world}/factions/025_United_Commonwealth.lua (100%) rename data/{ => world}/factions/026_United_Republic.lua (100%) rename data/{ => world}/factions/027_Shattered_Network.lua (100%) rename data/{ => world}/factions/028_Shattered_Empire.lua (100%) rename data/{ => world}/factions/029_Shattered_Systems.lua (100%) rename data/{ => world}/factions/030_Shattered_Worlds.lua (100%) rename data/{ => world}/factions/031_Stellar_Union.lua (100%) rename data/{ => world}/factions/032_Stellar_Horde.lua (100%) rename data/{ => world}/factions/033_Stellar_Network.lua (100%) rename data/{ => world}/factions/034_Stellar_Territories.lua (100%) rename data/{ => world}/factions/035_Stellar_Republic.lua (100%) rename data/{ => world}/factions/036_Free_Alliance.lua (100%) rename data/{ => world}/factions/037_Free_Horde.lua (100%) rename data/{ => world}/factions/038_Free_Kingdoms.lua (100%) rename data/{ => world}/factions/039_Free_Systems.lua (100%) rename data/{ => world}/factions/040_Free_Republic.lua (100%) rename data/{ => world}/factions/041_Blood_Expanse.lua (100%) rename data/{ => world}/factions/042_Blood_Faction.lua (100%) rename data/{ => world}/factions/043_Blood_League.lua (100%) rename data/{ => world}/factions/044_Blood_Empire.lua (100%) rename data/{ => world}/factions/045_Blood_Kingdoms.lua (100%) rename data/{ => world}/factions/046_Blood_Council.lua (100%) rename data/{ => world}/factions/047_Blood_Worlds.lua (100%) rename data/{ => world}/factions/048_Blood_Territories.lua (100%) rename data/{ => world}/factions/049_True_Expanse.lua (100%) rename data/{ => world}/factions/050_True_League.lua (100%) rename data/{ => world}/factions/051_True_Empire.lua (100%) rename data/{ => world}/factions/052_True_Systems.lua (100%) rename data/{ => world}/factions/053_True_Council.lua (100%) rename data/{ => world}/factions/054_True_Worlds.lua (100%) rename data/{ => world}/factions/055_True_Commonwealth.lua (100%) rename data/{ => world}/factions/056_True_Territories.lua (100%) rename data/{ => world}/factions/057_True_Republic.lua (100%) rename data/{ => world}/factions/058_Far_Horde.lua (100%) rename data/{ => world}/factions/059_Far_Faction.lua (100%) rename data/{ => world}/factions/060_Far_Republic.lua (100%) rename data/{ => world}/factions/061_Dagger_Union.lua (100%) rename data/{ => world}/factions/062_Dagger_Expanse.lua (100%) rename data/{ => world}/factions/063_Dagger_Kingdoms.lua (100%) rename data/{ => world}/factions/064_Dagger_Systems.lua (100%) rename data/{ => world}/factions/065_Dagger_Council.lua (100%) rename data/{ => world}/factions/066_Dagger_Worlds.lua (100%) rename data/{ => world}/factions/067_Liberation_Union.lua (100%) rename data/{ => world}/factions/068_Liberation_Horde.lua (100%) rename data/{ => world}/factions/069_Liberation_Faction.lua (100%) rename data/{ => world}/factions/070_Provisional_Expanse.lua (100%) rename data/{ => world}/factions/071_Provisional_Faction.lua (100%) rename data/{ => world}/factions/072_Provisional_Empire.lua (100%) rename data/{ => world}/factions/073_Provisional_Kingdoms.lua (100%) rename data/{ => world}/factions/074_Provisional_Systems.lua (100%) rename data/{ => world}/factions/075_Provisional_Commonwealth.lua (100%) rename data/{ => world}/factions/076_Continuity_Alliance.lua (100%) rename data/{ => world}/factions/077_Continuity_Horde.lua (100%) rename data/{ => world}/factions/078_Continuity_Network.lua (100%) rename data/{ => world}/factions/079_Continuity_Empire.lua (100%) rename data/{ => world}/factions/080_Continuity_Council.lua (100%) rename data/{ => world}/factions/081_Continuity_Worlds.lua (100%) rename data/{ => world}/factions/082_Independent_Union.lua (100%) rename data/{ => world}/factions/083_Independent_Expanse.lua (100%) rename data/{ => world}/factions/084_Independent_Faction.lua (100%) rename data/{ => world}/factions/085_Independent_Network.lua (100%) rename data/{ => world}/factions/086_Independent_League.lua (100%) rename data/{ => world}/factions/087_Independent_Commonwealth.lua (100%) rename data/{ => world}/factions/088_Independent_Territories.lua (100%) rename data/{ => world}/factions/089_Independent_Republic.lua (100%) rename data/{ => world}/factions/090_Inner_Expanse.lua (100%) rename data/{ => world}/factions/091_Inner_Horde.lua (100%) rename data/{ => world}/factions/092_Inner_Faction.lua (100%) rename data/{ => world}/factions/093_Inner_Kingdoms.lua (100%) rename data/{ => world}/factions/094_Inner_Systems.lua (100%) rename data/{ => world}/factions/095_Inner_Council.lua (100%) rename data/{ => world}/factions/096_Inner_Territories.lua (100%) rename data/{ => world}/factions/097_Outer_Expanse.lua (100%) rename data/{ => world}/factions/098_Outer_League.lua (100%) rename data/{ => world}/factions/099_Outer_Kingdoms.lua (100%) rename data/{ => world}/factions/100_Outer_Systems.lua (100%) rename data/{ => world}/factions/101_Outer_Worlds.lua (100%) rename data/{ => world}/factions/102_Outer_Republic.lua (100%) rename data/{ => world}/factions/XX_AutoGenerate.OLD (100%) rename data/{ => world}/systems/00_sol.lua (100%) rename data/{ => world}/systems/01_epsilon_eridani.lua (100%) rename data/{ => world}/systems/02_local_stars.lua (100%) rename data/{ => world}/systems/03_bright_stars.lua (100%) rename data/{ => world}/systems/custom/00_barnard_s_star.lua (100%) rename data/{ => world}/systems/custom/01_werribee.lua (100%) rename data/{ => world}/systems/custom/02_black_hole.lua (100%) rename data/{ => world}/systems/custom/03_achernar.lua (100%) rename data/{ => world}/systems/custom/04_rondel.lua (100%) rename data/{ => world}/systems/custom/05_trappist-1.lua (100%) rename data/{ => world}/systems/custom/06_61virginis.lua (100%) rename data/{ => world}/systems/custom/07_1orionis.lua (100%) rename data/{ => world}/systems/custom/08_61cygni.lua (100%) rename data/{ => world}/systems/custom/09_delta_eridani.lua (100%) rename data/{ => world}/systems/custom/10_ayizan_lacaille8760.lua (100%) rename data/{ => world}/systems/custom/11_noril_wolf1061.lua (100%) rename data/{ => world}/systems/custom/12_tau_ceti.lua (100%) rename data/{ => world}/systems/custom/13_fomalhaut.lua (100%) rename data/{ => world}/systems/custom/14_sirius.lua (100%) rename data/{ => world}/systems/custom/15_ross154.lua (100%) rename data/{ => world}/systems/custom/16_bathlight_55cancri.lua (100%) rename data/{ => world}/systems/custom/17_delta_pavonis.lua (100%) rename data/{ => world}/systems/custom/18_wolf359.lua (100%) rename data/{ => world}/systems/custom/19_starsend.lua (100%) diff --git a/data/lang/lore/en.json b/data/lang/lore/en.json index ba977ab0e06..13db3119d15 100644 --- a/data/lang/lore/en.json +++ b/data/lang/lore/en.json @@ -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" : "", diff --git a/data/world/STATIONS.txt b/data/world/WORLD.txt similarity index 69% rename from data/world/STATIONS.txt rename to data/world/WORLD.txt index 804e356400e..1e748d4e421 100644 --- a/data/world/STATIONS.txt +++ b/data/world/WORLD.txt @@ -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/.json world/stations//.json diff --git a/data/factions/000_Independent.lua b/data/world/factions/000_Independent.lua similarity index 100% rename from data/factions/000_Independent.lua rename to data/world/factions/000_Independent.lua diff --git a/data/factions/001_Solar_Federation.lua b/data/world/factions/001_Solar_Federation.lua similarity index 100% rename from data/factions/001_Solar_Federation.lua rename to data/world/factions/001_Solar_Federation.lua diff --git a/data/factions/002_Commonwealth_of_Independent_Worlds.lua b/data/world/factions/002_Commonwealth_of_Independent_Worlds.lua similarity index 100% rename from data/factions/002_Commonwealth_of_Independent_Worlds.lua rename to data/world/factions/002_Commonwealth_of_Independent_Worlds.lua diff --git a/data/factions/003_Haber_Corporation.lua b/data/world/factions/003_Haber_Corporation.lua similarity index 100% rename from data/factions/003_Haber_Corporation.lua rename to data/world/factions/003_Haber_Corporation.lua diff --git a/data/factions/004_Rim_Alliance.lua b/data/world/factions/004_Rim_Alliance.lua similarity index 100% rename from data/factions/004_Rim_Alliance.lua rename to data/world/factions/004_Rim_Alliance.lua diff --git a/data/factions/005_Rim_Faction.lua b/data/world/factions/005_Rim_Faction.lua similarity index 100% rename from data/factions/005_Rim_Faction.lua rename to data/world/factions/005_Rim_Faction.lua diff --git a/data/factions/006_Rim_League.lua b/data/world/factions/006_Rim_League.lua similarity index 100% rename from data/factions/006_Rim_League.lua rename to data/world/factions/006_Rim_League.lua diff --git a/data/factions/007_Rim_Systems.lua b/data/world/factions/007_Rim_Systems.lua similarity index 100% rename from data/factions/007_Rim_Systems.lua rename to data/world/factions/007_Rim_Systems.lua diff --git a/data/factions/008_Rim_Council.lua b/data/world/factions/008_Rim_Council.lua similarity index 100% rename from data/factions/008_Rim_Council.lua rename to data/world/factions/008_Rim_Council.lua diff --git a/data/factions/009_Rim_Worlds.lua b/data/world/factions/009_Rim_Worlds.lua similarity index 100% rename from data/factions/009_Rim_Worlds.lua rename to data/world/factions/009_Rim_Worlds.lua diff --git a/data/factions/010_Rim_Commonwealth.lua b/data/world/factions/010_Rim_Commonwealth.lua similarity index 100% rename from data/factions/010_Rim_Commonwealth.lua rename to data/world/factions/010_Rim_Commonwealth.lua diff --git a/data/factions/011_Rim_Territories.lua b/data/world/factions/011_Rim_Territories.lua similarity index 100% rename from data/factions/011_Rim_Territories.lua rename to data/world/factions/011_Rim_Territories.lua diff --git a/data/factions/012_Obsidian_Alliance.lua b/data/world/factions/012_Obsidian_Alliance.lua similarity index 100% rename from data/factions/012_Obsidian_Alliance.lua rename to data/world/factions/012_Obsidian_Alliance.lua diff --git a/data/factions/013_Obsidian_Union.lua b/data/world/factions/013_Obsidian_Union.lua similarity index 100% rename from data/factions/013_Obsidian_Union.lua rename to data/world/factions/013_Obsidian_Union.lua diff --git a/data/factions/014_Obsidian_Horde.lua b/data/world/factions/014_Obsidian_Horde.lua similarity index 100% rename from data/factions/014_Obsidian_Horde.lua rename to data/world/factions/014_Obsidian_Horde.lua diff --git a/data/factions/015_Obsidian_Systems.lua b/data/world/factions/015_Obsidian_Systems.lua similarity index 100% rename from data/factions/015_Obsidian_Systems.lua rename to data/world/factions/015_Obsidian_Systems.lua diff --git a/data/factions/016_Obsidian_Worlds.lua b/data/world/factions/016_Obsidian_Worlds.lua similarity index 100% rename from data/factions/016_Obsidian_Worlds.lua rename to data/world/factions/016_Obsidian_Worlds.lua diff --git a/data/factions/017_Obsidian_Commonwealth.lua b/data/world/factions/017_Obsidian_Commonwealth.lua similarity index 100% rename from data/factions/017_Obsidian_Commonwealth.lua rename to data/world/factions/017_Obsidian_Commonwealth.lua diff --git a/data/factions/018_United_Alliance.lua b/data/world/factions/018_United_Alliance.lua similarity index 100% rename from data/factions/018_United_Alliance.lua rename to data/world/factions/018_United_Alliance.lua diff --git a/data/factions/019_United_Union.lua b/data/world/factions/019_United_Union.lua similarity index 100% rename from data/factions/019_United_Union.lua rename to data/world/factions/019_United_Union.lua diff --git a/data/factions/020_United_Network.lua b/data/world/factions/020_United_Network.lua similarity index 100% rename from data/factions/020_United_Network.lua rename to data/world/factions/020_United_Network.lua diff --git a/data/factions/021_United_League.lua b/data/world/factions/021_United_League.lua similarity index 100% rename from data/factions/021_United_League.lua rename to data/world/factions/021_United_League.lua diff --git a/data/factions/022_United_Kingdoms.lua b/data/world/factions/022_United_Kingdoms.lua similarity index 100% rename from data/factions/022_United_Kingdoms.lua rename to data/world/factions/022_United_Kingdoms.lua diff --git a/data/factions/023_United_Systems.lua b/data/world/factions/023_United_Systems.lua similarity index 100% rename from data/factions/023_United_Systems.lua rename to data/world/factions/023_United_Systems.lua diff --git a/data/factions/024_United_Council.lua b/data/world/factions/024_United_Council.lua similarity index 100% rename from data/factions/024_United_Council.lua rename to data/world/factions/024_United_Council.lua diff --git a/data/factions/025_United_Commonwealth.lua b/data/world/factions/025_United_Commonwealth.lua similarity index 100% rename from data/factions/025_United_Commonwealth.lua rename to data/world/factions/025_United_Commonwealth.lua diff --git a/data/factions/026_United_Republic.lua b/data/world/factions/026_United_Republic.lua similarity index 100% rename from data/factions/026_United_Republic.lua rename to data/world/factions/026_United_Republic.lua diff --git a/data/factions/027_Shattered_Network.lua b/data/world/factions/027_Shattered_Network.lua similarity index 100% rename from data/factions/027_Shattered_Network.lua rename to data/world/factions/027_Shattered_Network.lua diff --git a/data/factions/028_Shattered_Empire.lua b/data/world/factions/028_Shattered_Empire.lua similarity index 100% rename from data/factions/028_Shattered_Empire.lua rename to data/world/factions/028_Shattered_Empire.lua diff --git a/data/factions/029_Shattered_Systems.lua b/data/world/factions/029_Shattered_Systems.lua similarity index 100% rename from data/factions/029_Shattered_Systems.lua rename to data/world/factions/029_Shattered_Systems.lua diff --git a/data/factions/030_Shattered_Worlds.lua b/data/world/factions/030_Shattered_Worlds.lua similarity index 100% rename from data/factions/030_Shattered_Worlds.lua rename to data/world/factions/030_Shattered_Worlds.lua diff --git a/data/factions/031_Stellar_Union.lua b/data/world/factions/031_Stellar_Union.lua similarity index 100% rename from data/factions/031_Stellar_Union.lua rename to data/world/factions/031_Stellar_Union.lua diff --git a/data/factions/032_Stellar_Horde.lua b/data/world/factions/032_Stellar_Horde.lua similarity index 100% rename from data/factions/032_Stellar_Horde.lua rename to data/world/factions/032_Stellar_Horde.lua diff --git a/data/factions/033_Stellar_Network.lua b/data/world/factions/033_Stellar_Network.lua similarity index 100% rename from data/factions/033_Stellar_Network.lua rename to data/world/factions/033_Stellar_Network.lua diff --git a/data/factions/034_Stellar_Territories.lua b/data/world/factions/034_Stellar_Territories.lua similarity index 100% rename from data/factions/034_Stellar_Territories.lua rename to data/world/factions/034_Stellar_Territories.lua diff --git a/data/factions/035_Stellar_Republic.lua b/data/world/factions/035_Stellar_Republic.lua similarity index 100% rename from data/factions/035_Stellar_Republic.lua rename to data/world/factions/035_Stellar_Republic.lua diff --git a/data/factions/036_Free_Alliance.lua b/data/world/factions/036_Free_Alliance.lua similarity index 100% rename from data/factions/036_Free_Alliance.lua rename to data/world/factions/036_Free_Alliance.lua diff --git a/data/factions/037_Free_Horde.lua b/data/world/factions/037_Free_Horde.lua similarity index 100% rename from data/factions/037_Free_Horde.lua rename to data/world/factions/037_Free_Horde.lua diff --git a/data/factions/038_Free_Kingdoms.lua b/data/world/factions/038_Free_Kingdoms.lua similarity index 100% rename from data/factions/038_Free_Kingdoms.lua rename to data/world/factions/038_Free_Kingdoms.lua diff --git a/data/factions/039_Free_Systems.lua b/data/world/factions/039_Free_Systems.lua similarity index 100% rename from data/factions/039_Free_Systems.lua rename to data/world/factions/039_Free_Systems.lua diff --git a/data/factions/040_Free_Republic.lua b/data/world/factions/040_Free_Republic.lua similarity index 100% rename from data/factions/040_Free_Republic.lua rename to data/world/factions/040_Free_Republic.lua diff --git a/data/factions/041_Blood_Expanse.lua b/data/world/factions/041_Blood_Expanse.lua similarity index 100% rename from data/factions/041_Blood_Expanse.lua rename to data/world/factions/041_Blood_Expanse.lua diff --git a/data/factions/042_Blood_Faction.lua b/data/world/factions/042_Blood_Faction.lua similarity index 100% rename from data/factions/042_Blood_Faction.lua rename to data/world/factions/042_Blood_Faction.lua diff --git a/data/factions/043_Blood_League.lua b/data/world/factions/043_Blood_League.lua similarity index 100% rename from data/factions/043_Blood_League.lua rename to data/world/factions/043_Blood_League.lua diff --git a/data/factions/044_Blood_Empire.lua b/data/world/factions/044_Blood_Empire.lua similarity index 100% rename from data/factions/044_Blood_Empire.lua rename to data/world/factions/044_Blood_Empire.lua diff --git a/data/factions/045_Blood_Kingdoms.lua b/data/world/factions/045_Blood_Kingdoms.lua similarity index 100% rename from data/factions/045_Blood_Kingdoms.lua rename to data/world/factions/045_Blood_Kingdoms.lua diff --git a/data/factions/046_Blood_Council.lua b/data/world/factions/046_Blood_Council.lua similarity index 100% rename from data/factions/046_Blood_Council.lua rename to data/world/factions/046_Blood_Council.lua diff --git a/data/factions/047_Blood_Worlds.lua b/data/world/factions/047_Blood_Worlds.lua similarity index 100% rename from data/factions/047_Blood_Worlds.lua rename to data/world/factions/047_Blood_Worlds.lua diff --git a/data/factions/048_Blood_Territories.lua b/data/world/factions/048_Blood_Territories.lua similarity index 100% rename from data/factions/048_Blood_Territories.lua rename to data/world/factions/048_Blood_Territories.lua diff --git a/data/factions/049_True_Expanse.lua b/data/world/factions/049_True_Expanse.lua similarity index 100% rename from data/factions/049_True_Expanse.lua rename to data/world/factions/049_True_Expanse.lua diff --git a/data/factions/050_True_League.lua b/data/world/factions/050_True_League.lua similarity index 100% rename from data/factions/050_True_League.lua rename to data/world/factions/050_True_League.lua diff --git a/data/factions/051_True_Empire.lua b/data/world/factions/051_True_Empire.lua similarity index 100% rename from data/factions/051_True_Empire.lua rename to data/world/factions/051_True_Empire.lua diff --git a/data/factions/052_True_Systems.lua b/data/world/factions/052_True_Systems.lua similarity index 100% rename from data/factions/052_True_Systems.lua rename to data/world/factions/052_True_Systems.lua diff --git a/data/factions/053_True_Council.lua b/data/world/factions/053_True_Council.lua similarity index 100% rename from data/factions/053_True_Council.lua rename to data/world/factions/053_True_Council.lua diff --git a/data/factions/054_True_Worlds.lua b/data/world/factions/054_True_Worlds.lua similarity index 100% rename from data/factions/054_True_Worlds.lua rename to data/world/factions/054_True_Worlds.lua diff --git a/data/factions/055_True_Commonwealth.lua b/data/world/factions/055_True_Commonwealth.lua similarity index 100% rename from data/factions/055_True_Commonwealth.lua rename to data/world/factions/055_True_Commonwealth.lua diff --git a/data/factions/056_True_Territories.lua b/data/world/factions/056_True_Territories.lua similarity index 100% rename from data/factions/056_True_Territories.lua rename to data/world/factions/056_True_Territories.lua diff --git a/data/factions/057_True_Republic.lua b/data/world/factions/057_True_Republic.lua similarity index 100% rename from data/factions/057_True_Republic.lua rename to data/world/factions/057_True_Republic.lua diff --git a/data/factions/058_Far_Horde.lua b/data/world/factions/058_Far_Horde.lua similarity index 100% rename from data/factions/058_Far_Horde.lua rename to data/world/factions/058_Far_Horde.lua diff --git a/data/factions/059_Far_Faction.lua b/data/world/factions/059_Far_Faction.lua similarity index 100% rename from data/factions/059_Far_Faction.lua rename to data/world/factions/059_Far_Faction.lua diff --git a/data/factions/060_Far_Republic.lua b/data/world/factions/060_Far_Republic.lua similarity index 100% rename from data/factions/060_Far_Republic.lua rename to data/world/factions/060_Far_Republic.lua diff --git a/data/factions/061_Dagger_Union.lua b/data/world/factions/061_Dagger_Union.lua similarity index 100% rename from data/factions/061_Dagger_Union.lua rename to data/world/factions/061_Dagger_Union.lua diff --git a/data/factions/062_Dagger_Expanse.lua b/data/world/factions/062_Dagger_Expanse.lua similarity index 100% rename from data/factions/062_Dagger_Expanse.lua rename to data/world/factions/062_Dagger_Expanse.lua diff --git a/data/factions/063_Dagger_Kingdoms.lua b/data/world/factions/063_Dagger_Kingdoms.lua similarity index 100% rename from data/factions/063_Dagger_Kingdoms.lua rename to data/world/factions/063_Dagger_Kingdoms.lua diff --git a/data/factions/064_Dagger_Systems.lua b/data/world/factions/064_Dagger_Systems.lua similarity index 100% rename from data/factions/064_Dagger_Systems.lua rename to data/world/factions/064_Dagger_Systems.lua diff --git a/data/factions/065_Dagger_Council.lua b/data/world/factions/065_Dagger_Council.lua similarity index 100% rename from data/factions/065_Dagger_Council.lua rename to data/world/factions/065_Dagger_Council.lua diff --git a/data/factions/066_Dagger_Worlds.lua b/data/world/factions/066_Dagger_Worlds.lua similarity index 100% rename from data/factions/066_Dagger_Worlds.lua rename to data/world/factions/066_Dagger_Worlds.lua diff --git a/data/factions/067_Liberation_Union.lua b/data/world/factions/067_Liberation_Union.lua similarity index 100% rename from data/factions/067_Liberation_Union.lua rename to data/world/factions/067_Liberation_Union.lua diff --git a/data/factions/068_Liberation_Horde.lua b/data/world/factions/068_Liberation_Horde.lua similarity index 100% rename from data/factions/068_Liberation_Horde.lua rename to data/world/factions/068_Liberation_Horde.lua diff --git a/data/factions/069_Liberation_Faction.lua b/data/world/factions/069_Liberation_Faction.lua similarity index 100% rename from data/factions/069_Liberation_Faction.lua rename to data/world/factions/069_Liberation_Faction.lua diff --git a/data/factions/070_Provisional_Expanse.lua b/data/world/factions/070_Provisional_Expanse.lua similarity index 100% rename from data/factions/070_Provisional_Expanse.lua rename to data/world/factions/070_Provisional_Expanse.lua diff --git a/data/factions/071_Provisional_Faction.lua b/data/world/factions/071_Provisional_Faction.lua similarity index 100% rename from data/factions/071_Provisional_Faction.lua rename to data/world/factions/071_Provisional_Faction.lua diff --git a/data/factions/072_Provisional_Empire.lua b/data/world/factions/072_Provisional_Empire.lua similarity index 100% rename from data/factions/072_Provisional_Empire.lua rename to data/world/factions/072_Provisional_Empire.lua diff --git a/data/factions/073_Provisional_Kingdoms.lua b/data/world/factions/073_Provisional_Kingdoms.lua similarity index 100% rename from data/factions/073_Provisional_Kingdoms.lua rename to data/world/factions/073_Provisional_Kingdoms.lua diff --git a/data/factions/074_Provisional_Systems.lua b/data/world/factions/074_Provisional_Systems.lua similarity index 100% rename from data/factions/074_Provisional_Systems.lua rename to data/world/factions/074_Provisional_Systems.lua diff --git a/data/factions/075_Provisional_Commonwealth.lua b/data/world/factions/075_Provisional_Commonwealth.lua similarity index 100% rename from data/factions/075_Provisional_Commonwealth.lua rename to data/world/factions/075_Provisional_Commonwealth.lua diff --git a/data/factions/076_Continuity_Alliance.lua b/data/world/factions/076_Continuity_Alliance.lua similarity index 100% rename from data/factions/076_Continuity_Alliance.lua rename to data/world/factions/076_Continuity_Alliance.lua diff --git a/data/factions/077_Continuity_Horde.lua b/data/world/factions/077_Continuity_Horde.lua similarity index 100% rename from data/factions/077_Continuity_Horde.lua rename to data/world/factions/077_Continuity_Horde.lua diff --git a/data/factions/078_Continuity_Network.lua b/data/world/factions/078_Continuity_Network.lua similarity index 100% rename from data/factions/078_Continuity_Network.lua rename to data/world/factions/078_Continuity_Network.lua diff --git a/data/factions/079_Continuity_Empire.lua b/data/world/factions/079_Continuity_Empire.lua similarity index 100% rename from data/factions/079_Continuity_Empire.lua rename to data/world/factions/079_Continuity_Empire.lua diff --git a/data/factions/080_Continuity_Council.lua b/data/world/factions/080_Continuity_Council.lua similarity index 100% rename from data/factions/080_Continuity_Council.lua rename to data/world/factions/080_Continuity_Council.lua diff --git a/data/factions/081_Continuity_Worlds.lua b/data/world/factions/081_Continuity_Worlds.lua similarity index 100% rename from data/factions/081_Continuity_Worlds.lua rename to data/world/factions/081_Continuity_Worlds.lua diff --git a/data/factions/082_Independent_Union.lua b/data/world/factions/082_Independent_Union.lua similarity index 100% rename from data/factions/082_Independent_Union.lua rename to data/world/factions/082_Independent_Union.lua diff --git a/data/factions/083_Independent_Expanse.lua b/data/world/factions/083_Independent_Expanse.lua similarity index 100% rename from data/factions/083_Independent_Expanse.lua rename to data/world/factions/083_Independent_Expanse.lua diff --git a/data/factions/084_Independent_Faction.lua b/data/world/factions/084_Independent_Faction.lua similarity index 100% rename from data/factions/084_Independent_Faction.lua rename to data/world/factions/084_Independent_Faction.lua diff --git a/data/factions/085_Independent_Network.lua b/data/world/factions/085_Independent_Network.lua similarity index 100% rename from data/factions/085_Independent_Network.lua rename to data/world/factions/085_Independent_Network.lua diff --git a/data/factions/086_Independent_League.lua b/data/world/factions/086_Independent_League.lua similarity index 100% rename from data/factions/086_Independent_League.lua rename to data/world/factions/086_Independent_League.lua diff --git a/data/factions/087_Independent_Commonwealth.lua b/data/world/factions/087_Independent_Commonwealth.lua similarity index 100% rename from data/factions/087_Independent_Commonwealth.lua rename to data/world/factions/087_Independent_Commonwealth.lua diff --git a/data/factions/088_Independent_Territories.lua b/data/world/factions/088_Independent_Territories.lua similarity index 100% rename from data/factions/088_Independent_Territories.lua rename to data/world/factions/088_Independent_Territories.lua diff --git a/data/factions/089_Independent_Republic.lua b/data/world/factions/089_Independent_Republic.lua similarity index 100% rename from data/factions/089_Independent_Republic.lua rename to data/world/factions/089_Independent_Republic.lua diff --git a/data/factions/090_Inner_Expanse.lua b/data/world/factions/090_Inner_Expanse.lua similarity index 100% rename from data/factions/090_Inner_Expanse.lua rename to data/world/factions/090_Inner_Expanse.lua diff --git a/data/factions/091_Inner_Horde.lua b/data/world/factions/091_Inner_Horde.lua similarity index 100% rename from data/factions/091_Inner_Horde.lua rename to data/world/factions/091_Inner_Horde.lua diff --git a/data/factions/092_Inner_Faction.lua b/data/world/factions/092_Inner_Faction.lua similarity index 100% rename from data/factions/092_Inner_Faction.lua rename to data/world/factions/092_Inner_Faction.lua diff --git a/data/factions/093_Inner_Kingdoms.lua b/data/world/factions/093_Inner_Kingdoms.lua similarity index 100% rename from data/factions/093_Inner_Kingdoms.lua rename to data/world/factions/093_Inner_Kingdoms.lua diff --git a/data/factions/094_Inner_Systems.lua b/data/world/factions/094_Inner_Systems.lua similarity index 100% rename from data/factions/094_Inner_Systems.lua rename to data/world/factions/094_Inner_Systems.lua diff --git a/data/factions/095_Inner_Council.lua b/data/world/factions/095_Inner_Council.lua similarity index 100% rename from data/factions/095_Inner_Council.lua rename to data/world/factions/095_Inner_Council.lua diff --git a/data/factions/096_Inner_Territories.lua b/data/world/factions/096_Inner_Territories.lua similarity index 100% rename from data/factions/096_Inner_Territories.lua rename to data/world/factions/096_Inner_Territories.lua diff --git a/data/factions/097_Outer_Expanse.lua b/data/world/factions/097_Outer_Expanse.lua similarity index 100% rename from data/factions/097_Outer_Expanse.lua rename to data/world/factions/097_Outer_Expanse.lua diff --git a/data/factions/098_Outer_League.lua b/data/world/factions/098_Outer_League.lua similarity index 100% rename from data/factions/098_Outer_League.lua rename to data/world/factions/098_Outer_League.lua diff --git a/data/factions/099_Outer_Kingdoms.lua b/data/world/factions/099_Outer_Kingdoms.lua similarity index 100% rename from data/factions/099_Outer_Kingdoms.lua rename to data/world/factions/099_Outer_Kingdoms.lua diff --git a/data/factions/100_Outer_Systems.lua b/data/world/factions/100_Outer_Systems.lua similarity index 100% rename from data/factions/100_Outer_Systems.lua rename to data/world/factions/100_Outer_Systems.lua diff --git a/data/factions/101_Outer_Worlds.lua b/data/world/factions/101_Outer_Worlds.lua similarity index 100% rename from data/factions/101_Outer_Worlds.lua rename to data/world/factions/101_Outer_Worlds.lua diff --git a/data/factions/102_Outer_Republic.lua b/data/world/factions/102_Outer_Republic.lua similarity index 100% rename from data/factions/102_Outer_Republic.lua rename to data/world/factions/102_Outer_Republic.lua diff --git a/data/factions/XX_AutoGenerate.OLD b/data/world/factions/XX_AutoGenerate.OLD similarity index 100% rename from data/factions/XX_AutoGenerate.OLD rename to data/world/factions/XX_AutoGenerate.OLD diff --git a/data/systems/00_sol.lua b/data/world/systems/00_sol.lua similarity index 100% rename from data/systems/00_sol.lua rename to data/world/systems/00_sol.lua diff --git a/data/systems/01_epsilon_eridani.lua b/data/world/systems/01_epsilon_eridani.lua similarity index 100% rename from data/systems/01_epsilon_eridani.lua rename to data/world/systems/01_epsilon_eridani.lua diff --git a/data/systems/02_local_stars.lua b/data/world/systems/02_local_stars.lua similarity index 100% rename from data/systems/02_local_stars.lua rename to data/world/systems/02_local_stars.lua diff --git a/data/systems/03_bright_stars.lua b/data/world/systems/03_bright_stars.lua similarity index 100% rename from data/systems/03_bright_stars.lua rename to data/world/systems/03_bright_stars.lua diff --git a/data/systems/custom/00_barnard_s_star.lua b/data/world/systems/custom/00_barnard_s_star.lua similarity index 100% rename from data/systems/custom/00_barnard_s_star.lua rename to data/world/systems/custom/00_barnard_s_star.lua diff --git a/data/systems/custom/01_werribee.lua b/data/world/systems/custom/01_werribee.lua similarity index 100% rename from data/systems/custom/01_werribee.lua rename to data/world/systems/custom/01_werribee.lua diff --git a/data/systems/custom/02_black_hole.lua b/data/world/systems/custom/02_black_hole.lua similarity index 100% rename from data/systems/custom/02_black_hole.lua rename to data/world/systems/custom/02_black_hole.lua diff --git a/data/systems/custom/03_achernar.lua b/data/world/systems/custom/03_achernar.lua similarity index 100% rename from data/systems/custom/03_achernar.lua rename to data/world/systems/custom/03_achernar.lua diff --git a/data/systems/custom/04_rondel.lua b/data/world/systems/custom/04_rondel.lua similarity index 100% rename from data/systems/custom/04_rondel.lua rename to data/world/systems/custom/04_rondel.lua diff --git a/data/systems/custom/05_trappist-1.lua b/data/world/systems/custom/05_trappist-1.lua similarity index 100% rename from data/systems/custom/05_trappist-1.lua rename to data/world/systems/custom/05_trappist-1.lua diff --git a/data/systems/custom/06_61virginis.lua b/data/world/systems/custom/06_61virginis.lua similarity index 100% rename from data/systems/custom/06_61virginis.lua rename to data/world/systems/custom/06_61virginis.lua diff --git a/data/systems/custom/07_1orionis.lua b/data/world/systems/custom/07_1orionis.lua similarity index 100% rename from data/systems/custom/07_1orionis.lua rename to data/world/systems/custom/07_1orionis.lua diff --git a/data/systems/custom/08_61cygni.lua b/data/world/systems/custom/08_61cygni.lua similarity index 100% rename from data/systems/custom/08_61cygni.lua rename to data/world/systems/custom/08_61cygni.lua diff --git a/data/systems/custom/09_delta_eridani.lua b/data/world/systems/custom/09_delta_eridani.lua similarity index 100% rename from data/systems/custom/09_delta_eridani.lua rename to data/world/systems/custom/09_delta_eridani.lua diff --git a/data/systems/custom/10_ayizan_lacaille8760.lua b/data/world/systems/custom/10_ayizan_lacaille8760.lua similarity index 100% rename from data/systems/custom/10_ayizan_lacaille8760.lua rename to data/world/systems/custom/10_ayizan_lacaille8760.lua diff --git a/data/systems/custom/11_noril_wolf1061.lua b/data/world/systems/custom/11_noril_wolf1061.lua similarity index 100% rename from data/systems/custom/11_noril_wolf1061.lua rename to data/world/systems/custom/11_noril_wolf1061.lua diff --git a/data/systems/custom/12_tau_ceti.lua b/data/world/systems/custom/12_tau_ceti.lua similarity index 100% rename from data/systems/custom/12_tau_ceti.lua rename to data/world/systems/custom/12_tau_ceti.lua diff --git a/data/systems/custom/13_fomalhaut.lua b/data/world/systems/custom/13_fomalhaut.lua similarity index 100% rename from data/systems/custom/13_fomalhaut.lua rename to data/world/systems/custom/13_fomalhaut.lua diff --git a/data/systems/custom/14_sirius.lua b/data/world/systems/custom/14_sirius.lua similarity index 100% rename from data/systems/custom/14_sirius.lua rename to data/world/systems/custom/14_sirius.lua diff --git a/data/systems/custom/15_ross154.lua b/data/world/systems/custom/15_ross154.lua similarity index 100% rename from data/systems/custom/15_ross154.lua rename to data/world/systems/custom/15_ross154.lua diff --git a/data/systems/custom/16_bathlight_55cancri.lua b/data/world/systems/custom/16_bathlight_55cancri.lua similarity index 100% rename from data/systems/custom/16_bathlight_55cancri.lua rename to data/world/systems/custom/16_bathlight_55cancri.lua diff --git a/data/systems/custom/17_delta_pavonis.lua b/data/world/systems/custom/17_delta_pavonis.lua similarity index 100% rename from data/systems/custom/17_delta_pavonis.lua rename to data/world/systems/custom/17_delta_pavonis.lua diff --git a/data/systems/custom/18_wolf359.lua b/data/world/systems/custom/18_wolf359.lua similarity index 100% rename from data/systems/custom/18_wolf359.lua rename to data/world/systems/custom/18_wolf359.lua diff --git a/data/systems/custom/19_starsend.lua b/data/world/systems/custom/19_starsend.lua similarity index 100% rename from data/systems/custom/19_starsend.lua rename to data/world/systems/custom/19_starsend.lua diff --git a/src/galaxy/GalaxyGenerator.cpp b/src/galaxy/GalaxyGenerator.cpp index 5cb015220f7..7b34690a065 100644 --- a/src/galaxy/GalaxyGenerator.cpp +++ b/src/galaxy/GalaxyGenerator.cpp @@ -73,7 +73,7 @@ RefCountedPtr 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(new DensityMapGalaxy(galgen, "galaxy_dense.bmp", 50000.0, 25000.0, 0.0, "factions", "systems")); + s_galaxy = RefCountedPtr(new DensityMapGalaxy(galgen, "galaxy_dense.bmp", 50000.0, 25000.0, 0.0, "world/factions", "world/systems")); s_galaxy->Init(); return s_galaxy; } else {