From e6d0754d0c44e97b2999ecc3d950e6a0d39f73fc Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 23 Feb 2018 18:23:43 -0500
Subject: [PATCH] fixes and a new, disabled, event
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 7 ++-
src/npc/abort.tw | 15 ++---
src/pregmod/birthStorm.tw | 10 ++--
src/uncategorized/randomNonindividualEvent.tw | 3 +
src/uncategorized/reRecruit.tw | 55 +++++++++++++++++++
5 files changed, 75 insertions(+), 15 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 5f1811486a8..27f08367c2b 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -3,7 +3,12 @@
0.10.7.0/1
2/23/18
-
+
+ 366
+ -more support from pregmodfan to his new system
+ -fixes to the facility decoration bug
+ -other fixes
+
365
-SFanon's player hacking skill (basic implementation)
Still more to come with it.
diff --git a/src/npc/abort.tw b/src/npc/abort.tw
index db1ac080218..c92c485f779 100644
--- a/src/npc/abort.tw
+++ b/src/npc/abort.tw
@@ -6,25 +6,22 @@
The remote surgery makes aborting a pregnancy quick and efficient. $activeSlave.slaveName is
<<if $activeSlave.fetish == "pregnancy">>
@@.red;fundamentally broken.@@ Her entire concept of self and sexuality was wrapped up in the life growing within her, and now it is gone.
- <<set $activeSlave.fetish to "mindbroken">>
+ <<set $activeSlave.fetish = "mindbroken">>
<<elseif $activeSlave.devotion < -50>>
@@.mediumorchid;filled with violent, consuming hatred@@. Even though she knew her baby was destined for a slave orphanage, it seems she cared for it and views you as its killer. She is @@.gold;terrified of your power@@ over her body.
- <<set $activeSlave.trust -= 10>>
- <<set $activeSlave.devotion -= 25>>
+ <<set $activeSlave.trust -= 10, $activeSlave.devotion -= 25>>
<<elseif $activeSlave.devotion < -20>>
@@.mediumorchid;afflicted by desperate, inconsolable sobbing@@. Even though she knew her baby was destined for a slave orphanage, it seems she cared for it. She is @@.gold;terrified of your power@@ over her body.
- <<set $activeSlave.trust -= 10>>
- <<set $activeSlave.devotion -= 10>>
+ <<set $activeSlave.trust -= 10, $activeSlave.devotion -= 10>>
<<elseif $activeSlave.devotion <= 20>>
@@.mediumorchid;consumed by muted weeping and enduring sorrow@@. Even though she knew her baby was destined for a slave orphanage, it seems she cared for it. She is @@.gold;terrified of your power@@ over her body.
- <<set $activeSlave.trust -= 10>>
- <<set $activeSlave.devotion -= 5>>
+ <<set $activeSlave.trust -= 10, $activeSlave.devotion -= 5>>
<<elseif $activeSlave.devotion <= 50>>
dully obedient. She has been broken to slave life so thoroughly that even this is neither surprising nor affecting. She is @@.gold;terrified of your power@@ over her body.
- <<set $activeSlave.trust -= 10>>
+ <<set $activeSlave.trust -= 10>>
<<else>>
@@.hotpink;pleased by this stark development@@, since she is so attentive to your will. She also expects she'll be able to fuck better now.
- <<set $activeSlave.devotion += 4>>
+ <<set $activeSlave.devotion += 4>>
<</if>>
<<if lastPregRule($activeSlave,$defaultRules)>><<set $activeSlave.preg = -1>><<else>><<set $activeSlave.preg = 0>><</if>>
diff --git a/src/pregmod/birthStorm.tw b/src/pregmod/birthStorm.tw
index 4d3b612846d..9a5ac69f57c 100644
--- a/src/pregmod/birthStorm.tw
+++ b/src/pregmod/birthStorm.tw
@@ -2,16 +2,16 @@
<<set $nextButton = "Back", $nextLink = "Slave Interact">>
-<<set $activeSlave.curBabies = WombBirth($activeSlave, 34)>> /*Here check - how much children survive this event. 34 weeks minimum.*/
+<<set $activeSlave.curBabies = WombBirth($activeSlave, 34)>> /*Here check - how many children survive this event. 34 weeks minimum.*/
<<set _curBabies = $activeSlave.curBabies>>
The remote surgery allows the removal of the pregnancy generator through conventional means, an injection to induce labor and the resulting birthing of the womb's contents.
<<if $activeSlave.pregType > 40>>
- $activeSlave.slaveName's obscenely swollen belly begins to shudder and writhe moments after being injected with the drug. She spread to either side of her spasming bulk as wide as she can with a loud moan. Her vaginal lips part as the first of her brood is born, followed by another, and another. After hours of constant
+ $activeSlave.slaveName's obscenely swollen belly begins to shudder and writhe moments after being injected with the drug as all her waters break. She spreads her <<if $activeSlave.amp != 1>>legs to either side of her spasming bulk as wide as she can<<else>>stumps as wide as che can<</if>> with a loud moan. Her vaginal lips part as the first of her brood is born, followed by another, and another. After hours of constant
<<elseif $activeSlave.pregType > 20>>
- $activeSlave.slaveName's massive belly shudders and shrinks as all her waters simultaneously break. She spreads her legs wide with a loud moan. Her vaginal lips part as the first of her brood is born, followed not long after by another. After an hour of constant
+ $activeSlave.slaveName's massive belly shudders and shrinks as all her waters simultaneously break. She spreads her <<if $activeSlave.amp != 1>>legs<<else>>stumps<</if>> wide with a loud moan. Her vaginal lips part as the first of her brood is born, followed not long after by another. After an hour of constant
<<else>>
- $activeSlave.slaveName's massive belly shudders and shrinks as all her waters simultaneously break. She spreads her legs wide with a loud moan. Her vaginal lips part as her birthing begin. After an hour of intensive
+ $activeSlave.slaveName's massive belly shudders and shrinks as all her waters simultaneously break. She spreads her <<if $activeSlave.amp != 1>>legs<<else>>stumps<</if>> wide with a loud moan. Her vaginal lips part as her birthing begin. After an hour of intensive
<</if>>
<<if $activeSlave.fetish == "mindbroken">>
birthing, she shows little interest in the changes to her body. @@.red;The ordeal of intensive birthing has had a massive effect on her health as well as completely destroying her vagina.@@
@@ -51,7 +51,7 @@ The remote surgery allows the removal of the pregnancy generator through convent
<</if>>
<<set $activeSlave.health -= 80>>
<<else>>
- <<set $activeSlave.preg = -1>> /* I think, it's not logical to break her reprofuctive system out of repair, if she is only type 1 broodmother. In this case she have to birth only like 5-10 fully grown babies, others get progressively smaller. It's should be even smaller stress to body then for "normal" hyperpregnant with 15-20+ children - they have to birth them all at full size.*/
+ <<if lastPregRule($activeSlave,$defaultRules)>><<set $activeSlave.preg = -1>><<else>><<set $activeSlave.preg = 0>><</if>> /* I think, it's not logical to break her reprofuctive system out of repair, if she is only type 1 broodmother. In this case she have to birth only like 5-10 fully grown babies, others get progressively smaller. It's should be even smaller stress to body then for "normal" hyperpregnant with 15-20+ children - they have to birth them all at full size.*/
<<if $activeSlave.vagina < 6>>
<<set $activeSlave.vagina = 6>>
<</if>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 2ac51dc1084..d8f547e4d46 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -511,6 +511,9 @@
<<if ($mercenaries >= 5)>>
<<set $recruit.push("female runaway")>>
<</if>>
+ <<if $seeHyperPreg == 1 && $cheatMode == 1>>
+ <<set $recruit.push("overwhelmed farmgirl")>>
+ <</if>>
<</if>>
<<set $recruit.push("female SD")>>
<<set $recruit.push("female SD 2")>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 64d30af4228..6a428c7b300 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -1739,6 +1739,52 @@ As you are heading back to your penthouse from inspecting a new line of sex shop
<</if>>
Every push, every desperate contraction must be agonizing to her. Fortunately you know what to do, however, it will not come cheap. Hour after hour you work with the girl, her dept to you growing ever higher, until you finally manage to coax the newborn from her battered body. She smiles at her baby before losing consciousness, she is in really bad shape. Odds are her child will grow up an orphan, even if you call in her debt.
+<<case "overwhelmed farmgirl">>
+
+<<include "Generate XX Slave">>
+<<set $activeSlave.origin = "She sold herself into slavery to feed herself and her growing brood.">>
+<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMinAge = 16>>
+<<set $activeSlaveOneTimeMaxAge = 24>>
+<<set $one_time_age_overrides_pedo_mode = 1>>
+<<include "Generate XX Slave">>
+<<set $activeSlave.origin = "She begged to be enslaved under fear of starvation.">>
+<<set $activeSlave.career = "a farm laborer">>
+<<set $activeSlave.health = random(-35,-10)>>
+<<set $activeSlave.devotion = random(35,45)>>
+<<set $activeSlave.trust = random(15,25)>>
+<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
+<<set $activeSlave.preg = 40>>
+<<set $activeSlave.pregType = 5>>
+<<set $activeSlave.pregKnown = 1>>
+<<set $activeSlave.pregWeek = $activeSlave.preg>>
+<<set $activeSlave.belly = 80000, $activeSlave.bellyPreg = 80000>> /* bait and switch! */
+<<set $activeSlave.ovaries = 1>>
+<<set $activeSlave.face = -15>>
+<<set $activeSlave.vagina = 1>>
+<<set $activeSlave.anus = 0>>
+<<set $activeSlave.weight = random(-80,-50)>>
+<<set $activeSlave.muscles = 20>>
+<<set $activeSlave.underArmHStyle = "bushy">>
+<<set $activeSlave.pubicHStyle = "bushy">>
+<<set $activeSlave.boobs = 700>>
+<<set $activeSlave.boobShape = "torpedo-shaped">>
+<<set $activeSlave.nipples = "puffy">>
+<<set $activeSlave.lactation = 1>>
+<<set $activeSlave.vaginaLube = 1>>
+<<set $activeSlave.butt = 3>>
+<<set $activeSlave.tired = 1>>
+<<set $activeSlave.sexualQuirk = "caring">>
+<<set $activeSlave.bellySag = 20>>
+<<set $activeSlave.bellySagPreg = 20>>
+<<set $activeSlave.pubertyXX = 1>>
+<<set $activeSlave.waist = 5>>
+<<if $activeSlave.accent > 2>>
+ <<set $activeSlave.accent = 2>>
+<</if>>
+
+Your desk flags a video message as having potential. It's a rather homely farmer begging for you to enslave her, not truly unusual given the ever increasing droughts and dangerous weather patterns. Given the huge stomach rounding out her worn clothing, she is likely ready to drop quints and desperately seeking any sort of future for them. You allow her to speak her plea. "Please <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>, I just can't go on out here. I'm always hungry and can barely even work with this belly in the way. I swear, it gets heavier every day and a life of physical labor just won't let me get by. I don't know what I'll do if you say no, so please, have mercy on a poor farmer."
+
<</switch>> /* END SLAVE GENERATION AND INTRODUCTION */
<<switch $recruit>>
@@ -1868,6 +1914,12 @@ Every push, every desperate contraction must be agonizing to her. Fortunately yo
She cooperates as the biometric scanners scrupulously record her every particular as belonging not to a person but to a piece of human property. She willingly places her biometric signature in testament to the truth of her voluntary enslavement. The process is completed with a distinct anticlimax: she is one of your slaves now. She looks almost relaxed, content in the knowledge that her daughters education has been paid in full.
<<case "immigrant">>
She comes immediately from the immigration center to your arcology. You patiently explain the realities of the situation to her. She isn't too bright and it takes a while for things to sink in. The scanners finally do it, though. She sobs as the biometric scanners scrupulously record her every particular as belonging not to a person but to a piece of human property. She tries to resist placing her biometric signature in testament to the truth of her debt, but when you observe that the alternative is death, she complies. The process is completed with a distinct anticlimax: she is one of your slaves now.
+ <<case "overwhelmed farmgirl">>
+ She barely manages to waddle into your penthouse before crashing onto your couch with permission. She willingly places her biometric signature in testament to the truth of her voluntary enslavement. She looks almost relieved. "I traded my virginity for bread and look what it got me. I'm so glad you took me in, I don't know how I would have carried on in a few months, I mean look at me." She gestures to her gravid bulge. 'A few months'? You probe further. "Huh? Oh, yes... I'm only four months along... You can see why I needed this now, right? I'm bigger than every other girl I've ever seen and I'm not even halfway there. You saved my life, even if you, um, get rid of them, you still saved me. So thank you." You can't believe what you are hearing, but a quick sonogram confirms it. Both you and her stare in shock at the sheer number of children growing in her womb. A rough estimate places their count at a staggering one-hundred-and-fifty. "...no way... There can't be that many in me..."
+ <<set $activeSlave.preg = 16>>
+ <<set $activeSlave.pregType = 150>>
+ <<set $activeSlave.pregWeek = $activeSlave.preg>>
+ <<SetBellySize $activeSlave>>
<</switch>>
<<switch $recruit>>
<<case "desperate birth">>
@@ -1948,6 +2000,9 @@ Every push, every desperate contraction must be agonizing to her. Fortunately yo
She cooperates as the biometric scanners scrupulously record her every particular as belonging not to a person but to a piece of human property. She willingly places her biometric signature in testament to the truth of her voluntary enslavement. A purchasing agent appears to take her away, which she accepts resignedly, though she does ask you who purchased her. Amused, you tell her that her reverence of education convinced you to sell her to a brothel catering to inexperienced men. "I'm going to be a little bit like a teacher?" She contemplates this unexpected turn of events. "Well, that's very thoughtful of you. Thank you."
<<case "immigrant">>
She comes immediately from the immigration center to your arcology. You patiently explain the realities of the situation to her. She isn't too bright and it takes a while for things to sink in. The scanners finally do it, though. She sobs as the biometric scanners scrupulously record her every particular as belonging not to a person but to a piece of human property. She tries to resist placing her biometric signature in testament to the truth of her debt, but when you observe that the alternative is death, she complies. You add that she's already been purchased by a brothel, and would be well advised to keep obeying. She breaks down entirely at this.
+ <<case "overwhelmed farmgirl">>
+ She barely manages to waddle into your penthouse beforeasking to have a seat on your couch. You decline, since she is clearly so skilled at carrying children, she will spend the rest of her enslavement as a volume breeder. Her gaze falls to the floor, this at least means she'll be fed and get to have her children. She cooperates to having her biometric readings taken and logged, before being seated in a wheelchair and taken to her new home.
+ Hours later, you recieve a brief message from the facility that purchased her. "150. One hundred and fifty babies. That is how many are crammed into that girl. She was a mere sisteen weeks along. If she lives through this, we may have a record breaking breeder on our hands. Felt the need to pass that along, you might have made us quite a profit this year."
<</switch>>
<</replace>>
<</link>> //This will bring in <<print cashFormat($slaveCost)>>.//
--
GitLab