From f0c02f21c1ea7773c655a0d34c9a4f034275dffc Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 20 Mar 2018 16:00:20 -0400
Subject: [PATCH] cleanup
---
devNotes/twine JS | 4 ++++
src/pregmod/breederProposal.tw | 5 ++++-
src/pregmod/newChildIntro.tw | 26 +++++++++++++-------------
src/pregmod/widgets/bodyswapWidgets.tw | 1 +
src/uncategorized/saLongTermEffects.tw | 3 +++
src/utility/descriptionWidgetsFlesh.tw | 8 ++++----
6 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 39a46f15318..a610d5e0fdb 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -6912,6 +6912,10 @@ window.WombInit = function(actor) //Init womb system.
actor.broodmotherFetuses = 0;
}
+ if ( typeof actor.readyOva != "number" )
+ {
+ actor.readyOva = 0;
+ }
if (actor.womb.length == 0 && actor.pregType != 0 && actor.broodmother == 0) //backward compatibility setup. Fully accurate for normal pregnancy only.
{
diff --git a/src/pregmod/breederProposal.tw b/src/pregmod/breederProposal.tw
index e1e39e8afd7..ca1d9e6a42a 100644
--- a/src/pregmod/breederProposal.tw
+++ b/src/pregmod/breederProposal.tw
@@ -29,6 +29,7 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
<<replace "#result">>
"Good choice girl. A selection of men will be provided to you, take your pick and bear our children. Or use a test tube, if that's more to your tastes."
<<set $playerBred = 1, $propOutcome = 1>>
+ <<InitStandards>>
<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
<</replace>>
<</link>>
@@ -47,6 +48,7 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
<<replace "#result">>
"Good choice girl, your proposal is more important than your dignity after all, isn't it? A selection of men will be provided to you, take your pick and bear our children. Or use a test tube, if that's more to your tastes."
<<set $failedElite -= 50, $playerBred = 1, $propOutcome = 1>>
+ <<InitStandards>>
<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
<</replace>>
<</link>>
@@ -55,6 +57,7 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
<<replace "#result">>
"Yes, you have done much to further out cuase. We respect the "balls" on you, despite your lack of them. Very well, we shall set the standards for what shall qualify as breeding stock and our standards will be delivered to you shortly."
<<set $propOutcome = 1>>
+ <<InitStandards>>
<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
<</replace>>
<</link>>
@@ -84,7 +87,7 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
<br><<link "Decline being used as a breeder and withdraw your proposal">>
<<replace "#result">>
"Very well, if your masculinity is more valuable to you than your proposal, then so be it."
- <<set $propOutcome to -1>>
+ <<set $propOutcome = -1>>
<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
<</replace>>
<</link>>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index 0338240cbf2..460dc3cd7d8 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -316,10 +316,10 @@ You completed the legalities before heading to $incubatorName, knowing the tank
Her eyes focus on _tempMom.slaveName's <<print _tempMom.boobs>>cc tits, taking in every centimeter of their enormity, but lingering on her <<if _tempMom.lactation == 2>>milk gushing <<elseif _tempMom.lactation == 1>>milk leaking <</if>>_tempMom.nipples nipples.
<<set _momInterest = "boobs">>
<<elseif _tempMom.bellyPreg >= 450000>>
- Her eyes focus on _tempMom.slaveName's massively distended, child-filled belly, taking in every obvious motion beneath her taut skin.<<if $activeSlave.pregType >= 20>> A hand runs across her own bloated middle and another down to her moist pussy.<</if>>
+ Her eyes focus on _tempMom.slaveName's massively distended, child-filled belly, taking in every obvious motion beneath her taut skin.<<if $activeSlave.readyOva >= 20>> A hand runs across her own bloated middle and another down to her moist pussy.<</if>>
<<set _momInterest = "belly">>
<<elseif _tempMom.belly >= 5000>>
- Her eyes focus on _tempMom.slaveName's rounded middle, staring in fascination at the unfamiliar bulge.<<if $activeSlave.pregType >= 20>> A hand runs across her own middle and another down to her moist pussy.<</if>>
+ Her eyes focus on _tempMom.slaveName's rounded middle, staring in fascination at the unfamiliar bulge.<<if $activeSlave.readyOva >= 20>> A hand runs across her own middle and another down to her moist pussy.<</if>>
<<set _momInterest = "belly">>
<<elseif _tempMom.dick > 15>>
Her eyes focus on _tempMom.slaveName's <<print (6*_tempMom.dick)>>cm long dick, trying to understand how it can fit in a girl.
@@ -400,10 +400,10 @@ You completed the legalities before heading to $incubatorName, knowing the tank
Her eyes focus on _tempDad.slaveName's <<print _tempDad.boobs>>cc tits, taking in every centimeter of their enormity, but lingering on her <<if _tempDad.lactation == 2>>milk gushing <<elseif _tempDad.lactation == 1>>milk leaking <</if>>_tempDad.nipples nipples.
<<set _dadInterest = "boobs">>
<<elseif _tempDad.bellyPreg >= 450000>>
- Her eyes focus on _tempDad.slaveName's massively distended, child-filled belly, taking in every obvious motion beneath her taut skin.<<if $activeSlave.pregType >= 20>> A hand runs across her own bloated middle and another down to her moist pussy.<</if>>
+ Her eyes focus on _tempDad.slaveName's massively distended, child-filled belly, taking in every obvious motion beneath her taut skin.<<if $activeSlave.readyOva >= 20>> A hand runs across her own bloated middle and another down to her moist pussy.<</if>>
<<set _dadInterest = "belly">>
<<elseif _tempDad.belly >= 5000>>
- Her eyes focus on _tempDad.slaveName's rounded middle, staring in fascination at the unfamiliar bulge.<<if $activeSlave.pregType >= 20>> A hand runs across her own middle and another down to her moist pussy.<</if>>
+ Her eyes focus on _tempDad.slaveName's rounded middle, staring in fascination at the unfamiliar bulge.<<if $activeSlave.readyOva >= 20>> A hand runs across her own middle and another down to her moist pussy.<</if>>
<<set _dadInterest = "belly">>
<<elseif _tempDad.dick > 15>>
Her eyes focus on _tempDad.slaveName's <<print (6*_tempDad.dick)>>cm long dick, trying to understand how it can fit in a girl.
@@ -564,7 +564,7 @@ You slowly strip down, gauging her reactions to your show, until you are fully n
<</if>>
<</if>>
<<if $arcologies[0].FSRepopulationFocus >= 50>>
- <<if $activeSlave.pregType > 0>>
+ <<if $activeSlave.readyOva > 0>>
She notices all the rounded bellies in your arcology and @@.mediumaquamarine;instinctively feels at home with her egg filled womb.@@
<<set $activeSlave.trust += 2>>
<</if>>
@@ -640,15 +640,9 @@ You slowly strip down, gauging her reactions to your show, until you are fully n
<<if $seePreg != 0>>
<<if isFertile($activeSlave)>>
<br><<link "Impregnate her">>
-<<set $activeSlave.preg = 1>>
-<<SetPregType $activeSlave>>
-<<set $activeSlave.pregSource = -1>>
-<<set $activeSlave.pregKnown = 1>>
-<<set $activeSlave.pregWeek = 1>>
-<<set WombImpregnate($activeSlave, $activeSlave.pregType, -1, 1)>>
<<replace "#result">>
- <<if $activeSlave.pregType > 0>>
- You don't need to perform an exam to know that she is fertile; her nethers are swollen with need and her pussy dripping with desire<<if $activeSlave.pregType > 20>>, and her stomach is already slightly bloated with the number of fertile eggs within her womb<</if>>. She moans with pent-up lust as you deeply penetrate her and begin steadily thrusting. Her tight pussy hungrily massages your dick as you near your climax, prompting you to hilt yourself in her before seeding the deepest reaches of her pussy. She passed out in ecstasy, so you carry her bred body to the couch to recover. She should make the connection once her belly starts to rapidly swell with child.
+ <<if $activeSlave.readyOva > 0>>
+ You don't need to perform an exam to know that she is fertile; her nethers are swollen with need and her pussy dripping with desire<<if $activeSlave.readyOva > 20>>, and her stomach is already slightly bloated with the number of fertile eggs within her womb<</if>>. She moans with pent-up lust as you deeply penetrate her and begin steadily thrusting. Her tight pussy hungrily massages your dick as you near your climax, prompting you to hilt yourself in her before seeding the deepest reaches of her pussy. She passed out in ecstasy, so you carry her bred body to the couch to recover. She should make the connection once her belly starts to rapidly swell with child.
<<else>>
You perform a careful medical examination to verify fertility, and then forcefully take the girl's virginity. Whenever you feel able, you drain your balls into her cunt, only allowing her to wander off when scans verify a fertilized ovum. She didn't properly understand the scans, so she just thought it was sex; she won't realize what happened for some months at least, and in the mean time, will think she is just getting fat. Though once her child starts kicking, she might make the connection between sex and pregnancy.
<</if>>
@@ -663,6 +657,12 @@ You slowly strip down, gauging her reactions to your show, until you are fully n
Society @@.green;approves@@ of your promptly putting a new slave in her; this advances the idea that all slaves should bear their masters' babies.
<<FSChange "GenderFundamentalist" 2>>
<</if>>
+ <<set $activeSlave.preg = 1>>
+ <<SetPregType $activeSlave>>
+ <<set $activeSlave.pregSource = -1>>
+ <<set $activeSlave.pregKnown = 1>>
+ <<set $activeSlave.pregWeek = 1>>
+ <<set WombImpregnate($activeSlave, $activeSlave.pregType, -1, 1)>>
<</replace>>
<</link>>
<</if>>
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index 4dced2bf183..79fa6735cb4 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -167,6 +167,7 @@
<<set $args[0].belly = $args[1].belly>>
<<set $args[0].bellyPreg = $args[1].bellyPreg>>
<<set $args[0].bellyFluid = $args[1].bellyFluid>>
+<<set $args[0].readyOva = $args[1].readyOva>>
<<set $args[0].womb = $args[1].womb>> /* this is array assigned by reference, if slave body that is $args[1] will be stil used anywhere in code (not discarded) - it's WRONG (they now technicaly share one womb object). Please tell me about it then. But if old body $args[1] just discarded - it's no problem then.*/
<<set $args[0].canRecruit = 0>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index de246b0dae8..f578d80e0a2 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -4415,6 +4415,9 @@
<<set $slaves[$i].pregType = 0>>
<<set WombFlush($slaves[$i])>>
<</if>>
+ <<if $slaves[$i].readyOva != 0>>
+ <<set $slaves[$i].readyOva = 0>>
+ <</if>>
<<elseif $slaves[$i].preg > 0 && $slaves[$i].pregType == 0>>
<<SetPregType $slaves[$i]>>
<<set WombImpregnate($slaves[$i], $slaves[$i].pregType, $slaves[$i].pregSource, 1)>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 822563ad1be..b6c84334735 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -3263,7 +3263,7 @@ $pronounCap's got a
<<if $activeSlave.dick > 0>>
<<if $activeSlave.vagina > -1>>
$possessiveCap
- <<if $activeSlave.ovaries == 1>>
+ <<if $activeSlave.genes == "XX">>
beautifully natural
<<else>>
artificial
@@ -8679,11 +8679,11 @@ $pronounCap has
<<elseif ($activeSlave.pregWeek < 0) && ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1)>>
$pronounCap is recovering from $possessive recent pregnancy.
<<elseif $activeSlave.preg == 0 && $activeSlave.vagina > -1>>
- <<if $activeSlave.pregType > 30>>
+ <<if $activeSlave..readyOva > 30>>
$possessiveCap lower belly is noticeably bloated, $possessive breasts bigger and more sensitive, and $possessive pussy swollen and leaking fluids. $pronoun desperately needs a dick in $object and reminds you of a bitch in heat.
- <<elseif $activeSlave.pregType > 20>>
+ <<elseif $activeSlave..readyOva > 20>>
$possessiveCap lower belly is noticeably bloated and $possessive pussy swollen and leaking fluids. $pronounCap is very ready to be seeded.
- <<elseif $activeSlave.pregType > 2>>
+ <<elseif $activeSlave..readyOva > 2>>
$possessiveCap lower belly is slightly bloated and $possessive pussy swollen and leaking fluids. $pronounCap is ready to be seeded.
<</if>>
<<elseif $activeSlave.bellyPreg >= 1000000>>
--
GitLab