From e33d1f9d4b77c59a66e2fccd1292f46048b41bfa Mon Sep 17 00:00:00 2001 From: Svornost <11434-svornost@users.noreply.gitgud.io> Date: Wed, 6 Sep 2023 16:42:17 -0400 Subject: [PATCH] 1. Add Antebellum Revivalist direction for automatic naming, and allow it to participated in undirected FS-based naming. 2. Fix automatic naming with Pastoralist direction. --- src/interaction/universalRules.js | 3 +++ src/npc/generate/slaveGenerationJS.js | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/src/interaction/universalRules.js b/src/interaction/universalRules.js index ea43683c11d..3e175d5e9bf 100644 --- a/src/interaction/universalRules.js +++ b/src/interaction/universalRules.js @@ -167,6 +167,9 @@ App.UI.universalRules = function() { if (V.arcologies[0].FSPastoralist >= 20) { option.addValue(`Pastoralist`, 9); } + if (V.arcologies[0].FSAntebellumRevivalist > 20) { + option.addValue('Antebellum', 10); + } } } frag.append(options.render()); diff --git a/src/npc/generate/slaveGenerationJS.js b/src/npc/generate/slaveGenerationJS.js index c07892a253d..4c412163789 100644 --- a/src/npc/generate/slaveGenerationJS.js +++ b/src/npc/generate/slaveGenerationJS.js @@ -121,6 +121,9 @@ globalThis.nationalityToName = function(slave) { } else if (V.arcologies[0].FSEdoRevivalist > 20) { slave.slaveName = jsEither(App.Data.misc.edoSlaveNames); slave.slaveSurname = jsEither(App.Data.misc.edoSlaveSurnames); + } else if (V.arcologies[0].FSAntebellumRevivalist > 20) { + slave.slaveName = jsEither(App.Data.misc.antebellumSlaveNames); + slave.slaveSurname = jsEither(App.Data.misc.antebellumSlaveSurnames); } else if (FutureSocieties.isActive('FSDegradationist')) { DegradingName(slave); } @@ -146,6 +149,12 @@ globalThis.nationalityToName = function(slave) { } else if (V.FSNamePref === 8) { slave.slaveName = jsEither(App.Data.misc.bimboSlaveNames); slave.slaveSurname = 0; + } else if (V.FSNamePref === 9) { + slave.slaveName = jsEither(App.Data.misc.cowSlaveNames); + slave.slaveSurname = 0; + } else if (V.FSNamePref === 10) { + slave.slaveName = jsEither(App.Data.misc.antebellumSlaveNames); + slave.slaveSurname = jsEither(App.Data.misc.antebellumSlaveSurnames); } } }; -- GitLab