From eb3ac223b1eba265f786cb3d3377e833253802e3 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 25 Mar 2018 22:09:47 -0400
Subject: [PATCH] tweaks to preg discovery
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 5 +++++
src/uncategorized/dispensary.tw | 18 ++++++++++--------
src/uncategorized/rulesAutosurgery.tw | 2 ++
src/uncategorized/saDiet.tw | 8 +++++++-
src/utility/raWidgets.tw | 7 ++++++-
5 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index d998a492996..7e161d83fac 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,11 @@
0.10.7.0/1
+3/25/2018
+
+ 8
+ -fixes and tweaks, nothing major
+
3/24/2018
7
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index 92a5434686f..75ade0bc505 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -273,14 +273,16 @@ Dietary Upgrades
<br>
<</if>>
-<<if $dietFertility != 1>>
- [[Purchase recipes to encourage ovulation|Dispensary][$cash -= 5000*_PCSkillCheck, $dietFertility = 1]]
- //Costs <<print cashFormat(3000*_PCSkillCheck)>>//
- <br> //Will allow for specially designed meals to be served in the cafeteria to promote slave fertility.//
- <br>
-<<elseif $dietFertility == 1>>
- The fabricator is producing meals to be served in the cafeteria designed to promote slave fertility.
- <br>
+<<if $seePreg == 1>>
+ <<if $dietFertility != 1>>
+ [[Purchase recipes to encourage ovulation|Dispensary][$cash -= 5000*_PCSkillCheck, $dietFertility = 1]]
+ //Costs <<print cashFormat(3000*_PCSkillCheck)>>//
+ <br> //Will allow for specially designed meals to be served in the cafeteria to promote slave fertility.//
+ <br>
+ <<elseif $dietFertility == 1>>
+ The fabricator is producing meals to be served in the cafeteria designed to promote slave fertility.
+ <br>
+ <</if>>
<</if>>
<<if $dietCleanse == 0>>
diff --git a/src/uncategorized/rulesAutosurgery.tw b/src/uncategorized/rulesAutosurgery.tw
index 14934f98be8..2a61403ba77 100644
--- a/src/uncategorized/rulesAutosurgery.tw
+++ b/src/uncategorized/rulesAutosurgery.tw
@@ -204,12 +204,14 @@
<<set $surgeries.push("surgery to remove her butt implants")>>
<<set $slaves[$i].butt -= $slaves[$i].buttImplant>>
<<set $slaves[$i].buttImplant = 0>>
+ <<set $slaves[$i].buttImplantType = 0>>
<<set $cash -= $surgeryCost>>
<<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($thisSurgery.boobs == 0) && ($slaves[$i].boobsImplant > 0)>>
<<set $surgeries.push("surgery to remove her boob implants")>>
<<set $slaves[$i].boobs -= $slaves[$i].boobsImplant>>
<<set $slaves[$i].boobsImplant = 0>>
+ <<set $slaves[$i].boobsImplantType = 0>>
<<set $cash -= $surgeryCost>>
<<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].butt <= 3) && ($slaves[$i].butt < $thisSurgery.butt)>>
diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw
index e2b275ac842..d08212738e2 100644
--- a/src/uncategorized/saDiet.tw
+++ b/src/uncategorized/saDiet.tw
@@ -714,7 +714,13 @@
<</if>>
<<case "fertility">> /* + ovum and small boosts to energy and attrXY */
<<if !canGetPregnant($slaves[$i])>>
- She is no longer able to get pregnant, for one reason or another. @@.yellow;Her fertility diet has been ended.@@
+ <<if $slaves[$i].pregKnown == 0 && $slaves[$i].preg > 0>>
+ The diet is not properly working; tests reveal the reason is a @@.lime;new pregnancy.@@
+ <<set $slaves[$i].pregKnown = 1>>
+ <<else>>
+ She is no longer able to get pregnant, for one reason or another.
+ <</if>>
+ @@.yellow;Her fertility diet has been ended.@@
<<set $slaves[$i].diet = "healthy">>
<</if>>
<<if $slaves[$i].fetish == "mindbroken">>
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index a52df2fd0ab..f8cce2d1ae9 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -4144,7 +4144,12 @@ Your brand design is ''$brandDesign.''
<<else>>
<<if ($args[0].diet !== "healthy")>>
<<set $args[0].diet = "healthy">>
- <br>$args[0].slaveName has been put on a standard diet since she is currently unable to become pregnant.
+ <<if $args[0].pregKnown == 0 && $args[0].preg > 0>>
+ <br>$args[0].slaveName has been put on a standard diet since tests reveal she has become pregnant.
+ <<set $args[0].pregKnown = 0>>
+ <<else>>
+ <br>$args[0].slaveName has been put on a standard diet since she is currently unable to become pregnant.
+ <</if>>
<</if>>
<</if>>
<<elseif (_combinedRule.diet == "cum production")>>
--
GitLab