From c5140461c505fbd64b52a44e1baf1f85eb200aa4 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 23 Feb 2017 03:18:35 -0500
Subject: [PATCH] Completion of incubator (first trial - player)
---
src/events/intro/introSummary.tw | 2 +-
src/init/storyInit.tw | 1 -
src/js/utilJS.tw | 67 +++++++
src/pregmod/generateChild.tw | 5 +-
src/pregmod/incubator.tw | 63 ++++---
src/pregmod/incubatorReport.tw | 186 +++++++++++++++++---
src/pregmod/incubatorRetrievalWorkaround.tw | 11 ++
src/pregmod/incubatorWorkaround.tw | 15 +-
src/uncategorized/longSlaveDescription.tw | 8 +-
src/uncategorized/saLongTermEffects.tw | 5 +
10 files changed, 300 insertions(+), 63 deletions(-)
create mode 100644 src/js/utilJS.tw
create mode 100644 src/pregmod/incubatorRetrievalWorkaround.tw
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 3b0667a94c3..e23d1b5d1d8 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -351,7 +351,7 @@ The Free City is located on ''$terrain'' terrain.
The Free City is located in ''$continent''.
-[[North America|Intro Summary][$continent to "North America", $language to "English"]] | [[South America|Intro Summary][$continent to "South America", $language to "Spanish"]] | [[Europe|Intro Summary][$continent to "Europe", $language to "English"]] | [[the Middle East|Intro Summary][$continent to "the Middle East", $language to "Arabic"]] | [[Africa|Intro Summary][$continent to "Africa", $language to "Arabic"]] | [[Asia|Intro Summary][$continent to "Asia", $language to "Chinese"]] | [[Australia|Intro Summary][$continent to "Australia", $language to "English"]] | [[Japan|Intro Summary][$continent to "Japan", $language to "Japanese"]]
+[[North America|Intro Summary][$continent to "North America", $language to "English"]] | [[South America|Intro Summary][$continent to "South America", $language to "Spanish"]] | [[Europe|Intro Summary][$continent to "Europe", $language to "English"]] | [[the Middle East|Intro Summary][$continent to "the Middle East", $language to "Arabic"]] | [[Africa|Intro Summary][$continent to "Africa", $language to "Arabic"]] | [[Asia|Intro Summary][$continent to "Asia", $language to "Chinese"]] | [[Australia|Intro Summary][$continent to "Australia", $language to "English"]] | [[Japan|Intro Summary][$continent to "Japan", $language to "Japanese", $PC.race to "asian", $PC.nationality to "Japanese", $PC.hColor to "black", $PC.eyeColor to "brown"]]
<</if>>
<br>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 99e6b324447..d082e37b343 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -514,7 +514,6 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $incubatorName = "the Incubator">>
<<set $incubatorNameCaps = "The Incubator">>
<<set $tanks = []>>
-<<set $tanks = [0]>>
<<set $clinicSlaves = 0>>
<<set $clinicDecoration = "standard">>
<<set $clinic = 0>>
diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw
new file mode 100644
index 00000000000..bf939d49397
--- /dev/null
+++ b/src/js/utilJS.tw
@@ -0,0 +1,67 @@
+:: UtilJS [script]
+
+if(!Array.prototype.findIndex) {
+ Array.prototype.findIndex = function(predicate) {
+ if (this == null) {
+ throw new TypeError('Array.prototype.find called on null or undefined');
+ }
+ if (typeof predicate !== 'function') {
+ throw new TypeError('predicate must be a function');
+ }
+ var list = Object(this);
+ var length = list.length >>> 0;
+ var thisArg = arguments[1];
+ var value;
+
+ for (var i = 0; i < length; i++) {
+ value = list[i];
+ if (predicate.call(thisArg, value, i, list)) {
+ return i;
+ }
+ }
+ return -1;
+ };
+};
+
+/*
+A categorizer is used to "slice" a value range into distinct categories in an efficient manner.
+
+--- Example ---
+Original SugarCube code
+<<if _Slave.muscles > 95>>
+ Musc++
+<<elseif _Slave.muscles > 30>>
+ Musc+
+<<elseif _Slave.muscles > 5>>
+ Toned
+<<elseif _Slave.muscles > -6>>
+<<elseif _Slave.muscles > -31>>
+ @@color:red;weak@@
+<<elseif _Slave.muscles > -96>>
+ @@color:red;weak+@@
+<<else>>
+ @@color:red;weak++@@
+<</if>>
+
+As a categorizer
+<<if ndef $cats>><<set $cats = {}>><</if>>
+<<if ndef $cats.muscleCat>>
+ <!-- This only gets set once, skipping much of the code evaluation, and can be set outside of the code in an "init" passage for further optimization -->
+ <<set $cats.muscleCat = new Categorizer([96, 'Musc++'], [31, 'Musc+'], [6, 'Toned'], [-5, ''], [-30, '@@color:red;weak@@'], [-95, '@@color:red;weak+@@'], [-Infinity, '@@color:red;weak++@@'])>>
+<</if>>
+<<print $cats.muscleCat.cat(_Slave.muscles)>>
+*/
+window.Categorizer = function() {
+ this.cats = Array.prototype.slice.call(arguments)
+ .filter(function(e, i, a) {
+ return e instanceof Array && e.length == 2 && typeof e[0] === 'number' && !isNaN(e[0])
+ && a.findIndex(function(val) { return e[0] === val[0]; }) === i; /* uniqueness test */ })
+ .sort(function(a, b) { return b[0] - a[0]; /* reverse sort */ });
+};
+window.Categorizer.prototype.cat = function(val, def) {
+ if(typeof val !== 'number' || isNaN(val)) {
+ return def;
+ }
+ var result = this.cats.find(function(e) { return val >= e[0]; });
+ return result ? result[1] : def;
+};
diff --git a/src/pregmod/generateChild.tw b/src/pregmod/generateChild.tw
index 52dd3fd4368..49db62a4e4f 100644
--- a/src/pregmod/generateChild.tw
+++ b/src/pregmod/generateChild.tw
@@ -385,8 +385,11 @@
<<set $activeSlave.vaginalSkill = 0>>
<<set $activeSlave.accent = 3>>
<<set $activeSlave.canRecruit = 0>>
+<<set $activeSlave.hStyle = "long">>
+<<set $activeSlave.hLength = 300>>
+<<set $activeSlave.pubicHStyle = either("bushy", "bushy", "bushy", "bushy", "bushy", "bushy", "hairless)>>
+<<set $activeSlave.underArmHStyle = either("bushy", "bushy", "bushy", "bushy", "bushy", "bushy", "hairless)>>
-<<set $targetAge = 0>>
<<set $mergeMom = 0>>
<<set $mergeDad = 0>>
<<set $mom = 0>>
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index 200bb0b50d1..227c256a3ca 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -6,21 +6,15 @@
<<set $returnTo to "Incubator">>
<<set $targetAge to Math.clamp($targetAge, $minimumSlaveAge, 18)>>
-<<if $tanks == 0>>
- <<set $tanks = [0]>>
-<</if>>
<<if $incubatorName != "the Incubator">>
- <<set $incubatorNameCaps to $arcadeName.replace("the ", "The ")>>
+ <<set $incubatorNameCaps to $incubatorName.replace("the ", "The ")>>
<</if>>
+<<set $readySlaves to 0>>
+<<set $readySlave to 0>>
<<set $incubatorSlaves to 0>>
-<<set $notIncubatorSlaves to 0>>
<<for _i to 0; _i < $tanks.length; _i++>>
- <<if $tanks[_i] != 0>>
<<set $incubatorSlaves += 1>>
- <<else>>
- <<set $notIncubatorSlaves += 1>>
- <</if>>
<</for>>
<br><br>
@@ -31,14 +25,14 @@ $incubatorNameCaps is a clean, cold hall designed to be lined with tanks and the
<<elseif $incubatorSlaves > 0>>
It's barely used; most of the tanks lie dormant.
<<else>>
- It's empty and quiet. [[Decommission the incubator|Main][$incubator to 0, $incubatorUpgradeSpeed = 0, $incubatorUpgradeWeight = 0, $incubatorUpgradeMuscles = 0, $incubatorUpgradeReproduction = 0, $tanks = [0]]]
+ It's empty and quiet. [[Decommission the incubator|Main][$incubator to 0, $incubatorUpgradeSpeed = 0, $incubatorUpgradeWeight = 0, $incubatorUpgradeMuscles = 0, $incubatorUpgradeReproduction = 0, $tanks = []]]
<</if>>
<br>It can support $incubator <<if $incubator == 1>>child<<else>>children<</if>>.
<<if $incubator == $incubatorSlaves>>
All of the tanks are currently occupied by growing children.
<</if>>
-[[Add another incubation tank|Incubator][$cash -= Math.trunc(60000*$upgradeMultiplierArcology), $incubator += 1, $tanks.push(0)]] //Costs ¤<<print Math.trunc(60000*$upgradeMultiplierArcology)>> and will increase upkeep costs//
+[[Add another incubation tank|Incubator][$cash -= Math.trunc(60000*$upgradeMultiplierArcology), $incubator += 1]] //Costs ¤<<print Math.trunc(60000*$upgradeMultiplierArcology)>> and will increase upkeep costs//
<br>
Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimum Legal Age|Incubator][$targetAge to $minimumSlaveAge]] | [[Average Age of Fertility|Incubator][$targetAge to $fertilityAge]] | [[Average Age of Potency|Incubator][$targetAge to $potencyAge]] | [[Legal Adulthood|Incubator][$targetAge to 18]]
@@ -78,11 +72,15 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
There are no systems in place to control a growing child's reproductive capability. [[Upgrade the growth tanks with hormone monitoring systems|Incubator][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $incubatorUpgradeReproduction to 1]] //Costs ¤<<print Math.trunc(50000*$upgradeMultiplierArcology)>> and will increase upkeep costs//
<</if>>
+<<if $incubatorSlaves > 0>>
<<for $i to 0; $i < $tanks.length; $i++>>
- <<if $tanks[$i] == 0>>
- <br><br>Tank #<<print $i + 1>> is currently empty.
- <<else>>
- <br><br>Tank #<<print $i + 1>> is currently accelerating <<print $tanks[$i].slaveName>>'s growth. She will be ready for release in about Math.round($tanks[$i].growth/$incubatorUpgradeSpeed) weeks.
+ <<set $tanks[$i].birthName = $tanks[$i].slaveName>>
+ <<if $tanks[$i].growTime <= 0>>
+ <<set $readySlaves = 1>>
+ <br><br>$tanks[$i].slaveName is ready to be released from her tank.
+ <<else>>
+ <br><br><<print $tanks[$i].slaveName>>'s growth is currently being accelerated. She will be ready for release in about <<print Math.round($tanks[$i].growTime/$incubatorUpgradeSpeed)>> weeks.
+ <</if>>
<<if $incubatorUpgradeWeight == 1>>
<br>
<<if $incubatorWeightSetting == 1>>
@@ -114,24 +112,24 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<</if>>
<</if>>
<br>
- Choose a name for her. <<textbox "$tanks[$i].birthName" $tanks[$i].birthName "Incubator">>
+ Choose a name for her. <<textbox "$tanks[$i].slaveName" $tanks[$i].slaveName "Incubator">>
<<if $tanks[$i].mother > 0>>
<<for _j to 0; _j < $slaves.length; _j++>>
<<if $tanks[$i].mother == $slaves[_j].ID>>
<<if $slaves[_j].ID == $Concubine.ID>>
- | [[Permit your Concubine to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ | [[Permit your Concubine to name her daughter|Incubator][$tanks[$i].slaveName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
<<break>>
<<elseif $slaves[_j].relationship == -4>>
- | [[Permit your wife to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ | [[Permit your wife to name her daughter|Incubator][$tanks[$i].slaveName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
<<break>>
<<elseif $slaves[_j].ID == $Bodyguard.ID>>
- | [[Permit your bodyguard to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ | [[Permit your bodyguard to name her daughter|Incubator][$tanks[$i].slaveName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
<<break>>
<<elseif $slaves[_j].ID == $HeadGirl.ID>>
- | [[Permit your headgirl to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ | [[Permit your headgirl to name her daughter|Incubator][$tanks[$i].slaveName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
<<break>>
<<elseif $slaves[_j].devotion > 50 && slaves[_j].trust > 50>>
- | [[Permit her devoted mother to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ | [[Permit her devoted mother to name her daughter|Incubator][$tanks[$i].slaveName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
<<break>>
<</if>>
<</if>>
@@ -141,27 +139,26 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<<for _j to 0; _j < $slaves.length; _j++>>
<<if $tanks[$i].father == $slaves[_j].ID>>
<<if $slaves[_j].ID == $Concubine.ID>>
- | [[Permit your Concubine to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ | [[Permit your Concubine to name her daughter|Incubator][$tanks[$i].slaveName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
<<break>>
<<elseif $slaves[_j].relationship == -4>>
- | [[Permit your wife to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ | [[Permit your wife to name her daughter|Incubator][$tanks[$i].slaveName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
<<break>>
<<elseif $slaves[_j].ID == $Bodyguard.ID>>
- | [[Permit your bodyguard to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ | [[Permit your bodyguard to name her daughter|Incubator][$tanks[$i].slaveName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
<<break>>
<<elseif $slaves[_j].ID == $HeadGirl.ID>>
- | [[Permit your headgirl to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ | [[Permit your headgirl to name her daughter|Incubator][$tanks[$i].slaveName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
<<break>>
<<elseif $slaves[_j].devotion > 50 && slaves[_j].trust > 50 && slaves[_j].fuckdoll == 0>>
- | [[Permit her devoted father to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ | [[Permit her devoted father to name her daughter|Incubator][$tanks[$i].slaveName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
<<break>>
<</if>>
<</if>>
<</for>>
<</if>>
- <<set $tanks[$i].slaveName = $tanks[$i].birthName>>
- <</if>>
<</for>>
+<</if>>
<br><br>
@@ -195,5 +192,15 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<</if>>
<</if>>
+<<if $readySlaves == 1>>
+ <<for $i to 0; $i < $tanks.length; $i++>>
+ <<if $tanks[$i].growTime <= 0>>
+ <<set $readySlave = $tanks.pluck([$i], [$i])>>
+ <<break>>
+ <</if>>
+ <</for>>
+ <<goto "Incubator Retrieval Workaround">>
+<</if>>
+
<br><br>Rename $incubatorName: <<textbox "$incubatorName" $incubatorName "Incubator">> //Use a noun or similar short phrase//
diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw
index 34321c873a0..949db2ae050 100644
--- a/src/pregmod/incubatorReport.tw
+++ b/src/pregmod/incubatorReport.tw
@@ -3,32 +3,22 @@
''Incubator Report''<hr style="margin:0">
<<set $incubatorSlaves to 0>>
-/*
- <<if $incubatorUpgradeSpeed == 52>>
- <<elseif $incubatorUpgradeSpeed == 18>>
- <<elseif $incubatorUpgradeSpeed == 9>>
- <<elseif $incubatorUpgradeSpeed == 6>>
- <<elseif $incubatorUpgradeSpeed == 5>>
- <</if>>
-*/
-
<<for $i to 0; $i < $tanks.length; $i++>>
-<<if $tanks[$i] > 0>>
<<set $tanks[$i].birthWeek += 1>>
- <<if $tanks[$i].birthWeek >= 52>>
+ <<if $tanks[$i].birthWeek >= 52>>
<<set $tanks[$i].birthWeek to 0>>
<<if $seeAge == 1>>
<<set $tanks[$i].actualAge += 1>>
<</if>>
- <</if>>
<</if>>
<<set $incubatorSlaves += 1>>
- <br>Tank #<<print $i + 1>> is currently accelerating <<print $tanks[$i].slaveName>>'s growth. She will be ready for release in about Math.round($tanks[$i].growth/$incubatorUpgradeSpeed) weeks.
- <<if $tanks[$i].growth > 0>>
- <<set $tanks[$i].growth -= $incubatorUpgradeSpeed>>
+ <br><<print $tanks[$i].slaveName>>'s growth is currently being accelerated. She will be ready for release in about <<print Math.round($tanks[$i].growTime/$incubatorUpgradeSpeed)>> weeks.
+ <<if $tanks[$i].growTime > 0>>
+ <<set $tanks[$i].growTime -= $incubatorUpgradeSpeed>>
<<else>>
- She is @@color:lime;ready for release.@@
+ $tanks[$i].slaveName is @@color:lime;ready for release.@@
<</if>>
+
<<if $incubatorUpgradeWeight == 1>>
<<if $incubatorWeightSetting == 1>>
<<if $tanks[$i].weight < 100>>
@@ -147,10 +137,133 @@
<<set $tanks[$i].muscles -= 40>>
<</if>>
<</if>>
+
<<if $incubatorUpgradeReproduction == 1>>
<br>
<<if $incubatorReproductionSetting == 2>>
- Her hormone levels are purposefully set highter than recommended; over-active reproductive systems likely.
+ Her developing body is being flooded with hormones.
+ <<if $tanks[$i].ovaries == 1>>
+ <<set $tanks[$i].pubertyXX = 1>>
+ <<if $seeHyperPreg == 1>>
+ <<set $tanks[$i].pregType = random(25,45)>>
+ <<else>>
+ <<set $tanks[$i].pregType = random(3,5)>>
+ <</if>>
+ <<if $incubatorUpgradeSpeed == 52>>
+ <<if $tanks[$i].breasts < 8000>>
+ The excess estrogen @@color:green;rapidly balloons her breasts.@@
+ <<set $tanks[$i].breasts += 1000>>
+ <</if>>
+ <<if $tanks[$i].hips < 2 && random(1,100) > 50>>
+ The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
+ <<set $tanks[$i].hips += 2>>
+ <</if>>
+ <<if $tanks[$i].butt < 12 && random(1,100) > 30>>
+ The excess estrogen @@color:green;causes her rear grow fatter.@@
+ <<set $tanks[$i].butt += 4>>
+ <</if>>
+ <<elseif $incubatorUpgradeSpeed == 18>>
+ <<if $tanks[$i].breasts < 8000>>
+ The excess estrogen @@color:green;rapidly balloons her breasts.@@
+ <<set $tanks[$i].breasts += 500>>
+ <</if>>
+ <<if $tanks[$i].hips < 2 && random(1,100) > 50>>
+ The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
+ <<set $tanks[$i].hips += 1>>
+ <</if>>
+ <<if $tanks[$i].butt < 12 && random(1,100) > 50>>
+ The excess estrogen @@color:green;causes her rear grow fatter.@@
+ <<set $tanks[$i].butt += 3>>
+ <</if>>
+ <<elseif $incubatorUpgradeSpeed == 9>>
+ <<if $tanks[$i].breasts < 8000>>
+ The excess estrogen @@color:green;rapidly balloons her breasts.@@
+ <<set $tanks[$i].breasts += 200>>
+ <</if>>
+ <<if $tanks[$i].hips < 2 && random(1,100) > 60>>
+ The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
+ <<set $tanks[$i].hips += 1>>
+ <</if>>
+ <<if $tanks[$i].butt < 12 && random(1,100) > 50>>
+ The excess estrogen @@color:green;causes her rear grow fatter.@@
+ <<set $tanks[$i].butt += 2>>
+ <</if>>
+ <<elseif $incubatorUpgradeSpeed == 6>>
+ <<if $tanks[$i].breasts < 8000>>
+ The excess estrogen @@color:green;rapidly balloons her breasts.@@
+ <<set $tanks[$i].breasts += 100>>
+ <</if>>
+ <<if $tanks[$i].hips < 2 && random(1,100) > 70>>
+ The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
+ <<set $tanks[$i].hips += 1>>
+ <</if>>
+ <<if $tanks[$i].butt < 12 && random(1,100) > 60>>
+ The excess estrogen @@color:green;causes her rear grow fatter.@@
+ <<set $tanks[$i].butt += 1>>
+ <</if>>
+ <<elseif $incubatorUpgradeSpeed == 5>>
+ <<if $tanks[$i].breasts < 8000>>
+ The excess estrogen @@color:green;rapidly balloons her breasts.@@
+ <<set $tanks[$i].breasts += 100>>
+ <</if>>
+ <<if $tanks[$i].hips < 2 && random(1,100) > 80>>
+ The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
+ <<set $tanks[$i].hips += 1>>
+ <</if>>
+ <<if $tanks[$i].butt < 12 && random(1,100) > 70>>
+ The excess estrogen @@color:green;causes her rear grow fatter.@@
+ <<set $tanks[$i].butt += 1>>
+ <</if>>
+ <</if>>
+ <<elseif $tanks[$i].balls > 0>>
+ <<set $tanks[$i].pubertyXY = 1>>
+ <<if $incubatorUpgradeSpeed == 52>>
+ <<if $tanks[$i].balls < 40>>
+ The excess testosterone @@color:green;causes her balls to balloon for extra cum production.@@
+ <<set $tanks[$i].balls += 16>>
+ <</if>>
+ <<if $tanks[$i].dick < 10 && random(1,100) > 20>>
+ The excess testosterone @@color:green;causes her penis to swell.@@
+ <<set $tanks[$i].dick += 4>>
+ <</if>>
+ <<elseif $incubatorUpgradeSpeed == 18>>
+ <<if $tanks[$i].balls < 40 && random(1,100) > 10>>
+ The excess testosterone @@color:green;causes her balls to balloon for extra cum production.@@
+ <<set $tanks[$i].balls += 9>>
+ <</if>>
+ <<if $tanks[$i].dick < 10 && random(1,100) > 30>>
+ The excess testosterone @@color:green;causes her penis to swell.@@
+ <<set $tanks[$i].dick += 3>>
+ <</if>>
+ <<elseif $incubatorUpgradeSpeed == 9>>
+ <<if $tanks[$i].balls < 40 && random(1,100) > 20>>
+ The excess testosterone @@color:green;causes her balls to balloon for extra cum production.@@
+ <<set $tanks[$i].balls += 4>>
+ <</if>>
+ <<if $tanks[$i].dick < 10 && random(1,100) > 50>>
+ The excess testosterone @@color:green;causes her penis to swell.@@
+ <<set $tanks[$i].dick += 2>>
+ <</if>>
+ <<elseif $incubatorUpgradeSpeed == 6>>
+ <<if $tanks[$i].balls < 40 && random(1,100) > 30>>
+ The excess testosterone @@color:green;causes her balls to balloon for extra cum production.@@
+ <<set $tanks[$i].balls += 2>>
+ <</if>>
+ <<if $tanks[$i].dick < 10 && random(1,100) > 70>>
+ The excess testosterone @@color:green;causes her penis to swell.@@
+ <<set $tanks[$i].dick += 1>>
+ <</if>>
+ <<elseif $incubatorUpgradeSpeed == 5>>
+ <<if $tanks[$i].balls < 40 && random(1,100) > 30>>
+ The excess testosterone @@color:green;causes her balls to balloon for extra cum production.@@
+ <<set $tanks[$i].balls += 1>>
+ <</if>>
+ <<if $tanks[$i].dick < 10 && random(1,100) > 80>>
+ The excess testosterone @@color:green;causes her penis to swell.@@
+ <<set $tanks[$i].dick += 1>>
+ <</if>>
+ <</if>>
+ <</if>>
<<elseif $incubatorReproductionSetting == 1>>
Her hormone levels are being carefully managed, @@color:green;encouraging early puberty.@@
<<if $tanks[$i].ovaries == 1>>
@@ -179,18 +292,47 @@
<</if>>
<</if>>
<<else>>
-
+ <<if $tanks[$i].balls > 0>>
+ <<if $tanks[$i].balls > 1>>
+ <<set $tanks[$i].balls -= 5>>
+ <</if>>
+ <<if $tanks[$i].dick > 1>>
+ <<set $tanks[$i].dick -= 5>>
+ <</if>>
+ <</if>>
+ <<if $tanks[$i].breasts > 0>>
+ <<set $tanks[$i].breasts -= 500>>
+ <</if>>
+ <<if $tanks[$i].butt > 0>>
+ <<set $tanks[$i].butt -= 4>>
+ <</if>>
+ <</if>>
+ <<else>>
+ <<if $tanks[$i].balls > 0>>
+ <<if $tanks[$i].balls > 1>>
+ <<set $tanks[$i].balls -= 5>>
+ <</if>>
+ <<if $tanks[$i].dick > 1>>
+ <<set $tanks[$i].dick -= 5>>
+ <</if>>
+ <</if>>
+ <<if $tanks[$i].breasts > 0>>
+ <<set $tanks[$i].breasts -= 500>>
+ <</if>>
+ <<if $tanks[$i].butt > 0>>
+ <<set $tanks[$i].butt -= 4>>
<</if>>
<</if>>
-
+
<<set $tanks[$i].weight = Math.clamp($tanks[$i].weight, -100, 100)>>
<<set $tanks[$i].muscles = Math.clamp($tanks[$i].muscles, -100, 100)>>
<<set $tanks[$i].dick = Math.clamp($tanks[$i].dick, 0, 10)>>
+ <<set $tanks[$i].hips = Math.clamp($tanks[$i].hips, -2, 2)>>
<<set $tanks[$i].balls = Math.clamp($tanks[$i].balls, 0, 40)>>
<<set $tanks[$i].boobs = Math.clamp($tanks[$i].boobs, 0, 10000)>>
-<<else>>
- <br>Tank #<<print $i + 1>> is currently empty.
-<</if>>
<</for>>
+<<if $incubatorSlaves == 0>>
+$incubatorNameCaps is currently unused.
+<</if>>
<br><br>
diff --git a/src/pregmod/incubatorRetrievalWorkaround.tw b/src/pregmod/incubatorRetrievalWorkaround.tw
new file mode 100644
index 00000000000..1336af8c42f
--- /dev/null
+++ b/src/pregmod/incubatorRetrievalWorkaround.tw
@@ -0,0 +1,11 @@
+:: Incubator Retrieval Workaround
+
+$readySlave.slaveName has been discharged from $incubatorName and is ready for her first ever inspection.
+
+<<set $activeSlave = $readySlave>>
+<<set $saleDescription to 0>>
+<<display "Long Slave Description">>
+<<set $slaves.push($activeSlave)>>
+<<set $nextLink to "AS Dump">>
+<<set $returnTo to "Incubator">>
+<<display "New Slave Intro">>
\ No newline at end of file
diff --git a/src/pregmod/incubatorWorkaround.tw b/src/pregmod/incubatorWorkaround.tw
index 7e5b0794bc5..58b6e64444b 100644
--- a/src/pregmod/incubatorWorkaround.tw
+++ b/src/pregmod/incubatorWorkaround.tw
@@ -1,12 +1,9 @@
:: Incubator Workaround
-<<for _i to 0; _i < $tanks.length; _i++>>
- <<if $tanks[_i] == 0>>
- <<set $tanks[_i] = $activeSlave>>
- <<set $incubatorSlaves++>>
- <<set $tanks[_i].growth = ($targetAge*52)>>
- <<break>>
- <</if>>
-<</for>>
+<<if $tanks.length < $incubator>>
+ <<set $activeSlave.growTime = Math.trunc($targetAge*52)>>
+ <<set $tanks.push($activeSlave)>>
+ <<set $incubatorSlaves++>>
+<</if>>
-<<set $activeSlave = 0>>
\ No newline at end of file
+<<set $activeSlave = {}>>
\ No newline at end of file
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 70359ccc9c0..c22c48bee6f 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -376,7 +376,7 @@ she's
<<elseif $activeSlave.physicalAge <= $activeSlave.actualAge-5 || $activeSlave.physicalAge >= $activeSlave.actualAge+5>>
a barely noticable difference from her actual age
<<else>>
- one couldn't tell the difference from her actual age
+ one could barely tell the difference from her actual age
<</if>>.
<</if>>
<<if $activeSlave.physicalAge != $activeSlave.visualAge>>
@@ -1615,6 +1615,12 @@ $pronounCap is
<<if ($activeSlave.preg is -2) && ($activeSlave.vagina < 0)>>
<<elseif ($activeSlave.preg <= -2) && ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1)>>
$pronounCap is sterile.
+<<elseif $activeSlave.preg == 0 && $activeSlave.vagina > -1>>
+ <<if $activeSlave.pregType > 20>>
+ $pronounCap's lower belly is noticably bloated and her pussy swollen and leaking fluids. She is very ready to be seeded.
+ <<elseif $activeSlave.pregType > 2>>
+ $pronounCap's lower belly is slightly bloated and her pussy swollen and leaking fluids. She is ready to be seeded.
+ <</if>>
<<elseif $activeSlave.preg > 30>>
<<if $activeSlave.pregType >= 20>>
$pronounCap is @@color:red;on the brink of bursting!@@ $possessiveCap belly is painfully stretched, the slightest provocation could cause $object to rupture.
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 34c461b1bef..e47b1feaf70 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -3799,6 +3799,11 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
<</if>>
<</if>>
<</if>>
+<<if $slaves[$i].preg < 1>>
+ <<if $slaves[$i].pregType != 0>>
+ <<set $slaves[$i].pregType == 0>>
+ <</if>>
+<</if>>
<</if>> /* CLOSES CAN GET PREGNANT */
<<else>>
--
GitLab