diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw index 6658a99205a77c8456f62442f4ab73d416ff7f67..58972bf83693109cda531f7d669eb3998c260469 100644 --- a/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw +++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw @@ -58,7 +58,7 @@ <<set $activeSlave.attrXY = Number($activeSlave.attrXY) || 0>> <<set $activeSlave.attrXX = Number($activeSlave.attrXX) || 0>> <<set $activeSlave.energy = Number($activeSlave.energy) || 0>> -<<SetbellySize $activeSlave>> +<<SetBellySize $activeSlave>> You perform the dark rituals, pray to the dark gods and sold your soul for the power to change and mold slaves to your will. diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw index c979e46c56c7aedfea40133384adb71d650629cc..fd372cca6fbe8dfd959dafcd786f732a3787b120 100644 --- a/src/pregmod/incubatorReport.tw +++ b/src/pregmod/incubatorReport.tw @@ -7,7 +7,7 @@ <<if $tanks[_inc].birthWeek >= 52>> <<set $tanks[_inc].birthWeek = 0>> <<if $seeAge == 1>> - <<set $tanks[_inc].actualAge++>> + <<set $tanks[_inc].actualAge++, $tanks[_inc].ovaryAge++>> <</if>> <</if>> <<set $incubatorSlaves += 1>> @@ -149,7 +149,7 @@ <<if $seeHyperPreg == 1>> <<set $tanks[_inc].pregType = random(25,45)>> <<else>> - <<set $tanks[_inc].pregType = random(3,5)>> + <<set $tanks[_inc].pregType = random(3,8)>> <</if>> <<if $incubatorUpgradeSpeed == 52>> <<if $tanks[_inc].boobs < 8000>> @@ -273,7 +273,7 @@ <<if $seeHyperPreg == 1>> <<set $tanks[_inc].pregType = random(15,25)>> <<else>> - <<set $tanks[_inc].pregType = random(2,4)>> + <<set $tanks[_inc].pregType = random(2,6)>> <</if>> <<if $incubatorUpgradeSpeed == 52>> <<if $tanks[_inc].boobs < 4000>> @@ -397,7 +397,7 @@ <<if $seeHyperPreg == 1>> <<set $tanks[_inc].pregType = random(10,15)>> <<else>> - <<set $tanks[_inc].pregType = random(2,3)>> + <<set $tanks[_inc].pregType = random(2,4)>> <</if>> <<if $incubatorUpgradeSpeed == 52>> <<if $tanks[_inc].boobs < 2000>> diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index 715cc4355407787052ad5e8981768412d430e7f6..45de8d52b7a3085f99a66a9f32a39f54437e6923 100644 --- a/src/uncategorized/brothelReport.tw +++ b/src/uncategorized/brothelReport.tw @@ -171,14 +171,14 @@ <</if>> <</if>> <<elseif $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a breeder.">> - <<if $slaves[$i].preg > 10>> + <<if $slaves[$i].bellyPreg >= 5000>> She makes sure $slaves[$i].slaveName's growing pregnancy is well taken care of, even if it means driving away potential customers away when the mother-to-be needs a rest. <<set $madamCashBonus -= 0.05>> <<elseif canGetPregnant($slaves[$i])>> She makes sure to play off $slaves[$i].slaveName's fame and fertility by enticing potential customers to be the one to claim her womb by filling it with their child. <<set $madamCashBonus += 0.15>> <<else>> - She would love to play off of $slaves[$i].slaveName's fame and fertility, but unfortunately she <<if $slaves[$i].preg > 0 && !visibleBellyPreg($slaves[$i])>>is already pregnant and not far enough along to show it<<elseif $slaves[$i].preg > 0>>already pregant, but no so much to be exciting<<else>>is unable to get knocked up<</if>>. + She would love to play off of $slaves[$i].slaveName's fame and fertility, but unfortunately she <<if $slaves[$i].pregKnown == 1 && $slaves[$i].bellyPreg < 1500>>is already pregnant and not far enough along to show it<<elseif $slaves[$i].pregKnown == 1 && $slaves[$i].bellyPreg < 5000>>already pregnant, but not enough to be exciting<<else>>is unable to get knocked up<</if>>. <</if>> <</if>> <</for>> @@ -328,11 +328,11 @@ <</if>> <</if>> <<if $brothelAdsPreg == 1>> - <<if ($slaves[$i].preg > 10) || ($slaves[$i].bellyImplant >= 4000)>> + <<if ($slaves[$i].bellyPreg >= 5000) || ($slaves[$i].bellyImplant >= 4000)>> <<set _seed++>> <</if>> <<elseif $brothelAdsPreg == -1>> - <<if ($slaves[$i].pregType < 10) && ($slaves[$i].preg < 1) && ($slaves[$i].weight < 30) && (!setup.fakeBellies.includes($bellyAccessory)) && ($slaves[$i].bellyImplant <= 0) && ($slaves[$i].inflation == 0)>> + <<if ($slaves[$i].belly < 100) && ($slaves[$i].weight < 30) && (!setup.fakeBellies.includes($bellyAccessory)) && ($slaves[$i].bellyImplant <= 0) && ($slaves[$i].inflation == 0)>> <<set _seed++>> <</if>> <</if>> diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw index c9026f9a4050174a6ec494cd86cc6de3f24cc8eb..8ab2b26cec9a0c8233a5e5ea80814702d72f1cdc 100644 --- a/src/uncategorized/clinicReport.tw +++ b/src/uncategorized/clinicReport.tw @@ -135,7 +135,7 @@ <</if>> <</if>> <<case "She is remembered for winning best in show as a breeder.">> - <<if $slaves[$i].preg > 10>> + <<if $slaves[$i].bellyPreg >= 1500>> She does her best to aid the pregnant $slaves[$i].slaveName, paying special attention to her swollen belly and the welfare of the life within. <<set $slaves[$i].health += 6>> <<elseif $slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1>> @@ -160,7 +160,7 @@ She is filled to the maximum that her body can stand. <</if>> <</if>> - <<if $slaves[$i].preg >= 1 && $slaves[$i].preg < 31 && $slaves[$i].pregControl == "speed up">> + <<if $slaves[$i].pregKnown == 1 && $slaves[$i].preg < 40 && $slaves[$i].pregControl == "speed up">> <br>''@@.pink;$slaves[$i].slaveName@@'' spends most of her time on bedrest being filled with rapid gestation agents and concentrated slave food. All she can do is <<if $slaves[$i].amp != 1 && canSee($slaves[$i])>>watch and feel her belly pushing further and further out with life<<elseif $slaves[$i].amp != 1>>watch her belly bulging further and further out with life<<elseif !canSee($slaves[$i])>>feel her belly pushing further and further out with life beneath her fingers<<else>>feel the every growing pressure inside her abdomen<</if>>. Careful attention, along with numerous drug injections, are used to make sure her body is able to safely adjust to her pregnancy's rapid growth. <<set $slaves[$i].health -= 10>> <<if ($slaves[$i].devotion > 50)>> @@ -174,6 +174,9 @@ <<set $slaves[$i].pregControl = "none">> ''@@.pink;$slaves[$i].slaveName's@@'' child is ready to pop out of her womb, ''@@.yellow;her course of rapid gestation agents is finished''. <</if>> + <<elseif $slaves[$i].preg > 2 && $slaves[$i].pregKnown == 0>> + During her tests, she discovers that $slaves[$i].slaveName @@.lime;is pregnant.@@ + <<set $slaves[$i].pregKnown = 1>> <</if>> <</for>> <<if (_DL < $clinic)>> @@ -233,7 +236,7 @@ <<if $slaves[$i].health < 90>> <<set $slaves[$i].health += 10 + ($curativeUpgrade * 10) + _healthBonus>> <</if>> - <<if ($Nurse != 0) && ($clinicSpeedGestation == 1) && ($slaves[$i].preg > 0)>> + <<if ($Nurse != 0) && ($clinicSpeedGestation == 1) && ($slaves[$i].pregKnown == 1)>> <<set $slaves[$i].pregControl = "speed up">> <</if>> <<if ($Nurse != 0) && ($slaves[$i].chem > 10) && ($clinicUpgradeFilters == 1)>> @@ -245,7 +248,7 @@ <</if>> <<if ($slaves[$i].health <= 40)>> <<elseif ($Nurse != 0) && ($slaves[$i].chem > 15) && ($clinicUpgradeFilters == 1)>> - <<elseif ($Nurse != 0) && ($slaves[$i].preg >= 1) && ($clinicSpeedGestation >= 0 || $slaves[$i].pregControl == "speed up")>> + <<elseif ($Nurse != 0) && ($slaves[$i].pregKnown == 1) && ($clinicSpeedGestation >= 0 || $slaves[$i].pregControl == "speed up")>> <<elseif ($Nurse != 0) && ($clinicInflateBelly > 0) && ($slaves[$i].bellyImplant >= 0) && ($slaves[$i].bellyImplant <= ($arcologies[0].FSTransformationFetishistResearch ? 40000 : 10000))>> <<else>> <br><br>''__@@.pink;$slaves[$i].slaveName@@__'' has been returned to health<<if ($Nurse != 0) && ($clinicUpgradeFilters == 1)>> and purity<</if>>, so @@.yellow;her assignment has defaulted to rest.@@ diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw index e67dea898c444779e1613f5fca99c3610f420a09..03e38faadaeb984f437e76a935cedf48e373e31c 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -51,7 +51,8 @@ <<for _dI = 0; _dI < _DL; _dI++>> <<set $i = $slaveIndices[$DairyiIDs[_dI]]>> <<if (canImpreg($slaves[$i], $Milkmaid))>> - <<set $slaves[$i].preg = 1, $slaves[$i].pregSource = $Milkmaid.ID, _milkmaidImpregnated++, $slaves[$i].vaginalCount += 10, $vaginalTotal += 10>> + <<set $slaves[$i].preg = 1, $slaves[$i].pregSource = $Milkmaid.ID, $slaves[$i].pregKnown = 1, $slaves[$i].pregWeek = 1, _milkmaidImpregnated++, $slaves[$i].vaginalCount += 10, $vaginalTotal += 10>> + <<SetPregType $slaves[$i]>> <</if>> <</for>> <<if _milkmaidImpregnated > 0>> @@ -207,7 +208,7 @@ She is disappointed that the (formerly) massive ejaculating cow $slaves[$i].slaveName<<if $slaves[$i].balls == 0 || $slaves[$i].dick == 0>> is incapable of giving cum. <<elseif $slaves[$i].prostate < 2>> no longer possesses a hyperactive prostate. <<else>>'s balls are considerably smaller than at their heyday.<</if>> <</if>> <</if>> - <<if $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a breeder." && $slaves[$i].preg > 10>> + <<if $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a breeder." && $slaves[$i].bellyPreg >= 1500>> She spends extra time with $slaves[$i].slaveName, the well-known breeder. $Milkmaid.slaveName is fascinated by her growing pregnancy and popular womb. She makes sure her belly and it's occupants are nice and comfortable. <<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>> <</if>> @@ -678,11 +679,11 @@ <</if>> <<if isFertile($slaves[$i])>> <<if $slaves[$i].eggType == "human">> - <<set $slaves[$i].preg = 1>> + <<set $slaves[$i].preg = 1, $slaves[$i].pregWeek = 1, $slaves[$i].pregKnown = 1>> <<if ($dairyPregSetting > 2)>> <<set $slaves[$i].pregType = random(10,29)>> <<elseif ($dairyPregSetting > 1)>> - <<set $slaves[$i].pregType = random(3,5)>> + <<set $slaves[$i].pregType = random(3,6)>> <<else>> <<set $slaves[$i].pregType = either(1, 1, 1, 1, 2, 2, 2, 3, 3, 4)>> <</if>> @@ -691,7 +692,7 @@ <<if ($slaves[$i].vagina == 0)>> <<set $slaves[$i].vagina++>> <</if>> - <<elseif ($slaves[$i].preg > 0)>> + <<elseif ($slaves[$i].pregKnown == 1)>> <<if ($dairyPregSetting > 2)>> <<set $cash += 100>> <<elseif ($dairyPregSetting > 1)>> diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw index 0dee7e736654b6c933b0980e9ddcbd5d44d173e7..31246eb029f7a7ccad0c316b8965173452cb7e00 100644 --- a/src/uncategorized/servantsQuartersReport.tw +++ b/src/uncategorized/servantsQuartersReport.tw @@ -48,6 +48,7 @@ <<set $i = $slaveIndices[$ServQiIDs[_dI]]>> <<if (canImpreg($slaves[$i], $Stewardess))>> <<KnockMeUp $slaves[$i] 100 2 $Stewardess.ID>> + <<set $slaves[$i].preg = 1, $slaves[$i].pregKnown = 1, $slaves[$i].pregWeek = 1, $slaves[$i].pregSource = $Stewardess.ID>><<SetPregType $slaves[$i]>> <<set $slaves[$i].vagina = Math.clamp($slaves[$i].vagina,1,10), _stewardessImpregnated++, $slaves[$i].vaginalCount += 10, $vaginalTotal += 10>> <</if>> <</for>> diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw index ad10504fc1c093369c6cb09ab8e2aafc2f5a8565..6e33a9b085df531c0ffcdf9e3527534e98b4f896 100644 --- a/src/uncategorized/spaReport.tw +++ b/src/uncategorized/spaReport.tw @@ -69,7 +69,7 @@ She's so intelligent she can suss out the cause of slaves' emotional issues and counsel them effectively. <<set _idleBonus++>> <</if>> - <<if isFertile($Attendant) || ($Attendant.preg > 0) || ($Attendant.birthsTotal > 0) || ($Attendant.bellyImplant >= 2000)>> + <<if isFertile($Attendant) || ($Attendant.bellyPreg >= 1500) || ($Attendant.birthsTotal > 0) || ($Attendant.bellyImplant >= 2000)>> She has a natural mothering instinct and really makes her girls feel at home. <<set _idleBonus++, _healthBonus++>> <</if>> @@ -163,7 +163,7 @@ <<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>> <</if>> <<case "She is remembered for winning best in show as a breeder.">> - <<if $slaves[$i].preg > 10>> + <<if $slaves[$i].bellyPreg >= 5000>> <<if $Attendant.fetish == "pregnancy">> She can't keep her hands off $slaves[$i].slaveName's pregnancy, but she doesn't mind her full belly being fondled. <<set $Attendant.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>