diff --git a/src/Mods/SpecialForce/TrickShotNight.tw b/src/Mods/SpecialForce/TrickShotNight.tw index f6042bd1ff38056abb5e76147e1a749495193d56..dd23d01ce61a524df16f71423a871eb34c457a70 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 64f2096b750fb532d9c09e35a8c784aac6b3051a..9a63c3ded1977f8c7bd83a22a10163134e079d94 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 0b60158580d0ca95eaacb5357edb9dddcde4dfac..d25cce3b1839a8af616fbcb6ef8c2dca3993b0a0 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 1b509dc1cecd329857e62a87bcca645dd220cbad..b82db10c716b1cb9bb415da7564614ab7ecd11cb 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 a641f16fea4812987bac2ac99d26574cd991014d..1a2ff32e4b8239a328e8e030078e8f87621439e5 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 92ffb75b5b0d97758235f57d46ab02732c53b514..7b9f6f2f4f2852d096841a9b9e4c8f1a15408ed5 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 ae5d67e7e4cc0a3f2d9569beff339f839e8adfb1..1abde95b13bb5defd8ddc64dc2ac1c32d23479ba 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 4dad59065c48b92836aafc98b43aa2d72ec508ed..6f50cd49a6e6a6dabcbe89b6304997cdc4d3bc24 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 223a31a7a2186dbab15283209fbd9c52456b168a..5f8f2e8f8da8741e20875510897c8b6c912ce7d8 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 cb7ec9ff420b1d9f57a78eec5a2842e2e4589e89..c8db5a8825d192af4a5fd98eb7fb6346a7703768 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 a6c4b1b09e41f20ae10475e187c16c2124a61557..b6e73ecaaa0ccbd0cb0dfb2f8553119dc1b62038 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 76dc6ac10a13ae445bcc464f01e74b14be2ff88c..b89c1256faebd0657a4ceb7d6ec60086d1604100 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 78aa833c9f603a1f391b3cbb90f621cb06541366..aca453e8e2f0c45191856c20db99382eee1ff903 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 8f624fb27666b6016c642797cdc9141e612cd08b..e44fe43bc661a05b63c227db2f7f365ab70a997c 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 62920e4da43886f5f2eceed580d618339206587c..0c8aa92b12033873da4bafbad3e5e8055a2e2038 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 417217150a092d0a0f7a452aa18a43029b29abe4..c3f612e390709165aaa65afa007e20022a287ff6 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 2cb9e34850f6c96603dadf6c93f77c8a82528b8f..8370bab00af2704ad400b94e25e26dd32dad7518 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 3d2eaf944f7287c030e55ff972e0c3f5984e6147..1e33d866f1bf8fb09f6a8c4fb64710439281b9e1 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 7287414a9e9df48f334119d6df09c52ebd724e2c..f071b4008be939afb952f3cee111b84d263a9687 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 605830217520ae68224c62f505f2d8795c5061de..c723d1e5ceedcb9d77610b620dec62e2e0c230dd 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 5a9fb2eabcabb051a8de27241525758540de0d60..fe2adca36cd2aaf0a3c856127e4086bab90af703 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 bc13008e094786f3d4abcef0b53bd1e69465f7b9..fb1c5010b0136aba087af01c8498c73876824569 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>>