From 32e304862492e42540a269c9c941f82cfc0a0683 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Tue, 21 Jan 2020 14:58:35 -0800
Subject: [PATCH] Slaves generated with races that can't be mapped to
nationalities will be Stateless.
---
src/js/slaveGenerationJS.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/js/slaveGenerationJS.js b/src/js/slaveGenerationJS.js
index fe05acf90be..d228006a17a 100644
--- a/src/js/slaveGenerationJS.js
+++ b/src/js/slaveGenerationJS.js
@@ -18,7 +18,12 @@ window.raceToNationality = function raceToNationality(slave) {
}
/* No success after 100 attempts, so just randomize according to race */
if (setup.raceSelector[slave.nationality] && !(slave.race in setup.raceSelector[slave.nationality]) && i === 100) {
- slave.nationality = hashChoice(setup[`${slave.race.toLowerCase().replace(/[ -]/g, "")}Nationalities`]);
+ const nationalityKey = `${slave.race.toLowerCase().replace(/[ -]/g, "")}Nationalities`;
+ if (nationalityKey in setup) {
+ slave.nationality = hashChoice(setup[nationalityKey]);
+ } else {
+ slave.nationality = "Stateless";
+ }
}
};
--
GitLab