From 53bc049f1cb0615a40e44883ff4a4770255c3644 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Wed, 17 Feb 2021 15:46:38 -0500
Subject: [PATCH] switch to getRaceArrayWithoutParamRace
---
src/Mods/SpecialForce/TrickShotNight.tw | 2 +-
src/futureSocieties/fsPassage.js | 4 +--
src/js/utilsMisc.js | 2 +-
src/npc/generate/generateGenetics.js | 2 +-
src/npc/generate/generateMarketSlave.js | 2 +-
src/pregmod/FCTV/FCTVshows.js | 6 ++--
src/pregmod/FCTV/seFCTVremote.tw | 4 +--
src/pregmod/eliteTakeOverResult.tw | 4 +--
src/pregmod/pRaped.tw | 2 +-
src/uncategorized/REFS.tw | 12 +++----
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/genericPlotEvents.tw | 2 +-
src/uncategorized/pHostageAcquisition.tw | 2 +-
src/uncategorized/pRivalryHostage.tw | 2 +-
src/uncategorized/reAWOL.tw | 2 +-
src/uncategorized/reFSAcquisition.tw | 16 ++++-----
src/uncategorized/reMalefactor.tw | 12 +++----
src/uncategorized/reMilfTourist.tw | 2 +-
src/uncategorized/rePokerNight.tw | 2 +-
src/uncategorized/reRecruit.tw | 46 ++++++++++++------------
src/uncategorized/reShelterInspection.tw | 2 +-
src/uncategorized/recETS.tw | 6 ++--
22 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/src/Mods/SpecialForce/TrickShotNight.tw b/src/Mods/SpecialForce/TrickShotNight.tw
index f6042bd1ff3..dd23d01ce61 100644
--- a/src/Mods/SpecialForce/TrickShotNight.tw
+++ b/src/Mods/SpecialForce/TrickShotNight.tw
@@ -70,7 +70,7 @@ Despite your direct elevator, interaction with the majority of your security for
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _race = _races.random()>>
<</if>>
<<set _genParam = {minAge: 25, maxAge: 35, ageOverridesPedoMode: 1, race: _race, disableDisability: 1}>>
diff --git a/src/futureSocieties/fsPassage.js b/src/futureSocieties/fsPassage.js
index 64f2096b750..9a63c3ded19 100644
--- a/src/futureSocieties/fsPassage.js
+++ b/src/futureSocieties/fsPassage.js
@@ -387,7 +387,7 @@ App.UI.fsPassage = function() {
r.push(`Select race:`);
const select = document.createElement("select");
r.push(select);
- for (const race of App.Utils.getNonSubjugationistSlaveRaces()) { // Subjugation race cannot be superior, so remove
+ for (const race of App.Utils.getRaceArrayWithoutParamRace(arc.FSSubjugationistRace)) { // Subjugation race cannot be superior, so remove
const choice = App.UI.DOM.appendNewElement("option", select, capFirstChar(race));
choice.value = race;
if (race === arc.FSSupremacistRace) {
@@ -431,7 +431,7 @@ App.UI.fsPassage = function() {
const select = document.createElement("select");
r.push(select);
- for (const race of App.Utils.getNonSupremacistSlaveRaces()) { // Superior race cannot be subj, so remove
+ for (const race of App.Utils.getRaceArrayWithoutParamRace(arc.FSSupremacistRace)) { // Superior race cannot be subj, so remove
const choice = App.UI.DOM.appendNewElement("option", select, capFirstChar(race));
choice.value = race;
if (race === arc.FSSubjugationistRace) {
diff --git a/src/js/utilsMisc.js b/src/js/utilsMisc.js
index 0b60158580d..d25cce3b183 100644
--- a/src/js/utilsMisc.js
+++ b/src/js/utilsMisc.js
@@ -112,7 +112,7 @@ App.Utils.removeArticles = function(str) {
};
/**
- * @param {FC.Race} badRace
+ * @param {FC.Zeroable<FC.Race>} badRace
* @returns {Array<FC.Race>}
*/
App.Utils.getRaceArrayWithoutParamRace = function(badRace) {
diff --git a/src/npc/generate/generateGenetics.js b/src/npc/generate/generateGenetics.js
index 1b509dc1cec..b82db10c716 100644
--- a/src/npc/generate/generateGenetics.js
+++ b/src/npc/generate/generateGenetics.js
@@ -241,7 +241,7 @@ globalThis.generateGenetics = (function() {
if (((actor2 === -2 || actor2 === -5) && V.arcologies[0].FSSupremacistLawME === 1) || (actor2 === -6 && V.arcologies[0].FSSupremacist !== "unset")) {
fatherRace = V.arcologies[0].FSSupremacistRace;
} else if (((actor2 === -2 || actor2 === -5) && V.arcologies[0].FSSubjugationistLawME === 1) || (actor2 === -6 && V.arcologies[0].FSSubjugationist !== "unset")) {
- fatherRace = App.Utils.getNonSubjugationistSlaveRaces().random();
+ fatherRace = App.Utils.getRaceArrayWithoutParamRace(V.arcologies[0].FSSubjugationistRace).random();
}
}
diff --git a/src/npc/generate/generateMarketSlave.js b/src/npc/generate/generateMarketSlave.js
index a641f16fea4..1a2ff32e4b8 100644
--- a/src/npc/generate/generateMarketSlave.js
+++ b/src/npc/generate/generateMarketSlave.js
@@ -1283,7 +1283,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
if (V.arcologies[0].FSSupremacistLawME === 1) {
SGProp.race = V.arcologies[0].FSSupremacistRace;
} else if (V.arcologies[0].FSSubjugationistLawME === 1) {
- const races = App.Utils.getNonSubjugationistSlaveRaces();
+ const races = App.Utils.getRaceArrayWithoutParamRace(V.arcologies[0].FSSubjugationistRace);
SGProp.race = jsEither(races);
}
slave = GenerateNewSlave(null, SGProp);
diff --git a/src/pregmod/FCTV/FCTVshows.js b/src/pregmod/FCTV/FCTVshows.js
index 92ffb75b5b0..7b9f6f2f4f2 100644
--- a/src/pregmod/FCTV/FCTVshows.js
+++ b/src/pregmod/FCTV/FCTVshows.js
@@ -409,7 +409,7 @@ App.Data.FCTV.actors = {
if (V.arcologies[0].FSSupremacistLawME === 1) {
races = [V.arcologies[0].FSSupremacistRace];
} else if (V.arcologies[0].FSSubjugationistLawME === 1) {
- races = App.Utils.getNonSubjugationistSlaveRaces();
+ races = App.Utils.getRaceArrayWithoutParamRace(V.arcologies[0].FSSubjugationistRace);
}
const slave = GenerateNewSlave(gender, {
ageOverridesPedoMode: 1, disableDisability: 1, minAge: 25, maxAge: 35, race: races.random()
@@ -438,7 +438,7 @@ App.Data.FCTV.actors = {
if (V.arcologies[0].FSSupremacistLawME === 1) {
races = [V.arcologies[0].FSSupremacistRace];
} else if (V.arcologies[0].FSSubjugationistLawME === 1) {
- races = App.Utils.getNonSubjugationistSlaveRaces();
+ races = App.Utils.getRaceArrayWithoutParamRace(V.arcologies[0].FSSubjugationistRace);
}
const slave = GenerateNewSlave(gender, {
ageOverridesPedoMode: 1, disableDisability: 1, minAge: 25, maxAge: 35, race: races.random()
@@ -470,7 +470,7 @@ App.Data.FCTV.actors = {
if (V.arcologies[0].FSSupremacistLawME === 1) {
races = [V.arcologies[0].FSSupremacistRace];
} else if (V.arcologies[0].FSSubjugationistLawME === 1) {
- races = App.Utils.getNonSubjugationistSlaveRaces();
+ races = App.Utils.getRaceArrayWithoutParamRace(V.arcologies[0].FSSubjugationistRace);
}
const slave = GenerateNewSlave(gender, {
ageOverridesPedoMode: 1, disableDisability: 1, minAge: 25, maxAge: 35, race: races.random()
diff --git a/src/pregmod/FCTV/seFCTVremote.tw b/src/pregmod/FCTV/seFCTVremote.tw
index ae5d67e7e4c..1abde95b13b 100644
--- a/src/pregmod/FCTV/seFCTVremote.tw
+++ b/src/pregmod/FCTV/seFCTVremote.tw
@@ -6,7 +6,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave(null, {minAge: 25, maxAge: 35, ageOverridesPedoMode: 1, race: _race, disableDisability: 1})>>
@@ -88,7 +88,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _race = _races.random()>>
<</if>>
<<set _genParam = {minAge: 25, maxAge: 35, ageOverridesPedoMode: 1, race: _race, disableDisability: 1}>>
diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw
index 4dad59065c4..6f50cd49a6e 100644
--- a/src/pregmod/eliteTakeOverResult.tw
+++ b/src/pregmod/eliteTakeOverResult.tw
@@ -120,7 +120,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _race = _races.random()>>
<</if>>
<<if $seeDicks == 0>>
@@ -160,7 +160,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _race = _races.random()>>
<</if>>
<<if $seeDicks == 0>>
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 223a31a7a21..5f8f2e8f8da 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -7,7 +7,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _race = _races.random()>>
<</if>>
<<set _genParam = {minAge: 16, race: _race, disableDisability: 1}>>
diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw
index cb7ec9ff420..c8db5a8825d 100644
--- a/src/uncategorized/REFS.tw
+++ b/src/uncategorized/REFS.tw
@@ -67,7 +67,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -85,7 +85,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -181,7 +181,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -203,7 +203,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -222,7 +222,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -244,7 +244,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index a6c4b1b09e4..b6e73ecaaa0 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -68,7 +68,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _race = _races.random()>>
<</if>>
<<set _meanGirl = GenerateNewSlave("XX", {minAge: 16, maxAge: 19, ageOverridesPedoMode: 1, nationality: "American", race: _race, disableDisability: 1})>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 76dc6ac10a1..b89c1256fae 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -51,7 +51,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave(null, _pram)>>
diff --git a/src/uncategorized/pHostageAcquisition.tw b/src/uncategorized/pHostageAcquisition.tw
index 78aa833c9f6..aca453e8e2f 100644
--- a/src/uncategorized/pHostageAcquisition.tw
+++ b/src/uncategorized/pHostageAcquisition.tw
@@ -83,7 +83,7 @@ Your hired mercenaries are en route now with your precious cargo.
<<if $arcologies[0].FSSubjugationistRace != 0>>
<<set _notSupreme = $arcologies[0].FSSubjugationistRace>>
<<else>>
- <<set _races = App.Utils.getNonSupremacistSlaveRaces>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace>>
<<set _notSupreme = _races.random()>>
<</if>>
<<run WombFatherRace($hostage, _notSupreme)>>
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index 8f624fb2766..e44fe43bc66 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -7,7 +7,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", {race: _race, disableDisability: 1})>>
diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw
index 62920e4da43..0c8aa92b120 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -11,7 +11,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _race = _races.random()>>
<</if>>
<<set _genParam = {minAge: _minAge, maxAge: 43, ageOverridesPedoMode: 1, race: _race, disableDisability: 1}>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index 417217150a0..c3f612e3907 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -66,7 +66,7 @@
<<if $arcologies[0].FSSubjugationistRace != 0>>
<<set _pram.race = $arcologies[0].FSSubjugationistRace>>
<<else>>
- <<set _races = App.Utils.getNonSupremacistSlaveRaces>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave()>>
@@ -82,7 +82,7 @@
<<if $arcologies[0].FSSubjugationistRace != 0>>
<<set _pram.race = $arcologies[0].FSSubjugationistRace>>
<<else>>
- <<set _races = App.Utils.getNonSupremacistSlaveRaces>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave(null, _pram)>>
@@ -294,7 +294,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave(null, _pram)>>
@@ -382,7 +382,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave(null, _pram)>>
@@ -581,7 +581,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave(null, _pram)>>
@@ -791,7 +791,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave(null, _pram)>>
@@ -902,7 +902,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -1005,7 +1005,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave(null, _pram)>>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 2cb9e34850f..8370bab00af 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -117,7 +117,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -146,7 +146,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave(null, _pram)>>
@@ -188,7 +188,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XY", _pram)>>
@@ -211,7 +211,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -262,7 +262,7 @@
<<if $arcologies[0].FSSubjugationistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSubjugationistRace>>
<<elseif $arcologies[0].FSSupremacistLawME === 1>>
- <<set _races = App.Utils.getNonSupremacistSlaveRaces>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave(null, _pram)>>
@@ -277,7 +277,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _fakeRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _fakeRace = _races.random()>>
<</if>>
<<set _realRace = _slave.race>>
diff --git a/src/uncategorized/reMilfTourist.tw b/src/uncategorized/reMilfTourist.tw
index 3d2eaf944f7..1e33d866f1b 100644
--- a/src/uncategorized/reMilfTourist.tw
+++ b/src/uncategorized/reMilfTourist.tw
@@ -9,7 +9,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", {minAge: 36, maxAge: 42, ageOverridesPedoMode: 1, race: _race, disableDisability: 1})>>
diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw
index 7287414a9e9..f071b4008be 100644
--- a/src/uncategorized/rePokerNight.tw
+++ b/src/uncategorized/rePokerNight.tw
@@ -57,7 +57,7 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _race = _races.random()>>
<</if>>
<<set _genParam = {minAge: 38, maxAge: 43, ageOverridesPedoMode: 1, race: _race, disableDisability: 1}>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 60583021752..c723d1e5cee 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -29,7 +29,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -57,7 +57,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XY", _pram)>>
@@ -86,7 +86,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -127,7 +127,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -139,7 +139,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XY", _pram)>>
@@ -165,7 +165,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -198,7 +198,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -225,7 +225,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave(null, _pram)>>
@@ -258,7 +258,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -277,7 +277,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XY", _pram)>>
@@ -358,7 +358,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -381,7 +381,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -408,7 +408,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XY", _pram)>>
@@ -449,7 +449,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -482,7 +482,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XY", _pram)>>
@@ -517,7 +517,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -565,7 +565,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -602,7 +602,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XY", _pram)>>
@@ -641,7 +641,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XY", _pram)>>
@@ -1388,7 +1388,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave(null, _pram)>>
@@ -1449,7 +1449,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave(null, _pram)>>
@@ -1515,7 +1515,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
@@ -1629,7 +1629,7 @@
<<if $arcologies[0].FSSupremacist != "unset">>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationist != "unset">>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
<<set _slave = GenerateNewSlave("XX", _pram)>>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index 5a9fb2eabca..fe2adca36cd 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -6,7 +6,7 @@
<<if $arcologies[0].FSSupremacistLawME == 1>>
<<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _race = _races.random()>>
<</if>>
<<set _ContractCost = 10000>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index bc13008e094..fb1c5010b01 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -65,7 +65,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
@@ -94,7 +94,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
@@ -392,7 +392,7 @@
<<if $arcologies[0].FSSupremacistLawME === 1>>
<<set _pram.race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME === 1>>
- <<set _races = App.Utils.getNonSubjugationistSlaveRaces()>>
+ <<set _races = App.Utils.getRaceArrayWithoutParamRace($arcologies[0].FSSubjugationistRace)>>
<<set _pram.race = _races.random()>>
<</if>>
--
GitLab