diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 02549edcb462cd9411f44e556153722acf5b51d7..7862ed3e346b0ac6d90fbd03b5ce7bca0ba65bed 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -1364,6 +1364,7 @@ App.Data.resetOnNGPlus = {
RapidCellGrowthFormula: 0,
UterineRestraintMesh: 0,
PGHack: 0,
+ BlackmarketPregAdaptation: 0,
diversePronouns: 0,
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index a12e766e9aecb90fefbb7dfeb14ddd424b4b4168..3562e04a232689f4a2f6d68cc371906cab0b7c78 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -328,20 +328,27 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<</if>>
</p>
-/*This option should be available ONLY after many other conditions meet, and this only initial conditions*/
-<<if $minimumSlaveAge <= 6>>
- <<if $incubatorUpgradeReproduction == 1 && $incubatorUpgradeOrgans == 1 && $ImplantProductionUpgrade == 1 && $bellyImplants == 1>>
- <<if $arcologies[0].FSRepopulationFocus >= 100 || $incubatorUpgradePregAdaptation == 1>>
- <p>
- <<if $incubatorUpgradePregAdaptation == 1>>
- The incubators have been upgraded with special set of manipulators, probes, nozzles and syringes coupled together with specific programs to take advantage of the accelerated growth to heighten viable reproductive capacity. These include injections of specialized serums and mechanical manipulation of the reproductive system and associated tissues, organs, muscles and bones.
- <<else>>
- The highly controlled environment inside incubation tube coupled with the greatly accelerated growth process is the perfect opportunity to push the boundaries of a body's ability to sustain pregnancy. This will include injections of specialized serums and mechanical manipulation of their reproductive system through a special set of manipulators, probes, nozzles and syringes supervised by a powerful monitoring program. Costly to maintain and ridiculously expensive to purchase through official means.
- [[Manufacture and install this subsystem|Incubator][cashX(forceNeg(Math.trunc(2000000*$upgradeMultiplierArcology)), "capEx"), $incubatorUpgradePregAdaptation = 1]] //Costs <<print cashFormat(Math.trunc(2000000*$upgradeMultiplierArcology))>> and will increase upkeep costs//
- <</if>>
- </p>
+<<if $minimumSlaveAge <= 6 && ($arcologies[0].FSRepopulationFocus >=60 || $BlackmarketPregAdaptation == 1) >> /*Main prequsite - stable repopulation FS OR documentation purchased from black market. And age gate. */
+ <p>
+ <<if $incubatorUpgradePregAdaptation == 1>>
+ The incubators have been upgraded with special set of manipulators, probes, nozzles and syringes coupled together with specific programs to take advantage of the accelerated growth to heighten viable reproductive capacity. These include injections of specialized serums and mechanical manipulation of the reproductive system and associated tissues, organs, muscles and bones.
+ <<else>>
+ The highly controlled environment inside incubation tube coupled with the greatly accelerated growth process is the perfect opportunity to push the boundaries of a body's ability to sustain pregnancy. This will include injections of specialized serums and mechanical manipulation of their reproductive system through a special set of manipulators, probes, nozzles and syringes supervised by a powerful monitoring program. Costly to maintain.<br>
+ <<if $incubatorUpgradeReproduction < 1>> /* Now with reports - what is lacking for construction */
+ Incubator lacks advanced monitoring and hormone injection systems. Construction not possible.
+ <<elseif $incubatorUpgradeOrgans < 1>>
+ Incubator lacks the ability to extract tissue samples. Construction not possible.
+ <<elseif $dispensaryUpgrade < 1>>
+ Incubator lacks connection with advanced pharmaceutical fabricator. Cutting-edge targeted serums production needed as integral part. Construction not possible.
+ <<elseif $bellyImplants < 1>>
+ Incubator lacks connection with implant manufacturing as fillable abdominal implants technology used as integral part. Construction not possible.
+ <<elseif $incubatorUpgradeGrowthStims < 1>>
+ Incubator lacks advanced monitoring and stimulant injection systems. Construction not possible.
+ <<else>>
+ [[Manufacture and install this subsystem|Incubator][cashX(forceNeg(Math.trunc(2000000*$upgradeMultiplierArcology)), "capEx"), $incubatorUpgradePregAdaptation = 1]] //Costs <<print cashFormat(Math.trunc(2000000*$upgradeMultiplierArcology))>> and will increase upkeep costs//
<</if>>
<</if>>
+ </p>
<</if>>
<p>
@@ -460,12 +467,12 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<</if>>
<</if>>
<<if ($incubatorPregAdaptationSetting == 1 && $tanks[$i].genes == "XX") || ($incubatorPregAdaptationSetting == 2 && $tanks[$i].genes == "XY") || $incubatorPregAdaptationSetting == 3 >>
- There are probes and tubes snaking into $his body cavity and reproductive organs so the incubator may prepare them.
+ There are probes and tubes inserted inside $his reproductive organs, as the Incubator works on them.
<<set _safecc = ($tanks[$i].pregAdaptation - 5) * 2000>>
<<if _safecc > 300000>> /* Some bigger size descriptions may be unreachable by normal game mechanics, so they are here just in case.*/
$His bloated form looks more like an overinflated beachball made of the overstretched skin of $his belly with $his relative tiny body attached to its side. $He is completely dominated by it now. The process has gone too far, so $his body can't maintain its form with the belly as part of abdominal cavity. Now $his skin, tissues and muscles have stretched enough for $his belly to expand outside of any physical boundaries and appear more an attachment to $his body, rather than part of it.
<<elseif _safecc > 150000>>
- $His body looks almost spherical, having been grotesquely inflated with the stimulator sacks inserted into $his internals. The incubator constantly maintains high pressure inside $him, forcing the displacement of $his organs and stretching skin tissues, and muscles. Even $his chest forced to become a part of the top of $his belly, having been pushed forward from the overwhelming pressure.
+ $His body looks almost spherical, having been grotesquely inflated with the stimulator sacks inserted into $his internals. The incubator constantly maintains high pressure inside $him, forcing the displacement of $his organs and stretching skin, tissues, and muscles. Even $his chest forced to become a part of the top of $his belly, having been pushed forward from the overwhelming volume inside.
<<elseif _safecc > 75000>>
$His belly has become so huge that can be easily compared with belly of a woman ready to birth quintuplets. It pulses from the pressure applied within by the incubator probes.
<<elseif _safecc > 45000>>
@@ -477,9 +484,9 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<<elseif _safecc > 10000>>
$His belly has inflated to the size of late term pregnancy; its skin shines from the tension.
<<elseif _safecc > 5000>>
- $His belly resembles a mid term pregnancy; it pulses slightly from the expansion and contraction of the incubator probes.
+ $His belly resembles a mid term pregnancy; it pulses slightly from the expansion and contraction of expandable sacks tipping the incubator probes.
<<elseif _safecc > 1500>>
- $His belly slightly bulges and rhythmically expands and contracts to the cycles of $his stimulation as the incubator inflates and deflates its probes within $his body cavity. With the correct serums applied, this should allow it to stretch the skin, tissues, and muscles of $his belly to better to tolerate the displacement of internal organs caused by fetal growth.
+ $His belly slightly bulges and rhythmically expands and contracts to the cycles of $his stimulation as the incubator inflates and deflates expandable sacks on its probes within $his body cavity. With the correct serums applied, this should allow it to stretch the skin, tissues, and muscles of $his belly to better to tolerate the displacement of internal organs caused by fetal growth.
<</if>>
<</if>>
<<if $tanks[$i].growTime <= 0>>
@@ -724,7 +731,6 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
Pregnancy adaptation system offline.
[[All|Incubator][$incubatorPregAdaptationSetting = 3]] | [[Females|Incubator][$incubatorPregAdaptationSetting = 1]] | [[Males|Incubator][$incubatorPregAdaptationSetting = 2]]
<</if>>
- //Only applies to incubatees set for release by age six//
<</if>>
<<if $incubatorUpgradePregAdaptation == 1 && $incubatorPregAdaptationSetting > 0>> /* Should be visible only after incubatorUpgradeReproduction is installed and turned on*/
<br>
@@ -735,7 +741,7 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
Pregnancy adaptation programmed to intensive procedures. Up to octuplet pregnancy should be possible for the subjects. Warning! Side effects may occur to health and mental condition.
[[Standart|Incubator][$incubatorPregAdaptationPower = 0]] | [[Advanced|Incubator][$incubatorPregAdaptationPower = 1]] | [[Extreme|Incubator][$incubatorPregAdaptationPower = 3]]
<<elseif $incubatorPregAdaptationPower == 3>>
- Pregnancy adaptation programmed to extreme procedures. Normally unustainable pregnancies should be possible for the subjects. Capacity will vary with genetic and other individal conditions. WARNING! Extreme side effects may occur to health and mental condition!
+ Pregnancy adaptation programmed to extreme procedures. Normally unusutainable pregnancies can be possible for the some subjects. Actual capacity may vary with genetic and other individal conditions. WARNING! Extreme side effects may occur to health and mental condition!
[[Standart|Incubator][$incubatorPregAdaptationPower = 0]] | [[Advanced|Incubator][$incubatorPregAdaptationPower = 1]] | [[Intensive|Incubator][$incubatorPregAdaptationPower = 2]]
<<else>>
Pregnancy adaptation programmed to standard procedures. Normal pregnancy should be safe for subjects.
diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw
index 1f6a20361f23cf0d1cea0f8362407fb781661cda..a027fd87b367434cc7b7b727d30b10cdc05b10d4 100644
--- a/src/pregmod/incubatorReport.tw
+++ b/src/pregmod/incubatorReport.tw
@@ -750,28 +750,25 @@
<<if ($incubatorPregAdaptationSetting == 1 && $tanks[_inc].genes == "XX") || ($incubatorPregAdaptationSetting == 2 && $tanks[_inc].genes == "XY") || $incubatorPregAdaptationSetting == 3>>
<br>
The incubator is working on adapting $his abdomen and reproductive organs for future pregnancies.
- <<if isNaN($tanks[_inc].incubatorPregAdaptationInWeek)>>
- <<set ($tanks[_inc].incubatorPregAdaptationInWeek = (15000 / 2000 - $tanks[_inc].pregAdaptation) / $tanks[_inc].growTime)>>
- <</if>>
+
<<set _weekAdapt = $tanks[_inc].incubatorPregAdaptationInWeek * $incubatorUpgradeSpeed>>
+ <<if isNaN(_weekAdapt)>> /* NaN check AFTER multiply operation, agains it result is critical here. Need to be absolutly sure about this operation, not about just tank[x] property itself. This give me two very unpleasant hours to catch this */
+ <<set $tanks[_inc].incubatorPregAdaptationInWeek = (15000 / 2000 - $tanks[_inc].pregAdaptation) / $tanks[_inc].growTime>>
+ <</if>>
+ <<set _weekAdapt = $tanks[_inc].incubatorPregAdaptationInWeek * $incubatorUpgradeSpeed>> /* Now it's should be fine */
<<set _weekAdapt *= 1 + ($incubatorReproductionSetting / 5)>>
<<set _weekAdapt *= 1 + ($tanks[_inc].hormoneBalance / 1500)>>
/*And now we done*/
<<set $tanks[_inc].pregAdaptation += _weekAdapt>>
/* here goes side effect from intense and extreme settings: */
<<if (random(0, 100) <= ($tanks[_inc].incubatorPregAdaptationPower - 1) * ($incubatorUpgradeSpeed / 2 + 1))>>
- <<set _sideEffect = random(1, 7)>>
- <<else>>
- <<set _sideEffect = 0>>
- <</if>>
- <<if _sideEffect > 0>>
- <<switch _sideEffect>>
+ <<switch random(1, 9)>> /*side effect selection*/
<<case 1>>
<<set $tanks[_inc].preg = -2>>
It caused @@.red;reproductive damage@@ when excessive meddling damaged an organ.
<<case 2>>
<<set $tanks[_inc].preg = -3>>
- It caused @@.red;severe reproductive damage@@ when excessive hormones shut down the associated organs.
+ It caused @@.red;severe reproductive damage@@ when excessive hormones shut down the associated organs. To avoid further damage corrupted organs forced to be removed.
<<case 3>>
<<set $tanks[_inc].lactation = 1>>
It has @@.orange;triggered a hormonal disorder,@@ causing $his breast glands begin producing milk.
diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
index b7fb83e6e4a770d78832e689967711b384407450..a819b1cb683ec089327233caffdfae20fb2c6a17 100644
--- a/src/pregmod/theBlackMarket.tw
+++ b/src/pregmod/theBlackMarket.tw
@@ -295,17 +295,18 @@ He gestures to a door in the back of the stall. "The good shit's back there<<if
<<if $thisWeeksIllegalWares[_bim] == "BlackmarketPregAdaptation">>
<br>
- <<if $incubatorUpgradePregAdaptation == 0 && $minimumSlaveAge <= 6>>
+ <<if $BlackmarketPregAdaptation == 0 && $minimumSlaveAge <= 6>>
<<if $seePreg == 1>>
- <<if $incubatorUpgradeReproduction == 1 && $incubatorUpgradeOrgans == 1 && $ImplantProductionUpgrade == 1 && $bellyImplants == 1>>
- <<if $cash >= 120000>>
- [[Purchase documents regarding an incubator pregnancy adaptation module|The Black Market][cashX(-120000, "capEx"), $incubatorUpgradePregAdaptation = 1, _dump = $merchantIllegalWares.delete("BlackmarketPregAdaptation")]] //@@.yellowgreen;<<print cashFormat(120000)>>.@@//
- <<else>>
+ <<if $cash >= 120000 && $arcologies[0].FSRepopulationFocus < 60>>
+ [[Purchase documents regarding an incubator pregnancy adaptation module|The Black Market][cashX(-120000, "capEx"), $BlackmarketPregAdaptation = 1, _dump = $merchantIllegalWares.delete("BlackmarketPregAdaptation")]] //@@.yellowgreen;<<print cashFormat(120000)>>.@@//
+ <<elseif $cash < 120000>>
You cannot afford the asking price of @@.red;<<print cashFormat(120000)>>@@ for documentation on an incubator pregnancy adaptation module.
- <</if>>
- <br>"I'm not sure about this... but you still might be interested. Let me just begin with a story... Some time ago, there was a man with very pregnant girl in tow. Not so unusual in these days, but what made it really stand out was the girl's age — she couldn't have been any older then six! And looked ready to birth full sized triplets, no less. To top it all off, she did not look stressed by it at all, which was just amazing, given her size. The man said that he invented some sort of subsystem for those modern incubators to prep the occupant's body in a special way, and that this girl was a test subject. I do not understand much about this technical stuff, but the documentation seems legit enough. If you like, I can sell it to you; no guarantees though, on either the construction or the results."
- <<else>>
- You lack the facilities needed to manufacture something this complex, so production of the incubator pregnancy adaptation module is out of your reach.
+ <</if>>
+ <br>"I'm not sure about this... but you still might be interested. Let me just begin with a story... Some time ago, there was a man with very pregnant girl in tow. Not so unusual in these days, but what made it really stand out was the girl's age — she couldn't have been any older then six! And looked ready to birth full sized triplets, no less. To top it all off, she did not look stressed by it at all, which was just amazing, given her size. The man said that he invented some sort of subsystem for those modern incubators to prep the occupant's body in a special way, and that this girl was a test subject. I do not understand much about this technical stuff, but the documentation seems legit enough. If you like, I can sell it to you; no guarantees though, on either the construction or the results."
+ <<if $arcologies[0].FSRepopulationFocus >= 60>>
+ <p> As pursuing repopulation focused society, you already have similar documentation in you possession. No reason to spend you money on dublicate. </p>
+ <<elseif $incubatorUpgradeReproduction < 1 || $incubatorUpgradeOrgans < 1 || $dispensaryUpgrade < 1 || $bellyImplants < 1 || $incubatorUpgradeGrowthStims < 1>>
+ <p> You lack the facilities needed to manufacture something this complex, so though you can buy documentation, actual production of the incubator pregnancy adaptation module is currently out of your reach.</p>
<</if>>
<<else>>
You have no interest in research that involves pregnancy.