diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index afdfb22d1746ac6007fbac7a2cd3aed80126bb32..e27f2a605070ea4ff5024852cabaddf05e2466f2 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4787,4 +4787,7 @@ Pregmod 0.10.3.0
12/02/17
178
+ -fixes
+
+ 12/03/17
-fixes
\ No newline at end of file
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 5e636e75288d0938339699bbae7f94a32fbbcb3b..9ad08dac7922790ff129ee8af3d86c442aeacdc6 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -614,14 +614,6 @@ window.tooBigBelly = function(slave){
return true;
} else if (slave.belly >= 250000+(slave.muscles*800) && slave.physicalAge <= 12) {
return true;
- } else if (slave.bellyImplant > 31000+(slave.muscles*100) && slave.physicalAge >= 18) {
- return true;
- } else if (slave.bellyImplant > 31000+(slave.muscles*80) && slave.physicalAge >= 13) {
- return true;
- } else if (slave.bellyImplant > 12000+(slave.muscles*20) && slave.physicalAge <= 3) {
- return true;
- } else if (slave.bellyImplant > 16000+(slave.muscles*50) && slave.physicalAge <= 12) {
- return true;
} else {
return false;
}
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index 713df8c486c49a138989249d1159763dfa9f7aaa..6a504a4abca9073208692c46388055f399dc8437 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -83,7 +83,7 @@
<hr>
<<if $slaveRebellion == 1>>
- Today, the _day of _month _year, our arcology was inflamed by the fires of rebellion. $attackTroops rebels from all over the structure dared rise up against their owners and conquer their freedom through blood. Our defense force, $troopCount strong, fought with them street by street
+ Today, the _day of _month _year, our arcology was inflamed by the fires of rebellion. Math.trunc($attackTroops) rebels from all over the structure dared rise up against their owners and conquer their freedom through blood. Our defense force, $troopCount strong, fought with them street by street
<<if $enemyLosses != $attackTroops>>
inflicting <<print $enemyLosses>> casualties, while sustaining <<print $losses>> casualties themselves.
<<else>>
@@ -107,13 +107,13 @@
The fight was long and hard, but despite their bravery the rebels proved too much for our men.
<</if>>
<<elseif $battleResult == 2>>
- The fight was long and hard, but in the end our men managed to stop the revolt, though not without difficulty.
+ The fight was long and hard, but in the end our men managed to stop the revolt, though not without difficulty.
<<elseif $battleResult == -2>>
The fight was long and hard. Our men in the end had to yield to the rebelling slaves, which were fortunately unable to capitalized on their victory.
<<elseif $battleResult == -1>>
You gave your troops the order to surrender, obediently they stand down.
<</if>>
-
+
/* effects */
<<if $battleResult == 3>>
Thanks to your victory, your @@.green;reputation@@ and @@.darkviolet;authority@@ increased.
@@ -144,11 +144,11 @@
<br>Many of the rebelling slaves were recaptured and punished. The instigators were executed one after another in a public trial that lasted for almost three days.
<<set $ASlaves -= random(10,30)>>
<<elseif $battleResult == -1>>
- Rather than waste the lives of your men you decided to surrender, hoping the rebels will cause less damage if you indulge them, this is however a big hit to your status. Your @@.red;reputation@@ and @@.red;authority@@ are significantly impacted.
+ Rather than waste the lives of your men you decided to surrender, hoping the rebels will cause less damage if you indulge them, this is however a big hit to your status. Your @@.red;reputation@@ and @@.red;authority@@ are significantly impacted.
<<set $rep -= random(1000,1200)>>
<<set $authority -= random(1000,1200)>>
<br>
- The surrender allows the arcology to survive @@.yellow;mostly intact@@, however reports of @@.red;mass looting and killing of citizens@@ flood your office for a few days.
+ The surrender allows the arcology to survive @@.yellow;mostly intact@@, however reports of @@.red;mass looting and killing of citizens@@ flood your office for a few days.
<<set $cash -= 1000>>
<<if $week <= 30>>
<<set $ACitizens -= random(100)>>
@@ -177,7 +177,7 @@
<<set $rebelDefeatAftermath = 5>>
<</if>>
<<else>>
- Today, the _day of _month _year, our arcology was inflamed by the fires of rebellion. $attackTroops rebels from all over the structure dared rise up to dethrone their arcology owner. Our defense force, $troopCount strong, fought with them street by street
+ Today, the _day of _month _year, our arcology was inflamed by the fires of rebellion. $attackTroops rebels from all over the structure dared rise up to dethrone their arcology owner. Our defense force, $troopCount strong, fought with them street by street
<<if $enemyLosses != $attackTroops>>
inflicting <<print $enemyLosses>> casualties, while sustaining <<print $losses>> casualties themselves.
<<else>>
@@ -201,13 +201,13 @@
The fight was long and hard, but despite their bravery the rebels proved too much for our men.
<</if>>
<<elseif $battleResult == 2>>
- The fight was long and hard, but in the end our men managed to stop the revolt, though not without difficulty.
+ The fight was long and hard, but in the end our men managed to stop the revolt, though not without difficulty.
<<elseif $battleResult == -2>>
The fight was long and hard. Our men in the end had to yield to the rebelling slaves, which were fortunately unable to fully capitalized on their victory.
<<elseif $battleResult == -1>>
You gave your troops the order to surrender, obediently they stand down.
<</if>>
-
+
/* effects */
<<if $battleResult == 3>>
Thanks to your victory, your @@.green;reputation@@ and @@.darkviolet;authority@@ increased.
@@ -237,11 +237,11 @@
<br>Many of the rebelling citizens were captured and punished, many others enslaved. The instigators were executed one after another in a public trial that lasted for almost three days.
<<set $ASlaves -= random(10,30)>>
<<elseif $battleResult == -1>>
- Rather than waste the lives of your men you decided to surrender, hoping the rebels will cause less damage if you indulge them, this is however a big hit to your status. Your @@.red;reputation@@ and @@.red;authority@@ are significantly impacted.
+ Rather than waste the lives of your men you decided to surrender, hoping the rebels will cause less damage if you indulge them, this is however a big hit to your status. Your @@.red;reputation@@ and @@.red;authority@@ are significantly impacted.
<<set $rep -= random(1000,1200)>>
<<set $authority -= random(1000,1200)>>
<br>
- The surrender allows the arcology to survive @@.yellow;mostly intact@@, however reports of @@.red;mass looting and killing of citizens@@ flood your office for a few days.
+ The surrender allows the arcology to survive @@.yellow;mostly intact@@, however reports of @@.red;mass looting and killing of citizens@@ flood your office for a few days.
<<set $cash -= 1000>>
<<if $week <= 30>>
<<set $ACitizens -= random(100)>>
@@ -270,7 +270,7 @@
<<set $rebelDefeatAftermath = 5>>
<</if>>
<</if>>
-
+
/* engage rules */
<<if $battleResult != -1>>
<<if $engageRule == 0>>
@@ -325,7 +325,7 @@
<</if>>
<<elseif $engageRule == 2>>
Since you did not apply any restriction on the weapons your forces should use, the arcology reported @@.red;heavy damage@@. Many citizens and uninvolved slaves are reported killed or missing. Casualties between the civilians were inevitable.
- Many businesses were damaged during the battle either by the fight itself, by fires which spread unchecked for hours or by looters.
+ Many businesses were damaged during the battle either by the fight itself, by fires which spread unchecked for hours or by looters.
<<set $arcRepairTime += 7>>
<<if $week <= 30>>
<<set $ACitizens -= random(100)>>
@@ -506,10 +506,10 @@
Your concubine was unfortunately caught in the crossfire and
<<set $woundType = random(1,10)>>
<<if $woundType == 1>>
- a splinter pierced her throat, severing her vocal cords.
+ a splinter pierced her throat, severing her vocal cords.
<<set $Concubine.voice = 0>>
<<elseif $woundType == 2>>
- a splinter hit her face, severely damaging her eyes.
+ a splinter hit her face, severely damaging her eyes.
<<set $Concubine.eyes = -2>>
<<elseif $woundType == 3>>
an explosion near her caused the loss of all her limbs.
@@ -563,16 +563,16 @@
<</if>>
<<if $Bodyguard.intelligence <= -3>>
<<set _woundChance += 1>>
- <</if>>
+ <</if>>
<<set _woundChance *= random(2,4)>>
<<if random(1,100) <= _woundChance>>
During one of the assaults your bodyguard was hit.
<<set $woundType = random(1,10)>>
<<if $woundType == 1>>
- A splinter pierced her throat, severing her vocal cords.
+ A splinter pierced her throat, severing her vocal cords.
<<set $Bodyguard.voice = 0>>
<<elseif $woundType == 2>>
- A splinter hit her face, severely damaging her eyes.
+ A splinter hit her face, severely damaging her eyes.
<<set $Bodyguard.eyes = -2>>
<<elseif $woundType == 3>>
An explosion near her caused the loss of all her limbs.
@@ -676,10 +676,10 @@
Your concubine was unfortunately caught in the crossfire and
<<set $woundType = random(1,10)>>
<<if $woundType == 1>>
- a splinter pierced her throat, severing her vocal cords.
+ a splinter pierced her throat, severing her vocal cords.
<<set $Concubine.voice = 0>>
<<elseif $woundType == 2>>
- a splinter hit her face, severely damaging her eyes.
+ a splinter hit her face, severely damaging her eyes.
<<set $Concubine.eyes = -2>>
<<elseif $woundType == 3>>
an explosion near her caused the loss of all her limbs.
@@ -784,10 +784,10 @@
Your concubine was unfortunately caught in the crossfire and
<<set $woundType = random(1,10)>>
<<if $woundType == 1>>
- a splinter pierced her throat, severing her vocal cords.
+ a splinter pierced her throat, severing her vocal cords.
<<set $Concubine.voice = 0>>
<<elseif $woundType == 2>>
- a splinter hit her face, severely damaging her eyes.
+ a splinter hit her face, severely damaging her eyes.
<<set $Concubine.eyes = -2>>
<<elseif $woundType == 3>>
an explosion near her caused the loss of all her limbs.
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index bf3b0526a161c3e7aec8e6780127586038bc1d5b..305c32242d6cd299ed2ff647509e96c948513c98 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1076,7 +1076,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $nextLink = "EW Slaves">>
<<set $customSlaveOrdered = 0>>
-<<set $customSlave = {age: 19, health: 0, muscles: 0, lips: 15, heightMod: "normal", weight: 0, face: 0, race: "white", skin: 0, boobs: 500, butt: 3, sex: 1, virgin: 0, dick: 2, balls: 2, clit: 0, labia: 0, vaginaLube: 1, analVirgin: 0, skills: 15, whoreSkills: 15, combatSkills: 0, intelligence: 0, intelligenceImplant: 1, nationality: "Stateless", amp: 0, eyes: 1}>>
+<<set $customSlave = {age: 19, health: 0, muscles: 0, lips: 15, voice: -1, heightMod: "normal", weight: 0, face: 0, race: "white", skin: 0, boobs: 500, butt: 3, sex: 1, virgin: 0, dick: 2, balls: 2, clit: 0, labia: 0, vaginaLube: 1, analVirgin: 0, skills: 15, whoreSkills: 15, combatSkills: 0, intelligence: 0, intelligenceImplant: 1, nationality: "Stateless", amp: 0, eyes: 1}>>
<<set $huskSlaveOrdered = 0>>
<<set $huskSlave = {age: 18, nationality: "Stateless", race: "white", sex: 1, virgin: 0}>>
@@ -1201,7 +1201,7 @@ FertilityAge($fertilityAge)
<<set $securityForceGiantRobot = 0>> /* Has the player assembled a makeshift giant robot */
<<set $securityForceMissileSilo = 0>> /* Has the SF found a disused missile silo in need of reassignement?*/
<<set $securityForceAircraftCarrier = 0>> /* Has the SF found a busted down aircraft carrier begging for work? */
-<<set $securityForceSubmarine = 0>> /* Has the SF found a busted down submarine begging for work? */
+<<set $securityForceSubmarine = 0>> /* Has the SF found a busted down submarine begging for work? */
<<set $securityForceHeavyAmphibiousTransport = 0>> /* Has the SF found a busted down heavy amphibious transport begging for work? */
<<set $securityForceMissionEfficiency = 1>> /* How efficient is the SF at completing its assigned task? (Upgrades*Drug Multiplier) */
@@ -1211,11 +1211,11 @@ FertilityAge($fertilityAge)
<<set $FacilitySupportfficiency = 0>> /* How efficent is the support facility? */
<<set $FacilitySupportUpgrade = 0>> /* How many support facility upgrades has the play brought? */
-/* Colonel */
+/* Colonel */
<<set $securityForceSexedColonelToken = 0>> /* Has the player sexed The colonel this week? */
<<set $ColonelCore = 0>> /* What is the core of The Colonel? */
<<set $securityForceColonelToken = 0>> /* Flag to keep track of talking to the colonel. */
-<<set $securityForceColonelSexed = 0>> /* Has the player sexed The colonel this week? */
+<<set $securityForceColonelSexed = 0>> /* Has the player sexed The colonel this week? */
/* TradeShow */
<<set $TradeShowAttendanceGranted = 0>> /* Has The Colonel been allowed to go the TradeShow? */
@@ -1226,7 +1226,7 @@ FertilityAge($fertilityAge)
<<set $TradeShowHelots = 0>> /* How many menail slaves were sent as a bonus from generic scematic sales during the current TradeShow?
<<set $TotalTradeShowHelots = 0>> /* Total number of menail slaves acquired via the Trade Show */
-
+
/* Misc mod variables */
<<set $recruiterEugenics = 0>>
<<set $cyberMod = 0>>
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index e61daf30868948dba4bd5652951162c94590fed4..96265e0c8bbddc1c44b66d0fd559534fa43ede10 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -614,14 +614,6 @@ window.tooBigBelly = function(slave){
return true;
} else if (slave.belly >= 250000+(slave.muscles*800) && slave.physicalAge <= 12) {
return true;
- } else if (slave.bellyImplant > 31000+(slave.muscles*100) && slave.physicalAge >= 18) {
- return true;
- } else if (slave.bellyImplant > 31000+(slave.muscles*80) && slave.physicalAge >= 13) {
- return true;
- } else if (slave.bellyImplant > 12000+(slave.muscles*20) && slave.physicalAge <= 3) {
- return true;
- } else if (slave.bellyImplant > 16000+(slave.muscles*50) && slave.physicalAge <= 12) {
- return true;
} else {
return false;
}
diff --git a/src/npc/descriptions/fLips.tw b/src/npc/descriptions/fLips.tw
index 6de41047ce56a137b8eac8e6679b75c69a93f69d..8c42ffe3ff6374185d71ab72020e5ec7410ca4ac 100644
--- a/src/npc/descriptions/fLips.tw
+++ b/src/npc/descriptions/fLips.tw
@@ -83,14 +83,14 @@ You tell $activeSlave.slaveName to
<<elseif tooBigBelly($activeSlave)>>
You get her situated on the edge of your desk, on her back. This pins her down, the massive weight of her belly stopping her from going anywhere at all. Her head dangles off the edge of the desk, leaving her <<if $seeRace == 1>>$activeSlave.race <</if>>mouth at the perfect angle for use.
<<if ($PC.dick != 0)>>
- <<if $activeSlave.bellyImplant > 8000>>
+ <<if $activeSlave.bellyImplant >= 1500>>
She has absolutely no control over the depth or quickness of oral sex, so you are careful not to hurt her. Even so, you take her to the edge of gagging, enjoying the sight of the spasms running through her stomach as she struggles to breathe. Eventually you shoot your load directly down her gullet.
<<else>>
She has absolutely no control over the depth or quickness of oral sex, so you are careful not to hurt her. Even so, you take her to the edge of gagging, enjoying the sight of her $activeSlave.skin throat bulging and every movement within her overstuffed womb as she struggles to breathe. Eventually you shoot your load directly down her gullet.
<</if>>
<<if $PC.vagina == 1>>If she thought that was it, she's soon corrected: you hike yourself up further, and grind your pussy against her face.<</if>>
<<else>>
- <<if $activeSlave.bellyImplant > 8000>>
+ <<if $activeSlave.bellyImplant >= 1500>>
She has absolutely no control over how hard you grind your cunt against her face, so you are careful not to suffocate her. Even so, you take her to the edge, enjoying the sight of the spasms running through her stomach as she struggles to breathe. Eventually you climax, giving her a good taste of your femcum.
<<else>>
She has absolutely no control over how hard you grind your cunt against her face, so you are careful not to suffocate her. Even so, you take her to the edge, enjoying the sight of the movement within her overstuffed womb as she struggles to breathe. Eventually you climax, giving her a good taste of your femcum.
diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw
index 9c0c0c13611131842c4759f4947fc89dc1633c97..2209c6695d736ea9aedfd2e5164791ee1ddb7498 100644
--- a/src/npc/descriptions/fVagina.tw
+++ b/src/npc/descriptions/fVagina.tw
@@ -281,7 +281,7 @@ You decide to fuck her
She puts her hands on your chest starts to lean back as you continue to thrust upwards;
<</if>>
<<else>> /* wheelbarrow */
- <<if ($activeSlave.preg > 30 && $activeSlave.pregType >= 10) || ($activeSlave.bellyImplant >= 16000)>>
+ <<if ($activeSlave.preg > 30 && $activeSlave.pregType >= 10) || ($activeSlave.bellyImplant >= 300000)>>
Before long both of your strength begins to wane, causing her belly to touch the floor. With some of the weight off of the both of you, you keep on pounding;
<<else>>
She begins to tire as you keep pounding;
diff --git a/src/pregmod/fFeet.tw b/src/pregmod/fFeet.tw
index bca7391715b81c995d133a0fb30a5ff6fb4c5d8c..f6d53997b9bfc722ac56c3d39334951193f1d714 100644
--- a/src/pregmod/fFeet.tw
+++ b/src/pregmod/fFeet.tw
@@ -252,10 +252,18 @@ You call $activeSlave.slaveName to your office, telling $possessive to use $poss
<</if>>
/*Part 2: lube and reaction*/
<<if !canWalk($activeSlave)>>
- <<if $activeSlave.boobs > $activeSlave.belly>>
- Since $pronoun is immobilized by $possessive _boobs boobs, you have $object lay on $possessive side on the floor,
- <<else>>
+ <<if tooBigBreasts($activeSlave)>>
+ Since $pronoun is immobilized by $possessive _boobs boobs, you have $object lay on $possessive side on the floor,
+ <<elseif tooBigBelly($activeSlave)>>
Since $pronoun is immobilized by $possessive <<if $activeSlave.bellyPreg >= 3000>>hugely gravid<<elseif $activeSlave.bellyImplant >= 3000>>_belly protruding<<else>>heavy <<print $activeSlave.inflationType>>-filled<</if>> belly, you have $object lay on $possessive side on the floor,
+ <<elseif tooBigDick($activeSlave)>>
+ Since $pronoun is immobilized by $possessive _dick dick, you have $object lay on $possessive side on the floor,
+ <<elseif tooBigButt($activeSlave)>>
+ Since $pronoun is immobilized by $possessive _dick dick, you have $object sit on your desk to present $possessive _legs legs and feet,
+ <<elseif tooBigBalls(activeSlave)>>
+ Since $pronoun is immobilized by $possessive _balls balls, you have $object lay on $possessive back on the floor with $possessive legs over $possessive nuts,
+ <<else>>
+ You have $object sit on the edge of your desk to present $possessive _legs legs and feet,
<</if>>
<<else>>
You have $object sit on the edge of your desk to present $possessive _legs legs and feet,
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index 49f2942a7ed461d92894577c62c9746ac8f60bc6..fcb42aca1e7cadae21c61def956b4db30eae0dc8 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -1262,12 +1262,13 @@ You beckon the curious girl to your hefty breasts, having noticed how hungrily s
<</link>>
<</if>>
<<if $arcologies[0].FSTransformationFetishistResearch == 1>>
- <br><<link "Put her into a medical coma and implant a 10000cc belly implant in her abdomen">>
+ <br><<link "Put her into a medical coma and implant a 200000cc belly implant in her abdomen">>
<<set $activeSlave.devotion += 25>>
<<set $activeSlave.trust += 25>>
- <<set $activeSlave.bellyImplant = 10000>>
+ <<set $activeSlave.bellyImplant = 200000>>
<<set $cash -= $surgeryCost>>
<<set $activeSlave.health -= 50>>
+ <<SetBellySize $activeSlave>>
<<replace "#result">>
You escort her to the remote surgery, strap her in, and put her under. When she awakes from her induced coma, she nearly faints at the sight of her immense middle. She's @@.hotpink;deliriously happy@@ at her hugeness and @@.mediumaquamarine;squirms happily@@ when she hears you can make it bigger, despite the fact that it is nearly as large as she is and pins her to the bed she lies upon. As it was an invasive surgery, @@.red;her health has been greatly affected.@@
<</replace>>
@@ -1279,6 +1280,7 @@ You beckon the curious girl to your hefty breasts, having noticed how hungrily s
<<set $activeSlave.bellyImplant = 2000>>
<<set $cash -= $surgeryCost>>
<<set $activeSlave.health -= 10>>
+ <<SetBellySize $activeSlave>>
<<replace "#result">>
You escort her to the remote surgery, strap her in, and put her under. When she awakes, she can't keep her hands off her new bulbous middle. She's @@.hotpink;deliriously happy@@ that she has her own round belly and @@.mediumaquamarine;bounces cheerfully@@ when she hears you can make it bigger. As with all surgery @@.red;her health has been slightly affected.@@
<</replace>> //This option costs ¤$surgeryCost//
diff --git a/src/pregmod/saInflation.tw b/src/pregmod/saInflation.tw
index 9b5f35388a9d730f8a11d27363bd5a0a54f10db3..30e28eed5048f7720c122c94b4245690bdb85cf3 100644
--- a/src/pregmod/saInflation.tw
+++ b/src/pregmod/saInflation.tw
@@ -2,7 +2,7 @@
<<if $slaves[$i].assignment == "be confined in the arcade" || $slaves[$i].assignment == "work in the dairy">>
<<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].milkSource = 0>>
-<<elseif $slaves[$i].bellyImplant > 2000>>
+<<elseif $slaves[$i].bellyImplant >= 1500>>
<<if $slaves[$i].inflation > 1>>
Due to the mounting pressure from her filled abdominal implant, she can no longer fill herself as large as she used to.
<<set $slaves[$i].inflation = 1>>
diff --git a/src/pregmod/seHuskSlaveDelivery.tw b/src/pregmod/seHuskSlaveDelivery.tw
index 81b59bc52df858fe1be8ce94cdf4ee677d53e599..b18c527bb9e699e3772ae23f665b08fc8d5f807d 100644
--- a/src/pregmod/seHuskSlaveDelivery.tw
+++ b/src/pregmod/seHuskSlaveDelivery.tw
@@ -6,7 +6,7 @@
<<set $activeSlaveOneTimeMaxAge = $huskSlave.age>>
<<set $one_time_age_overrides_pedo_mode = 1>>
-<<set $fixedNationality = $huskSlave.race>>
+
<<if $huskSlave.sex == 2>>
<<include "Generate XY Slave">>
<<set $activeSlave.boobs = 0>>
@@ -14,12 +14,12 @@
<<else>>
<<include "Generate XX Slave">>
<</if>>
-<<set $fixedNationality = 0>>
<<set $activeSlave.slaveName = "Doll">>
<<set $activeSlave.birthName = "">>
<<set $activeSlave.slaveSurname = "">>
<<set $activeSlave.surname = "">>
+<<set $$activeSlave.race = $huskSlave.race>>
<<set $activeSlave.nationality = $huskSlave.nationality>>
<<set $activeSlave.origin = "You reserved a mindless slave like her from the Flesh Heap.">>
<<set $activeSlave.devotion = 0>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 4055695ebf4b2611e5b84edc2076f41adff8c247..56526bf642c7df67d0178cf28db1663e17fc0495 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -1565,7 +1565,7 @@ Choose a tattoo style:
<</if>>
<br>
-<<if (($activeSlave.belly >= 10000 && ($activeSlave.preg < 30 || $activeSlave.pregType < 10)) || $activeSlave.bellyImplant >= 8000) && $activeSlave.bellyFluid < 5000>>
+<<if $activeSlave.belly >= 10000 && ($activeSlave.preg < 30 || $activeSlave.pregType < 10) && $activeSlave.bellyFluid < 5000>>
<<if $activeSlave.bellyTat == 0>>
$pronounCap has no navel tattoos.
<<else>>
diff --git a/src/uncategorized/customSlave.tw b/src/uncategorized/customSlave.tw
index f2d13cc6a26adb527ed50148c00d7e38485fcc02..0a56f2c299ea266b1f4eb9aaefe562ed7733b9fb 100644
--- a/src/uncategorized/customSlave.tw
+++ b/src/uncategorized/customSlave.tw
@@ -140,6 +140,41 @@
<br>
+<span id = "voice">
+<<if $customSlave.voice == 3>>high, girly voice.
+<<elseif $customSlave.voice == 2>>feminine voice.
+<<elseif $customSlave.voice == 1>>deep voice.
+<<elseif $customSlave.voice == 0>>mute.
+<<elseif $customSlave.voice == -1>>Voice is unimportant.
+<</if>>
+</span>
+<<link "high, girly voice">>
+ <<set $customSlave.voice = 3>>
+ <<CustomSlaveVoice>>
+<</link>>
+|
+<<link "feminine voice">>
+ <<set $customSlave.voice = 2>>
+ <<CustomSlaveVoice>>
+<</link>>
+|
+<<link "deep voice">>
+ <<set $customSlave.voice = 1>>
+ <<CustomSlaveVoice>>
+<</link>>
+|
+<<link "mute">>
+ <<set $customSlave.voice = 0>>
+ <<CustomSlaveVoice>>
+<</link>>
+|
+<<link "Voice is unimportant">>
+ <<set $customSlave.voice = -1>>
+ <<CustomSlaveVoice>>
+<</link>>
+
+<br>
+
<span id = "height">
<<if $customSlave.heightMod == "greatly below average">>Petite.
<<elseif $customSlave.heightMod == "below average">>Short.
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 6f8cf8eff405947076e3635ecc1f0c1efa9877e5..c1a7d0631123d89b3f5a0811a52f2646823cbeb6 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1537,7 +1537,7 @@ The legalities completed, ''__@@.pink;<<SlaveFullName $activeSlave>>@@__'' <<if
<</link>>
<</if>>
-<<if $activeSlave.preg < 1 && $activeSlave.bellyImplant == -1 && $activeSlave.inflation == 0 && $activeSlave.amp != 1 && $arcologies[0].FSHedonisticDecadenceResearch == 1>>
+<<if $activeSlave.preg < 1 && $activeSlave.bellyImplant <= 0 && $activeSlave.inflation == 0 && $activeSlave.amp != 1 && $arcologies[0].FSHedonisticDecadenceResearch == 1>>
<br>
<<link "Offer her a slave-food cookie">>
<<replace "#introResult">>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 51af4323ce0e7679d4bc8d7fca78a65646463f2e..b084a4331263e59582e96eefa8caf5b79903a3c3 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -503,26 +503,26 @@ waist.
<br>
-$pronounCap's got a
+$pronounCap's
<<if $activeSlave.pregKnown == 1>>
- pregnant
+ pregnant.
<<elseif $activeSlave.bellyImplant > 0>>
- <<print $activeSlave.bellyImplant>>cc implant filled
-<<elseif $activeSlave.bellyImplant >= 2000>>
- <<print $activeSlave.inflationType>>-filled
+ got a <<print $activeSlave.bellyImplant>>cc implant filled implant located in $possessive abdomen.
+ <<if $activeSlave.cervixImplant == 1 >>
+ $pronounCap also has micropump filter installed in $possessive cervix feeding into the implant.
+ <</if>>
+<<elseif $activeSlave.bellyFluid >= 1500>>
+ got a <<print $activeSlave.inflationType>>-filled implant located in $possessive abdomen.
+ <<if $activeSlave.cervixImplant == 1 >>
+ $pronounCap also has micropump filter installed in $possessive cervix feeding into the implant.
+ <</if>>
<<elseif $activeSlave.bellyImplant == 0>>
- empty fillable implant in her
-<<else>>
- normal
-<</if>>
-_belly stomach.
-
-<<if $activeSlave.bellyImplant == -1>>
-<<else>>
- $pronounCap has a fillable implant located in $possessive abdomen.
+ got a empty fillable implant located in $possessive abdomen.
<<if $activeSlave.cervixImplant == 1 >>
$pronounCap also has micropump filter installed in $possessive cervix feeding into the implant.
<</if>>
+<<else>>
+ got a normal stomach.
<</if>>
<<if $activeSlave.indentureRestrictions >= 2>>
@@ -531,10 +531,16 @@ _belly stomach.
//You are forbidden from affecting $possessive fertility//
<<elseif $activeSlave.preg > 0 || $activeSlave.inflation > 0>>
//$pronounCap is unable to support an abdominal implant at this time//
-<<elseif $activeSlave.bellyImplant >= 40000>>
- //$possessiveCap belly is as large as $pronoun can physically support//
-<<elseif $activeSlave.bellyImplant > 10000 && $arcologies[0].FSTransformationFetishistResearch != 1>>
- //$possessiveCap belly is as large as $pronoun can physically support//
+<<elseif $activeSlave.bellyImplant >= 750000>>
+ //$possessiveCap abdominal implant is so far beyond its maximum limit it is at risk of rupturing//
+<<elseif $activeSlave.bellyImplant >= 600000>>
+ //$possessiveCap abdominal implant is greatly beyond its maximum limit//
+<<elseif $activeSlave.bellyImplant >= 450000>>
+ //$possessiveCap abdominal implant is over-filled//
+<<elseif $activeSlave.bellyImplant >= 400000>>
+ //$possessiveCap abdominal implant is at its capacity//
+<<elseif $activeSlave.bellyImplant > 130000 && $arcologies[0].FSTransformationFetishistResearch != 1>>
+ //$possessiveCap abdominal implant is at its capacity//
<<elseif $activeSlave.bellyImplant == -1 && ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1) && $bellyImplants == 1>>
[[Implant fillable abdominal implant|Surgery Degradation][$activeSlave.bellyImplant = 0,$activeSlave.preg = -2, $activeSlave.bellyPain += 1,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "bellyIn"]]
<<elseif $activeSlave.bellyImplant == -1 && $bellyImplants == 1>>
@@ -543,12 +549,17 @@ _belly stomach.
//$possessiveCap body can not handle more filler this week//
<<elseif $activeSlave.bellyImplant > -1 && $activeSlave.bellyPain == 0>>
[[Add inert filler|Surgery Degradation][$activeSlave.bellyImplant += 200, $activeSlave.bellyPain += 1,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "bellyUp"]]
+ | [[Add a considerable amount of inert filler|Surgery Degradation][$activeSlave.bellyImplant += 500, $activeSlave.bellyPain += 1,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "bellyUp"]]
<<elseif $activeSlave.bellyImplant > -1 && $activeSlave.bellyPain == 1>>
[[Add more inert filler|Surgery Degradation][$activeSlave.bellyImplant += 200, $activeSlave.bellyPain += 1,$cash -= $surgeryCost, $activeSlave.health -= 30,$surgeryType = "bellyUp"]]
+ | [[Add a considerable amount of inert filler|Surgery Degradation][$activeSlave.bellyImplant += 500, $activeSlave.bellyPain += 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "bellyUp"]]<<if $activeSlave.health < 0>>//@@.red;This may cause severe health issues//<</if>>
<</if>>
<<if $activeSlave.bellyImplant > -1>>
<<if $activeSlave.indentureRestrictions < 2>>
| [[Drain implant|Surgery Degradation][$activeSlave.bellyImplant -= 200,$cash -= $surgeryCost, $surgeryType = "bellyDown"]]
+ <<if $activeSlave.bellyImplant >= 500>>
+ | [[Greatly drain implant|Surgery Degradation][$activeSlave.bellyImplant -= 500,$cash -= $surgeryCost, $surgeryType = "bellyDown"]]
+ <</if>>
| [[Remove implant|Surgery Degradation][$activeSlave.bellyImplant = -1, $activeSlave.cervixImplant = 0, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "bellyOut"]]
<</if>>
<<if $activeSlave.cervixImplant != 1 && $cervixImplants == 1 && $activeSlave.vagina > -1>> /* slave should have vagina */
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 58d1c0a1387aa69d1eab9ee9226effa03afb2a8b..5688727a111d3d8dd50659c7294100eb1878a299 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -1807,7 +1807,8 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<<case "bellyUp">>
- <<if ($activeSlave.bellyImplant == 4000)>>
+ <<SetBellySize $activeSlave>>
+ <<if $activeSlave.bellyImplant >= 10000 && $activeSlave.bellyImplant < 12000>>
Her bellybutton has become an outie from the size of the implant within her.
<</if>>
<<if $activeSlave.bellyPain == 1>>
@@ -1837,7 +1838,7 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<<case "bellyDown">>
- <<if $activeSlave.bellyImplant < 0>><<set $activeSlave.bellyImplant = 0>><</if>>
+ <<if $activeSlave.bellyImplant < 0>><<set $activeSlave.bellyImplant = 0>><</if>><<SetBellySize $activeSlave>>
<<if ($activeSlave.devotion > 50)>>
<<if $activeSlave.amp != 1>>She hefts her lighter belly experimentally and turns to you with a smile to show off her new, slimmer form. She's still sore, so she doesn't bounce or stretch, but she turns from side to side to let you see it from all angles.<<else>>She bounces a little to feel the change in weight within her middle and turns her torso to you with a smile to show is off. She's still sore, so she doesn't bounce too much.<</if>> @@.hotpink;She's happy with your changes to her body@@ and @@.mediumaquamarine;trusts@@ that your looking out for her ability to serve you. As with all surgery @@.red;her health has been slightly affected.@@
<<set $activeSlave.devotion += 3>>
@@ -1852,6 +1853,7 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<<case "bellyOut">>
+ <<SetBellySize $activeSlave>>
She notices almost immediately that the weight in her middle is gone. She shifts her torso idly; it looks like she doesn't know what to think about having her belly implant removed. As with all surgery @@.red;her health has been slightly affected.@@
<<case "body hair removal">>
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 4c16b7686a7852d07e2c43e1aaa0b9ad37dbf127..9d853bae4c846641b2f142e2cfbcd76a64f8d890 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -703,8 +703,8 @@
<<case "pregnancy">>
having intimate sex <<if $activeSlave.livingRules == "luxurious">>in the nice little room they share.<<elseif ($activeSlave.ID == $HeadGirl.ID) && ($HGSuite == 1)>>in $activeSlave.ID's suite.<<else>>out in the open in the slave dormitory.<</if>> $activeSlave.slaveName's <<if visibleBelly($activeSlave)>>middle is heavily rounded<<else>>desire to be bred is raging<</if>>, and _partnerSlave.slaveName does her best to keep her _activeSlaveRel satisfied.
_partnerSlave.slaveName
- <<if ($activeSlave.vagina > 0) || ($activeSlave.anus > 0)>>
- <<if _partnerSlave.bellyPreg >= 10000 || _partnerSlave.bellyImplant >= 4000>> is heavily pregnant herself, so she has $activeSlave.slaveName on her back so that she can penetrate her as best she can with her<<elseif _partnerSlave.bellyPreg > 5000>> is pregnant herself, so she has $activeSlave.slaveName on her back so that she can penetrate her easier with her<<else>>has $activeSlave.slaveName on her back so that tease her belly as she fucks her with her<</if>>
+ <<if (canDoVaginal($activeSlave) && $activeSlave.vagina > 0) || (canDoAnal($activeSlave) && $activeSlave.anus > 0)>>
+ <<if _partnerSlave.bellyPreg >= 10000 || _partnerSlave.bellyImplant >= 10000>> is <<if _partnerSlave.bellyPreg >= 1500>>heavily pregnant<<else>>hugely gravid<</if>> herself, so she has $activeSlave.slaveName on her back so that she can penetrate her as best she can with her<<elseif _partnerSlave.bellyPreg > 5000 || _partnerSlave.bellyImplant >= 10000>> is <<if _partnerSlave.bellyPreg >= 1500>>pregnant<<else>>gravid<</if>>herself, so she has $activeSlave.slaveName on her back so that she can penetrate her easier with her<<else>>has $activeSlave.slaveName on her back so that tease her belly as she fucks her with her<</if>>
<<if (_partnerSlave.dick > 1) && canPenetrate(_partnerSlave)>>
cock
<<else>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index dbf1943bc373387929a03a7c64bc9d378725cae6..ba2ce55be865041ec3fcc4701b4a93a348dbb17d 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -2771,6 +2771,12 @@ This experience
<<else>>
<<set $args[0].bellyPreg = 0>>
<</if>>
+ <<if $args[0].bellyImplant > 0>>
+ <<set _implantSize = $args[0].bellyImplant>>
+ <<else>>
+ <<set _implantSize = 0>>
+ <</if>>
+ <</if>>
<<if $args[0].inflation == 3>>
<<set $args[0].bellyFluid = 10000>>
<<elseif $args[0].inflation == 2>>
@@ -2780,7 +2786,7 @@ This experience
<<else>>
<<set $args[0].bellyFluid = 0>>
<</if>>
- <<set $args[0].belly = $args[0].bellyPreg+$args[0].bellyFluid>>
+ <<set $args[0].belly = $args[0].bellyPreg+$args[0].bellyFluid+_implantSize>>
<</widget>>
/* see how they are on a single line? This permits "."s and other things to be appended directly onto the widget result */
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index f5300fb3d1fc117f525e85c43071ff0eac9be3a8..878fba4229374142ead3591b041923722a709059 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -474,7 +474,7 @@
<</if>>
</span>
<<textbox "$activeSlave.pubertyAgeXX" $activeSlave.pubertyAgeXX "Starting Girls">>
- <<link "Postpubescent">><<set $activeSlave.pubertyXX = 1>><<replace "#pub">>Postpubescent.<</replace>><<StartingGirlsCost>><</link>> |
+ <<link "Postpubescent">><<set $activeSlave.pubertyXX = 1>><<replace "#pub">>Postpubescent.<</replace>><<StartingGirlsCost>><</link>> |
<<link "Prepubescent">><<set $activeSlave.pubertyXX = 0,$activeSlave.pubertyAgeXX = $fertilityAge,$activeSlave.preg = 0,$activeSlave.pregType = 0,$activeSlave.belly = 0,$activeSlave.bellyPreg = 0,$activeSlave.pregSource = 0>><<replace "#pub">>Prepubescent.<</replace>><<StartingGirlsCost>><</link>>
<<if $PC.dick == 1>>
<br> ''Father:''
@@ -483,7 +483,7 @@
<<else>>
<</if>>
</span>
- <<link "Carrying my child">><<set $activeSlave.pregSource = -1>><<replace "#father">>My child.<</replace>><<StartingGirlsCost>><</link>> |
+ <<link "Carrying my child">><<set $activeSlave.pregSource = -1>><<replace "#father">>My child.<</replace>><<StartingGirlsCost>><</link>> |
<<link "Clear">><<set $activeSlave.pregSource = 0>><<replace "#father">><</replace>><<StartingGirlsCost>><</link>>
<</if>>
<</replace>>
@@ -560,7 +560,7 @@
<<else>>Prepubescent.
<</if>>
</span>
- <<link "Postpubescent">><<set $activeSlave.pubertyXY = 1>><<replace "#Mpub">>Postpubescent.<</replace>><<StartingGirlsCost>><</link>> |
+ <<link "Postpubescent">><<set $activeSlave.pubertyXY = 1>><<replace "#Mpub">>Postpubescent.<</replace>><<StartingGirlsCost>><</link>> |
<<link "Prepubescent">><<set $activeSlave.pubertyXY = 0,$activeSlave.pubertyAgeXY = $potencyAge>><<replace "#Mpub">>Prepubescent.<</replace>><<StartingGirlsCost>><</link>>
<</if>>
<</if>>
@@ -571,7 +571,7 @@
<<else>>No prostate.
<</if>>
<</replace>>
-
+
<<replace "#analSkillsBlock">>
<<if $activeSlave.anus == 0>>
//Anal virgins cannot be given anal skills//
@@ -695,7 +695,7 @@
<<replace "#devotionWarning">>
<<if $activeSlave.devotion > 20>>
<br>
- //@@.red;Starting slaves incur
+ //@@.red;Starting slaves incur
<<if $activeSlave.devotion > 50>>
a severe cost penalty at very high
<<else>>
@@ -708,7 +708,7 @@
<<replace "#skillsWarning">>
<<if $activeSlave.whoreSkill+$activeSlave.entertainSkill+$activeSlave.vaginalSkill+$activeSlave.analSkill+$activeSlave.oralSkill+($activeSlave.combatSkill*100) > 200>>
<br>
- //@@.red;Starting slaves incur
+ //@@.red;Starting slaves incur
<<if $activeSlave.whoreSkill+$activeSlave.entertainSkill+$activeSlave.vaginalSkill+$activeSlave.analSkill+$activeSlave.oralSkill+($activeSlave.combatSkill*100) > 400>>
a severe cost penalty at for being highly
<<else>>
@@ -1522,6 +1522,20 @@
<</replace>>
<</widget>>
+/%
+ Call as <<CustomSlaveVoice>>
+%/
+<<widget "CustomSlaveVoice">>
+ <<replace #voice>>
+ <<if $customSlave.voice == 3>>high, girly voice.
+ <<elseif $customSlave.voice == 2>>feminine voice.
+ <<elseif $customSlave.voice == 1>>deep voice.
+ <<elseif $customSlave.voice == 0>>mute.
+ <<elseif $customSlave.voice == -1>>Voice is unimportant.
+ <</if>>
+ <</replace>>
+<</widget>>
+
/%
Call as <<CustomSlaveHeight>>
%/
@@ -1893,11 +1907,11 @@
<</replace>>
<</widget>>
-/%
+/%
Call as <<GenerateMarketSlave 'market' ['arcology']>>
If $args[0] is undefined, will generate a kidnapper's market slave.
If $args[0] is "neighbor", $numArcology is used as the index of which neighbor to use.
-
+
%/
<<widget GenerateMarketSlave>>
<<if $args[0]>>
@@ -2269,15 +2283,15 @@
<<set $activeSlave.amp = 1>>
<<set $activeSlave.fetishStrength = 10, $activeSlave.attrXY = 50, $activeSlave.attrXX = 50, $activeSlave.attrKnown = 1, $activeSlave.devotion = 40, $activeSlave.trust = -40, $activeSlave.vaginalSkill = 0, $activeSlave.oralSkill = 0, $activeSlave.analSkill = 0, $activeSlave.combatSkill = 0, $activeSlave.whoreSkill = 0, $activeSlave.entertainSkill = 0, $activeSlave.intelligence = -2, $activeSlave.intelligenceImplant = 0, $activeSlave.sexualFlaw = "none", $activeSlave.sexualQuirk = "none", $activeSlave.behavioralFlaw = "none", $activeSlave.behavioralQuirk = "none">>
<</if>>
-
-
+
+
<<case "neighbor">>
<<if ($numArcology < $arcologies.length) && ($numArcology > 0)>>
<<set _market = $numArcology>>
<<else>>
<<set _market = 1>>
<</if>>
-
+
<<set $activeArcology = $arcologies[0]>>
<<set $targetArcology = $arcologies[_market]>>
<<include "Arcology Opinion">>
@@ -2315,7 +2329,7 @@
They're universally $arcologies[_market].FSSubjugationistRace.
<<set $fixedRace = $arcologies[_market].FSSubjugationistRace>><<NationalityToRace $activeSlave>><<NationalityToName $activeSlave>><<NationalityToAccent $activeSlave>><<set $fixedRace = 0>>
<</if>>
-
+
<<if $arcologies[_market].FSRepopulationFocus > 50>>
They are exclusively female and all extremely pregnant.
<<set $activeSlave.ovaries = 1>>
@@ -2355,7 +2369,7 @@
<<set $activeSlave.addict = either(0,0,0,0,0,0,0,0,5,20,20,50,100)>>
<</if>>
<</if>>
-
+
<<if $arcologies[_market].FSGenderRadicalist > 50>>
They all show signs of intensive hormone therapy.
<<set $activeSlave.chem += random(10,100)>>
@@ -2443,7 +2457,7 @@
<<set $activeSlave.eyes = -2>>
<</if>>
<</if>>
-
+
<<if $arcologies[_market].FSBodyPurist > 80>>
They're quite pristine, free of any genomic damage or addictions regardless of any transformations they've had.
<<set $activeSlave.chem = 0>>
@@ -2580,7 +2594,7 @@
<</if>>
<<set $activeSlave.fetishStrength = random(60,90)>>
<<if random(1,100) <= 5 && $activeSlave.fetish != "mindbroken">>
- <<switch $activeSlave.fetish>>
+ <<switch $activeSlave.fetish>>
<<case "submissive">>
<<set $activeSlave.sexualFlaw = "neglectful">>
<<case "cumslut">>
@@ -2631,7 +2645,7 @@
<<set $activeSlave.muscles += random(0,20)>>
<</if>>
<</if>>
-
+
<<if $arcologies[_market].FSChattelReligionist > 20>>
They're rarely anything but devoted, and sometimes present interesting peccadilloes.
<<set $activeSlave.slaveName = setup.chattelReligionistSlaveNames.random()>>
@@ -3574,7 +3588,7 @@
<<set $activeSlave.hStyle = either("neat", "braided", "tails", "ponytail", "bun")>>
<<set $activeSlave.hLength = random(5,50)>>
<<set $activeSlave.clothes = "a nice maid outfit">>
- <<set $activeSlave.customTat = "She has the sword and eagle symbol of the Hippolyta Academy tattooed on her left shoulder.">>
+ <<set $activeSlave.customTat = "She has the sword and eagle symbol of the Hippolyta Academy tattooed on her left shoulder.">>
<<default>>
Someone messed up. _market is not known.