From 96c077c1f853dc9e30a86f73d1ed5ec550f76910 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 6 Apr 2018 23:56:36 -0400
Subject: [PATCH] Rival hacking fix

---
 devNotes/VersionChangeLog-Premod+LoliMod.txt |  13 +
 slave variables documentation - Pregmod.txt  |   1 +
 src/uncategorized/pRivalryActions.tw         |  14 +-
 src/uncategorized/pRivalryCapture.tw         | 269 ++++++++++++
 src/uncategorized/pRivalryVictory.tw         | 411 +------------------
 src/uncategorized/saLongTermEffects.tw       |   8 +-
 6 files changed, 298 insertions(+), 418 deletions(-)
 create mode 100644 src/uncategorized/pRivalryCapture.tw

diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 04cec1fbe80..df5605907f3 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,19 @@
 
 0.10.7.1-0.1.x
 
+4/06/2018
+
+	28
+	-typo corrections
+	-some code improvements
+	-still more names and nicknames
+
+	27
+	-typo corrections
+	-some code improvements
+	-even more names
+	-more careers
+
 4/05/2018
 
 	27
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index a2a9fe3d4bc..4706af58e2e 100644
--- a/slave variables documentation - Pregmod.txt	
+++ b/slave variables documentation - Pregmod.txt	
@@ -1896,6 +1896,7 @@ collar:
 
 may accept strings, use at own risk
 "none"
+"ancient Egyptian"
 "cruel retirement counter"
 "uncomfortable leather"
 "tight steel"
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index 6513b60da64..1cc24cd2b3c 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -3857,8 +3857,7 @@ You remind yourself that success in this conflict will not be defined by the tra
 	With every external, and several internal, supply lines severed, <<if _num < $seeDicks>>his<<else>>her<</if>> tenants are faced with imminent destruction and @@.green;rise up@@ against their hapless landlord. <<if _num < $seeDicks>>He<<else>>She<</if>> will not be able to weather such a siege for long. 
 	<<set $rivalryPower += 10>>
 	<</replace>>
-<</link>>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;//This option is available due to your @@.springgreen;societal connections,@@ and will economically devastate your rival//
+<</link>>&nbsp;&nbsp;&nbsp;&nbsp;//This option is available due to your @@.springgreen;societal connections,@@ and will economically devastate your rival//
 <</if>>
 <</if>>
 <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>
@@ -3943,7 +3942,7 @@ You remind yourself that success in this conflict will not be defined by the tra
 
 		<<if random(0,100) > 50>>
 			Bagged and tagged. Confirm, bagged and tagged. No
-			<<set $rivalOwner = -1>>
+			<<set _rivalCaptured = 1>>
 		<<else>>
 			EKIA. Confirm, E. K. I. A. No other
 			<<set $rivalOwner = 0>>
@@ -3968,7 +3967,14 @@ You remind yourself that success in this conflict will not be defined by the tra
 		$assistantName pauses. "Also confirm package is secure."
 		<<set $hostageRescued = 1>>
 	<</if>>
-	Smirking to yourself at a job well done, you return to your usual work.
+	Smirking to yourself at a job well done, you
+	<<if _rivalCaptured != 1>>
+		return to your usual work.
+	<<else>>
+		await the bastard's arrival.
+		<br><br>
+		<<include "P rivalry capture">>
+	<</if>>
 	<</replace>>
 <</link>>&nbsp;&nbsp;&nbsp;&nbsp;//This option is available due to your @@.springgreen;your hacking mastery,@@. This will immediately end the conflict with a chance of enslaving your rival//
 <</if>>
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
new file mode 100644
index 00000000000..cff44409301
--- /dev/null
+++ b/src/uncategorized/pRivalryCapture.tw
@@ -0,0 +1,269 @@
+:: P rivalry capture [nobr]
+
+<<set $rivalOwner = -1, $nextLink = "AS Dump", $returnTo = "P rival initiation", $rivalID = $activeSlave.ID, $activeSlave.combatSkill = 0, $activeSlaveOneTimeMinAge = 18, $activeSlaveOneTimeMaxAge = 42, $activeSlave.face = 100, $activeSlave.faceImplant = 0, $activeSlave.intelligence = 3, $activeSlave.intelligenceImplant = 1, $activeSlave.whoreSkill = 0>> /* proceed directly to rival initiation event after New Slave Intro */
+<<set $seed = []>>
+<<if _num <= $seeDicks>>
+	<<set $seed.push("expansionist shemale"),$seed.push("masculine"),$seed.push("micropenis"),$seed.push("cum addict")>>
+		<<if $pedo_mode == 1>>
+			<<set $seed.push("hung shota")>>
+		<</if>>
+<<else>>
+	<<set $seed.push("bull dyke"),$seed.push("cow"),$seed.push("bimbo"),$seed.push("addict"),$seed.push("breeder")>>
+		<<if $pedo_mode == 1>>
+			<<set $seed.push("oppai loli")>>
+		<</if>>
+<</if>>
+<<set $seed = $seed.random()>>
+Your 
+<<if passage() == "P rivalry actions">> 
+	target is quickly delivered. Politely dismissing the head of your <<if $mercenariesTitle != "mercenaries">> $mercenariesTitle <<else>> mercenaries <</if>>, you savour 
+<<else>>
+	bounty is quickly claimed, and you are treated to 
+<</if>>
+the delicious moment of finding your rival on her knees in front of you with a black bag over her head and her hands cuffed behind her. She's one of your slaves now, fundamentally no different than any other. Looking her over, the causes of her downfall are 
+	<<switch $seed>>
+		<<case "expansionist shemale">>
+			immediately apparent: she's obviously been indulging in self-transformation to excess.
+			<<include "Generate XY Slave">>
+			<<set $activeSlave.faceImplant = 15,$activeSlave.faceShape = "androgynous">>
+			<<set $activeSlave.muscles = 20>>
+			<<set $activeSlave.height = random(185,215)>>
+			<<set $activeSlave.lips = 35>>
+			<<set $activeSlave.butt = either(4,5,6)>>
+			<<set $activeSlave.boobs = either(800,1000,1200)>>
+			<<set $activeSlave.dick = 6>>
+			<<if $activeSlave.foreskin > 0>>
+				<<set $activeSlave.foreskin = $activeSlave.dick>>
+			<</if>>
+			<<set $activeSlave.balls = 10>>
+			<<set $activeSlave.anus = 3>>
+			<<set $activeSlave.vagina = -1>>
+			<<set $activeSlave.weight = 20>>
+			<<set $activeSlave.oralSkill = 100,$activeSlave.analSkill = 100,$activeSlave.whoreSkill = 15,$activeSlave.entertainSkill = 100>>
+			<<set $activeSlave.clitPiercing = 2,$activeSlave.nipplesPiercing = 1,$activeSlave.earPiercing = 1,$activeSlave.tonguePiercing = 1,$activeSlave.eyebrowPiercing = 1>>
+			<<set $activeSlave.behavioralFlaw = "odd",$activeSlave.behavioralQuirk = "confident">>
+			<<set $activeSlave.sexualFlaw = "judgemental",$activeSlave.sexualQuirk = "romantic">>
+			<<set $activeSlave.hStyle = "luxurious",$activeSlave.hLength = 80>>
+		<<case "cum addict">>
+			immediately apparent: there's nothing wrong with having cumflation and ball expansion fetishes, but applying them to oneself can be addictive.
+			<<include "Generate XY Slave">>
+			<<set $activeSlave.chem = 3000,$activeSlave.faceShape = "masculine">>
+			<<set $activeSlave.muscles = 100>>
+			<<set $activeSlave.height = random(185,215)>>
+			<<set $activeSlave.lips = 10>>
+			<<set $activeSlave.butt = 10>>
+			<<set $activeSlave.boobs = either(100,200)>>
+			<<set $activeSlave.dick = 6>>
+			<<set $activeSlave.foreskin = 0>>
+			<<set $activeSlave.balls = 300>>
+			<<set $activeSlave.scrotum = 1>>
+			<<set $activeSlave.anus = 3>>
+			<<set $activeSlave.vagina = -1>>
+			<<set $activeSlave.weight = -35>>
+			<<set $activeSlave.oralSkill = 0,$activeSlave.analSkill = 100,$activeSlave.whoreSkill = 15,$activeSlave.entertainSkill = 100>>
+			<<set $activeSlave.dickPiercing = 2>>
+			<<set $activeSlave.fetish = "pregnancy",$activeSlave.fetishStrength = 100>>
+			<<set $activeSlave.behavioralFlaw = "odd",$activeSlave.behavioralQuirk = "confident">>
+			<<set $activeSlave.sexualFlaw = "cum addict",$activeSlave.sexualQuirk = "size queen">>
+			<<set $activeSlave.hStyle = "neat",$activeSlave.hLength = 20>>
+		<<case "hung shota">>
+			not immediately apparent: she's young, in good shape, and not lacking down there at all.
+			<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge,$activeSlaveOneTimeMaxAge = 18>>
+			<<include "Generate XY Slave">>
+			<<set $activeSlave.faceShape = "androgynous">>
+			<<set $activeSlave.muscles = 0>>
+			<<set $activeSlave.lips = 10>>
+			<<set $activeSlave.butt = 0>>
+			<<set $activeSlave.boobs = either(100,200)>>
+			<<set $activeSlave.dick = 6>>
+			<<set $activeSlave.foreskin = $activeSlave.dick>>
+			<<set $activeSlave.balls = 6>>
+			<<set $activeSlave.scrotum = 6>>
+			<<set $activeSlave.anus = 0>>
+			<<set $activeSlave.vagina = -1>>
+			<<set $activeSlave.weight = -35>>
+			<<set $activeSlave.oralSkill = 0,$activeSlave.analSkill = 0,$activeSlave.entertainSkill = 100>>
+			<<set $activeSlave.dickPiercing = 2>>
+			<<set $activeSlave.pubertyXY = 1>>
+			<<set $activeSlave.fetish = "pregnancy">>
+			<<set $activeSlave.fetishStrength = 100>>
+			<<set $activeSlave.behavioralFlaw = "hates men",$activeSlave.behavioralQuirk = "adores women">>
+			<<set $activeSlave.sexualFlaw = "shamefast",$activeSlave.sexualQuirk = "perverted">>
+			<<set $activeSlave.hLength = 20>>
+		<<case "masculine">>
+			not immediately apparent: she's in good shape, if quite masculine.
+			<<include "Generate XY Slave">>
+			<<set $activeSlave.face = 55,$activeSlave.faceShape = "masculine">>
+			<<set $activeSlave.muscles = either(20,50,100)>>
+			<<set $activeSlave.height = random(185,195)>>
+			<<set $activeSlave.butt = either(2, 3)>>
+			<<set $activeSlave.boobs = either(100,200)>>
+			<<set $activeSlave.dick = 5>>
+			<<if $activeSlave.foreskin > 0>>
+				<<set $activeSlave.foreskin = $activeSlave.dick>>
+			<</if>>
+			<<set $activeSlave.balls = 5>>
+			<<set $activeSlave.anus = 0>>
+			<<set $activeSlave.vagina = -1>>
+			<<set $activeSlave.weight = 0>>
+			<<set $activeSlave.vaginalSkill = 0,$activeSlave.oralSkill = 15,$activeSlave.analSkill = 0,$activeSlave.entertainSkill = 15>>
+			<<set $activeSlave.combatSkill = 1>>
+			<<set $activeSlave.behavioralFlaw = "hates men",$activeSlave.behavioralQuirk = "fitness">>
+			<<set $activeSlave.sexualFlaw = "hates anal",$activeSlave.sexualQuirk = "perverted">>
+			<<set $activeSlave.hStyle = "neat",$activeSlave.hLength = 5>>
+		<<case "micropenis">>
+			immediately apparent: she's got a slavegirl's cock and balls, not an arcology owner's.
+			<<include "Generate XY Slave">>
+			<<set $activeSlave.face = 55,$activeSlave.faceShape = "masculine">>
+			<<set $activeSlave.muscles = 0>>
+			<<set $activeSlave.height = random(145,160)>>
+			<<set $activeSlave.butt = either(2,4)>>
+			<<set $activeSlave.boobs = either(100,400)>>
+			<<set $activeSlave.dick = 1>>
+			<<if $activeSlave.foreskin > 0>>
+				<<set $activeSlave.foreskin = $activeSlave.dick>>
+			<</if>>
+			<<set $activeSlave.balls = 2>>
+			<<set $activeSlave.anus = 1>>
+			<<set $activeSlave.vagina = -1>>
+			<<set $activeSlave.weight = 100>>
+			<<set $activeSlave.vaginalSkill = 0,$activeSlave.oralSkill = 15,$activeSlave.analSkill = 15,$activeSlave.entertainSkill = 15>>
+			<<set $activeSlave.behavioralFlaw = "hates men",$activeSlave.behavioralQuirk = "insecure">>
+			<<set $activeSlave.sexualFlaw = "shamefast",$activeSlave.sexualQuirk = "perverted">>
+			<<set $activeSlave.hStyle = "neat",$activeSlave.hLength = 5>>
+		<<case "bull dyke">>
+			not immediately apparent: though female, she's obviously no stranger to taking a dominant sexual role, to put it politely.
+			<<include "Generate XX Slave">>
+			<<set $activeSlave.face = 55,$activeSlave.faceShape = "androgynous">>
+			<<set $activeSlave.muscles = 100>>
+			<<set $activeSlave.height = random(185,195)>>
+			<<set $activeSlave.lipsImplant = 10,$activeSlave.lips = 35>>
+			<<set $activeSlave.buttImplant = 1,$activeSlave.butt += $activeSlave.buttImplant>>
+			<<set $activeSlave.boobs -= 100,$activeSlave.boobsImplant = either(400,600,800),$activeSlave.boobs += $activeSlave.boobsImplant>>
+			<<set $activeSlave.clit = 2>>
+			<<set $activeSlave.anus = 1>>
+			<<set $activeSlave.vagina = 1>>
+			<<set $activeSlave.preg = -1>>
+			<<set $activeSlave.vaginalSkill = 15,$activeSlave.oralSkill = 0,$activeSlave.analSkill = 15,$activeSlave.entertainSkill = 0>>
+			<<set $activeSlave.combatSkill = 1>>
+			<<set $activeSlave.clitPiercing = 1,$activeSlave.earPiercing = 1>>
+			<<set $activeSlave.behavioralFlaw = "hates men",$activeSlave.behavioralQuirk = "fitness">>
+			<<set $activeSlave.sexualFlaw = "hates penetration",$activeSlave.sexualQuirk = "unflinching">>
+			<<set $activeSlave.hStyle = "neat",$activeSlave.hLength = 5>>
+		<<case "breeder">>
+			immediately apparent: there's nothing wrong with having a pregnancy fetish, but applying it to oneself is ill-fitting for an arcology owner.
+			<<if $pedo_mode == 1>>
+				<<set $activeSlaveOneTimeMinAge = ($fertilityAge + 6),$one_time_age_overrides_pedo_mode = 1>> /% Old enough to have been pregnant many times. %/	
+			<</if>>
+			<<include "Generate XX Slave">>
+			<<set $activeSlave.pubertyXX = 1>>
+			<<set $activeSlave.faceShape = "sensual">>
+			<<set $activeSlave.muscles = 50>>
+			<<set $activeSlave.lips = 35>>
+			<<set $activeSlave.butt = either(6,7,8)>>
+			<<set $activeSlave.boobs = 5000>>
+			<<set $activeSlave.nipples = "huge">>
+			<<set $activeSlave.lactation = 1>>
+			<<set $activeSlave.anus = 1>>
+			<<set $activeSlave.preg = 25>>
+			<<if $seeHyperPreg == 1>>
+				<<set $activeSlave.vagina = 10>>
+				<<set $activeSlave.pregType = random(20,35),$activeSlave.birthsTotal = random(120,180)>>
+				<<set $activeSlave.bellySag = 30,$activeSlave.bellySagPreg = 30>>
+			<<else>>
+				<<set $activeSlave.vagina = 5>>
+				<<set $activeSlave.pregType = either(3,3,4,4,4,5,5,6,6,7,7,8,8,8),$activeSlave.birthsTotal = random(18,27)>>
+				<<set $activeSlave.bellySag = 2,$activeSlave.bellySagPreg = 2>>
+			<</if>>
+			<<set $activeSlave.pregKnown = 1,$activeSlave.pregWeek = $activeSlave.preg>>
+			<<SetBellySize $activeSlave>>
+			<<set $activeSlave.vaginalSkill = 100,$activeSlave.oralSkill = 15,$activeSlave.analSkill = 15,$activeSlave.whoreSkill = 35,$activeSlave.entertainSkill = 15>>
+			<<set $activeSlave.fetish = "pregnancy",$activeSlave.fetishStrength = 1000>>
+			<<set $activeSlave.behavioralFlaw = "odd",$activeSlave.behavioralQuirk = "adores men">>
+			<<set $activeSlave.sexualFlaw = "breeder",$activeSlave.sexualQuirk = "caring">>
+			<<set $activeSlave.hStyle = "luxurious",$activeSlave.hLength = 80>>
+		<<case "oppai loli">>
+			immediately apparent: she's young, inexperienced, and extremely top heavy.
+			<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge,$activeSlaveOneTimeMaxAge = 12>>
+			<<include "Generate XX Slave">>
+			<<set $activeSlave.faceShape = "cute">>
+			<<set $activeSlave.muscles = 20>>
+			<<set $activeSlave.weight = 60>>
+			<<set $activeSlave.lips = 10>>
+			<<set $activeSlave.butt = 1>>
+			<<set $activeSlave.hips = -1>>
+			<<set $activeSlave.shoulders = -2>>
+			<<set $activeSlave.boobs = 7000>>
+			<<set $activeSlave.nipples = "huge">>
+			<<set $activeSlave.anus = 0>>
+			<<set $activeSlave.vagina = 0>>
+			<<set $activeSlave.preg = 0>>
+			<<set $activeSlave.vaginalSkill = 0,$activeSlave.oralSkill = 0,$activeSlave.analSkill = 0,$activeSlave.entertainSkill = 15>>
+			<<set $activeSlave.behavioralFlaw = "odd",$activeSlave.behavioralQuirk = "insecure">>
+			<<set $activeSlave.sexualFlaw = "shamefast",$activeSlave.sexualQuirk = "tease">>
+			<<set $activeSlave.hStyle = "twin tails",$activeSlave.hLength = 40>>
+		<<case "cow">>
+			immediately apparent: there's nothing wrong with having lactation and breast expansion fetishes, but applying them to oneself can be addictive.
+			<<include "Generate XX Slave">>
+			<<set $activeSlave.face = 55,$activeSlave.faceShape = "cute">>
+			<<set $activeSlave.muscles = 50>>
+			<<set $activeSlave.height = random(185,195)>>
+			<<set $activeSlave.lips = 35>>
+			<<set $activeSlave.butt = either(6, 7, 8)>>
+			<<set $activeSlave.boobs = 30000>>
+			<<set $activeSlave.weight = random(100,160)>>
+			<<set $activeSlave.nipples = "huge">>
+			<<set $activeSlave.lactation = 2>>
+			<<set $activeSlave.anus = 1>>
+			<<set $activeSlave.vagina = 2>>
+			<<set $activeSlave.preg = 0>>
+			<<set $activeSlave.vaginalSkill = 15,$activeSlave.oralSkill = 15,$activeSlave.analSkill = 0,$activeSlave.entertainSkill = 15>>
+			<<set $activeSlave.behavioralFlaw = "odd",$activeSlave.behavioralQuirk = "insecure">>
+			<<set $activeSlave.sexualFlaw = "breast growth",$activeSlave.sexualQuirk = "perverted">>
+			<<set $activeSlave.hStyle = "neat",$activeSlave.hLength = 5>>
+		<<case "bimbo">>
+			immediately apparent: there's nothing wrong with having a bimbo fetish, but applying it to oneself can be addictive.
+			<<include "Generate XX Slave">>
+			<<set $activeSlave.faceImplant = 65,$activeSlave.faceShape = "sensual">>
+			<<set $activeSlave.muscles = 0>>
+			<<set $activeSlave.height = random(180,190)>>
+			<<set $activeSlave.lipsImplant = 2,$activeSlave.lips = random(25,55)>>
+			<<set $activeSlave.buttImplant = 2,$activeSlave.butt += $activeSlave.buttImplant>>
+			<<set $activeSlave.boobsImplant = either(600,800,1000),$activeSlave.boobs += $activeSlave.boobsImplant>>
+			<<set $activeSlave.anus = 2>>
+			<<set $activeSlave.vagina = 1>>
+			<<set $activeSlave.preg = -1>>
+			<<set $activeSlave.vaginalSkill = 100,$activeSlave.oralSkill = 100,$activeSlave.analSkill = 35,$activeSlave.whoreSkill = 35,$activeSlave.entertainSkill = 35>>
+			<<set $activeSlave.clitPiercing = 1,$activeSlave.earPiercing = 1>>
+			<<set $activeSlave.behavioralFlaw = "arrogant",$activeSlave.behavioralQuirk = "insecure">>
+			<<set $activeSlave.sexualFlaw = "crude",$activeSlave.sexualQuirk = "caring">>
+			<<set $activeSlave.hStyle = "tails",$activeSlave.hLength = 80>>
+			<<set $activeSlave.intelligence = -3,$activeSlave.intelligenceImplant = 0>>
+		<<default>>
+			immediately apparent: she seems to have recently fallen into serious aphrodisiac addiction.
+			<<include "Generate XX Slave">>
+			<<set $activeSlave.faceImplant = 15>>
+			<<set $activeSlave.muscles = 0>>
+			<<set $activeSlave.lips = 35>>
+			<<set $activeSlave.butt += random(1,3)>>
+			<<set $activeSlave.boobs += 200*random(1,3)>>
+			<<set $activeSlave.anus = 4>>
+			<<set $activeSlave.vagina = 4>>
+			<<set $activeSlave.preg = 2,$activeSlave.pregKnown = 1,$activeSlave.pregWeek = $activeSlave.preg>>
+			<<SetBellySize $activeSlave>>
+			<<set $activeSlave.vaginalSkill = 100,$activeSlave.oralSkill = 100,$activeSlave.analSkill = 100,$activeSlave.whoreSkill = 100,$activeSlave.entertainSkill = 0>>
+			<<set $activeSlave.clitPiercing = 1,$activeSlave.earPiercing = 1>>
+			<<set $activeSlave.behavioralFlaw = "bitchy",$activeSlave.behavioralQuirk = "funny">>
+			<<set $activeSlave.sexualFlaw = "crude",$activeSlave.sexualQuirk = "size queen">>
+			<<set $activeSlave.hStyle = "neat",$activeSlave.hLength = 80>>
+			<<set $activeSlave.addict = 10>>
+	<</switch>>
+<<set $activeSlave.devotion = -20,$activeSlave.trust = -10>>
+<<set $activeSlave.origin = "She was once an arcology owner like yourself.",$activeSlave.career = "an arcology owner">>
+<<set $activeSlave.prestige = 3,$activeSlave.prestigeDesc = "You bankrupted and enslaved her in revenge for her part in the attack on your arcology by the Daughters of Liberty.">>
+<<set $activeSlave.health = 100>>
+<<if $activeSlave.physicalAge > 35>>
+	<<set $activeSlave.ageImplant = 1>> <<AgeImplantAdjustment $activeSlave>>
+<</if>>
+<<set $activeSlave.pubicHStyle = "waxed",$activeSlave.underArmHStyle = "waxed">>
+<br><br><<include "New Slave Intro">>
\ No newline at end of file
diff --git a/src/uncategorized/pRivalryVictory.tw b/src/uncategorized/pRivalryVictory.tw
index ebdef635462..efe9d5f0cfe 100644
--- a/src/uncategorized/pRivalryVictory.tw
+++ b/src/uncategorized/pRivalryVictory.tw
@@ -125,416 +125,7 @@ For the first time, you receive a direct call from your rival. You pictured the
 		<<set $cash -= random(10000,25000)>>
 	<</if>>
 	<<set $cash -= 50000>>
-	<<set $rivalOwner = -1>>
-	<<set $seed = []>>
-	<<if _num <= $seeDicks>>
-	  <<set $seed.push("expansionist shemale")>>
-	  <<set $seed.push("masculine")>>
-	  <<set $seed.push("micropenis")>>
-	  <<set $seed.push("cum addict")>>
-	  <<if $pedo_mode == 1>>
-	  <<set $seed.push("hung shota")>>
-	  <</if>>
-	<</if>>
-	<<if _num > $seeDicks>>
-	  <<set $seed.push("bull dyke")>>
-	  <<set $seed.push("cow")>>
-	  <<set $seed.push("bimbo")>>
-	  <<set $seed.push("addict")>>
-	  <<set $seed.push("breeder")>>
-	  <<if $pedo_mode == 1>>
-	  <<set $seed.push("oppai loli")>>
-	  <</if>>
-	<</if>>
-	<<set $seed = $seed.random()>>
-	<br><br>
-	Your bounty is quickly claimed, and you are treated to the delicious moment of finding your rival on her knees in front of you with a black bag over her head and her hands cuffed behind her. She's one of your slaves now, fundamentally no different than any other. Looking her over, the causes of her downfall are
-	<<if $seed == "expansionist shemale">>
-		immediately apparent: she's obviously been indulging in self-transformation to excess.
-		<<set $activeSlaveOneTimeMinAge = 18>>
-		<<set $activeSlaveOneTimeMaxAge = 42>>
-		<<include "Generate XY Slave">>
-		<<set $activeSlave.face = 100>>
-		<<set $activeSlave.faceImplant = 15>>
-		<<set $activeSlave.faceShape = "androgynous">>
-		<<set $activeSlave.muscles = 20>>
-		<<set $activeSlave.height = random(185,215)>>
-		<<set $activeSlave.lips = 35>>
-		<<set $activeSlave.butt = either(4, 5, 6)>>
-		<<set $activeSlave.boobs = either(800, 1000, 1200)>>
-		<<set $activeSlave.dick = 6>>
-		<<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
-		<<set $activeSlave.balls = 10>>
-		<<set $activeSlave.anus = 3>>
-		<<set $activeSlave.vagina = -1>>
-		<<set $activeSlave.weight = 20>>
-		<<set $activeSlave.oralSkill = 100>>
-		<<set $activeSlave.analSkill = 100>>
-		<<set $activeSlave.whoreSkill = 15>>
-		<<set $activeSlave.entertainSkill = 100>>
-		<<set $activeSlave.combatSkill = 0>>
-		<<set $activeSlave.clitPiercing = 2>>
-		<<set $activeSlave.nipplesPiercing = 1>>
-		<<set $activeSlave.earPiercing = 1>>
-		<<set $activeSlave.tonguePiercing = 1>>
-		<<set $activeSlave.eyebrowPiercing = 1>>
-		<<set $activeSlave.behavioralFlaw = "odd">>
-		<<set $activeSlave.behavioralQuirk = "confident">>
-		<<set $activeSlave.sexualFlaw = "judgemental">>
-		<<set $activeSlave.sexualQuirk = "romantic">>
-		<<set $activeSlave.hStyle = "luxurious">>
-		<<set $activeSlave.hLength = 80>>
-	<<elseif $seed == "cum addict">>
-		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>>
-		<<include "Generate XY Slave">>
-		<<set $activeSlave.chem = 3000>>
-		<<set $activeSlave.face = 100>>
-		<<set $activeSlave.faceShape = "masculine">>
-		<<set $activeSlave.muscles = 100>>
-		<<set $activeSlave.height = random(185,215)>>
-		<<set $activeSlave.lips = 10>>
-		<<set $activeSlave.butt = 10>>
-		<<set $activeSlave.boobs = either(100, 200)>>
-		<<set $activeSlave.dick = 6>>
-		<<set $activeSlave.foreskin = 0>>
-		<<set $activeSlave.balls = 300>>
-		<<set $activeSlave.scrotum = 1>>
-		<<set $activeSlave.anus = 3>>
-		<<set $activeSlave.vagina = -1>>
-		<<set $activeSlave.weight = -35>>
-		<<set $activeSlave.oralSkill = 0>>
-		<<set $activeSlave.analSkill = 100>>
-		<<set $activeSlave.whoreSkill = 15>>
-		<<set $activeSlave.entertainSkill = 100>>
-		<<set $activeSlave.combatSkill = 0>>
-		<<set $activeSlave.dickPiercing = 2>>
-		<<set $activeSlave.fetish = "pregnancy">>
-		<<set $activeSlave.fetishStrength = 100>>
-		<<set $activeSlave.behavioralFlaw = "odd">>
-		<<set $activeSlave.behavioralQuirk = "confident">>
-		<<set $activeSlave.sexualFlaw = "cum addict">>
-		<<set $activeSlave.sexualQuirk = "size queen">>
-		<<set $activeSlave.hStyle = "neat">>
-		<<set $activeSlave.hLength = 20>>
-	<<elseif $seed == "hung shota">>
-		not immediately apparent: she's young, in good shape, and not lacking down there at all.
-		<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
-		<<set $activeSlaveOneTimeMaxAge = 18>>
-		<<include "Generate XY Slave">>
-		<<set $activeSlave.face = 100>>
-		<<set $activeSlave.faceShape = "androgynous">>
-		<<set $activeSlave.muscles = 0>>
-		<<set $activeSlave.lips = 10>>
-		<<set $activeSlave.butt = 0>>
-		<<set $activeSlave.boobs = either(100, 200)>>
-		<<set $activeSlave.dick = 6>>
-		<<set $activeSlave.foreskin = $activeSlave.dick>>
-		<<set $activeSlave.balls = 6>>
-		<<set $activeSlave.scrotum = 6>>
-		<<set $activeSlave.anus = 0>>
-		<<set $activeSlave.vagina = -1>>
-		<<set $activeSlave.weight = -35>>
-		<<set $activeSlave.oralSkill = 0>>
-		<<set $activeSlave.analSkill = 0>>
-		<<set $activeSlave.whoreSkill = 0>>
-		<<set $activeSlave.entertainSkill = 100>>
-		<<set $activeSlave.combatSkill = 0>>
-		<<set $activeSlave.dickPiercing = 2>>
-		<<set $activeSlave.pubertyXY = 1>>
-		<<set $activeSlave.fetish = "pregnancy">>
-		<<set $activeSlave.fetishStrength = 100>>
-		<<set $activeSlave.behavioralFlaw = "hates men">>
-		<<set $activeSlave.behavioralQuirk = "adores women">>
-		<<set $activeSlave.sexualFlaw = "shamefast">>
-		<<set $activeSlave.sexualQuirk = "perverted">>
-		<<set $activeSlave.hLength = 20>>
-	<<elseif $seed == "masculine">>
-		not immediately apparent: she's in good shape, if quite masculine.
-		<<set $activeSlaveOneTimeMinAge = 18>>
-		<<set $activeSlaveOneTimeMaxAge = 42>>
-		<<include "Generate XY Slave">>
-		<<set $activeSlave.face = 55>>
-		<<set $activeSlave.faceImplant = 0>>
-		<<set $activeSlave.faceShape = "masculine">>
-		<<set $activeSlave.muscles = either(20, 50, 100)>>
-		<<set $activeSlave.height = random(185,195)>>
-		<<set $activeSlave.butt = either(2, 3)>>
-		<<set $activeSlave.boobs = either(100, 200)>>
-		<<set $activeSlave.dick = 5>>
-		<<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
-		<<set $activeSlave.balls = 5>>
-		<<set $activeSlave.anus = 0>>
-		<<set $activeSlave.vagina = -1>>
-		<<set $activeSlave.weight = 0>>
-		<<set $activeSlave.vaginalSkill = 0>>
-		<<set $activeSlave.oralSkill = 15>>
-		<<set $activeSlave.analSkill = 0>>
-		<<set $activeSlave.whoreSkill = 0>>
-		<<set $activeSlave.entertainSkill = 15>>
-		<<set $activeSlave.combatSkill = 1>>
-		<<set $activeSlave.behavioralFlaw = "hates men">>
-		<<set $activeSlave.behavioralQuirk = "fitness">>
-		<<set $activeSlave.sexualFlaw = "hates anal">>
-		<<set $activeSlave.sexualQuirk = "perverted">>
-		<<set $activeSlave.hStyle = "neat">>
-		<<set $activeSlave.hLength = 5>>
-	<<elseif $seed == "micropenis">>
-		immediately apparent: she's got a slavegirl's cock and balls, not an arcology owner's.
-		<<set $activeSlaveOneTimeMinAge = 18>>
-		<<set $activeSlaveOneTimeMaxAge = 42>>
-		<<include "Generate XY Slave">>
-		<<set $activeSlave.face = 55>>
-		<<set $activeSlave.faceImplant = 0>>
-		<<set $activeSlave.faceShape = "masculine">>
-		<<set $activeSlave.muscles = 0>>
-		<<set $activeSlave.height = random(145,160)>>
-		<<set $activeSlave.butt = either(2, 4)>>
-		<<set $activeSlave.boobs = either(100, 400)>>
-		<<set $activeSlave.dick = 1>>
-		<<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
-		<<set $activeSlave.balls = 2>>
-		<<set $activeSlave.anus = 1>>
-		<<set $activeSlave.vagina = -1>>
-		<<set $activeSlave.weight = 100>>
-		<<set $activeSlave.vaginalSkill = 0>>
-		<<set $activeSlave.oralSkill = 15>>
-		<<set $activeSlave.analSkill = 15>>
-		<<set $activeSlave.whoreSkill = 0>>
-		<<set $activeSlave.entertainSkill = 15>>
-		<<set $activeSlave.combatSkill = 0>>
-		<<set $activeSlave.behavioralFlaw = "hates men">>
-		<<set $activeSlave.behavioralQuirk = "insecure">>
-		<<set $activeSlave.sexualFlaw = "shamefast">>
-		<<set $activeSlave.sexualQuirk = "perverted">>
-		<<set $activeSlave.hStyle = "neat">>
-		<<set $activeSlave.hLength = 5>>
-	<<elseif $seed == "bull dyke">>
-		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>>
-		<<include "Generate XX Slave">>
-		<<set $activeSlave.face = 55>>
-		<<set $activeSlave.faceImplant = 0>>
-		<<set $activeSlave.faceShape = "androgynous">>
-		<<set $activeSlave.muscles = 100>>
-		<<set $activeSlave.height = random(185,195)>>
-		<<set $activeSlave.lipsImplant = 10>>
-		<<set $activeSlave.lips = 35>>
-		<<set $activeSlave.buttImplant = 1>>
-		<<set $activeSlave.butt += $activeSlave.buttImplant>>
-		<<set $activeSlave.boobs -= 100>>
-		<<set $activeSlave.boobsImplant = either(400, 600, 800)>>
-		<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
-		<<set $activeSlave.clit = 2>>
-		<<set $activeSlave.anus = 1>>
-		<<set $activeSlave.vagina = 1>>
-		<<set $activeSlave.preg = -1>>
-		<<set $activeSlave.vaginalSkill = 15>>
-		<<set $activeSlave.oralSkill = 0>>
-		<<set $activeSlave.analSkill = 15>>
-		<<set $activeSlave.whoreSkill = 0>>
-		<<set $activeSlave.entertainSkill = 0>>
-		<<set $activeSlave.combatSkill = 1>>
-		<<set $activeSlave.clitPiercing = 1>>
-		<<set $activeSlave.earPiercing = 1>>
-		<<set $activeSlave.behavioralFlaw = "hates men">>
-		<<set $activeSlave.behavioralQuirk = "fitness">>
-		<<set $activeSlave.sexualFlaw = "hates penetration">>
-		<<set $activeSlave.sexualQuirk = "unflinching">>
-		<<set $activeSlave.hStyle = "neat">>
-		<<set $activeSlave.hLength = 5>>
-	<<elseif $seed == "breeder">>
-		immediately apparent: there's nothing wrong with having a pregnancy fetish, but applying it to oneself is ill-fitting for an arcology owner.
-		<<if $pedo_mode == 1>>
-			<<set $activeSlaveOneTimeMinAge = ($fertilityAge + 6)>>
-			<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have been pregnant many times. %/
-		<<else>>
-			<<set $activeSlaveOneTimeMinAge = 18>>
-			<<set $activeSlaveOneTimeMaxAge = 42>>
-		<</if>>
-		<<include "Generate XX Slave">>
-		<<set $activeSlave.pubertyXX = 1>>
-		<<set $activeSlave.face = 100>>
-		<<set $activeSlave.faceImplant = 0>>
-		<<set $activeSlave.faceShape = "sensual">>
-		<<set $activeSlave.muscles = 50>>
-		<<set $activeSlave.lips = 35>>
-		<<set $activeSlave.butt = either(6, 7, 8)>>
-		<<set $activeSlave.boobs = 5000>>
-		<<set $activeSlave.nipples = "huge">>
-		<<set $activeSlave.lactation = 1>>
-		<<set $activeSlave.anus = 1>>
-		<<set $activeSlave.preg = 25>>
-		<<if $seeHyperPreg == 1>>
-			<<set $activeSlave.vagina = 10>>
-			<<set $activeSlave.pregType = random(20,35)>>
-			<<set $activeSlave.birthsTotal = random(120,180)>>
-			<<set $activeSlave.bellySag = 30, $activeSlave.bellySagPreg = 30>>
-		<<else>>
-			<<set $activeSlave.vagina = 5>>
-			<<set $activeSlave.pregType = either(3,3,4,4,4,5,5,6,6,7,7,8,8,8)>>
-			<<set $activeSlave.birthsTotal = random(18,27)>>
-			<<set $activeSlave.bellySag = 2, $activeSlave.bellySagPreg = 2>>
-		<</if>>
-		<<set $activeSlave.pregKnown = 1>>
-		<<set $activeSlave.pregWeek = $activeSlave.preg>>
-		<<SetBellySize $activeSlave>>
-		<<set $activeSlave.vaginalSkill = 100>>
-		<<set $activeSlave.oralSkill = 15>>
-		<<set $activeSlave.analSkill = 15>>
-		<<set $activeSlave.whoreSkill = 35>>
-		<<set $activeSlave.entertainSkill = 15>>
-		<<set $activeSlave.combatSkill = 0>>
-		<<set $activeSlave.fetish = "pregnancy">>
-		<<set $activeSlave.fetishStrength = 1000>>
-		<<set $activeSlave.behavioralFlaw = "odd">>
-		<<set $activeSlave.behavioralQuirk = "adores men">>
-		<<set $activeSlave.sexualFlaw = "breeder">>
-		<<set $activeSlave.sexualQuirk = "caring">>
-		<<set $activeSlave.hStyle = "luxurious">>
-		<<set $activeSlave.hLength = 80>>
-	<<elseif $seed == "oppai loli">>
-		immediately apparent: she's young, inexperienced, and extremely top heavy.
-		<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
-		<<set $activeSlaveOneTimeMaxAge = 12>>
-		<<include "Generate XX Slave">>
-		<<set $activeSlave.face = 100>>
-		<<set $activeSlave.faceImplant = 0>>
-		<<set $activeSlave.faceShape = "cute">>
-		<<set $activeSlave.muscles = 20>>
-		<<set $activeSlave.weight = 60>>
-		<<set $activeSlave.lips = 10>>
-		<<set $activeSlave.butt = 1>>
-		<<set $activeSlave.hips = -1>>
-		<<set $activeSlave.shoulders = -2>>
-		<<set $activeSlave.boobs = 7000>>
-		<<set $activeSlave.nipples = "huge">>
-		<<set $activeSlave.anus = 0>>
-		<<set $activeSlave.vagina = 0>>
-		<<set $activeSlave.preg = 0>>
-		<<set $activeSlave.vaginalSkill = 0>>
-		<<set $activeSlave.oralSkill = 0>>
-		<<set $activeSlave.analSkill = 0>>
-		<<set $activeSlave.whoreSkill = 0>>
-		<<set $activeSlave.entertainSkill = 15>>
-		<<set $activeSlave.combatSkill = 0>>
-		<<set $activeSlave.behavioralFlaw = "odd">>
-		<<set $activeSlave.behavioralQuirk = "insecure">>
-		<<set $activeSlave.sexualFlaw = "shamefast">>
-		<<set $activeSlave.sexualQuirk = "tease">>
-		<<set $activeSlave.hStyle = "twin tails">>
-		<<set $activeSlave.hLength = 40>>
-	<<elseif $seed == "cow">>
-		immediately apparent: there's nothing wrong with having lactation and breast expansion fetishes, but applying them to oneself can be addictive.
-		<<include "Generate XX Slave">>
-		<<set $activeSlave.face = 55>>
-		<<set $activeSlave.faceImplant = 0>>
-		<<set $activeSlave.faceShape = "cute">>
-		<<set $activeSlave.muscles = 50>>
-		<<set $activeSlave.height = random(185,195)>>
-		<<set $activeSlave.lips = 35>>
-		<<set $activeSlave.butt = either(6, 7, 8)>>
-		<<set $activeSlave.boobs = 30000>>
-		<<set $activeSlave.weight = random(100,160)>>
-		<<set $activeSlave.nipples = "huge">>
-		<<set $activeSlave.lactation = 2>>
-		<<set $activeSlave.anus = 1>>
-		<<set $activeSlave.vagina = 2>>
-		<<set $activeSlave.preg = 0>>
-		<<set $activeSlave.vaginalSkill = 15>>
-		<<set $activeSlave.oralSkill = 15>>
-		<<set $activeSlave.analSkill = 0>>
-		<<set $activeSlave.whoreSkill = 0>>
-		<<set $activeSlave.entertainSkill = 15>>
-		<<set $activeSlave.combatSkill = 0>>
-		<<set $activeSlave.behavioralFlaw = "odd">>
-		<<set $activeSlave.behavioralQuirk = "insecure">>
-		<<set $activeSlave.sexualFlaw = "breast growth">>
-		<<set $activeSlave.sexualQuirk = "perverted">>
-		<<set $activeSlave.hStyle = "neat">>
-		<<set $activeSlave.hLength = 5>>
-	  <<elseif $seed == "bimbo">>
-		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>>
-		<<include "Generate XX Slave">>
-		<<set $activeSlave.face = 100>>
-		<<set $activeSlave.faceImplant = 65>>
-		<<set $activeSlave.faceShape = "sensual">>
-		<<set $activeSlave.muscles = 0>>
-		<<set $activeSlave.height = random(180,190)>>
-		<<set $activeSlave.lipsImplant = 2>>
-		<<set $activeSlave.lips = random(25,55)>>
-		<<set $activeSlave.buttImplant = 2>>
-		<<set $activeSlave.butt += $activeSlave.buttImplant>>
-		<<set $activeSlave.boobsImplant = either(600, 800, 1000)>>
-		<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
-		<<set $activeSlave.anus = 2>>
-		<<set $activeSlave.vagina = 1>>
-		<<set $activeSlave.preg = -1>>
-		<<set $activeSlave.vaginalSkill = 100>>
-		<<set $activeSlave.oralSkill = 100>>
-		<<set $activeSlave.analSkill = 35>>
-		<<set $activeSlave.whoreSkill = 35>>
-		<<set $activeSlave.entertainSkill = 35>>
-		<<set $activeSlave.combatSkill = 0>>
-		<<set $activeSlave.clitPiercing = 1>>
-		<<set $activeSlave.earPiercing = 1>>
-		<<set $activeSlave.behavioralFlaw = "arrogant">>
-		<<set $activeSlave.behavioralQuirk = "insecure">>
-		<<set $activeSlave.sexualFlaw = "crude">>
-		<<set $activeSlave.sexualQuirk = "caring">>
-		<<set $activeSlave.hStyle = "tails">>
-		<<set $activeSlave.hLength = 80>>
-	  <<else>>
-		immediately apparent: she seems to have recently fallen into serious aphrodisiac addiction.
-		<<set $activeSlaveOneTimeMinAge = 18>>
-		<<set $activeSlaveOneTimeMaxAge = 42>>
-		<<include "Generate XX Slave">>
-		<<set $activeSlave.face = 100>>
-		<<set $activeSlave.faceImplant = 15>>
-		<<set $activeSlave.muscles = 0>>
-		<<set $activeSlave.lips = 35>>
-		<<set $activeSlave.butt += random(1,3)>>
-		<<set $activeSlave.boobs += 200*random(1,3)>>
-		<<set $activeSlave.anus = 4>>
-		<<set $activeSlave.vagina = 4>>
-		<<set $activeSlave.preg = 2>>
-		<<set $activeSlave.pregKnown = 1>>
-		<<set $activeSlave.pregWeek = $activeSlave.preg>>
-		<<SetBellySize $activeSlave>>
-		<<set $activeSlave.vaginalSkill = 100>>
-		<<set $activeSlave.oralSkill = 100>>
-		<<set $activeSlave.analSkill = 100>>
-		<<set $activeSlave.whoreSkill = 100>>
-		<<set $activeSlave.entertainSkill = 0>>
-		<<set $activeSlave.combatSkill = 0>>
-		<<set $activeSlave.clitPiercing = 1>>
-		<<set $activeSlave.earPiercing = 1>>
-		<<set $activeSlave.behavioralFlaw = "bitchy">>
-		<<set $activeSlave.behavioralQuirk = "funny">>
-		<<set $activeSlave.sexualFlaw = "crude">>
-		<<set $activeSlave.sexualQuirk = "size queen">>
-		<<set $activeSlave.hStyle = "neat">>
-		<<set $activeSlave.hLength = 80>>
-		<<set $activeSlave.addict = 10>>
-	<</if>>
-	<<set $activeSlave.intelligence = 3>>
-	<<set $activeSlave.intelligenceImplant = 1>>
-	<<set $activeSlave.devotion = -20>>
-	<<set $activeSlave.trust = -10>>
-	<<set $activeSlave.origin = "She was once an arcology owner like yourself.">>
-	<<set $activeSlave.career = "an arcology owner">>
-	<<set $activeSlave.prestige = 3>>
-	<<set $activeSlave.prestigeDesc = "You bankrupted and enslaved her in revenge for her part in the attack on your arcology by the Daughters of Liberty.">>
-	<<set $activeSlave.health = 100>>
-	<<if $activeSlave.physicalAge > 35>><<set $activeSlave.ageImplant = 1>><<AgeImplantAdjustment $activeSlave>><</if>>
-	<<set $activeSlave.pubicHStyle = "waxed">>
-	<<set $activeSlave.underArmHStyle = "waxed">>
-	<<set $nextLink = "AS Dump", $returnTo = "P rival initiation", $rivalID = $activeSlave.ID>> /* proceed directly to rival initiation event after New Slave Intro */
-	<<include "New Slave Intro">>
+	<<include "pRivalryCapture">>
 	<</replace>>
 <</link>>
 </span>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 8deb8e20cb0..bfac8fae825 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -6111,7 +6111,7 @@
 		<<if ($slaves[$i].boobs > 30000+($slaves[$i].muscles*100))>>
 		<<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) || $arcologies[0].FSAssetExpansionistResearch == 0>>
 		<<if ($slaves[$i].drugs != "breast injections" && $slaves[$i].drugs != "intensive breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>>
-		<<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 400>>
+		<<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 300>>
 		<<if ($slaves[$i].boobs > 30000+($slaves[$i].muscles*100))>>
 			Her breasts are larger than her body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
 			<<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-25, 30000+($slaves[$i].muscles*100), 50000)>>
@@ -6169,7 +6169,7 @@
 		<<if ($slaves[$i].boobs > 5000+($slaves[$i].muscles*10))>>
 		<<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) || $arcologies[0].FSAssetExpansionistResearch == 0>>
 		<<if ($slaves[$i].drugs != "breast injections" && $slaves[$i].drugs != "intensive breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>>
-		<<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 400>>
+		<<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 300>>
 		<<if ($slaves[$i].boobs > 5000+($slaves[$i].muscles*10))>>
 			Her breasts are larger than her body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
 			<<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-25, 5000+($slaves[$i].muscles*10), 50000)>>
@@ -6236,7 +6236,7 @@
 		<<if ($slaves[$i].boobs > 10000+($slaves[$i].muscles*20))>>
 		<<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) || $arcologies[0].FSAssetExpansionistResearch == 0>>
 		<<if ($slaves[$i].drugs != "breast injections" && $slaves[$i].drugs != "intensive breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>>
-		<<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 400>>
+		<<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 300>>
 		<<if ($slaves[$i].boobs > 10000+($slaves[$i].muscles*20))>>
 			Her breasts are larger than her body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
 			<<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-25, 10000+($slaves[$i].muscles*20), 50000)>>
@@ -6303,7 +6303,7 @@
 		<<if ($slaves[$i].boobs > 20000+($slaves[$i].muscles*50))>>
 		<<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) || $arcologies[0].FSAssetExpansionistResearch == 0>>
 		<<if ($slaves[$i].drugs != "breast injections" && $slaves[$i].drugs != "intensive breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>>
-		<<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 400>>
+		<<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 300>>
 		<<if ($slaves[$i].boobs > 20000+($slaves[$i].muscles*50))>>
 			Her breasts are larger than her body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
 			<<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-25, 20000+($slaves[$i].muscles*50), 50000)>>
-- 
GitLab