From 7c67fca03e97f1bec245f03a52225865bf720802 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 13 Aug 2017 19:26:11 -0400
Subject: [PATCH] Completion of player pregnancy overhaul
---
src/events/intro/introSummary.tw | 6 ++--
src/js/economyJS.tw | 2 ++
src/js/pregJS.tw | 44 +---------------------------
src/npc/acquisition.tw | 2 +-
src/pregmod/managePersonalAffairs.tw | 5 ++--
src/pregmod/sePlayerBirth.tw | 6 ++--
src/uncategorized/costs.tw | 2 ++
src/uncategorized/costsReport.tw | 2 ++
src/uncategorized/endWeek.tw | 12 ++++++--
src/uncategorized/seRaiding.tw | 14 ++++-----
src/uncategorized/sellSlave.tw | 2 +-
src/utility/miscWidgets.tw | 20 ++++++++++++-
12 files changed, 53 insertions(+), 64 deletions(-)
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 06bc22e3fdf..c3cbeeabfb1 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -529,13 +529,13 @@ Genitalia:
[[Do not take contraceptives|Intro Summary][$PC.preg = 0]]
<<elseif $PC.preg == 0>>
Contraceptives: ''off''. Can get pregnant; some scene alterations.
- [[Take contraceptives|Intro Summary][$PC.preg = -1]] | [[Too late for that|Intro Summary][$PC.preg = 10]]
+ [[Take contraceptives|Intro Summary][$PC.preg = -1]] | [[Too late for that|Intro Summary][$PC.preg = 10, $PC.pregType = 1]]
<<elseif $PC.preg == 10>>
Contraceptives: ''pregnant''. Already pregnant; some scene alterations, more difficult reputation management, larger increase to living expenses.
- [[Not pregnant|Intro Summary][$PC.preg = 0]] | [[Heavily pregnant|Intro Summary][$PC.preg = 43]]
+ [[Not pregnant|Intro Summary][$PC.preg = 0, $PC.pregType = 0]] | [[Heavily pregnant|Intro Summary][$PC.preg = 43, $PC.pregType = 1]]
<<else>>
Contraceptives: ''heavily pregnant''. About to give birth; some scene alterations, more difficult reputation management, larger increase to living expenses.
- [[Not pregnant|Intro Summary][$PC.preg = 0]]
+ [[Not pregnant|Intro Summary][$PC.preg = 0, $PC.pregType = 0]]
<</if>>
<br>
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index ed30e327755..ec348b6cb1a 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -205,6 +205,8 @@ window.getCost = function(array) {
if(State.variables.PC.preg === -1) {
costs += 25;
+ } else if(State.variables.PC.fertDrugs === 1) {
+ costs += 50;
} else if(State.variables.PC.preg >= 16) {
costs += 100;
}
diff --git a/src/js/pregJS.tw b/src/js/pregJS.tw
index 69132d34736..ec63e867faf 100644
--- a/src/js/pregJS.tw
+++ b/src/js/pregJS.tw
@@ -16,46 +16,4 @@ window.getPregBellySize = function(s) {
var bellySize = ((4 / 3) * (Math.PI) * (phi / 2) * (Math.pow((targetLen / 2), 3)) * fetuses);
return bellySize;
-};
-
-/*
-window.setPregType = function(s) {
- <<if $args[0].ID == -1>>
- <<set $args[0].pregType = 1>>
- <<else>>
- <<if $args[0].pregType == 0>>
- <<if ($args[0].drugs == "super fertility drugs")>>
- <<if (($masterSuitePregnancyFertilitySupplements == 1) && (($args[0].assignment == "serve in the master suite") || ($args[0].assignment == "be your Concubine")))>>
- <<if ($args[0].hormones == 2)>>
- <<set $args[0].pregType = random(20,29)>>
- <<else>>
- <<set $args[0].pregType = random(10,29)>>
- <</if>>
- <<else>>
- <<if ($args[0].hormones == 2)>>
- <<set $args[0].pregType = random(10,29)>>
- <<else>>
- <<set $args[0].pregType = either(3, 4, 4, 4, 5, 5, 5, 10, 10, 20)>>
- <</if>>
- <</if>>
- <<elseif ($args[0].drugs == "fertility drugs")>>
- <<if (($masterSuitePregnancyFertilitySupplements == 1) && (($args[0].assignment == "serve in the master suite") || ($args[0].assignment == "be your Concubine")))>>
- <<if ($args[0].hormones == 2)>>
- <<set $args[0].pregType = random(4,5)>>
- <<else>>
- <<set $args[0].pregType = either(2, 2, 3, 3, 3, 3, 4, 4, 5, 5)>>
- <</if>>
- <<else>>
- <<if ($args[0].hormones == 2)>>
- <<set $args[0].pregType = random(2,5)>>
- <<else>>
- <<set $args[0].pregType = either(1, 1, 2, 2, 3, 3, 4, 4, 5, 5)>>
- <</if>>
- <</if>>
- <<else>>
- <<set $args[0].pregType = either(1, 1, 1, 1, 1, 1, 1, 1, 1, 2)>>
- <</if>>
- <</if>>
- <</if>>
-}
-*/
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index ab007daacc8..16a2e8be3d2 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -46,7 +46,7 @@
<<elseif $PC.career == "escort">>
<<set $PC.pregSource = -2>>
<</if>>
- <<set $PC.pregType = 1, $PC.pregKnown = 1>>
+ <<set $PC.pregKnown = 1>>
<<set $PC.belly = getPregBellySize($PC)>>
<</if>>
<</if>>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 613c4c84ebb..3ccaa9e7ed2 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -2,7 +2,6 @@
<<set $nextButton = "Back", $nextLink = "Main", $showEncyclopedia = 0>>
<<PCTitle>>
-<<set $PC.belly = getPregBellySize($PC)>>
You pause for a moment from your busy day to day life to return to <<if $masterSuite != 0>>$masterSuiteName<<else>>your room<</if>> to consider some things about yourself.
<br>You take yourself in a full length mirror. You are a $PC.race <<if $PC.dick == 1 && $PC.vagina == 1>>futanari<<elseif $PC.dick == 1>>man<<else>>woman<</if>> with<<if $PC.markings == "freckles">> freckled<<elseif $PC.markings == "heavily freckled">> heavily freckled<</if>> <<print $PC.skin>> skin, $PC.hColor hair and $PC.eyeColor eyes.
@@ -81,7 +80,7 @@ Looking down;
Your belly is still bloated from your recent pregnancy
<<elseif $PC.belly >= 100>>
Your belly is still slightly swollen after your recent pregnancy.
-<</if>>
+<</if>>$PC.belly
<<if $PC.balls == 2 && $PC.belly < 5000>> Your pubic mound is swells outward slightly due to your oversized prostate. <<elseif $PC.balls > 2 && $PC.belly < 10000>> Your pubic mound bulges outward noticeably thanks to your massive prostate. <</if>>
Beneath all that;
<<if $PC.dick == 1 && $PC.vagina == 1>>
@@ -472,7 +471,7 @@ In total, you have given birth to:
<br><<print $PC.birthMaster>> bab<<if $PC.birthMaster > 1>>ies<<else>>y<</if>> for your former master.
<</if>>
<<if $PC.birthClient > 0>>
-<br><<print $PC.birthOther>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from clients you've slept with.
+<br><<print $PC.birthClient>> bab<<if $PC.birthClient > 1>>ies<<else>>y<</if>> from clients you've slept with.
<</if>>
<<if $PC.birthDegenerate > 0>>
<br><<print $PC.birthDegenerate>> bastard<<if $PC.birthDegenerate > 1>>s<</if>> from getting fucked by slaves.
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 3391dec5a34..c7a3817704b 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -74,7 +74,7 @@ While sitting at your desk planning your day, @@.lime;your water breaks,@@ thoro
<<if $Nurse != 0>>
@@.pink;$Nurse.slaveName@@ waiting for you with everything she needs to be a capable midwife to you.<<if _concubinePresent == 1>> @@.pink;$Concubine.slaveName@@ wraps her arms around you from behind, letting you know she'll be here to comfort you while you labor.<</if>>
<<elseif $Bodyguard != 0>>
- @@.pink;$Bodyguard.slaveName@@ waiting for you. Ever since she realized she was protecting for two, she made sure to hone her skills as a midwife to make sure she could protect you and your unborn child from any dangers.<<if _concubinePresent == 1>> @@.pink;$Concubine.slaveName@@ wraps her arms around you from behind, letting you know she'll be here to comfort you while you labor.<</if>>
+ @@.pink;$Bodyguard.slaveName@@ waiting for you. Ever since she realized she was protecting for <<if $PC.pregType > 1>>many<<else>>two<</if>>, she made sure to hone her skills as a midwife to make sure she could protect you and your unborn child<<if $PC.pregType > 1>>ren<</if>> from any dangers.<<if _concubinePresent == 1>> @@.pink;$Concubine.slaveName@@ wraps her arms around you from behind, letting you know she'll be here to comfort you while you labor.<</if>>
<<elseif $HeadGirl != 0>>
@@.pink;$HeadGirl.slaveName@@ is waiting for you. She promises to do everything she can to help you.<<if _concubinePresent == 1>> @@.pink;$Concubine.slaveName@@ wraps her arms around you from behind, letting you know she'll be here to comfort you while you labor.<</if>>
<<elseif _concubinePresent == 1>>
@@ -84,11 +84,11 @@ While sitting at your desk planning your day, @@.lime;your water breaks,@@ thoro
<</if>>
<<else>>
<<if $Concubine != 0>><<if !canWalk($Concubine)>><<set _concubinePresent = 2>><<else>><<set _concubinePresent = 1>><</if>><</if>>
- You barely make it half-way down the hall before you feel the first of your many children drop into position as the entrance to your birth canal. You try to keep going, but as it forces its way through your pelvis, spreading it wider, your forced to the ground. Fortunatly the penthouse is littered with supply rooms and closets, so you drag your laboring body into the nearest one instead. $assistantName discretely directs
+ You barely make it half-way down the hall before you feel the first of your many children drop into position at the entrance to your birth canal. You try to keep going, but as it forces its way through your pelvis, spreading it wider, you're forced to the ground. Fortunatly the penthouse is littered with supply rooms and closets, so you drag your laboring body into the nearest one instead. $assistantName discretely directs
<<if $Nurse != 0>>
@@.pink;$Nurse.slaveName@@ to you with everything she'll need to deliver your children.<<if _concubinePresent == 1>> @@.pink;$Concubine.slaveName@@ bursts in after her and circles around behind you before wrapping her arms around your contraction wracked middle. She'll be here to comfort you while you labor.<</if>>
<<elseif $Bodyguard != 0>>
- @@.pink;$Bodyguard.slaveName@@ to your location. Ever since she realized she was protecting for two, she made sure to hone her skills as a midwife to make sure she could protect you and your unborn child from any dangers. She apologizes profusely for not being there when you needed her most; she wanted to make sure everything was ready for your arrival.<<if _concubinePresent == 1>> @@.pink;$Concubine.slaveName@@ bursts in after her and circles around behind you before wrapping her arms around your contraction wracked middle. She'll be here to comfort you while you labor.<</if>>
+ @@.pink;$Bodyguard.slaveName@@ to your location. Ever since she realized she was protecting for not only you, but the lives your bear too, she made sure to hone her skills as a midwife to make sure she could protect you and your unborn children from any dangers. She apologizes profusely for not being there when you needed her most; she wanted to make sure everything was ready for your arrival.<<if _concubinePresent == 1>> @@.pink;$Concubine.slaveName@@ bursts in after her and circles around behind you before wrapping her arms around your contraction wracked middle. She'll be here to comfort you while you labor.<</if>>
<<elseif $HeadGirl != 0>>
@@.pink;$HeadGirl.slaveName@@ to your location. She promises to do everything she can to help you.<<if _concubinePresent == 1>> @@.pink;$Concubine.slaveName@@ bursts in after her and circles around behind you before wrapping her arms around your contraction wracked middle. She'll be here to comfort you while you labor.<</if>>
<<elseif _concubinePresent == 1>>
diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw
index dfc43ccd114..0f312ebc7cc 100644
--- a/src/uncategorized/costs.tw
+++ b/src/uncategorized/costs.tw
@@ -376,6 +376,8 @@
<<if $PC.preg == -1>>
<<set $costs += 25>>
+<<elseif $PC.fertDrugs == 1>>
+ <<set $costs += 50>>
<<elseif $PC.preg >= 16>>
<<set $costs += 100>>
<</if>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 62e9c3551a3..493424ad05a 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -18,6 +18,8 @@
<<if $PC.preg == -1>>
<br>Your Contraceptives expenses: ¤25
+<<elseif $PC.fertDrugs == 1>>
+ <br>Your fertility regimen: ¤50
<<elseif $PC.preg >= 16>>
<br>Increased living expenses due to being pregnant : ¤100
<</if>>
diff --git a/src/uncategorized/endWeek.tw b/src/uncategorized/endWeek.tw
index c6942fa7087..e91fa9ce33b 100644
--- a/src/uncategorized/endWeek.tw
+++ b/src/uncategorized/endWeek.tw
@@ -124,9 +124,17 @@
<</if>>
<<if $PC.preg > 0>>
<<set $PC.preg++>>
- <<set $PC.belly = getPregBellySize($PC)>>
+ <<set _newBelly = getPregBellySize($PC)>>
+ <<if _newBelly >= $PC.belly>>
+ <<set $PC.belly = _newBelly>>
+ <<elseif $PC.belly > 500>>
+ <<set $PC.belly *= .75>>
+ <</if>>
+ <<if $PC.fertDrugs != 0>>
+ <<set $PC.fertDrugs = 0>>
+ <</if>>
<<elseif $PC.belly > 0>>
- <<if $PC.belly < 500>>
+ <<if $PC.belly < 100>>
<<set $PC.belly = 0>>
<<else>>
<<set $PC.belly *= .75>>
diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw
index 0c6bae55d9d..69c4f2dbd1a 100644
--- a/src/uncategorized/seRaiding.tw
+++ b/src/uncategorized/seRaiding.tw
@@ -87,7 +87,7 @@ Worthy of consideration is that although the $mercenariesTitle will enslave the
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.weight = random(-50,130)>>
<<set $activeSlave.career = either("a housewife", "a trophy wife")>>
- is an idyllic manse in the countryside of an Old World nation. It's owner is a businessman of some notoriety, but is often away from his expansive estate. A number of servants and maids are in residence, but the primary resident of the manse is his wife. From the sound of things, she is not a young woman but attractive enough in a fake sort of way.
+ is an idyllic mansion in the countryside of an Old World nation. It's owner is a businessman of some notoriety, but is often away from his expansive estate. A number of servants and maids are in residence, but the primary resident of the mansion is his wife. From the sound of things, she is not a young woman but attractive enough in a fake sort of way.
<<elseif $origin == "university professor">>
<<set $activeSlaveOneTimeMinAge = 35>>
<<set $activeSlaveOneTimeMaxAge = 55>>
@@ -628,9 +628,9 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<if $targetEscape >= $MercCapture>>
Somehow the housewife manages to evade your mercenaries.
<<elseif _raidescape == 1>>
- Your $mercenariesTitle pry open the door to the manse's panic room to find that the woman has hung herself to escape capture. A waste.
+ Your $mercenariesTitle pry open the door to the mansion's panic room to find that the woman has hung herself to escape capture. A waste.
<<else>>
- Your $mercenariesTitle pry open the door to the manse's panic room and pull the protesting housewife from its depths.
+ Your $mercenariesTitle pry open the door to the mansion's panic room and pull the protesting housewife from its depths.
The housewife watches in terror as your $mercenariesTitle slake their lust on her servants and maids, knowing that her respite from a brutal rape must only be a temporary blessing.
<<AddSlave $activeSlave>> /* skip New Slave Intro */
<</if>>
@@ -854,9 +854,9 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<if $targetEscape >= $MercCapture>>
Somehow the housewife manages to evade your mercenaries.
<<elseif _raidescape == 1>>
- Your $mercenariesTitle pry open the door to the manse's panic room to find that the woman has hung herself to escape capture. A waste.
+ Your $mercenariesTitle pry open the door to the mansion's panic room to find that the woman has hung herself to escape capture. A waste.
<<else>>
- Your $mercenariesTitle pry open the door to the manse's panic room and pull the protesting housewife from its depths.
+ Your $mercenariesTitle pry open the door to the mansion's panic room and pull the protesting housewife from its depths.
The housewife watches in terror as your $mercenariesTitle slake their lust on her servants and maids, knowing that her respite from a brutal rape must only be a temporary blessing.
<<AddSlave $activeSlave>> /* skip New Slave Intro */
<</if>>
@@ -1080,9 +1080,9 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<if $targetEscape >= $MercCapture>>
Somehow the housewife manages to evade your mercenaries.
<<elseif _raidescape == 1>>
- Your $mercenariesTitle pry open the door to the manse's panic room to find that the woman has hung herself to escape capture. A waste.
+ Your $mercenariesTitle pry open the door to the mansion's panic room to find that the woman has hung herself to escape capture. A waste.
<<else>>
- Your $mercenariesTitle pry open the door to the manse's panic room and pull the protesting housewife from its depths.
+ Your $mercenariesTitle pry open the door to the mansion's panic room and pull the protesting housewife from its depths.
The housewife watches in terror as your $mercenariesTitle slake their lust on her servants and maids, knowing that her respite from a brutal rape must only be a temporary blessing.
<<AddSlave $activeSlave>> /* skip New Slave Intro */
<</if>>
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index 90b0d530de5..9dd7958a991 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -1331,7 +1331,7 @@ __Bids Received__
<<if $activeSlave.weight <= 95>>
<<if $activeSlave.health > 60>>
<<if random(1,100) > 70>>
- <br>''¤<<print 500*Math.trunc(($slaveCost*1.25)/500)>>'' from a fellow arcology owner devoted to chubby ladies. He seems to feel that $activeSlave.slaveName can handle a fair bit more weight, and wants a try at fettening her up himself.
+ <br>''¤<<print 500*Math.trunc(($slaveCost*1.25)/500)>>'' from a fellow arcology owner devoted to chubby ladies. He seems to feel that $activeSlave.slaveName can handle a fair bit more weight, and wants a try at fattening her up himself.
<<link "Accept bid">>
<<set $cash += 500*Math.trunc(($slaveCost*1.25)/500)>>
<<set $buyer = "hedonistic decadence arcology">>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index d9469a45a87..ecd65fb8cf1 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -2581,7 +2581,25 @@ Call as <<SlaveSort [$slaves]>>
*/
<<widget "SetPregType">>
<<if $args[0].ID == -1>>
- <<set $args[0].pregType = 1>>
+ <<if $PC.birthMaster > 0>> /* Predisposed to twins */
+ <<if $PC.fertDrugs == 1>>
+ <<set $args[0].pregType = either(2, 2, 3, 3, 3, 3, 4, 4)>>
+ <<else>>
+ <<set $args[0].pregType = either(1, 1, 1, 2, 2, 2, 2, 2, 2, 3)>>
+ <</if>>
+ <<if $PC.forcedFertDrugs == 1>>
+ <<set $args[0].pregType += either(1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4)>>
+ <</if>>
+ <<else>>
+ <<if $PC.fertDrugs == 1>>
+ <<set $args[0].pregType = either(1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 4)>>
+ <<else>>
+ <<set $args[0].pregType = either(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2)>>
+ <</if>>
+ <<if $PC.forcedFertDrugs == 1>>
+ <<set $args[0].pregType += either(0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 4)>>
+ <</if>>
+ <</if>>
<<else>>
<<if $args[0].pregType == 0>>
<<if ($args[0].drugs == "super fertility drugs")>>
--
GitLab