From 3a02c3808d70bf5c44f4645f6c16bb768e96cd2c Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Fri, 12 May 2017 16:27:06 -0400 Subject: [PATCH] Fixes. --- src/uncategorized/RESS.tw | 6 +++--- src/uncategorized/genericPlotEvents.tw | 24 +++++++++++++++++++++--- src/uncategorized/nonRandomEvent.tw | 18 ++++++++++++++---- 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index b08560058b0..1d3d11147bc 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -1951,7 +1951,7 @@ up to the tops of her thighs, but that's all she can manage. The wardrobe includ <<set $activeSlave.devotion += 5>> <<set $activeSlave.vaginalCount += 1>> <<set $vaginalTotal += 1>> - <<include "VaginalVCheck">> + <<VaginalVCheck>> <<set $activeSlave.preg = 1>> <<set $activeSlave.pregType = 1>> <<set $activeSlave.pregSource = -1>> @@ -1972,7 +1972,7 @@ up to the tops of her thighs, but that's all she can manage. The wardrobe includ <<set $activeSlave.analCount += 1>> <<set $analTotal += 1>> <<set $activeSlave.vaginalAccessory = "chastity belt">> - <<include "AnalVCheck">> + <<AnalVCheck>> <</replace>> <</link>><<if ($activeSlave.anus == 0)>> //This option will take virginity//<</if>> @@ -2056,7 +2056,7 @@ up to the tops of her thighs, but that's all she can manage. The wardrobe includ <<set $activeSlave.analCount += 1>> <<set $analTotal += 1>> <<set $activeSlave.dickAccessory = "chastity">> - <<include "AnalVCheck">> + <<AnalVCheck>> <</replace>> <</link>><<if ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>> <<if $seeExtreme == 1 && $activeSlave.indentureRestrictions <= 0>> diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw index 1b22f904b42..ca83286e845 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">> + <<if $slaves[$i].drugs == "breast injections" || $slaves[$i].drugs == "hyper breast injections">> <<set $slaves[$i].health -= random(1,2)>> <<set $activeSlave = $slaves[$i]>> <</if>> @@ -38,7 +38,7 @@ The firm promptly pays @@.yellowgreen;fair compensation@@ for the minor damage t <<goto "Random Nonindividual Event">> <</if>> -Early one morning, you hear heaving coming from one of the bathrooms. On investigation, it seems that $activeSlave.slaveName woke up feeling terribly nauseous. She's in no danger, but you've hardly checked her over before more slaves stagger in. Every one of your slaves on A-HGH has been struck by the mysterious malady and has @@.red;sickened.@@ +Early one morning, you hear heaving coming from one of the bathrooms. On investigation, it seems that $activeSlave.slaveName woke up feeling terribly nauseous. She's in no danger, but you've hardly checked her over before more slaves stagger in. Every one of your slaves on breast focused A-HGH has been struck by the mysterious malady and has @@.red;sickened.@@ <br><br> It doesn't take much investigation before you find other slaveowners reporting the same thing. Elementary detective work fingers a particular drug supplier as the culprit, and before long the unfortunate Pharmacuetical concern is drowning under a rain of harsh public comment and harsher private contract warfare. As the day wears on, the poor slaves feel much better, and appear positively glowing. However, their breasts swell slightly and their bellies bulge, pointing to the issue being the contamination of the A-HGH production line with fertility agents. <br><br> @@ -547,13 +547,31 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your <<for $i = 0; $i < $slaves.length; $i++>> <<if ($slaves[$i].drugs == "breast injections") && canGetPregnant($slaves[$i])>> <<set $slaves[$i].preg = 1>> - <<set $slaves[$i].pregType = random(20,29)>> + <<set $slaves[$i].pregType = random(10,19)>> <<elseif $slaves[$i].drugs == "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>> + <</if>> + <<if $slaves[$i].pubertyXY == 0 && $slaves[$i].balls > 0>> + <<set $slaves[$i].pubertyAgeXY += 1>> + <</if>> + <</if>> + <<set $slaves[$i].boobs += 300>> + <<elseif ($slaves[$i].drugs == "hyper breast injections") && canGetPregnant($slaves[$i])>> + <<set $slaves[$i].preg = 1>> + <<set $slaves[$i].pregType = random(20,29)>> + <<elseif $slaves[$i].drugs == "hyper breast injections">> + <<set $slaves[$i].lactation = 1>> + <<if $slaves[$i].hips < 1>> + <<set $slaves[$i].hips += 1>> + <<set $slaves[$i].butt += 2>> + <</if>> <<if $precociousPuberty == 1>> <<if $slaves[$i].pubertyXX == 0 && ($slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1)>> <<set $slaves[$i].pubertyAgeXX -= 2>> diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw index 4afca14f2b0..301a11a86d2 100644 --- a/src/uncategorized/nonRandomEvent.tw +++ b/src/uncategorized/nonRandomEvent.tw @@ -21,8 +21,13 @@ <<elseif (_effectiveWeek == 12) && $PC.vagina > 0 && $raped == -1 && $arcologyUpgrade.drones != 1 && $Bodyguard == 0 && $PC.career != "arcology owner">> <<goto "P raped">> <<elseif (_effectiveWeek == 14)>> - <<set $Event = "bad curatives">> - <<goto "Generic Plot Events">> + <<for_i = 0; _i < $slaves.length; _i++>> + <<if $slaves[_i].curatives > 1 || $slaves[_i].inflationType == "curative">> + <<set $Event = "bad curatives">> + <<goto "Generic Plot Events">> + <<break>> + <</if>> + <</for>> <<elseif (_effectiveWeek == 17)>> <<set $Event = "shoot invitation">> <<goto "Generic Plot Events">> @@ -49,8 +54,13 @@ <<elseif (_effectiveWeek == 49) && ($slaveMedic > 0)>> <<goto "P slave medic">> <<elseif (_effectiveWeek == 52) && ($seeHyperPreg == 1)>> - <<set $Event = "bad breasts">> - <<goto "Generic Plot Events">> + <<for _i = 0; _i < $slaves.length; _i++>> + <<if $slaves[_i].drugs == "breast injections" || $slaves[_i].drugs == "hyper breast injections">> + <<set $Event = "bad breasts">> + <<goto "Generic Plot Events">> + <<break>> + <</if>> + <</for>> <<elseif (_effectiveWeek == 56)>> <<set $collaboration = 0>> <<set $traitor = 0>> -- GitLab