diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index d998a4929960cf42f137caf12f91c1169874d83d..7e161d83fac52c8e63b2aef3e8fe9a63775155d1 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 92a5434686fd9d2587711a1a36cc1d137835bfc1..75ade0bc5055f40c62b4c1aabb2376f13dcd9e10 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 14934f98be80d7913ae11d5ac169497e9109ff48..2a61403ba77ca4fca0beb4b5bca560f026243a55 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 e2b275ac84237d1b3410c799469755b764634c55..d08212738e2c8bfefe23f8fe2bb3887ec6c0edf2 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 a52df2fd0ab2ac311c226581c735e08443f57561..f8cce2d1ae9c287e8010dee830e8cd95d3dc0b39 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")>>