From 207a5ef8d572a4dc8742c739d89cb5b5535ead41 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 12 Oct 2018 00:05:14 -0400
Subject: [PATCH] it helps to actually commit things first

---
 devNotes/VersionChangeLog-Premod+LoliMod.txt |   6 +
 src/pregmod/rePregInventor.tw                |   8 +-
 src/uncategorized/genericPlotEvents.tw       | 227 +++++++++++++++++--
 3 files changed, 223 insertions(+), 18 deletions(-)

diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index cadd07048b7..c0a2b6b0752 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,12 @@
 
 0.10.7.1-0.10.x
 
+10/12/2018
+
+	10
+	-fixes
+	-adjustments to how intelligence and education affects slave price
+
 10/11/2018
 
 	9
diff --git a/src/pregmod/rePregInventor.tw b/src/pregmod/rePregInventor.tw
index 966f3452651..a8c939f82f6 100644
--- a/src/pregmod/rePregInventor.tw
+++ b/src/pregmod/rePregInventor.tw
@@ -41,7 +41,13 @@
 		blushes and wiggles $his stumps, looking down.
 	<</if>>
 	<<if canTalk($activeSlave)>>
-		"<<Master>>," $he <<says>>s, "I love being your hyper-pregnant brood <<s>>lave. My poor <<if $eventSlave.mpreg == 1>>a<<ss>><</if>>pu<<ss>>y weep<<s>> every time a baby pa<<ss>>e<<s>> through it, and <<s>>o many have pa<<ss>>ed through—and, <<Master>>, it hurt<<s>>, <<s>>ometime<<s>>, but I love the feeling of my body <<s>>tretched fuller and fuller with life every day. There'<<s>> nothing I want more than to be your <<= lispReplace(SlaveTitle($activeSlave))>> until my body give<<s>> out. <<S>>o, <<Master>>, I really want to give <<s>>omething back to you for making my dream<<s>> come true."
+		"<<Master>>," $he <<say>>s, "I love being your hyper-pregnant brood <<s>>lave. My poor <<if $eventSlave.mpreg == 1>>a<<ss>><</if>>pu<<ss>>y weep<<s>> every time a baby pa<<ss>>e<<s>> through it, and <<s>>o many have pa<<ss>>ed through—and, <<Master>>, it hurt<<s>>, <<s>>ometime<<s>>, but I love the feeling of my body <<s>>tretched fuller and fuller with life every day. There'<<s>> nothing I want more than to be your
+		<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
+			<<= lispReplace(SlaveTitle($activeSlave))>>
+		<<else>>
+			SlaveTitle($activeSlave)
+		<</if>>
+		until my body give<<s>> out. <<S>>o, <<Master>>, I really want to give <<s>>omething back to you for making my dream<<s>> come true."
 	<<else>> 
 		<<if $activeSlave.amp < 1>>
 			$He signs to you that $he wants to give back to you for blessing $him with $his <<if $activeSlave.broodmother > 0>>permanently hyperpregnant<<else>>life-swollen<</if>> body.
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 8174f17d6e1..0f821c3d290 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -152,6 +152,9 @@ The crowd of nude slaves led up to the lawn and chained to rings along one edge
 	<<set _trapped.push("housewives")>>
 	<<if $seePreg != 0>>
 		<<set _trapped.push("maternity")>>
+		<<if $continent == "Africa">>
+			<<set _trapped.push("seizedMission")>>
+		<</if>>
 	<</if>>
 	<<set _trapped.push("volleyballTeam")>>
 <</if>>
@@ -175,24 +178,30 @@ A small old world country near the arcology is experiencing serious unrest. Its
 	a student stranded
 <<elseif $PAidTarget == "volleyballTeam">>
 	a student athlete
+<<elseif $PAidTarget == "seizedMission">>
+	the leader of a group of missionaries
 <</if>>
 in the capital city.
 <br><br>
-They are deeply worried by the situation. There have been large riots over the past week, and yesterday they became seriously violent. The unrest is targeting 
-<<if $PAidTarget == "convent">>
-	 better-off citizens, including the caller. Though most of the nuns have already left, the leader and a few of her women are now stuck in the area and are running out of options as the riots lock down transportation. 
-<<elseif $PAidTarget == "school">>
-	 better-off citizens, including the caller. Though most of the students have already made it out, the principal and a few students are now stuck in the area and are running out of options as the riots lock down transportation. 
-<<elseif $PAidTarget == "housewives">>
-	 better-off citizens, including the caller. Though most of them have taken flights out, the leader and a few of them are now stuck in the area and are running out of options as the riots lock down transportation. 
-<<elseif $PAidTarget == "maternity">>
-	better-off citizens, including the caller. Though most of the patients have already left, several of the most pregnant are now stuck in the area and are running out of options as the riots lock down transportation. 
-<<elseif $PAidTarget == "conversion">>
-	better-off citizens, including the caller. Though most of the camp's inmates have already left, a few of them and the owner are now stuck in the area and are running out of options as the riots lock down transportation. 
-<<elseif $PAidTarget == "gradeSchool">>
-	better-off citizens, including the caller. Though most of the other students and faculty escaped, a few of the students are now stuck in the school and are running out of options as the riots steadily creep closer to the grounds. 
-<<elseif $PAidTarget == "volleyballTeam">>
-	vulnerable citizens, including the caller. Their bus broke down on the way to the championship game and all those that have left to get help have not returned. Her and her several remaining teammates are running out of options as those looking for easy targets creep ever closer.
+<<if $PAidTarget != "seizedMission">>
+	They are deeply worried by the situation. There have been large riots over the past week, and yesterday they became seriously violent. The unrest is targeting
+	<<if $PAidTarget == "convent">>
+		 better-off citizens, including the caller. Though most of the nuns have already left, the leader and a few of her women are now stuck in the area and are running out of options as the riots lock down transportation. 
+	<<elseif $PAidTarget == "school">>
+		 better-off citizens, including the caller. Though most of the students have already made it out, the principal and a few students are now stuck in the area and are running out of options as the riots lock down transportation. 
+	<<elseif $PAidTarget == "housewives">>
+		 better-off citizens, including the caller. Though most of them have taken flights out, the leader and a few of them are now stuck in the area and are running out of options as the riots lock down transportation. 
+	<<elseif $PAidTarget == "maternity">>
+		better-off citizens, including the caller. Though most of the patients have already left, several of the most pregnant are now stuck in the area and are running out of options as the riots lock down transportation. 
+	<<elseif $PAidTarget == "conversion">>
+		better-off citizens, including the caller. Though most of the camp's inmates have already left, a few of them and the owner are now stuck in the area and are running out of options as the riots lock down transportation. 
+	<<elseif $PAidTarget == "gradeSchool">>
+		better-off citizens, including the caller. Though most of the other students and faculty escaped, a few of the students are now stuck in the school and are running out of options as the riots steadily creep closer to the grounds. 
+	<<elseif $PAidTarget == "volleyballTeam">>
+		vulnerable citizens, including the caller. Their bus broke down on the way to the championship game and all those that have left to get help have not returned. Her and her several remaining teammates are running out of options as those looking for easy targets creep ever closer.
+	<</if>>
+<<else>>
+	After years of constant rape and abuse, an opening finally arrived for escape when a rival faction raided the decaying church they were stored in, however the situation outside isn't much better. Violent riots are taking place and the mobs are eagerly snatching up what ever loot and women they can get their hands on. Her and the remaining women are trapped and in no condition to run; most particularly the youngest of the group who is ripe with child, though she herself and one of the others are also carrying their rapists' babies. They are completely out of options and as the looters work their way down the city streets.
 <</if>>
 They beg you to help evacuate them, and promise to pay you once they're out.
 
@@ -215,8 +224,10 @@ You watch on the feeds from your VTOL craft as it settles <<if $PAidTarget == "v
 	school whose students
 <<elseif $PAidTarget == "volleyballTeam">>
 	bus whose athletes
+<<elseif $PAidTarget == "seizedMission">>
+	building the raped missionaries
 <</if>>
-you promised to rescue. Its side doors retract, allowing the escapees to hustle aboard with their bundles of personal possessions. Once they're on board and strapped into their seats, the turbofans howl and the craft peels smoothly off the roof, the hot jet wash setting it alight. Once it transitions fully into level flight, the true plan goes into operation. At a carefully selected moment, injectors concealed within each seat lance into the passengers' buttocks, knocking them out. It works flawlessly, the drugs precisely calibrated to each body based on the weight added to the VTOL as each climbed aboard. This avoids the potential for over- or under-dosage present when using gas or darts to subdue groups. In perfect unison, the passengers slump against the harnesses holding them against the seats.
+you promised to rescue<<if $PAidTarget == "seizedMission">>  where held up in<</if>>. Its side doors retract, allowing the escapees to hustle aboard with their bundles of personal possessions. Once they're on board and strapped into their seats, the turbofans howl and the craft peels smoothly off the roof, the hot jet wash setting it alight. Once it transitions fully into level flight, the true plan goes into operation. At a carefully selected moment, injectors concealed within each seat lance into the passengers' buttocks, knocking them out. It works flawlessly, the drugs precisely calibrated to each body based on the weight added to the VTOL as each climbed aboard. This avoids the potential for over- or under-dosage present when using gas or darts to subdue groups. In perfect unison, the passengers slump against the harnesses holding them against the seats.
 <br><br>
 When the aircraft lands at your penthouse pad, the would-be escapees are still unconscious. This makes putting them through enslavement physically laborious, though it does cut down on the usual whining; fortunately, you reserved the credits necessary to obscure their questionably legitimate enslavement. By the time they awake, they'll be indistinguishable from any other new slave in the arcology. The possibility remains, however that rumor of the incident will leak out. Your VTOL bird's entry and exit from the capital city was likely noticed and remarked upon.
 <br><br>
@@ -455,6 +466,188 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
 		<<set $activeSlave.butt = random(1,2)>>
 		<<set _newSlaves.push($activeSlave)>>
 	<</for>>
+<<elseif $PAidTarget == "seizedMission">>
+	In any case, you've enslaved a fine group. The women will clean up nicely and are already accustomed to being rape and abused, so they should bear the transition to slave life reasonably well. The leader is a little older than the rest and clearly has been pregnant several times given the sag to her breasts and the stretch marks coating her swollen belly; it's clear she has a rape baby growing inside her. The next two are younger, but no better off; one is hugely pregnant and the other shows signs of a recent birth. The last, however, is the most eye-catching;
+	<<if $minimumSlaveAge < 8 && $fertilityAge < 8>>
+		she is just a little and a massively pregnant one at that. The leader was right to worry about her well-being, there is no way she would survive giving birth.
+	<<elseif $fertilityAge < 18 && $minimumSlaveAge < 18>>
+		she is in no way prepared to be as pregnant as she is. The leader was right to worry about her well-being, birth is going to be a struggle for her.
+	<<else>>
+		her stomach has already dropped and she clearly has no experience with pregnancy. The leader was right to worry about her well-being, her body is ill-suited for childbirth.
+	<</if>>
+	/* we need our child genetics blacked */
+	/* leader */
+	<<if $pedo_mode == 1>>
+		<<set $activeSlaveOneTimeMinAge = 18>>
+		<<set $activeSlaveOneTimeMaxAge = 24>>
+	<<else>>
+		<<set $activeSlaveOneTimeMinAge = 25>>
+		<<set $activeSlaveOneTimeMaxAge = 39>>
+	<</if>>
+	<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to be pregnant. %/
+	<<set $oneTimeDisableDisability = 1>>
+	<<set $fixedRace = "white">>
+	<<include "Generate XX Slave">>
+	<<set $activeSlave.origin = "She was the head nun of a conquered mission. Once claimed, she was reduced to nothing more than a cum dump for her black masters.">>
+	<<set $activeSlave.career = "a nun">>
+	<<set $activeSlave.intelligence = random(16,80)>>
+	<<set $activeSlave.intelligenceImplant = 15>>
+	<<set $activeSlave.devotion = 40>>
+	<<set $activeSlave.trust = random(0,40)>>
+	<<set $activeSlave.health = random(-50,-10)>>
+	<<set $activeSlave.anus = 3>>
+	<<set $activeSlave.vagina = 5>>
+	<<set $activeSlave.weight = random(-80,-20)>>
+	<<set $activeSlave.muscles = random(-20,0)>>
+	<<set $activeSlave.waist = random(-40,0)>>
+	<<set $activeSlave.attrXY = random(0,10)>>
+	<<set $activeSlave.energy = random(0,20)>>
+	<<set $activeSlave.vaginalSkill = 50>>
+	<<set $activeSlave.oralSkill = 75>>
+	<<set $activeSlave.analSkill = 25>>
+	<<set $activeSlave.pubicHStyle = "bushy">>
+	<<set $activeSlave.underarmHStyle = "bushy">>
+	<<set $activeSlave.preg = random(15,25)>>
+	<<set $activeSlave.pregType = 1>>
+	<<set $activeSlave.pregKnown = 1>>
+	<<set $activeSlave.pregWeek = $activeSlave.preg>>
+	<<run SetBellySize($activeSlave)>>
+	<<set $activeSlave.birthsTotal = 3>>
+	<<set $activeSlave.bellySag = 5>>
+	<<set $activeSlave.bellySagPreg = 5>>
+	<<set $activeSlave.boobs += 100*random(1,3)>>
+	<<set $activeSlave.lactation = 1>>
+	<<set $activeSlave.boobShape = "saggy">>
+	<<set $activeSlave.nipples = "huge">>
+	<<set _newSlaves.push($activeSlave)>>
+	/* preggo */
+	<<if $pedo_mode == 1>>
+		<<set $activeSlaveOneTimeMinAge = 16>>
+		<<set $activeSlaveOneTimeMaxAge = 18>>
+	<<else>>
+		<<set $activeSlaveOneTimeMinAge = 18>>
+		<<set $activeSlaveOneTimeMaxAge = 24>>
+	<</if>>
+	<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to be pregnant. %/
+	<<set $oneTimeDisableDisability = 1>>
+	<<set $fixedRace = "white">>
+	<<include "Generate XX Slave">>
+	<<set $activeSlave.origin = "She was a nun in a felled mission. Once claimed, she was reduced to nothing more than a cum dump for her black masters.">>
+	<<set $activeSlave.career = "a nun">>
+	<<set $activeSlave.intelligenceImplant = 15>>
+	<<set $activeSlave.devotion = 30>>
+	<<set $activeSlave.trust = random(-20,20)>>
+	<<set $activeSlave.health = random(-60,-10)>>
+	<<set $activeSlave.anus = 3>>
+	<<set $activeSlave.vagina = 4>>
+	<<set $activeSlave.weight = random(-90,-20)>>
+	<<set $activeSlave.muscles = random(-50,-20)>>
+	<<set $activeSlave.waist = random(-40,0)>>
+	<<set $activeSlave.attrXY = random(0,10)>>
+	<<set $activeSlave.energy = random(0,20)>>
+	<<set $activeSlave.vaginalSkill = 50>>
+	<<set $activeSlave.oralSkill = 75>>
+	<<set $activeSlave.analSkill = 25>>
+	<<set $activeSlave.pubicHStyle = "bushy">>
+	<<set $activeSlave.underarmHStyle = "bushy">>
+	<<set $activeSlave.preg = random(30,35)>>
+	<<set $activeSlave.pregType = 1>>
+	<<set $activeSlave.pregKnown = 1>>
+	<<set $activeSlave.pregWeek = $activeSlave.preg>>
+	<<run SetBellySize($activeSlave)>>
+	<<set $activeSlave.birthsTotal = 3>>
+	<<set $activeSlave.bellySag = 5>>
+	<<set $activeSlave.bellySagPreg = 5>>
+	<<set $activeSlave.boobs += 100*random(0,2)>>
+	<<set $activeSlave.lactation = 1>>
+	<<set $activeSlave.boobShape = "saggy">>
+	<<set $activeSlave.nipples = either("cute", "puffy")>>
+	<<set _newSlaves.push($activeSlave)>>
+	/* post preggo */
+	<<if $pedo_mode == 1>>
+		<<set $activeSlaveOneTimeMinAge = 16>>
+		<<set $activeSlaveOneTimeMaxAge = 18>>
+	<<else>>
+		<<set $activeSlaveOneTimeMinAge = 19>>
+		<<set $activeSlaveOneTimeMaxAge = 22>>
+	<</if>>
+	<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to be pregnant. %/
+	<<set $oneTimeDisableDisability = 1>>
+	<<set $fixedRace = "white">>
+	<<include "Generate XX Slave">>
+	<<set $activeSlave.origin = "She was a nun in a felled mission. Once claimed, she was reduced to nothing more than a cum dump for her black masters.">>
+	<<set $activeSlave.career = "a nun">>
+	<<set $activeSlave.devotion = 50>>
+	<<set $activeSlave.trust = random(0,50)>>
+	<<set $activeSlave.health = random(-90,-50)>>
+	<<set $activeSlave.anus = 3>>
+	<<set $activeSlave.vagina = 5>>
+	<<set $activeSlave.weight = random(-90,-60)>>
+	<<set $activeSlave.muscles = random(-70,-20)>>
+	<<set $activeSlave.waist = random(-10,0)>>
+	<<set $activeSlave.attrXY = random(0,10)>>
+	<<set $activeSlave.energy = random(0,20)>>
+	<<set $activeSlave.vaginalSkill = 50>>
+	<<set $activeSlave.oralSkill = 75>>
+	<<set $activeSlave.analSkill = 25>>
+	<<set $activeSlave.pubicHStyle = "bushy">>
+	<<set $activeSlave.underarmHStyle = "bushy">>
+	<<set $activeSlave.preg = 0>>
+	<<set $activeSlave.pregWeek = -3>>
+	<<set $activeSlave.birthsTotal = 2>>
+	<<set $activeSlave.bellySag = 5>>
+	<<set $activeSlave.bellySagPreg = 5>>
+	<<set $activeSlave.boobs += 100*random(1,3)>>
+	<<set $activeSlave.lactation = 1>>
+	<<set $activeSlave.boobShape = "saggy">>
+	<<set $activeSlave.nipples = either("cute", "puffy")>>
+	<<set _newSlaves.push($activeSlave)>>
+	/* young preggo*/
+	<<if $minimumSlaveAge < $fertilityAge>>
+		<<set $activeSlaveOneTimeMinAge = $fertilityAge>>
+		<<set $activeSlaveOneTimeMaxAge = $fertilityAge>>
+	<<else>>
+		<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
+		<<set $activeSlaveOneTimeMaxAge = $minimumSlaveAge>>
+	<</if>>
+	<<set $one_time_age_overrides_pedo_mode = 1>>
+	<<set $oneTimeDisableDisability = 1>>
+	<<set $fixedRace = "white">>
+	<<include "Generate XX Slave">>
+	<<set $activeSlave.origin = "She was a fucktoy held in a felled mission. She was nothing more than a cum dump to her black masters for years.">>
+	<<set $activeSlave.career = "an orphan">>
+	<<set $activeSlave.devotion = -20>>
+	<<set $activeSlave.trust = random(-100,-80)>>
+	<<set $activeSlave.health = random(-90,-70)>>
+	<<set $activeSlave.anus = 3>>
+	<<set $activeSlave.vagina = 5>>
+	<<set $activeSlave.weight = -100,-60
+	<<set $activeSlave.muscles = random(-100,-80)>>
+	<<set $activeSlave.waist = random(-40,-10)>>
+	<<set $activeSlave.attrXY = random(0,10)>>
+	<<set $activeSlave.energy = random(0,20)>>
+	<<set $activeSlave.vaginalSkill = 75>>
+	<<set $activeSlave.oralSkill = 75>>
+	<<set $activeSlave.analSkill = 50>>
+	<<set $activeSlave.pubicHStyle = "bushy">>
+	<<set $activeSlave.underarmHStyle = "bushy">>
+	<<set $activeSlave.preg = 40>>
+	<<set $activeSlave.pregType = 1>>
+	<<set $activeSlave.pregKnown = 1>>
+	<<set $activeSlave.pregWeek = $activeSlave.preg>>
+	<<run SetBellySize($activeSlave)>>
+	<<set $activeSlave.birthsTotal = 0>>
+	<<set $activeSlave.bellySag = 5>>
+	<<set $activeSlave.bellySagPreg = 5>>
+	<<if $activeSlave.boobs < 300>>
+		<<set $activeSlave.boobs = 400>>
+	<<else>>
+		<<set $activeSlave.boobs += 100>>
+	<</if>>
+	<<set $activeSlave.lactation = 1>>
+	<<set $activeSlave.boobShape = either("perky", "torpedo-shaped")>>
+	<<set $activeSlave.nipples = either("cute", "puffy")>>
+	<<set _newSlaves.push($activeSlave)>>
 <<else>>
 	In any case, you've enslaved a fine group. The women seem to have banded together when they were left to fend for themselves in their suburban neighborhood. They're older than many slaves, but they seem to have had rich husbands; they're conventionally pretty, and have lived soft lives that have left them healthy.
 	<<for $i = 0; $i < 4; $i++>>
@@ -463,7 +656,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
 		<<set $oneTimeDisableDisability = 1>>
 		<<include "Generate XX Slave">>
 		<<set $activeSlave.origin = "She was a wealthy housewife who you enslaved as she fled societal collapse.">>
-	<<set $activeSlave.career = "a housewife">>
+		<<set $activeSlave.career = "a housewife">>
 		<<set $activeSlave.devotion = -20>>
 		<<set $activeSlave.trust = random(-10,10)>>
 		<<set $activeSlave.health = random(30,50)>>
-- 
GitLab