diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw index 71a68b8b8425c84335d70013d7b42699a2df4e3b..56bb8591b1990c5523ff73fd1c6ac4b90af7a6ff 100644 --- a/src/uncategorized/RETS.tw +++ b/src/uncategorized/RETS.tw @@ -638,7 +638,7 @@ waist to cup her <<if $subSlave.dick > 0>>cock<<elseif $subSlave.vagina == -1>>a $activeSlave.slaveName chuckles into $subSlave.slaveName's ear, crooning, <<if $subSlave.bellyPreg >= 120000>> You little preggo <<s>>lut. Look at how many babie<<s>> you've gotten fucked into you, gue<<ss>> that'<<s>> why you're a <<s>>lave. You're good for nothing but being a breeding bitch. -<<elseif $subSlave.dick < 3>> +<<elseif $subSlave.dick > 0 && $subSlave.dick < 3>> "You u<<s>>ele<<ss>> little bitch. Your pathetic cock i<<s>> <<s>>o <<s>>mall, no wonder you're a <<s>>lave." <<elseif $subSlave.balls == 0>> "You <<s>>orry little bitch. Your cock i<<s>>n't <<s>>o hard now, i<<s>> it? You're never going to fuck anyone ever again, bitch." @@ -648,7 +648,7 @@ $activeSlave.slaveName chuckles into $subSlave.slaveName's ear, crooning, <<if $subSlave.bellyPreg >= 3000>> "You pregnant <<s>>lut. You think I'll <<s>>how mercy <<s>>in<<c>>e you're pregnant? Think again." <<elseif $subSlave.bellyImplant >= 3000>> - "You blow-up whore. You think I'm dumb enough to be fooled by a fake pregnan<<c>>y? Not a chance." + "You blow-up whore. You think I'm dumb enough to be fooled by a fake pregnan<<c>>y? Not a chan<<c>>e." <<else>> "You bloated <<s>>lut. We're going to find out ju<<s>>t how much raping it take<<s>> to make you leak." <</if>> diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw index 887b261abe125b89b234a6b2637a871e498ee5c8..167b941da82c5109629a06e2150618ba9b7fc0eb 100644 --- a/src/uncategorized/randomIndividualEvent.tw +++ b/src/uncategorized/randomIndividualEvent.tw @@ -135,7 +135,7 @@ <<if $eventSlave.energy > 40>> <<if canPenetrate($eventSlave)>> <<if canSee($eventSlave)>> -<<if $eventSlave.releaseRules != "restrictive" && $slaves[$i].releaseRules != "masturbation">> +<<if $eventSlave.releaseRules != "restrictive" && $eventSlave.releaseRules != "masturbation">> <<set $RETSevent.push("interslave begging")>> <</if>> <</if>> @@ -150,7 +150,7 @@ <<if $eventSlave.sexualQuirk == "perverted" || $eventSlave.energy > 80>> <<if $eventSlave.relation == "mother">> <<if $eventSlave.lactation>> - <<if $eventSlave.releaseRules != "restrictive" && $slaves[$i].releaseRules != "masturbation">> + <<if $eventSlave.releaseRules != "restrictive" && $eventSlave.releaseRules != "masturbation">> <<set $RETSevent.push("incestuous nursing")>> <</if>> <</if>> @@ -158,7 +158,7 @@ <</if>> <</if>> <<else>> - <<if $eventSlave.devotion > 20 && ($eventSlave.sexualQuirk == "perverted" || $eventSlave.energy > 80) && $eventSlave.belly < 100000 && $eventSlave.lactation > 0 && $eventSlave.releaseRules != "restrictive" && $slaves[$i].releaseRules != "masturbation" && $eventSlave.daughters > 0>> + <<if $eventSlave.devotion > 20 && ($eventSlave.sexualQuirk == "perverted" || $eventSlave.energy > 80) && $eventSlave.belly < 100000 && $eventSlave.lactation > 0 && $eventSlave.releaseRules != "restrictive" && $eventSlave.releaseRules != "masturbation" && $eventSlave.daughters > 0>> <<set $RETSevent.push("incestuous nursing")>> <</if>> <</if>> @@ -366,7 +366,7 @@ <<if $REAnalCowgirlSubIDs.length > 1 || ($REAnalCowgirlSubIDs.length == 1 && $eventSlave.ID != $REAnalCowgirlSubIDs[0])>> <<if ($eventSlave.devotion > 20)>> -<<if ($eventSlave.releaseRules != "restrictive") && $slaves[$i].releaseRules != "masturbation">> +<<if ($eventSlave.releaseRules != "restrictive") && $eventSlave.releaseRules != "masturbation">> <<if ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "sadist") || ($eventSlave.fetish == "dom")>> <<if ($eventSlave.dickAccessory != "chastity") || ($eventSlave.dick == 0)>> <<set $RETSevent.push("anal cowgirl")>> @@ -434,7 +434,7 @@ <<if $eventSlave.energy > 95>> <<set $RESSevent.push("devoted nympho")>> <</if>> - <<if $eventSlave.releaseRules == "permissive" || $slaves[$i].releaseRules == "masturbation">> + <<if $eventSlave.releaseRules == "permissive" || $eventSlave.releaseRules == "masturbation">> <<if !["chastity", "combined chastity"].includes($eventSlave.dickAccessory) || ($eventSlave.dick == 0)>> <<set $RESSevent.push("permitted masturbation")>> <</if>> @@ -1304,7 +1304,7 @@ <</if>> <</if>> -<<if ($eventSlave.releaseRules != "restrictive") && $slaves[$i].releaseRules != "masturbation">> +<<if ($eventSlave.releaseRules != "restrictive") && $eventSlave.releaseRules != "masturbation">> <<if ($eventSlave.dick != 0) >> <<if ($eventSlave.hormones < 1)>> <<if ($eventSlave.balls > 0)>> @@ -1470,7 +1470,7 @@ <<if ($corpIncorporated != 0)>> <<set $RESSevent.push("shift sleep")>> <</if>> - <<if ($eventSlave.releaseRules == "permissive") || $slaves[$i].releaseRules == "masturbation">> + <<if ($eventSlave.releaseRules == "permissive") || $eventSlave.releaseRules == "masturbation">> <<set $RESSevent.push("shift masturbation")>> <</if>> <<if ($eventSlave.entertainSkill >= 60)>> @@ -1585,7 +1585,7 @@ <<if ($eventSlave.fetishKnown == 1)>> <<if ($eventSlave.energy > 95)>> <<if ($eventSlave.devotion > 20)>> -<<if ($eventSlave.releaseRules == "permissive") || $slaves[$i].releaseRules == "masturbation">> +<<if ($eventSlave.releaseRules == "permissive") || $eventSlave.releaseRules == "masturbation">> <<set $RESSevent.push("nympho with assistant")>> <</if>> <</if>> @@ -1673,7 +1673,7 @@ <</if>> <</if>> -<<if ($eventSlave.releaseRules != "restrictive") && $slaves[$i].releaseRules != "masturbation">> +<<if ($eventSlave.releaseRules != "restrictive") && $eventSlave.releaseRules != "masturbation">> <<if ($eventSlave.clit > 2)>> <<if ($eventSlave.vaginalAccessory != "chastity belt" && $eventSlave.vaginalAccessory != "combined chastity")>> <<set $RESSevent.push("slave clit on slave")>> diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw index ef01ff2db34bfa6385b636b3bdca12ee9fca69d9..660a9998dae9edbc0dd2495e2fd78d1f55e4ee07 100644 --- a/src/uncategorized/reFSAcquisition.tw +++ b/src/uncategorized/reFSAcquisition.tw @@ -72,7 +72,13 @@ <<set $contractCost = 2000>> <<include "Generate New Slave">> <<if $activeSlave.race == $arcologies[0].FSSupremacistRace>> - <<goto "RE FSSupremacist acquisition">> + <<if def $arcologies[0].FSSubjugationistRace>> + <<set $activeSlave.race == $arcologies[0].FSSubjugationistRace>> + <<elseif $arcologies[0].FSSupremacistRace != "mixed race">> + <<set $activeSlave.race == "mixed race">> + <<else>> + <<set $activeSlave.race == "black">> + <</if>> <</if>> <<set $activeSlave.origin = "She was captured and enslaved in a conflict zone and fenced to you by a mercenary group.">> <<set $activeSlave.devotion -= 8>> @@ -85,7 +91,13 @@ <<set $contractCost = 2000>> <<include "Generate New Slave">> <<if $activeSlave.race == $arcologies[0].FSSupremacistRace>> - <<goto "RE FSSupremacist acquisition">> + <<if def $arcologies[0].FSSubjugationistRace>> + <<set $activeSlave.race == $arcologies[0].FSSubjugationistRace>> + <<elseif $arcologies[0].FSSupremacistRace != "mixed race">> + <<set $activeSlave.race == "mixed race">> + <<else>> + <<set $activeSlave.race == "black">> + <</if>> <</if>> <<set $activeSlave.origin = "She made the mistake of marrying into a $arcologies[0].FSSupremacistRace neighborhood and was kidnapped then sold to you.">> <<set $activeSlave.devotion -= 8>> diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index 61b5b3dc373129510920c3bd8e0e8e48913b159e..15c80168dfa784d82394322f2bc3327d9f653216 100644 --- a/src/utility/slaveCreationWidgets.tw +++ b/src/utility/slaveCreationWidgets.tw @@ -2742,7 +2742,7 @@ <<set $activeSlave.origin = "You bought her from the girl raiders' slave market the week she reached her majority.">> <<set $activeSlave.trust -= 25>> <<set $activeSlave.health += 20>> - <<set $activeSlave.career = "a student">> + <<set $activeSlave.career = either("a student", "a student", "a student", "a student", "a student", "a party girl", "a cheerleader", "a farm laborer")>> <<set $activeSlave.birthWeek = 0>> <<if $activeSlave.vagina != -1>> <<if random(1,2) == 1>>