From aae5dece9fd5378c4080937e46840dcb9105aa9f Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 13 Aug 2017 15:55:24 -0400
Subject: [PATCH] Fixes.
---
src/js/pregJS.tw | 44 ++++++++++++-
src/pregmod/managePersonalAffairs.tw | 89 ++++++++++++++++++--------
src/uncategorized/officeDescription.tw | 8 +++
src/uncategorized/wardrobe.tw | 2 +-
src/utility/miscWidgets.tw | 1 +
5 files changed, 114 insertions(+), 30 deletions(-)
diff --git a/src/js/pregJS.tw b/src/js/pregJS.tw
index ec63e867faf..69132d34736 100644
--- a/src/js/pregJS.tw
+++ b/src/js/pregJS.tw
@@ -16,4 +16,46 @@ window.getPregBellySize = function(s) {
var bellySize = ((4 / 3) * (Math.PI) * (phi / 2) * (Math.pow((targetLen / 2), 3)) * fetuses);
return bellySize;
-};
\ No newline at end of file
+};
+
+/*
+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
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index d9f5a9d9f30..613c4c84ebb 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -32,30 +32,57 @@ Looking down;
<<else>>
you have a @@.orange;masculine chest.@@<<if $PC.preg > 30 || $PC.births > 0>> Your chest feels swollen; the beads of milk forming on your nipples tells you why.<</if>><<if $PC.markings == "freckles">>Your chest is covered in a light spray of freckles.<<elseif $PC.markings == "heavily freckled">>Your chest is covered in dense freckles.<</if>>
<</if>>
-<<if $PC.preg >= 41>>
- You don't know why you even bother getting out of bed; you are @@.orange;overdue and ready to drop@@ at any time, making your life as arcology owner very difficult. You try to relax and enjoy your slaves, but you can only manage so much in this state.
-<<elseif $PC.preg >= 39>>
- You feel absolutely massive; your @@.orange;full-term belly@@ makes your life as arcology owner very difficult. You try your best to not wander too far from your penthouse, not with labor and birth so close.
-<<elseif $PC.preg >= 36>>
- You can barely wrap your arms around your @@.orange;huge pregnant belly,@@ and when you do, your popped navel reminds you your bun is almost ready.
-<<elseif $PC.preg >= 32>>
- Your @@.orange;pregnancy has gotten quite huge,@@ none of your clothes fit it right.
-<<elseif $PC.preg >= 28>>
- Your @@.orange;pregnant belly juts out annoyingly far,@@ just getting dressed is a pain now.
-<<elseif $PC.preg >= 24>>
- Half way there! Your @@.orange;belly has gotten quite large with child;@@ it is beginning to get the way of sex and business.
-<<elseif $PC.preg >= 20>>
- Your @@.orange;belly is now large enough that there is no hiding it.@@
-<<elseif $PC.preg >= 16>>
- Your @@.orange;belly is rounded by your early pregnancy.@@
-<<elseif $PC.preg >= 12>>
- Your @@.orange;lower belly is beginning to stick out,@@ you're definitely pregnant.
-<<elseif $PC.preg >= 8>>
- Your @@.orange;belly is slightly swollen;@@ combined with your missed period, odds are you're pregnant.
-<<elseif $PC.preg >= 3>>
- Your @@.red;period hasn't happened in some time,@@ you might be pregnant.
-<</if>>
-<<if $PC.balls == 2 && $PC.preg < 24>> Your pubic mound is swells outward slightly due to your oversized prostate. <<elseif $PC.balls > 2 && $PC.preg < 30>> Your pubic mound bulges outward noticeably thanks to your massive prostate. <</if>>
+<<if $PC.preg > 0>>
+ <<if $PC.belly >= 120000>>
+ @@.red;Your belly is coated with stretch marks and is taut as a drum; you don't know how much more your poor womb can endure.@@ You can barely even leave your bed without a helping hand. Kicks can almost constantly be seen dotting its surface. You give it a pat for good measure, only encouraging your octuplets to squirm in excitement.<<if $PC.dick == 1>> You watch as your dick hardens from the prostate stimulation; you steady yourself for the coming orgasm.<</if>>
+ <<elseif $PC.belly >= 105000>>
+ You have trouble getting up and sitting down. Even standing while supporting your @@.orange;massive belly@@ has become an exhausting endeaver.
+ <<elseif $PC.belly >= 90000>>
+ You can @@.orange;barely reach around your gravid mass@@ any longer. Even the shortest waddle is exhausting.
+ <<elseif $PC.belly >= 75000>>
+ Your @@.orange;belly is starting to become worrying;@@ you feel over-filled at all times, and your children like to remind you just how full you are.
+ <<elseif $PC.belly >= 60000>>
+ You're @@.orange;definitely having multiples,@@ there is no denying it at this point. All you can do is try to relax and keep try to stave off the stretch marks.
+ <<elseif $PC.belly >= 45000>>
+ You both look and feel enormous, your @@.orange;belly juts out so much now.@@ You've grown so much you now have trouble viewing yourself in mirror.
+ <<elseif $PC.belly >= 30000>>
+ Whenever you have the chance, you prefer to stay naked instead of stretching out your clothing with your @@.orange;giant pregnant belly.@@
+ <<elseif $PC.belly >= 14000>>
+ Your @@.orange;so gravid@@ you have trouble seeing the entirety of your huge belly.
+ <<elseif $PC.belly >= 12000>>
+ You can barely wrap your arms around your @@.orange;huge pregnant belly,@@ and when you do, your popped navel reminds you of the bun<<if $PC.pregType > 0>>s<</if>> in your oven.
+ <<elseif $PC.belly >= 10000>>
+ Your @@.orange;pregnancy has gotten quite huge,@@ none of your clothes fit it right.
+ <<elseif $PC.belly >= 7000>>
+ Your @@.orange;pregnant belly juts out annoyingly far,@@ just getting dressed is a pain now.
+ <<elseif $PC.belly >= 5000>>
+ Your @@.orange;belly has gotten quite large with child;@@ it is beginning to get the way of sex and business.
+ <<elseif $PC.belly >= 1500>>
+ Your @@.orange;belly is now large enough that there is no hiding it.@@
+ <<elseif $PC.belly >= 500>>
+ Your @@.orange;belly is rounded by your early pregnancy.@@
+ <<elseif $PC.belly >= 250>>
+ Your @@.orange;lower belly is beginning to stick out,@@ you're definitely pregnant.
+ <<elseif $PC.belly >= 100>>
+ Your @@.orange;belly is slightly swollen;@@ combined with your missed period, odds are you're pregnant.
+ <<elseif $PC.belly < 100>>
+ Your @@.red;period hasn't happened in some time,@@ you might be pregnant.
+ <</if>>
+ <<if $PC.preg >= 41>>
+ You don't know why you even bother getting out of bed; you are @@.orange;overdue and ready to drop@@ at any time, making your life as arcology owner very difficult. You try to relax and enjoy your slaves, but you can only manage so much in this state.
+ <<elseif $PC.preg >= 39>>
+ You feel absolutely massive; your @@.orange;full-term belly@@ makes your life as arcology owner very difficult.
+ <</if>>
+<<elseif $PC.belly >= 1500>>
+ Your belly is still very distended from your recent pregnancy.
+<<elseif $PC.belly >= 500>>
+ Your belly is still distended from your recent pregnancy.
+<<elseif $PC.belly >= 250>>
+ 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.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>>
an @@.orange;above average penis@@<<if $PC.balls > 2>> that is constantly streaming precum,<<elseif $PC.balls > 0>> that is constantly dripping precum,<</if>> and a pair of
@@ -421,13 +448,13 @@ __Contraceptives and Fertility__
<br>
<span id="miniscene">
-<<if $PC.preg > 3 && $PC.preg < 6 && $PC.pregSource != -1>>
+<<if $PC.preg < 6 && $PC.pregKnown == 1 && $PC.pregSource != -1>>
Your period is late, so the first thing you do is test yourself for a potential pregnancy: @@.lime;you are pregnant.@@ <<link "Abort your child">><<replace "#miniscene">><<set $PC.preg = 0, $PC.pregType = 0, $PC.pregSource = 0, $PC.pregKnown = 0>><<print "You take a syringe filled with abortificants and make your self comfortable. Injecting the vial through your belly into your womb, your close your eyes and wait for what is coming. Once you feel it is over, you clean yourself up and go on your way, child free.">><br> <</replace>><</link>>
<<elseif $PC.labor == 1>>
You are beginning to feel contractions, you'll be giving birth soon.
<<elseif $PC.preg >= 39>>
Your due date is looming, but your child doesn't seem to be interested in coming out just yet. [[Induce childbirth|Manage Personal Affairs][$PC.labor = 1]]
-<<elseif $PC.preg >= 6 && $PC.pregSource != -1>>
+<<elseif $PC.pregKnown == 1 && $PC.pregSource != -1>>
You're pregnant, something rather unbecoming for an arcology owner. <<link "Abort your child">><<replace "#miniscene">><<set $PC.preg = 0, $PC.pregType = 0, $PC.pregSource = 0, $PC.belly = 0, $PC.pregKnown = 0>><<print "You take a syringe filled with abortificants and make your self comfortable. Injecting the vial through your belly into your womb, your close your eyes and wait for what is coming. Once you feel it is over, you clean yourself up and go on your way, child free.">><br> <</replace>><</link>>
<</if>>
</span>
@@ -488,7 +515,7 @@ In total, you have given birth to:
You're currently <<print $PC.preg>> week<<if $PC.preg > 1>>s<</if>> pregnant, so contraception doesn't matter right now.
<<elseif $PC.preg >= 6>>
You're having morning sickness.
-<<elseif $PC.preg > 3>>
+<<elseif $PC.preg > 1>>
You've missed your period. This could be bad.
<<elseif $PC.preg > 0 && $PC.pregSource != -1>>
Your fertile pussy has been thoroughly seeded, there is a chance you are pregnant. [[Pop some morning after pills|Manage Personal Affairs][$PC.preg = 0, $PC.pregKnown = 0, $PC.pregType = 0]]
@@ -499,7 +526,13 @@ In total, you have given birth to:
[[Stop taking it|Manage Personal Affairs][$PC.preg = 0]]
<<elseif $PC.preg == 0>>
You're currently fertile.
- [[Start taking birth control|Manage Personal Affairs][$PC.preg = -1]]
+ [[Start taking birth control|Manage Personal Affairs][$PC.preg = -1, $PC.fertDrugs = 0]]
+ <br>
+ <<if $PC.fertDrugs == 1>>
+ You are currently taking fertility supplements.<<if $PC.forcedFertDrugs == 1>> You feel a strange eagerness whenever you think of bareback sex.<</if>> [[Stop taking fertility drugs|Manage Personal Affairs][$PC.fertDrugs = 0]]
+ <<else>>
+ You are not on any fertility supplements.<<if $PC.forcedFertDrugs == 1>> You feel a strange eagerness whenever you think of bareback sex.<</if>> [[Start taking fertility drugs|Manage Personal Affairs][$PC.fertDrugs = 1]]
+ <</if>>
<</if>>
<<if $arcologies[0].FSRestartDecoration >= 100>>
diff --git a/src/uncategorized/officeDescription.tw b/src/uncategorized/officeDescription.tw
index c555c3932e9..35bb52d8e83 100644
--- a/src/uncategorized/officeDescription.tw
+++ b/src/uncategorized/officeDescription.tw
@@ -256,6 +256,14 @@ A $PC.visualAge year old<<if $PC.markings == "freckles">>, freckled<<elseif $PC.
<<elseif $PC.preg >= 39>>
You feel absolutely massive; your full-term belly makes your life as arcology owner very difficult. You try your best to not wander too far from your penthouse, not with labor and birth so close.
<</if>>
+<<elseif $PC.belly >= 1500>>
+ Your belly is still very distended from your recent pregnancy.
+<<elseif $PC.belly >= 500>>
+ Your belly is still distended from your recent pregnancy.
+<<elseif $PC.belly >= 250>>
+ 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.ballsImplant > 3>>
<<if $ballsAccessibility == 1>>
diff --git a/src/uncategorized/wardrobe.tw b/src/uncategorized/wardrobe.tw
index 47b4c4a55c8..4d22b7dcaa9 100644
--- a/src/uncategorized/wardrobe.tw
+++ b/src/uncategorized/wardrobe.tw
@@ -73,7 +73,7 @@
<<if $clothesBoughtHuipil == 0 && $arcologies[0].FSAztecRevivalist == "unset" && $cheatMode == 0>>
[[Order a shipment of huipil|Wardrobe][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $clothesBoughtHuipil = 1]]
//Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>//
-<<else>>You are well stocked with exquisite Aztech Huipil.
+<<else>>You are well stocked with exquisite Aztec Huipil.
<</if>>
<</nobr>>
<<nobr>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 22812c721c1..d9469a45a87 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -2575,6 +2575,7 @@ Call as <<SlaveSort [$slaves]>>
<</widget>>
/*
+ DEPRECATED
Call as <<SetPregType>>
$args[0]: Slave.
*/
--
GitLab