diff --git a/src/SpecialForce/TrickShotNight.tw b/src/SpecialForce/TrickShotNight.tw
index 7867dc1ec615986de28ec5ffb70f46fed583d39a..d790ed021210b366a7d91bc3fa2b8bacbeddfc6f 100644
--- a/src/SpecialForce/TrickShotNight.tw
+++ b/src/SpecialForce/TrickShotNight.tw
@@ -46,8 +46,7 @@ Despite your direct elevator, interaction with the majority of your security for
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
diff --git a/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw b/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw
index f2f7da1aa021f06f852ddf91d06acf2860a4b4cf..31bca5cfb2770698102d494b85ecfaf2140d85eb 100644
--- a/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw
+++ b/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw
@@ -13,14 +13,14 @@
<<if $arcologies[_i].FSSupremacist != "unset">>
<<set $arcologies[_i].FSSupremacist = Number($arcologies[_i].FSSupremacist) || "unset">>
<</if>>
- <<if $arcologies[_i].FSSupremacist != "unset" && !["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"].includes($arcologies[_i].FSSupremacistRace)>>
- <<set $arcologies[_i].FSSupremacistRace = either("amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white")>>
+ <<if $arcologies[_i].FSSupremacist != "unset" && !setup.filterRacesLowercase.includes($arcologies[_i].FSSupremacistRace)>>
+ <<set $arcologies[_i].FSSupremacistRace = setup.filterRacesLowercase.random()>>
<</if>>
<<if $arcologies[_i].FSSubjugationist != "unset">>
<<set $arcologies[_i].FSSubjugationist = Number($arcologies[_i].FSSubjugationist) || "unset">>
<</if>>
- <<if $arcologies[_i].FSSubjugationist != "unset" && !["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"].includes($arcologies[_i].FSSubjugationistRace)>>
- <<set $arcologies[_i].FSSubjugationistRace = either("amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white")>>
+ <<if $arcologies[_i].FSSubjugationist != "unset" && !setup.filterRacesLowercase.includes($arcologies[_i].FSSubjugationistRace)>>
+ <<set $arcologies[_i].FSSubjugationistRace = setup.filterRacesLowercase.random()>>
<</if>>
<<if $arcologies[_i].FSGenderRadicalist != "unset">>
<<set $arcologies[_i].FSGenderRadicalist = Number($arcologies[_i].FSGenderRadicalist) || "unset">>
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 82a4a5c10834bb64588e54df7f73e305c136c25d..a5243147a0273c3233c700f8e92247facb6b8045 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -31,6 +31,7 @@ equine: {type: "equine", normalOvaMin:1, normalOvaMax: 1, normalBirth: 48, minLi
/* equine: {type: "equine", normalOvaMin:1, normalOvaMax: 1, normalBirth: 48, minLiveBirth: 44, fetusWeek: [0, 4, 7, 9, 10, 12, 17, 21, 25, 34, 38, 48, 192, 99999], fetusSize: [0, 2.5, 3, 4, 6.3, 14, 17.7, 30, 61, 76.2, 92, 121, 235, 235], fetusRate: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] sizeType: 0} */
<<set setup.filterRaces = ["Amerindian", "Asian", "Black", "Indo-Aryan", "Latina", "Malay", "Middle Eastern", "Mixed Race", "Pacific Islander", "Semitic", "Southern European", "White"]>>
+<<set setup.filterRacesLowercase = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
<<set setup.filterRegions = ["Africa", "Asia", "Australia", "Europe", "Middle East", "North America", "South America"]>>
/* START Custom Nationalities region filter */
diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw
index dd8508e6dcf9a4cd7c27c6ac24cb2ad4680951ba..45bfb9bd52aaea1318852fa5babd958b55cabc4d 100644
--- a/src/pregmod/eliteTakeOverResult.tw
+++ b/src/pregmod/eliteTakeOverResult.tw
@@ -121,8 +121,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<if $seeDicks == 0>>
@@ -166,8 +165,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<if $seeDicks == 0>>
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index a058ded2f6c76dfb7c858fdbc5c138113f61cf23..1b281df0d66b8cbb8323013aea408546d8eb2c25 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -118,8 +118,7 @@ It would be prudent to up security in your arcology. That or take a guard along
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XY Slave">>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 598898f43b64f6ac0bf732a04091fb79415e6146..524755f7fda7484993335aef9360799e1590ae25 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1297,17 +1297,16 @@ extremely pale -5
<<widget "HeroSlavesCleanup">>
<<run $heroSlaves.forEach(function(s) {
- const validRaces = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"];
/* Nationalities, races, surnames random fill */
if(!s.nationality) {
/* Check for a pre-set race and if the nationality fits, else regenerate */
- if(s.race && validRaces.includes(s.race)) {
+ if(s.race && setup.filterRacesLowercase.includes(s.race)) {
raceToNationality(s);
} else {
s.nationality = hashChoice($nationalities);
}
}
- if(!s.race || !validRaces.includes(s.race)) {
+ if(!s.race || !setup.filterRacesLowercase.includes(s.race)) {
nationalityToRace(s);
}
if(!s.birthSurname && s.birthSurname !== "") {
diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw
index 367ba022986e8a777db03fb3f6485d8d21dd4eb8..1b4cc30bc92e5e97254340113adaa29606751fae 100644
--- a/src/uncategorized/REFS.tw
+++ b/src/uncategorized/REFS.tw
@@ -72,8 +72,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
@@ -94,8 +93,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
@@ -120,8 +118,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 8135345d1112442fcf10bb9da2d729a754eec271..1ccf465c24ebe0c7909828f4d1e66c4e00145da0 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -17227,8 +17227,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<set $fixedNationality = "American">>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index f51185b2e01b06187f8b9c9084daf2e29603e697..017bb2c77f838d07616e116dc5897197088cc28f 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -63,8 +63,7 @@ As you step off the elevator, you hear female voices shouting. Apparently one of
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate New Slave">>
diff --git a/src/uncategorized/neighborsFSAdoption.tw b/src/uncategorized/neighborsFSAdoption.tw
index a9a6077b4cdcc6fbd6325736b62df4fd346d99b3..ca150d43775596665633ea250c99b0bdf34d21d7 100644
--- a/src/uncategorized/neighborsFSAdoption.tw
+++ b/src/uncategorized/neighborsFSAdoption.tw
@@ -961,7 +961,7 @@ societal development.
<</switch>>
<<switch random(1,26)>>
<<case 1>>
- <<set _subjugationRace = either("amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white")>>
+ <<set _subjugationRace = setup.filterRacesLowercase.random()>>
<<if ($arcologies[$i].FSSubjugationist == "unset")>>
<<if ($arcologies[$i].FSSupremacist == "unset") || (_subjugationRace != $arcologies[$i].FSSupremacistRace)>>
$desc preoccupied by a racial animus towards _subjugationRace people, leading the arcology to @@.yellow;adopt _subjugationRace Subjugation.@@
@@ -970,7 +970,7 @@ societal development.
<</if>>
<</if>>
<<case 2>>
- <<set _supremacistRace = either("amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white")>>
+ <<set _supremacistRace = setup.filterRacesLowercase.random()>>
<<if ($arcologies[$i].FSSupremacist == "unset")>>
<<if ($arcologies[$i].FSSubjugationist == "unset") || (_supremacistRace != $arcologies[$i].FSSubjugationistRace)>>
$desc preoccupied by belief in the superiority of the _supremacistRace race, leading the arcology to @@.yellow;adopt _supremacistRace Supremacy.@@
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
index 17b902bb167bc60c729fac119ef93b49343cec32..8f2db9cbd804dea8438a9adabd3c1cbc32d61176 100644
--- a/src/uncategorized/pRivalryCapture.tw
+++ b/src/uncategorized/pRivalryCapture.tw
@@ -28,7 +28,7 @@
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
- <<if ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
+ <<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XY Slave">>
<<set $activeSlave.face = 100>>
<<set $activeSlave.faceImplant = 15>>
@@ -64,7 +64,7 @@
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
- <<if ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
+ <<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XY Slave">>
<<set $activeSlave.chem = 3000>>
<<set $activeSlave.face = 100>>
@@ -99,7 +99,7 @@
<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $oneTimeDisableDisability = 1>>
- <<if ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
+ <<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XY Slave">>
<<set $activeSlave.face = 100>>
<<set $activeSlave.faceShape = "androgynous">>
@@ -132,7 +132,7 @@
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
- <<if ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
+ <<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XY Slave">>
<<set $activeSlave.face = 55>>
<<set $activeSlave.faceImplant = 0>>
@@ -163,7 +163,7 @@
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
- <<if ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
+ <<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XY Slave">>
<<set $activeSlave.face = 55>>
<<set $activeSlave.faceImplant = 0>>
@@ -194,7 +194,7 @@
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
- <<if ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
+ <<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XX Slave">>
<<set $activeSlave.face = 55>>
<<set $activeSlave.faceImplant = 0>>
@@ -235,7 +235,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<</if>>
<<set $oneTimeDisableDisability = 1>>
- <<if ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
+ <<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XX Slave">>
<<set $activeSlave.pubertyXX = 1>>
<<set $activeSlave.face = 100>>
@@ -284,7 +284,7 @@
<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
<<set $activeSlaveOneTimeMaxAge = 12>>
<<set $oneTimeDisableDisability = 1>>
- <<if ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
+ <<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XX Slave">>
<<set $activeSlave.face = 100>>
<<set $activeSlave.faceImplant = 0>>
@@ -316,7 +316,7 @@
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
- <<if ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
+ <<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XX Slave">>
<<set $activeSlave.face = 55>>
<<set $activeSlave.faceImplant = 0>>
@@ -349,7 +349,7 @@
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
- <<if ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
+ <<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XX Slave">>
<<set $activeSlave.face = 100>>
<<set $activeSlave.faceImplant = 65>>
@@ -383,7 +383,7 @@
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
- <<if ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
+ <<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XX Slave">>
<<set $activeSlave.face = 100>>
<<set $activeSlave.faceImplant = 15>>
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index 101570a7c79c22b1205334519be0cd20043384f9..7466244a7a4ff9619296130f8017e75a36d35b58 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -8,8 +8,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw
index d524af17309d583038e1e6b56fc49f7a0896abc8..fddfe9a847bdc53b9243c282c3f79c92ef8d4015 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -13,8 +13,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<if $seeDicks != 100>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index 9651b0dbadc9c5ea0e208c4ee54825a34e777ef4..0e7ec6f844ae510b6be4deca7c63d094d7406aaa 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -394,8 +394,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate New Slave">>
@@ -532,8 +531,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate New Slave">>
@@ -765,8 +763,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate New Slave">>
@@ -887,8 +884,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
@@ -991,8 +987,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate New Slave">>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index d6ff5c0fc2a731b9b2d2e01c126604733e796dbe..782395cd4c7ac0ef5a4a0afefcf1ec4f8c4b5a25 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -135,8 +135,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
@@ -165,8 +164,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate New Slave">>
@@ -209,8 +207,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XY Slave">>
@@ -237,8 +234,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
diff --git a/src/uncategorized/reMilfTourist.tw b/src/uncategorized/reMilfTourist.tw
index 194dc3813c4f651fdd7080d141b5b3cb27d23da0..ed8b5951180fa00eaff0425963516628f135e871 100644
--- a/src/uncategorized/reMilfTourist.tw
+++ b/src/uncategorized/reMilfTourist.tw
@@ -14,8 +14,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw
index f4d308cf4dafc3d5b6f4cf52d8f2a4df716dab45..23e00cb7bdeb8f39a3626cbbcce79da7cf620f1f 100644
--- a/src/uncategorized/rePokerNight.tw
+++ b/src/uncategorized/rePokerNight.tw
@@ -61,8 +61,7 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<if $seeDicks != 100>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index b14a5b92da7c7606e6cd275823f011f459e2b40f..f0690c448d9bbe3ac6e1f0394cc953ccce8cbba1 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -32,8 +32,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
@@ -68,8 +67,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XY Slave">>
@@ -99,8 +97,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
@@ -140,8 +137,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
@@ -156,8 +152,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XY Slave">>
@@ -186,8 +181,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
@@ -223,8 +217,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
@@ -255,8 +248,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate New Slave">>
@@ -293,8 +285,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
@@ -316,8 +307,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XY Slave">>
@@ -407,8 +397,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
@@ -434,8 +423,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
@@ -465,8 +453,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XY Slave">>
@@ -508,8 +495,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
@@ -545,8 +531,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XY Slave">>
@@ -585,8 +570,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
@@ -640,8 +624,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
@@ -681,8 +664,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XY Slave">>
@@ -723,8 +705,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XY Slave">>
@@ -1536,8 +1517,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate New Slave">>
@@ -1601,8 +1581,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate New Slave">>
@@ -1658,8 +1637,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<set $oneTimeDisableDisability = 1>>
@@ -1780,8 +1758,7 @@
<<if $arcologies[0].FSSupremacist != "unset">>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationist != "unset">>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index 1731d8ed637bc9f0f11871162c01f22caabea7c5..87cc0aecca274fc7f74d9898f77bc3e370f201a1 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -9,8 +9,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<set $contractCost = 10000>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 04132d6714a688ca919fb143e2dc7da7680df5ab..6259225495f3c21eecff91745832d3ac5cd247bc 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -31,8 +31,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate New Slave">>
@@ -69,8 +68,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
@@ -461,8 +459,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XY Slave">>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 0ad6c32e2ca31be9aa56ae8c20d08960aca0e4a8..0c4616de86867c5802d7d4ca8d89a617b7bb7ecd 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -2848,8 +2848,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
- <<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate New Slave">>