From 4f928a8921ec29cfb494316d685efff97ddfa62a Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 17 Nov 2017 16:56:33 -0500
Subject: [PATCH] Fixes and start of inflation overhaul (phase 2 begin)
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 6 +-
src/npc/descriptions/fAnus.tw | 6 +-
src/npc/descriptions/fButt.tw | 6 +-
src/npc/descriptions/fVagina.tw | 6 +-
src/npc/fAbuse.tw | 30 +++--
src/npc/fFeelings.tw | 20 ++-
src/pregmod/fMarry.tw | 25 ++--
src/uncategorized/pUndergroundRailroad.tw | 2 +-
src/uncategorized/slaveInteract.tw | 106 ++++++++--------
src/uncategorized/slaveSold.tw | 2 +-
src/utility/miscWidgets.tw | 125 +++++++++----------
11 files changed, 172 insertions(+), 162 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 1dd5fa36786..4a4abb67905 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4595,4 +4595,8 @@ Pregmod 0.10.3.0
136
-fixes
- -RESSTR cleaning completed
\ No newline at end of file
+ -RESSTR cleaning completed
+
+ 137
+ -fixes
+ -began inflation rework stage of pregnancy overhaul (phase 2)
\ No newline at end of file
diff --git a/src/npc/descriptions/fAnus.tw b/src/npc/descriptions/fAnus.tw
index f9d71e5d396..02ad7633c84 100644
--- a/src/npc/descriptions/fAnus.tw
+++ b/src/npc/descriptions/fAnus.tw
@@ -126,10 +126,10 @@ Her anus is invitingly bleached,
<<if ($activeSlave.bellyPreg >= 1500)>>
The poor slave's pregnant belly causes her some discomfort as you sodomize her.
-<<elseif ($activeSlave.inflation > 0)>>
- The poor girl's sloshing belly causes her some discomfort as you sodomize her, though the lewd jiggling the pounding sends through it is quite a sight.
-<<elseif ($activeSlave.bellyImplant >= 2000)>>
+<<elseif ($activeSlave.bellyImplant >= 1500)>>
The poor girl's implant filled belly causes her some discomfort as you sodomize her.
+<<elseif ($activeSlave.bellyFluid >= 1500)>>
+ The poor girl's sloshing belly causes her some discomfort as you sodomize her, though the lewd jiggling the pounding sends through it is quite a sight.
<</if>>
<<if ($activeSlave.anusTat == "scenes") && ($activeSlave.anus == 1)>>
diff --git a/src/npc/descriptions/fButt.tw b/src/npc/descriptions/fButt.tw
index df83020ffbd..56f7458224b 100644
--- a/src/npc/descriptions/fButt.tw
+++ b/src/npc/descriptions/fButt.tw
@@ -147,10 +147,10 @@ Her anus is invitingly bleached,
<<if ($activeSlave.bellyPreg >= 1500)>>
The poor girl's pregnant belly makes taking a rough fuck in both her holes uncomfortable for her.
-<<elseif ($activeSlave.inflation > 0)>>
- The poor girl's sloshing belly makes taking a rough fuck in both her holes uncomfortable for her, though the lewd jiggling the pounding sends through it is quite a sight.
-<<elseif ($activeSlave.bellyImplant >= 2000)>>
+<<elseif ($activeSlave.bellyImplant >= 1500)>>
The poor girl's implant filled belly makes taking a rough fuck in both her holes uncomfortable for her.
+<<elseif ($activeSlave.bellyFluid >= 1500)>>
+ The poor girl's sloshing belly makes taking a rough fuck in both her holes uncomfortable for her, though the lewd jiggling the pounding sends through it is quite a sight.
<</if>>
<<if ($activeSlave.anusTat == "scenes") && ($activeSlave.anus == 1)>>
diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw
index 584eb05c136..9c0c0c13611 100644
--- a/src/npc/descriptions/fVagina.tw
+++ b/src/npc/descriptions/fVagina.tw
@@ -319,10 +319,10 @@ You decide to fuck her
<<if ($activeSlave.bellyPreg >= 1500)>>
The poor slave's belly gets in the way, but the added perversion of fucking a pregnant hole makes the inconvenience worthwhile.
-<<elseif ($activeSlave.inflation > 0)>>
- The poor slave's sloshing belly gets in the way, but the added perversion of seeing it jiggle makes the inconvenience worthwhile.
-<<elseif ($activeSlave.bellyImplant >= 2000)>>
+<<elseif ($activeSlave.bellyImplant >= 1500)>>
The poor slave's implant filled belly gets in the way, but the added perversion of fucking a girl with such a round stomach makes the inconvenience worthwhile.
+<<elseif ($activeSlave.bellyFluid >= 1500)>>
+ The poor slave's sloshing belly gets in the way, but the added perversion of seeing it jiggle makes the inconvenience worthwhile.
<</if>>
<<if (random(1,100) > (100 + $activeSlave.devotion))>>
diff --git a/src/npc/fAbuse.tw b/src/npc/fAbuse.tw
index de24a9c0910..1c3868e099a 100644
--- a/src/npc/fAbuse.tw
+++ b/src/npc/fAbuse.tw
@@ -26,7 +26,7 @@
You call her over so you can abuse the <<if $seeRace == 1>>$activeSlave.race <</if>>bitch. You get things started with an open-handed slap across the face<<if !canSee($activeSlave)>>; she never saw it coming<</if>>. As she reels in shock and pain, you follow up with
<<if ($activeSlave.preg > 30) && ($activeSlave.pregType >= 20)>>
a vicious slap across her straining pregnant belly,
- <<elseif ($activeSlave.inflation > 0)>>
+ <<elseif ($activeSlave.bellyFluid > 2000)>>
a vicious punch into her bloated belly,
<<elseif ($activeSlave.dick > 0)>>
a vicious slap to her cock,
@@ -44,33 +44,37 @@
a vicious thrust to her altered tendons,
<<elseif ($activeSlave.boobs >= 800)>>
a vicious slap across her massive breasts,
- <<elseif ($activeSlave.bellyImplant >= 2000)>>
+ <<elseif ($activeSlave.bellyImplant >= 1500)>>
a vicious slap across her implant rounded belly,
- <<elseif ($activeSlave.vaginalAccessory !== "chastity belt")>>
+ <<elseif !["chastity belt", "combined chastity"].includes($activeSlave.vaginalAccessory)>>
a vicious slap on the mons,
<<else>>
a vicious jerk on her nipples,
<</if>>
- <<if $activeSlave.inflation == 3>>
+ <<if $activeSlave.bellyFluid >= 10000>>
<<if $activeSlave.inflationMethod == 2>>
which causes her to discharge her contained $activeSlave.inflationType all over herself before collapsing into her puddle on the floor in agony.
<<set $activeSlave.inflation = 0, $activeSlave.inflationType = "none", $activeSlave.inflationMethod = 0, $activeSlave.cumSource = 0, $activeSlave.milkSource = 0>>
+ <<SetBellySize $activeSlave>>
<<else>>
which causes her to vomit up her contained $activeSlave.inflationType all over herself before collapsing into her puddle on the floor in agony.
<<set $activeSlave.inflation = 0, $activeSlave.inflationType = "none", $activeSlave.inflationMethod = 0, $activeSlave.cumSource = 0, $activeSlave.milkSource = 0>>
+ <<SetBellySize $activeSlave>>
<</if>>
- <<elseif $activeSlave.inflation == 2>>
+ <<elseif $activeSlave.bellyFluid >= 5000>>
<<if random(1,100) > $activeSlave.devotion>>
- which nearly forces her to lose her contained $activeSlave.inflationType, but she controls herself out of devotion to you as she drops to the floor in agony.
+ which nearly forces her to lose her contained $activeSlave.inflationType, but she controls herself out of devotion to you as she drops to the floor in agony.
<<else>>
- <<if $activeSlave.inflationMethod == 2>>
- which causes her to discharge her contained $activeSlave.inflationType all over herself before collapsing into her puddle on the floor in agony.
- <<set $activeSlave.inflation = 0, $activeSlave.inflationType = "none", $activeSlave.inflationMethod = 0, $activeSlave.cumSource = 0, $activeSlave.milkSource = 0>>
- <<else>>
- which causes her to vomit up her contained $activeSlave.inflationType all over herself before collapsing into her puddle on the floor in agony.
- <<set $activeSlave.inflation = 0, $activeSlave.inflationType = "none", $activeSlave.inflationMethod = 0, $activeSlave.cumSource = 0, $activeSlave.milkSource = 0>>
- <</if>>
+ <<if $activeSlave.inflationMethod == 2>>
+ which causes her to discharge her contained $activeSlave.inflationType all over herself before collapsing into her puddle on the floor in agony.
+ <<set $activeSlave.inflation = 0, $activeSlave.inflationType = "none", $activeSlave.inflationMethod = 0, $activeSlave.cumSource = 0, $activeSlave.milkSource = 0>>
+ <<SetBellySize $activeSlave>>
+ <<else>>
+ which causes her to vomit up her contained $activeSlave.inflationType all over herself before collapsing into her puddle on the floor in agony.
+ <<set $activeSlave.inflation = 0, $activeSlave.inflationType = "none", $activeSlave.inflationMethod = 0, $activeSlave.cumSource = 0, $activeSlave.milkSource = 0>>
+ <<SetBellySize $activeSlave>>
+ <</if>>
<</if>>
<<else>>
which causes her to collapse to the floor in agony.
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 99398c65624..bfb993cb69c 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -543,12 +543,20 @@ My favorite part of my body i<<s>>
I can practically feel my butt getting tighter. Thi<<s>> i<<s>> great, I'll be like new <<s>>oon. Thank you, <<Master>>.
<</if>>
-<<if $activeSlave.inflation == 3>>
- I feel really full, can I let the $activeSlave.inflationType out now?
-<<elseif $activeSlave.inflation == 2>>
- I feel <<s>>o full, can I let the $activeSlave.inflationType out now?
-<<elseif $activeSlave.inflation == 1>>
- I feel <<s>>o uncomfortable, can I let the $activeSlave.inflationType out now?
+<<if $activeSlave.inflation > 0>>
+ <<if SlaveStatsChecker.checkForLisp($activeSlave)>>
+ <<set _fluid = $activeSlave.inflationType, _fluid = _fluid.replace("ss", "th"), _fluid = _fluid.replace("S", "Th"), _fluid = _fluid.replace("s", "th")>>
+ <<set _slavename = $activeSlave.slaveName, _slavename = _slavename.replace("ss", "th"), _slavename = _slavename.replace("S", "Th"), _slavename = _slavename.replace("s", "th")>>
+ <<else>>
+ <<set _fluid = $activeSlave.inflationType>>
+ <</if>>
+ <<if $activeSlave.bellyFluid >= 10000>>
+ I feel really full, can I let the _fluid out now?
+ <<elseif $activeSlave.bellyFluid >= 5000>>
+ I feel <<s>>o full, can I let the _fluid out now?
+ <<elseif $activeSlave.bellyFluid >= 2000>>
+ I feel <<s>>o uncomfortable, can I let the _fluid out now?
+ <</if>>
<</if>>
<<switch $activeSlave.drugs>>
diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw
index 282819da2c0..6c0a3952103 100644
--- a/src/pregmod/fMarry.tw
+++ b/src/pregmod/fMarry.tw
@@ -2,6 +2,7 @@
<<set $nextButton = "Back", $nextLink = "Slave Interact", $weddingSlaveID = $activeSlave.ID>>
<<Enunciate $activeSlave>>
+<<set _belly = bellyAdjective($activeSlave)>>
<<ClearSummaryCache $activeSlave>>
<<if $activeSlave.relationship > 0>>
@@ -500,23 +501,23 @@ You tell $activeSlave.slaveName that you're going to marry her. (A proposal, of
Her lacy bridal bra flatters her pretty chest.
<</if>>
<<if ($activeSlave.preg > 20) && ($activeSlave.pregType >= 10)>>
- Her massive, squirming pregnant belly makes her bridal wear particularly obscene.
+ Her massive, squirming pregnant belly makes her bridal wear particularly obscene.
<<elseif ($activeSlave.bellyPreg >= 1500)>>
- Her pregnant belly protrudes out the front of her bridal wear.
- <<elseif ($activeSlave.inflation == 3)>>
- Her hugely bloated, <<print $activeSlave.inflationType>>-filled belly protrudes out the front of her bridal wear.
- <<elseif ($activeSlave.inflation == 2)>>
- Her bloated, <<print $activeSlave.inflationType>>-stuffed belly protrudes out the front of her bridal wear.
- <<elseif ($activeSlave.inflation == 1)>>
- Her distended, <<print $activeSlave.inflationType>>-belly protrudes out the front of her bridal wear.
- <<elseif ($activeSlave.bellyImplant >= 2000)>>
- Her <<print $activeSlave.bellyImplant>>cc belly implant protrudes her middle out the front of her bridal wear.
+ Her _belly pregnant belly protrudes out the front of her bridal wear.
+ <<elseif ($activeSlave.bellyImplant >= 1500)>>
+ Her _belly <<print $activeSlave.bellyImplant>>cc belly implant protrudes her middle out the front of her bridal wear.
+ <<elseif ($activeSlave.bellyFluid >= 10000)>>
+ Her hugely bloated, <<print $activeSlave.inflationType>>-filled belly protrudes out the front of her bridal wear.
+ <<elseif ($activeSlave.bellyFluid >= 5000)>>
+ Her bloated, <<print $activeSlave.inflationType>>-stuffed belly protrudes out the front of her bridal wear.
+ <<elseif ($activeSlave.bellyFluid >= 1500)>>
+ Her distended, <<print $activeSlave.inflationType>>-belly protrudes out the front of her bridal wear.
<</if>>
<<if $activeSlave.dickAccessory == ("chastity") || $activeSlave.dickAccessory == ("combined chastity")>>
Her slave dick is hidden by its chastity cage.
<<elseif canAchieveErection($activeSlave)>>
- <<if ($activeSlave.dick > 4) && ($activeSlave.bellyPreg >= 5000)>>
- She's hugely erect, with her lacy g-string only serving to hold her dick agonizingly pressed against the bottom of her pregnant belly.
+ <<if ($activeSlave.dick > 4) && ($activeSlave.belly >= 5000)>>
+ She's hugely erect, with her lacy g-string only serving to hold her dick agonizingly pressed against the bottom of her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly.
<<elseif $activeSlave.dick > 4>>
She's hugely erect, with her lacy g-string only serving to hold her dick upright along her belly.
<<else>>
diff --git a/src/uncategorized/pUndergroundRailroad.tw b/src/uncategorized/pUndergroundRailroad.tw
index 4c73f1039cf..31ce2d491b9 100644
--- a/src/uncategorized/pUndergroundRailroad.tw
+++ b/src/uncategorized/pUndergroundRailroad.tw
@@ -103,7 +103,7 @@ that several nondescript citizens she sees occasionally at work have passed a fe
<<set $traitorStats = {PCpregSource: 0, PCmother: 0, PCfather: 0, traitorMother: [], traitorFather: [], traitorPregSources: [], traitorMotherTank: [], traitorFatherTank: []}>>
<<if $familyTesting == 1>>
<<if $traitor.ID == $PC.pregSource>>
- <<if $traitorStats.PCpregSource>>
+ <<set $traitorStats.PCpregSource = $traitor.ID>>
<</if>>
<<if $PC.mother == $traitor.ID>>
<<set $traitorStats.PCmother = $traitor.ID>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 76d997811a9..b924f60df39 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -118,59 +118,57 @@
<</if>>
| [[Use another slave to impregnate her|FSlaveImpreg]]
<</if>>
- <<if $activeSlave.preg <= 0 && $activeSlave.bellyImplant == -1>>
<<if $activeSlave.assignment != "work in the dairy" && $activeSlave.assignment != "be confined in the arcade">>
- <<if $enema == 1>>
- <<if $activeSlave.inflation < 3>>
- <<if $activeSlave.inflationType == "water" || $activeSlave.inflationType == "none">>
- | <<link "Fill her ass with water">><<set $activeSlave.inflationType to "water">><<set $activeSlave.inflationMethod to 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- <</if>>
- <<if $medicalEnema == 1>>
- <<if $activeSlave.inflationType == "aphrodisiac" || $activeSlave.inflationType == "none">>
- | <<link "Fill her ass with aphrodisiacs">><<set $activeSlave.inflationType = "aphrodisiac">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- <</if>>
- <<if $activeSlave.inflationType == "curative" || $activeSlave.inflationType == "none">>
- | <<link "Fill her ass with curatives">><<set $activeSlave.inflationType = "curative">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <<if $enema == 1>>
+ <<if $activeSlave.inflation < 3>>
+ <<if $activeSlave.inflationType == "water" || $activeSlave.inflationType == "none">>
+ | <<link "Fill her ass with water">><<set $activeSlave.inflationType to "water">><<set $activeSlave.inflationMethod to 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <</if>>
+ <<if $medicalEnema == 1>>
+ <<if $activeSlave.inflationType == "aphrodisiac" || $activeSlave.inflationType == "none">>
+ | <<link "Fill her ass with aphrodisiacs">><<set $activeSlave.inflationType = "aphrodisiac">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <</if>>
+ <<if $activeSlave.inflationType == "curative" || $activeSlave.inflationType == "none">>
+ | <<link "Fill her ass with curatives">><<set $activeSlave.inflationType = "curative">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <</if>>
+ <<if $activeSlave.inflationType == "tightener" || $activeSlave.inflationType == "none">>
+ | <<link "Fill her ass with rectal tighteners">><<set $activeSlave.inflationType = "tightener">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
- <<if $activeSlave.inflationType == "tightener" || $activeSlave.inflationType == "none">>
- | <<link "Fill her ass with rectal tighteners">><<set $activeSlave.inflationType = "tightener">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <<if $dairyPiping == 1>>
+ <<if ($milkPipeline > 88 && $milkPipeline != 0) || $arcologies[0].FSPastoralistLaw == 1>>
+ <<if $activeSlave.inflation < 3>>
+ <<if $activeSlave.inflationType == "milk" || $activeSlave.inflationType == "none">>
+ | <<link "Fill her ass with milk">><<set $activeSlave.inflationType to "milk">><<set $activeSlave.inflationMethod to 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ | <<link "Force feed her milk">><<set $activeSlave.inflationType to "milk">><<set $activeSlave.inflationMethod to 1>><<replace "#miniscene">><<include "FillUpFace">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <</if>>
+ <</if>>
+ <<else>>
+ | //$dairyNameCaps is not producing enough milk to pump through the pipes//
+ <</if>>
+ <<if ($cumPipeline > 88 && $cumPipeline != 0) || $arcologies[0].FSPastoralistLaw == 1>>
+ <<if $activeSlave.inflation < 3>>
+ <<if $activeSlave.inflationType == "cum" || $activeSlave.inflationType == "none">>
+ | <<link "Fill her ass with cum">><<set $activeSlave.inflationType to "cum">><<set $activeSlave.inflationMethod to 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ | <<link "Force feed her cum">><<set $activeSlave.inflationType to "cum">><<set $activeSlave.inflationMethod to 1>><<replace "#miniscene">><<include "FillUpFace">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <</if>>
+ <</if>>
+ <<else>>
+ | //$dairyNameCaps is not producing enough cum to pump through the pipes//
+ <</if>>
<</if>>
<</if>>
- <</if>>
- <</if>>
- <<if $dairyPiping == 1>>
- <<if ($milkPipeline > 88 && $milkPipeline != 0) || $arcologies[0].FSPastoralistLaw == 1>>
- <<if $activeSlave.inflation < 3>>
- <<if $activeSlave.inflationType == "milk" || $activeSlave.inflationType == "none">>
- | <<link "Fill her ass with milk">><<set $activeSlave.inflationType to "milk">><<set $activeSlave.inflationMethod to 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- | <<link "Force feed her milk">><<set $activeSlave.inflationType to "milk">><<set $activeSlave.inflationMethod to 1>><<replace "#miniscene">><<include "FillUpFace">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- <</if>>
- <</if>>
- <<else>>
- | //$dairyNameCaps is not producing enough milk to pump through the pipes//
- <</if>>
- <<if ($cumPipeline > 88 && $cumPipeline != 0) || $arcologies[0].FSPastoralistLaw == 1>>
- <<if $activeSlave.inflation < 3>>
- <<if $activeSlave.inflationType == "cum" || $activeSlave.inflationType == "none">>
- | <<link "Fill her ass with cum">><<set $activeSlave.inflationType to "cum">><<set $activeSlave.inflationMethod to 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- | <<link "Force feed her cum">><<set $activeSlave.inflationType to "cum">><<set $activeSlave.inflationMethod to 1>><<replace "#miniscene">><<include "FillUpFace">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- <</if>>
- <</if>>
- <<else>>
- | //$dairyNameCaps is not producing enough cum to pump through the pipes//
- <</if>>
- <</if>>
- <</if>>
- <</if>>
- <<if ($activeSlave.preg <= 0) && ($activeSlave.inflation == 0) && ($activeSlave.bellyImplant == -1)>>
- <<if $activeSlave.assignment != "work in the dairy" || $activeSlave.assignment != "be confined in the arcade">>
- | [[Use another slave to forcefeed her|SlaveOnSlaveFeedingWorkAround]]
- <<if $buckets == 1>>
- | <<link "Make her consume two liters of slave food">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 1>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- | <<link "Force her to consume a gallon of slave food">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 2>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- | <<link "Force two gallons of slave food into her">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 3>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- <</if>>
- <</if>>
+ <<if ($activeSlave.inflation == 0)>>
+ <<if $activeSlave.assignment != "work in the dairy" || $activeSlave.assignment != "be confined in the arcade">>
+ | [[Use another slave to forcefeed her|SlaveOnSlaveFeedingWorkAround]]
+ <<if $buckets == 1>>
+ | <<link "Make her consume two liters of slave food">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 1>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ | <<link "Force her to consume a gallon of slave food">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 2>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ | <<link "Force two gallons of slave food into her">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 3>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <</if>>
+ <</if>>
<</if>>
</span>
<<if canDoVaginal($activeSlave)>>
@@ -725,7 +723,7 @@
| <<link "Extreme corset">><<set $activeSlave.bellyAccessory = "an extreme corset">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
<</if>>
<<if isItemAccessible("a small empathy belly")>> /* works for all of them */
- <<if $activeSlave.belly < 1500 && $activeSlave.inflation == 0 && $activeSlave.weight < 130>>
+ <<if $activeSlave.belly < 1500 && $activeSlave.weight < 130>>
| <<link "1st Trimester belly">><<set $activeSlave.bellyAccessory = "a small empathy belly">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
| <<link "2nd Trimester belly">><<set $activeSlave.bellyAccessory = "a medium empathy belly">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
| <<link "3rd Trimester belly">><<set $activeSlave.bellyAccessory = "a large empathy belly">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
@@ -1130,13 +1128,13 @@ __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<
<br>
__Required Bloating__: <strong><span id="inflate"><<if $activeSlave.inflation is 3>><<print "She is required to keep 2 gallons of $activeSlave.inflationType in her at all times">><<elseif $activeSlave.inflation is 2>><<print "She is required to keep 4 liters of $activeSlave.inflationType in her at all times">><<elseif $activeSlave.inflation is 1>><<print "She is required to keep 2 liters of $activeSlave.inflationType in her at all times">><</if>></span></strong>.
<<if $activeSlave.inflationMethod == 3>>
- <<link "Let her deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0,$activeSlave.cumSource = 0,$activeSlave.milkSource = 0>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <<link "Let her deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0,$activeSlave.cumSource = 0,$activeSlave.milkSource = 0>><<SetBellySize $activeSlave>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
<<elseif $activeSlave.inflationType == "milk">>
- <<link "Let her deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <<link "Let her deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0>><<SetBellySize $activeSlave>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
<<elseif $activeSlave.inflationType == "cum">>
- <<link "Let her deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <<link "Let her deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0>><<SetBellySize $activeSlave>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
<<else>>
- <<link "Let her deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <<link "Let her deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0>><<SetBellySize $activeSlave>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
<</if>>
<</if>>
</span>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index 968aca8bef8..98e23b0420e 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -16,7 +16,7 @@
<<set $boomerangStats = {PCpregSource: 0, PCmother: 0, PCfather: 0, boomerangMother: [], boomerangFather: [], boomerangPregSources: [], boomerangMotherTank: [], boomerangFatherTank: []}>>
<<if $familyTesting == 1>>
<<if $activeSlave.ID == $PC.pregSource>>
- <<if $boomerangStats.PCpregSource>>
+ <<set $boomerangStats.PCpregSource = $activeSlave.ID>>
<</if>>
<<if $PC.mother == $activeSlave.ID>>
<<set $boomerangStats.PCmother = $activeSlave.ID>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 12651eee38f..1e12d3f5b03 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -385,59 +385,57 @@
<</if>>
| [[Use another slave to impregnate her|FSlaveImpreg]]
<</if>>
- <<if $activeSlave.preg <= 0 && $activeSlave.bellyImplant == -1>>
<<if $activeSlave.assignment != "work in the dairy" && $activeSlave.assignment != "be confined in the arcade">>
- <<if $enema == 1>>
- <<if $activeSlave.inflation < 3>>
- <<if $activeSlave.inflationType == "water" || $activeSlave.inflationType == "none">>
- | <<link "Fill her ass with water">><<set $activeSlave.inflationType = "water">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- <</if>>
- <<if $medicalEnema == 1>>
- <<if $activeSlave.inflationType == "aphrodisiac" || $activeSlave.inflationType == "none">>
- | <<link "Fill her ass with aphrodisiacs">><<set $activeSlave.inflationType = "aphrodisiac">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- <</if>>
- <<if $activeSlave.inflationType == "curative" || $activeSlave.inflationType == "none">>
- | <<link "Fill her ass with curatives">><<set $activeSlave.inflationType = "curative">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- <</if>>
- <<if $activeSlave.inflationType == "tightener" || $activeSlave.inflationType == "none">>
- | <<link "Fill her ass with rectal tighteners">><<set $activeSlave.inflationType = "tightener">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- <</if>>
- <</if>>
- <</if>> /* inflation < 3 */
- <</if>> /* enema == 1 */
- <<if $dairyPiping == 1>>
- <<if ($milkPipeline > 88 && $milkPipeline != 0) || $arcologies[0].FSPastoralistLaw == 1>>
- <<if $activeSlave.inflation < 3>>
- <<if $activeSlave.inflationType == "milk" || $activeSlave.inflationType == "none">>
- | <<link "Fill her ass with milk">><<set $activeSlave.inflationType = "milk">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- | <<link "Force feed her milk">><<set $activeSlave.inflationType = "milk">><<set $activeSlave.inflationMethod = 1>><<replace "#miniscene">><<include "FillUpFace">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- <</if>>
- <</if>>
- <<else>>
- | //$dairyNameCaps is not producing enough milk to pump through the pipes//
- <</if>>
- <<if ($cumPipeline > 88 && $cumPipeline != 0) || $arcologies[0].FSPastoralistLaw == 1>>
- <<if $activeSlave.inflation < 3>>
- <<if $activeSlave.inflationType == "cum" || $activeSlave.inflationType == "none">>
- | <<link "Fill her ass with cum">><<set $activeSlave.inflationType = "cum">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- | <<link "Force feed her cum">><<set $activeSlave.inflationType = "cum">><<set $activeSlave.inflationMethod = 1>><<replace "#miniscene">><<include "FillUpFace">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- <</if>>
- <</if>>
- <<else>>
- | //$dairyNameCaps is not producing enough cum to pump through the pipes//
- <</if>>
- <</if>> /* dairyPiping == 1 */
+ <<if $enema == 1>>
+ <<if $activeSlave.inflation < 3>>
+ <<if $activeSlave.inflationType == "water" || $activeSlave.inflationType == "none">>
+ | <<link "Fill her ass with water">><<set $activeSlave.inflationType = "water">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <</if>>
+ <<if $medicalEnema == 1>>
+ <<if $activeSlave.inflationType == "aphrodisiac" || $activeSlave.inflationType == "none">>
+ | <<link "Fill her ass with aphrodisiacs">><<set $activeSlave.inflationType = "aphrodisiac">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <</if>>
+ <<if $activeSlave.inflationType == "curative" || $activeSlave.inflationType == "none">>
+ | <<link "Fill her ass with curatives">><<set $activeSlave.inflationType = "curative">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <</if>>
+ <<if $activeSlave.inflationType == "tightener" || $activeSlave.inflationType == "none">>
+ | <<link "Fill her ass with rectal tighteners">><<set $activeSlave.inflationType = "tightener">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <</if>>
+ <</if>>
+ <</if>> /* inflation < 3 */
+ <</if>> /* enema == 1 */
+ <<if $dairyPiping == 1>>
+ <<if ($milkPipeline > 88 && $milkPipeline != 0) || $arcologies[0].FSPastoralistLaw == 1>>
+ <<if $activeSlave.inflation < 3>>
+ <<if $activeSlave.inflationType == "milk" || $activeSlave.inflationType == "none">>
+ | <<link "Fill her ass with milk">><<set $activeSlave.inflationType = "milk">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ | <<link "Force feed her milk">><<set $activeSlave.inflationType = "milk">><<set $activeSlave.inflationMethod = 1>><<replace "#miniscene">><<include "FillUpFace">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <</if>>
+ <</if>>
+ <<else>>
+ | //$dairyNameCaps is not producing enough milk to pump through the pipes//
+ <</if>>
+ <<if ($cumPipeline > 88 && $cumPipeline != 0) || $arcologies[0].FSPastoralistLaw == 1>>
+ <<if $activeSlave.inflation < 3>>
+ <<if $activeSlave.inflationType == "cum" || $activeSlave.inflationType == "none">>
+ | <<link "Fill her ass with cum">><<set $activeSlave.inflationType = "cum">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ | <<link "Force feed her cum">><<set $activeSlave.inflationType = "cum">><<set $activeSlave.inflationMethod = 1>><<replace "#miniscene">><<include "FillUpFace">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <</if>>
+ <</if>>
+ <<else>>
+ | //$dairyNameCaps is not producing enough cum to pump through the pipes//
+ <</if>>
+ <</if>> /* dairyPiping == 1 */
<</if>> /* assigned to dairy or arcade */
- <</if>> /* not pregnant and no belly implant */
- <<if ($activeSlave.preg <= 0) && ($activeSlave.inflation == 0) && ($activeSlave.bellyImplant == -1)>>
- <<if $activeSlave.assignment != "work in the dairy" || $activeSlave.assignment != "be confined in the arcade">>
- | [[Use another slave to forcefeed her|SlaveOnSlaveFeedingWorkAround]]
- <<if $buckets == 1>>
- | <<link "Make her consume two liters of slave food">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 1>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- | <<link "Force her to consume a gallon of slave food">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 2>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- | <<link "Force two gallons of slave food into her">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 3>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
- <</if>>
- <</if>>
+ <<if ($activeSlave.inflation == 0)>>
+ <<if $activeSlave.assignment != "work in the dairy" || $activeSlave.assignment != "be confined in the arcade">>
+ | [[Use another slave to forcefeed her|SlaveOnSlaveFeedingWorkAround]]
+ <<if $buckets == 1>>
+ | <<link "Make her consume two liters of slave food">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 1>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ | <<link "Force her to consume a gallon of slave food">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 2>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ | <<link "Force two gallons of slave food into her">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 3>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <</if>>
+ <</if>>
<</if>>
<</replace>>
<<replace #bloating>>
@@ -445,13 +443,13 @@
<br>
__Required Bloating__: <strong><span id="inflate"><<if $activeSlave.inflation is 3>><<print "She is required to keep 2 gallons of $activeSlave.inflationType in her at all times">><<elseif $activeSlave.inflation is 2>><<print "She is required to keep 4 liters of $activeSlave.inflationType in her at all times">><<elseif $activeSlave.inflation is 1>><<print "She is required to keep 2 liters of $activeSlave.inflationType in her at all times">><</if>></span></strong>.
<<if $activeSlave.inflationMethod == 3>>
- <<link "Let her deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0,$activeSlave.cumSource = 0,$activeSlave.milkSource = 0>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <<link "Let her deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0,$activeSlave.cumSource = 0,$activeSlave.milkSource = 0>><<SetBellySize $activeSlave>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
<<elseif $activeSlave.inflationType == "milk">>
- <<link "Let her deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <<link "Let her deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0>><<SetBellySize $activeSlave>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
<<elseif $activeSlave.inflationType == "cum">>
- <<link "Let her deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <<link "Let her deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0>><<SetBellySize $activeSlave>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
<<else>>
- <<link "Let her deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <<link "Let her deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0>><<SetBellySize $activeSlave>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
<</if>>
<</if>>
<</replace>>
@@ -467,7 +465,7 @@
//She is sterile//
<<elseif ($activeSlave.pubertyXX == 0) && $activeSlave.preg < 1>>
//She is not yet fertile//
- <<elseif $activeSlave.physicalAge >= 47 && $activeSlave.preg < 1>>
+ <<elseif $activeSlave.ovaryAge >= 47 && $activeSlave.preg < 1>>
//She is too old to become pregnant//
<<if $activeSlave.preg == -1>>
<<set $activeSlave.preg = 0, $activeSlave.bellyPreg = 0>>
@@ -495,7 +493,7 @@
//It is sterile//
<<elseif ($activeSlave.pubertyXX == 0)>>
//It is not yet fertile//
- <<elseif $activeSlave.physicalAge >= 47>>
+ <<elseif $activeSlave.ovaryAge >= 47>>
//It is too old to become pregnant//
<<elseif ($activeSlave.preg >= -1)>>
__Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>.
@@ -542,12 +540,12 @@
<<replace #sexoption>>
<<if ($activeSlave.vagina > -1)>>
<<if canDoVaginal($activeSlave)>>
- <<link "Fuck her">><<replace "#miniscene">><<include "FVagina">><br><</replace>><<SlaveInteractFertility>><</link>>
- <<if canDoAnal($activeSlave)>>
- | <<link "Use her holes">><<replace "#miniscene">><<include "FButt">><br> <</replace>><<SlaveInteractFertility>><</link>>
- <</if>>
+ <<link "Fuck her">><<replace "#miniscene">><<include "FVagina">><br><</replace>><<SlaveInteractFertility>><</link>>
+ <<if canDoAnal($activeSlave)>>
+ | <<link "Use her holes">><<replace "#miniscene">><<include "FButt">><br> <</replace>><<SlaveInteractFertility>><</link>>
+ <</if>>
<<else>>
- //Remove her chastity belt if you wish to fuck her//
+ //Remove her chastity belt if you wish to fuck her//
<</if>>
<</if>>
<</replace>>
@@ -2760,7 +2758,6 @@ This experience
<<else>>
<<set $args[0].bellyPreg = 0>>
<</if>>
- /* inflation will change
<<if $args[0].inflation == 3>>
<<set $args[0].bellyFluid = 10000>>
<<elseif $args[0].inflation == 2>>
@@ -2770,8 +2767,6 @@ This experience
<<else>>
<<set $args[0].bellyFluid = 0>>
<</if>>
- */
- <<set $args[0].bellyFluid = 0>>
<<set $args[0].belly = $args[0].bellyPreg+$args[0].bellyFluid>>
<</widget>>
--
GitLab