From d42b4780c7f802c4169c0e4d6e4b7ca321d9f9ee Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 31 Mar 2018 18:28:14 -0400
Subject: [PATCH] fixes
---
src/events/intro/introSummary.tw | 6 +++++-
src/uncategorized/RESS.tw | 4 ++--
src/uncategorized/genericPlotEvents.tw | 24 +++++++++++++++++++++++-
src/uncategorized/nonRandomEvent.tw | 2 +-
src/uncategorized/options.tw | 8 ++++----
5 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index c8626f53a77..e9daf3365a1 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -449,7 +449,11 @@ __''Player Character''__
<<if $freshPC == 1 || $saveImported == 0>>
<<if ndef $PCCreationSex>>
- <<set $PCCreationSex = "masculine ''Master''">>
+ <<if $PC.title == 1>>
+ <<set $PCCreationSex = "masculine ''Master''">>
+ <<else>>
+ <<set $PCCreationSex = feminine ''Mistress'>>
+ <</if>>
<</if>>
<br>You are a $PCCreationSex.
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 6fc2fe02dc9..6c9a7e09b0f 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -701,7 +701,7 @@ form. She's good at this, so you let her continue; <<if $activeSlave.clothes !=
wet for her <<WrittenMaster>>.
<</if>>
<br><br>
-Finally, she pulls herself over to one side of the doorframe, clasping it like a lover.<<if $activeSlave.belly >= 5000>> After leaning forward to accommodate her gravid body.<</if>>
+Finally, she pulls herself over to one side of the doorframe, <<if $activeSlave.belly >= 5000>>leaning far forward to accommodate her gravid body and<</if>> clasping it like a lover.
<<if ($activeSlave.boobs > 2000)>>
She nestles it between her enormous tits, forcing them apart,
<<elseif ($activeSlave.boobs > 800)>>
@@ -747,7 +747,7 @@ She pulls the buttock closest to you aside, giving you a clear view of her
lewd, well traveled pussy. She traces a finger around it before sinking her hand into it and spreading herself wide like a good slavegirl for her <<WrittenMaster>>.
<<elseif $activeSlave.vagina > 1>>
loose pussy. She traces a finger around it before spreading herself wide like a good slavegirl for her <<WrittenMaster>>.
- <<elseif $activeSlave.vagina > 1>>
+ <<elseif $activeSlave.vagina > 0>>
tight pussy. She traces a finger around it before spreading herself like a good slavegirl for her <<WrittenMaster>>.
<<else>>
virgin pussy. She traces a finger around it before spreading herself like a good slavegirl for her <<WrittenMaster>>.
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index c9bbd2debd1..168a531272a 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -29,7 +29,7 @@ The firm promptly pays @@.yellowgreen;fair compensation@@ for the minor damage t
<<set $activeSlave = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].drugs == "breast injections" || $slaves[$i].drugs == "hyper breast injections">>
+ <<if $slaves[$i].drugs == "breast injections" || $slaves[$i].drugs == "intensive breast injections" || $slaves[$i].drugs == "hyper breast injections">>
<<set $slaves[$i].health -= random(1,2)>>
<<set $activeSlave = $slaves[$i]>>
<</if>>
@@ -611,6 +611,28 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<</if>>
<</if>>
<<set $slaves[$i].boobs += 300>>
+ <<elseif $slaves[$i].drugs == "intensive breast injections" && canGetPregnant($slaves[$i])>>
+ <<set $slaves[$i].preg = 1>>
+ <<set $slaves[$i].pregType = random(15,35)>>
+ <<set $activeSlave.pregKnown = 1>>
+ <<set $activeSlave.pregWeek = 1>>
+ <<SetBellySize $activeSlave>>
+ <<elseif $slaves[$i].drugs == "intensive breast injections">>
+ <<set $slaves[$i].lactation = 1>>
+ <<if $slaves[$i].hips < 1>>
+ <<set $slaves[$i].hips += 1>>
+ <<set $slaves[$i].butt += 1>>
+ <</if>>
+ <<if $precociousPuberty == 1>>
+ <<if $slaves[$i].pubertyXX == 0 && ($slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1)>>
+ <<set $slaves[$i].pubertyAgeXX -= 1.5>>
+ <</if>>
+ <<if $slaves[$i].pubertyXY == 0 && $slaves[$i].balls > 0>>
+ <<set $slaves[$i].pubertyAgeXY += 1.5>>
+ <</if>>
+ <</if>>
+ <<set $slaves[$i].boobs += 300>>
+ <</if>>
<<elseif ($slaves[$i].drugs == "hyper breast injections") && canGetPregnant($slaves[$i])>>
<<set $slaves[$i].preg = 1>>
<<set $slaves[$i].pregType = random(20,45)>>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index c1feb313ce7..41ae1707329 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -61,7 +61,7 @@
<<elseif (_effectiveWeek == 46) && ($mercenaries > 0)>>
<<goto "P raid invitation">>
<<elseif (_effectiveWeek == 52) && ($seeHyperPreg == 1) && $seePreg != 0 && $badB != 1>>
- <<set _valid = $slaves.find(function(s) { return s.drugs == "breast injections" || s.drugs == "hyper breast injections"; })>>
+ <<set _valid = $slaves.find(function(s) { return s.drugs == "breast injections" || s.drugs == "hyper breast injections" || s.drugs == "intensive breast injections"; })>>
<<if def _valid>>
<<set $badB = 1, $Event = "bad breasts">>
<<goto "Generic Plot Events">>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 0c71b78da36..dd3fdb05694 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -296,10 +296,10 @@ Assignment performance vignettes on the end week report are
<br>
<<if $newDescriptions == 1>>
- Slaves ''will'' have alternate titles.
+ Slaves @@.cyan;will@@ have alternate titles.
[[Disable|Options][$newDescriptions = 0]]
<<else>>
- Slaves ''will not'' have alternate titles.
+ Slaves @@.cyan;will not@@ have alternate titles.
[[Enable|Options][$newDescriptions = 1]]
<</if>>
@@ -307,10 +307,10 @@ Assignment performance vignettes on the end week report are
<<if $familyTesting == 1>>
<<if $allowFamilyTitles == 1>>
- Your relatives ''will'' use family titles.
+ Your relatives @@.cyan;will@@ use family titles.
[[Disable family titles|Options][$allowFamilyTitles = 0]]
<<else>>
- Your relatives ''will not'' use family titles.
+ Your relatives @@.cyan;will not@@ use family titles.
[[Enable family titles|Options][$allowFamilyTitles = 1]]
<</if>>
<</if>>
--
GitLab