From 036d07a547f8bfb7c397994348cfe9fcc3e5c463 Mon Sep 17 00:00:00 2001 From: VoiceInYourHead Date: Wed, 15 May 2024 13:06:50 +0300 Subject: [PATCH] Temp home planets removal --- .../code/locations_humankind.dm | 218 +++++++++++++++++- mods/fd_backgrounds/code/locations_ipc.dm | 78 ++++++- 2 files changed, 291 insertions(+), 5 deletions(-) diff --git a/mods/fd_backgrounds/code/locations_humankind.dm b/mods/fd_backgrounds/code/locations_humankind.dm index 62047c028ff72..8bb2d7d5f040b 100644 --- a/mods/fd_backgrounds/code/locations_humankind.dm +++ b/mods/fd_backgrounds/code/locations_humankind.dm @@ -1,6 +1,25 @@ #define HOME_SYSTEM_MEOT "Meotourne" #define HOME_SYSTEM_REPUBL "Nova Respublica" +#define HOME_SYSTEM_EARTH_FD "Earth" +#define HOME_SYSTEM_LUNA_FD "Luna" +#define HOME_SYSTEM_MARS_FD "Mars" +#define HOME_SYSTEM_VENUS_FD "Venus" +#define HOME_SYSTEM_CERES_FD "Ceres" +#define HOME_SYSTEM_PLUTO_FD "Pluto" +#define HOME_SYSTEM_TAU_CETI_FD "Ceti Epsilon" +#define HOME_SYSTEM_HELIOS_FD "Eos" +#define HOME_SYSTEM_TERRA_FD "Terra" +#define HOME_SYSTEM_SAFFAR_FD "Saffar" +#define HOME_SYSTEM_PIRX_FD "Pirx" +#define HOME_SYSTEM_TADMOR_FD "Tadmor" +#define HOME_SYSTEM_BRAHE_FD "Brahe" +#define HOME_SYSTEM_IOLAUS_FD "Iolaus" +#define HOME_SYSTEM_GAIA_FD "Gaia" +#define HOME_SYSTEM_MAGNITKA_FD "Magnitka" +#define HOME_SYSTEM_CASTILLA_FD "Nueva Castilla" +#define HOME_SYSTEM_FOSTER_FD "Foster's World" + #define HUMAN_HOMES_TO_DELETE list(HOME_SYSTEM_TERSTEN, \ HOME_SYSTEM_AVALON, \ HOME_SYSTEM_MIRANIA, \ @@ -8,9 +27,45 @@ HOME_SYSTEM_NYX_KALDARK, \ HOME_SYSTEM_NYX_ROANOK, \ HOME_SYSTEM_NYX_YUKLIT, \ - HOME_SYSTEM_NYX_CASSER) + HOME_SYSTEM_NYX_CASSER, \ + HOME_SYSTEM_EARTH, \ + HOME_SYSTEM_LUNA, \ + HOME_SYSTEM_MARS, \ + HOME_SYSTEM_VENUS, \ + HOME_SYSTEM_CERES, \ + HOME_SYSTEM_PLUTO, \ + HOME_SYSTEM_TAU_CETI, \ + HOME_SYSTEM_HELIOS, \ + HOME_SYSTEM_TERRA, \ + HOME_SYSTEM_SAFFAR, \ + HOME_SYSTEM_PIRX, \ + HOME_SYSTEM_TADMOR, \ + HOME_SYSTEM_BRAHE, \ + HOME_SYSTEM_IOLAUS, \ + HOME_SYSTEM_GAIA, \ + HOME_SYSTEM_MAGNITKA, \ + HOME_SYSTEM_CASTILLA, \ + HOME_SYSTEM_FOSTER) #define HUMAN_HOMES_TO_ADD list(HOME_SYSTEM_MEOT, \ - HOME_SYSTEM_REPUBL) + HOME_SYSTEM_REPUBL, \ + HOME_SYSTEM_EARTH_FD, \ + HOME_SYSTEM_LUNA_FD, \ + HOME_SYSTEM_MARS_FD, \ + HOME_SYSTEM_VENUS_FD, \ + HOME_SYSTEM_CERES_FD, \ + HOME_SYSTEM_PLUTO_FD, \ + HOME_SYSTEM_TAU_CETI_FD, \ + HOME_SYSTEM_HELIOS_FD, \ + HOME_SYSTEM_TERRA_FD, \ + HOME_SYSTEM_SAFFAR_FD, \ + HOME_SYSTEM_PIRX_FD, \ + HOME_SYSTEM_TADMOR_FD, \ + HOME_SYSTEM_BRAHE_FD, \ + HOME_SYSTEM_IOLAUS_FD, \ + HOME_SYSTEM_GAIA_FD, \ + HOME_SYSTEM_MAGNITKA_FD, \ + HOME_SYSTEM_CASTILLA_FD, \ + HOME_SYSTEM_FOSTER_FD) /datum/map/New() available_cultural_info[TAG_HOMEWORLD] += HUMAN_HOMES_TO_ADD @@ -21,6 +76,9 @@ ..() available_cultural_info[TAG_HOMEWORLD] -= HUMAN_HOMES_TO_DELETE +//OUR OWN LOCATIONS// +//START// + /singleton/cultural_info/location/human/meotourne name = HOME_SYSTEM_MEOT distance = "23 light years" @@ -48,7 +106,163 @@ economic_power = 0.8 ruling_body = "Nova Respublica" +//END// + +//REWRITED SIERRA AND OFF-BAY ONES// +//START// + +/singleton/cultural_info/location/human_fd + name = HOME_SYSTEM_MARS_FD + description = "-" + distance = "1.5AU" + capital = "Олимп" + economic_power = 1.1 + +/singleton/cultural_info/location/human_fd/earth + name = HOME_SYSTEM_EARTH_FD + description = "-" + distance = "1AU" + capital = "Женева" + economic_power = 1.2 + +/singleton/cultural_info/location/human_fd/luna + name = HOME_SYSTEM_LUNA_FD + distance = "1AU" + description = "-" + capital = "Селена" + economic_power = 1.3 + secondary_langs = list(LANGUAGE_HUMAN_SELENIAN) + +/singleton/cultural_info/location/human_fd/venus + name = HOME_SYSTEM_VENUS_FD + distance = "0.7AU" + description = "-" + capital = "Центральная Административная \"Зона\"" + economic_power = 1.4 + +/singleton/cultural_info/location/human_fd/ceres + name = HOME_SYSTEM_CERES_FD + distance = "2.7AU" + description = "-" + capital = "Строительная верфь \"Кханион\"" + +/singleton/cultural_info/location/human_fd/pluto + name = HOME_SYSTEM_PLUTO_FD + distance = "45AU" + description = "-" + capital = "Нью-Доминго" + economic_power = 0.8 + secondary_langs = list(LANGUAGE_GUTTER) + +/singleton/cultural_info/location/human_fd/cetiepsilon + name = HOME_SYSTEM_TAU_CETI_FD + distance = "11.9 light years" + description = "-" + capital = "Иакон" + economic_power = 1.2 + +/singleton/cultural_info/location/human_fd/eos + name = HOME_SYSTEM_HELIOS_FD + description = "-" + capital = "Сария" + economic_power = 1.3 + distance = "10 light years" + +/singleton/cultural_info/location/human_fd/terra + name = HOME_SYSTEM_TERRA_FD + description = "-" + capital = "Амерант" + distance = "22.5 light years." + economic_power = 0.9 + ruling_body = "Гильгамешская Колониальная Конфедерация" + language = LANGUAGE_HUMAN_RUSSIAN + +/singleton/cultural_info/location/human_fd/saffar + name = HOME_SYSTEM_SAFFAR + distance = "44 light years" + description = "-" + capital = "Орбитальная станция \"Саффар-1\"" + economic_power = 1.2 + +/singleton/cultural_info/location/human_fd/tadmor + name = HOME_SYSTEM_TADMOR_FD + distance = "45 light years" + description = "-" + capital = "Пальмира" + economic_power = 1.0 + +/singleton/cultural_info/location/human_fd/pirx + name = HOME_SYSTEM_PIRX_FD + distance = "41 light years" + description = "-" + capital = "Йуду" + economic_power = 0.7 + +/singleton/cultural_info/location/human_fd/brahe + name = HOME_SYSTEM_BRAHE_FD + distance = "41 light years" + description = "-" + capital = "Нью-Орхус" + economic_power = 1.1 + +/singleton/cultural_info/location/human_fd/iolaus + name = HOME_SYSTEM_IOLAUS_FD + distance = "41 light years" + description = "-" + capital = "Немея" + economic_power = 1.0 + +/singleton/cultural_info/location/human_fd/gaia + name = HOME_SYSTEM_GAIA_FD + distance = "14 light years" + description = "-" + capital = "Новая Венеция" + economic_power = 1.0 + +/singleton/cultural_info/location/human_fd/magnitka + name = HOME_SYSTEM_MAGNITKA_FD + distance = "24 light years" + description = "-" + capital = "Стройгородок" + economic_power = 0.8 + ruling_body = "Магнитка" + +/singleton/cultural_info/location/human_fd/castilla + name = HOME_SYSTEM_CASTILLA_FD + distance = "10 light years" + description = "-" + capital = "Пласида" + economic_power = 1.0 + +/singleton/cultural_info/location/human_fd/fosters + name = HOME_SYSTEM_FOSTER_FD + distance = "11 light years" + description = "-" + capital = "Вайтхилл" + economic_power = 1.2 + +//END// + #undef HOME_SYSTEM_MEOT #undef HOME_SYSTEM_REPUBL +#undef HOME_SYSTEM_EARTH_FD +#undef HOME_SYSTEM_LUNA_FD +#undef HOME_SYSTEM_MARS_FD +#undef HOME_SYSTEM_VENUS_FD +#undef HOME_SYSTEM_CERES_FD +#undef HOME_SYSTEM_PLUTO_FD +#undef HOME_SYSTEM_TAU_CETI_FD +#undef HOME_SYSTEM_HELIOS_FD +#undef HOME_SYSTEM_TERRA_FD +#undef HOME_SYSTEM_SAFFAR_FD +#undef HOME_SYSTEM_PIRX_FD +#undef HOME_SYSTEM_TADMOR_FD +#undef HOME_SYSTEM_BRAHE_FD +#undef HOME_SYSTEM_IOLAUS_FD +#undef HOME_SYSTEM_GAIA_FD +#undef HOME_SYSTEM_MAGNITKA_FD +#undef HOME_SYSTEM_CASTILLA_FD +#undef HOME_SYSTEM_FOSTER_FD + #undef HUMAN_HOMES_TO_DELETE diff --git a/mods/fd_backgrounds/code/locations_ipc.dm b/mods/fd_backgrounds/code/locations_ipc.dm index 7457da1a30256..f550681b9f9bb 100644 --- a/mods/fd_backgrounds/code/locations_ipc.dm +++ b/mods/fd_backgrounds/code/locations_ipc.dm @@ -2,10 +2,63 @@ #define HOME_SYSTEM_MEOT "Meotourne" #define HOME_SYSTEM_REPUBL "Nova Respublica" -#define IPC_HOMES_TO_DELETE list(HOME_SYSTEM_ROOT) +#define HOME_SYSTEM_EARTH_FD "Earth" +#define HOME_SYSTEM_LUNA_FD "Luna" +#define HOME_SYSTEM_MARS_FD "Mars" +#define HOME_SYSTEM_VENUS_FD "Venus" +#define HOME_SYSTEM_CERES_FD "Ceres" +#define HOME_SYSTEM_PLUTO_FD "Pluto" +#define HOME_SYSTEM_TAU_CETI_FD "Ceti Epsilon" +#define HOME_SYSTEM_HELIOS_FD "Eos" +#define HOME_SYSTEM_TERRA_FD "Terra" +#define HOME_SYSTEM_SAFFAR_FD "Saffar" +#define HOME_SYSTEM_PIRX_FD "Pirx" +#define HOME_SYSTEM_TADMOR_FD "Tadmor" +#define HOME_SYSTEM_BRAHE_FD "Brahe" +#define HOME_SYSTEM_IOLAUS_FD "Iolaus" +#define HOME_SYSTEM_GAIA_FD "Gaia" +#define HOME_SYSTEM_MAGNITKA_FD "Magnitka" +#define HOME_SYSTEM_CASTILLA_FD "Nueva Castilla" +#define HOME_SYSTEM_FOSTER_FD "Foster's World" + +#define IPC_HOMES_TO_DELETE list(HOME_SYSTEM_ROOT, \ + HOME_SYSTEM_EARTH, \ + HOME_SYSTEM_LUNA, \ + HOME_SYSTEM_MARS, \ + HOME_SYSTEM_VENUS, \ + HOME_SYSTEM_CERES, \ + HOME_SYSTEM_PLUTO, \ + HOME_SYSTEM_TAU_CETI, \ + HOME_SYSTEM_HELIOS, \ + HOME_SYSTEM_TERRA, \ + HOME_SYSTEM_SAFFAR, \ + HOME_SYSTEM_PIRX, \ + HOME_SYSTEM_TADMOR, \ + HOME_SYSTEM_BRAHE, \ + HOME_SYSTEM_IOLAUS, \ + HOME_SYSTEM_GAIA, \ + HOME_SYSTEM_MAGNITKA, \ + HOME_SYSTEM_CASTILLA, \ + HOME_SYSTEM_FOSTER) #define IPC_HOMES_TO_ADD list(HOME_SYSTEM_ERIDANI, \ - HOME_SYSTEM_MEOT, \ - HOME_SYSTEM_REPUBL) + HOME_SYSTEM_EARTH_FD, \ + HOME_SYSTEM_LUNA_FD, \ + HOME_SYSTEM_MARS_FD, \ + HOME_SYSTEM_VENUS_FD, \ + HOME_SYSTEM_CERES_FD, \ + HOME_SYSTEM_PLUTO_FD, \ + HOME_SYSTEM_TAU_CETI_FD, \ + HOME_SYSTEM_HELIOS_FD, \ + HOME_SYSTEM_TERRA_FD, \ + HOME_SYSTEM_SAFFAR_FD, \ + HOME_SYSTEM_PIRX_FD, \ + HOME_SYSTEM_TADMOR_FD, \ + HOME_SYSTEM_BRAHE_FD, \ + HOME_SYSTEM_IOLAUS_FD, \ + HOME_SYSTEM_GAIA_FD, \ + HOME_SYSTEM_MAGNITKA_FD, \ + HOME_SYSTEM_CASTILLA_FD, \ + HOME_SYSTEM_FOSTER_FD) /datum/species/machine/New() available_cultural_info[TAG_HOMEWORLD] += IPC_HOMES_TO_ADD @@ -29,5 +82,24 @@ #undef HOME_SYSTEM_MEOT #undef HOME_SYSTEM_REPUBL +#undef HOME_SYSTEM_EARTH_FD +#undef HOME_SYSTEM_LUNA_FD +#undef HOME_SYSTEM_MARS_FD +#undef HOME_SYSTEM_VENUS_FD +#undef HOME_SYSTEM_CERES_FD +#undef HOME_SYSTEM_PLUTO_FD +#undef HOME_SYSTEM_TAU_CETI_FD +#undef HOME_SYSTEM_HELIOS_FD +#undef HOME_SYSTEM_TERRA_FD +#undef HOME_SYSTEM_SAFFAR_FD +#undef HOME_SYSTEM_PIRX_FD +#undef HOME_SYSTEM_TADMOR_FD +#undef HOME_SYSTEM_BRAHE_FD +#undef HOME_SYSTEM_IOLAUS_FD +#undef HOME_SYSTEM_GAIA_FD +#undef HOME_SYSTEM_MAGNITKA_FD +#undef HOME_SYSTEM_CASTILLA_FD +#undef HOME_SYSTEM_FOSTER_FD + #undef IPC_HOMES_TO_DELETE #undef IPC_HOMES_TO_ADD