diff --git a/src/js/slaveGenerationJS.tw b/src/js/slaveGenerationJS.tw
index 66c7e332feac5d7d6ce229354b185a7ca431e959..7e2ecd8a62d2a693102615a7b032a6effea02957 100644
--- a/src/js/slaveGenerationJS.tw
+++ b/src/js/slaveGenerationJS.tw
@@ -1272,27 +1272,27 @@ window.disabilityRoll = function disabilityRoll(slave) {
let disableCount = 0;
if (V.oneTimeDisableDisability === 0) {
while (disList.length > 0) {
- let rolled jsEither(disList);
+ let rolled = jsEither(disList);
switch (rolled) {
case "hearNot":
if ((jsRandom(1,100)-(disableCount*2)) > 90) {
slave.hears = -2;
}
- removeFromArray(disList, hearNot);
+ disList.delete("hearNot");
disableCount++;
break;
case "seeNot":
if ((jsRandom(1,100)-(disableCount*2)) > 90) {
slave.eyes = -2;
}
- removeFromArray(disList, seeNot);
+ disList.delete("seeNot");
disableCount++;
break;
case "speakNot":
if ((jsRandom(1,100)-(disableCount*2)) > 90) {
slave.voice = 0;
}
- removeFromArray(disList, speakNot);
+ disList.delete("speakNot");
disableCount++;
break;
}
diff --git a/src/pregmod/eliteSlave.tw b/src/pregmod/eliteSlave.tw
index 4afff93e1616d0fa6d0d8f82f92533039780ecd4..2888adffbf4480e334535cc318405e667182acf5 100644
--- a/src/pregmod/eliteSlave.tw
+++ b/src/pregmod/eliteSlave.tw
@@ -18,10 +18,11 @@ You check to see if any potential breeding slaves are on auction. <<if $eliteAuc
<<set $activeSlaveOneTimeMaxAge = 40>>
<</if>>
<<set $one_time_age_overrides_pedo_mode = 1>>
+<<set $oneTimeDisableDisability = 1>>
<<if $arcologies[0].FSSupremacist != "unset">>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationist != "unset">>
- <<set _races = ["white", "white", "white", "white", "white", "white", "white", "white", "white", "asian", "asian", "asian", "asian", "asian", "asian", "latina", "latina", "latina", "black", "black", "middle eastern", "middle eastern", "indo-aryan", "indo-aryan", "southern european", "southern european", "semitic", "semitic", "malay", "malay", "amerindian", "pacific islander", "mixed race"]>>
+ <<set _races = ["white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race"]>>
<<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw
index ffe9bbc2c4a0b76ec176583a800c4032283a4977..ff5aa824740ff8d711dd6ed8bce482ab8b4b1d9a 100644
--- a/src/pregmod/eliteTakeOverResult.tw
+++ b/src/pregmod/eliteTakeOverResult.tw
@@ -110,6 +110,7 @@
<<set $eliteLeft-->>
<<set $activeSlaveOneTimeMinAge = 25>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
+ <<set $oneTimeDisableDisability = 1>>
<<if random(1,100) > 50>> /* 50% chance of getting girl or boy */
<<include "Generate XX Slave">>
<<else>>
@@ -143,6 +144,7 @@
<<for _i = $eliteLeft; _i > 0; _i-->>
<<set $activeSlaveOneTimeMinAge = 25>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
+ <<set $oneTimeDisableDisability = 1>>
<<if random(1,100) > 50>> /* 50% chance of getting girl or boy */
<<include "Generate XX Slave">>
<<else>>
diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw
index 4267a695385a64229828212380f0dff7d1aeee9b..8c7cbe300c52770e90dc058e8bfd40d90b3ac124 100644
--- a/src/uncategorized/generateXXSlave.tw
+++ b/src/uncategorized/generateXXSlave.tw
@@ -514,4 +514,6 @@
<</if>>
<</if>>
-<<run disabilityRoll($activeSlave)>>
+<<if $seeExtreme == 1>>
+ <<run disabilityRoll($activeSlave)>>
+<</if>>
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index 895accc6d324d32244816f146327d25e13f4ffd1..7f74e73775532c9874ca5cbc2ee65171ba0871f3 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -677,4 +677,6 @@
<</if>>
<</if>>
-<<run disabilityRoll($activeSlave)>>
+<<if $seeExtreme == 1>>
+ <<run disabilityRoll($activeSlave)>>
+<</if>>
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
index 089cf664273ebfe6874d2d2d76772b443f49401b..3dcbcef03f9a882655268f094b32500b01706074 100644
--- a/src/uncategorized/pRivalryCapture.tw
+++ b/src/uncategorized/pRivalryCapture.tw
@@ -34,6 +34,7 @@ the delicious moment of finding your rival on her knees in front of you with a b
immediately apparent: she's obviously been indulging in self-transformation to excess.
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
+ <<set $oneTimeDisableDisability = 1>>
<<if ["white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XY Slave">>
<<set $activeSlave.face = 100>>
@@ -70,6 +71,7 @@ the delicious moment of finding your rival on her knees in front of you with a b
immediately apparent: there's nothing wrong with having cumflation and ball expansion fetishes, but applying them to oneself can be addictive.
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
+ <<set $oneTimeDisableDisability = 1>>
<<if ["white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XY Slave">>
<<set $activeSlave.chem = 3000>>
@@ -105,6 +107,7 @@ the delicious moment of finding your rival on her knees in front of you with a b
not immediately apparent: she's young, in good shape, and not lacking down there at all.
<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
<<set $activeSlaveOneTimeMaxAge = 18>>
+ <<set $oneTimeDisableDisability = 1>>
<<if ["white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XY Slave">>
<<set $activeSlave.face = 100>>
@@ -138,6 +141,7 @@ the delicious moment of finding your rival on her knees in front of you with a b
not immediately apparent: she's in good shape, if quite masculine.
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
+ <<set $oneTimeDisableDisability = 1>>
<<if ["white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XY Slave">>
<<set $activeSlave.face = 55>>
@@ -169,6 +173,7 @@ the delicious moment of finding your rival on her knees in front of you with a b
immediately apparent: she's got a slavegirl's cock and balls, not an arcology owner's.
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
+ <<set $oneTimeDisableDisability = 1>>
<<if ["white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XY Slave">>
<<set $activeSlave.face = 55>>
@@ -200,6 +205,7 @@ the delicious moment of finding your rival on her knees in front of you with a b
not immediately apparent: though female, she's obviously no stranger to taking a dominant sexual role, to put it politely.
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
+ <<set $oneTimeDisableDisability = 1>>
<<if ["white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XX Slave">>
<<set $activeSlave.face = 55>>
@@ -241,6 +247,7 @@ the delicious moment of finding your rival on her knees in front of you with a b
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<</if>>
+ <<set $oneTimeDisableDisability = 1>>
<<if ["white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XX Slave">>
<<set $activeSlave.pubertyXX = 1>>
@@ -287,6 +294,7 @@ the delicious moment of finding your rival on her knees in front of you with a b
immediately apparent: she's young, inexperienced, and extremely top heavy.
<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
<<set $activeSlaveOneTimeMaxAge = 12>>
+ <<set $oneTimeDisableDisability = 1>>
<<if ["white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XX Slave">>
<<set $activeSlave.face = 100>>
@@ -319,6 +327,7 @@ the delicious moment of finding your rival on her knees in front of you with a b
immediately apparent: there's nothing wrong with having lactation and breast expansion fetishes, but applying them to oneself can be addictive.
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
+ <<set $oneTimeDisableDisability = 1>>
<<if ["white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XX Slave">>
<<set $activeSlave.face = 55>>
@@ -351,6 +360,7 @@ the delicious moment of finding your rival on her knees in front of you with a b
immediately apparent: there's nothing wrong with having a bimbo fetish, but applying it to oneself can be addictive.
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
+ <<set $oneTimeDisableDisability = 1>>
<<if ["white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XX Slave">>
<<set $activeSlave.face = 100>>
@@ -385,6 +395,7 @@ the delicious moment of finding your rival on her knees in front of you with a b
immediately apparent: she seems to have recently fallen into serious aphrodisiac addiction.
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
+ <<set $oneTimeDisableDisability = 1>>
<<if ["white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race"].includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
<<include "Generate XX Slave">>
<<set $activeSlave.face = 100>>