From e169bdcef0deb92c3a3709709b04f500ba234e5b Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Sat, 2 Sep 2017 01:43:33 -0400 Subject: [PATCH] fixes --- src/uncategorized/masterSuiteReport.tw | 6 ++--- src/uncategorized/saDrugs.tw | 27 ++++++++++++--------- src/uncategorized/saLongTermEffects.tw | 4 +-- src/uncategorized/servantsQuartersReport.tw | 5 ++-- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw index eec4895a44d..b69d81eee1a 100644 --- a/src/uncategorized/masterSuiteReport.tw +++ b/src/uncategorized/masterSuiteReport.tw @@ -19,7 +19,7 @@ <<if canAchieveErection($slaves[$i])>> <<set _masterSuiteAverageCum += $slaves[$i].balls, _masterSuiteAverageDick += $slaves[$i].dick>> <</if>> - <<set _masterSuiteAverageMilk += $slaves[$i].lactation*($slaves[$i].boobs-$slaves[$i].boobsImplant), _masterSuiteAveragePreg += $slaves[$i].preg>> + <<set _masterSuiteAverageMilk += $slaves[$i].lactation*($slaves[$i].boobs-$slaves[$i].boobsImplant), _masterSuiteAveragePreg += $slaves[$i].pregKnown>> <<switch $slaves[$i].fetish>> <<case "dom">> <<set _masterSuiteAverageDom += $slaves[$i].fetishStrength>> @@ -141,7 +141,7 @@ <</if>> <</if>> <<if $Concubine.prestigeDesc == "She is remembered for winning best in show as a breeder.">> - <<if $Concubine.preg > 10>> + <<if $Concubine.bellyPreg >= 5000>> When she has a free moment, she refines her flexibility so that she can perform any sexual position possible for her in her motherly state. She takes the time to look up new positions to work around her growing pregnancy. <<elseif isFertile($Concubine) || $Concubine.preg > 0>> When she has a free moment, she refines her flexibility so that she is prepared for any sexual position you can think of, no matter how heavy she becomes with children. @@ -307,7 +307,7 @@ <<set $slaves[$i].drugs = "no drugs">> <</if>> /* We don't know they're pregnant for a month or so by game logic */ - <<if ($slaves[$i].preg >= 4)>> + <<if ($slaves[$i].pregKnown == 1)>> /* Once we know they're knocked up, get the counter going. */ <<set _masterSuitePregnantSlaves += 1>> /* Don't know about twins/triplets etc until 10 weeks. Once we do, get the counter going */ diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw index c8f45c83df0..f9952a30f9e 100644 --- a/src/uncategorized/saDrugs.tw +++ b/src/uncategorized/saDrugs.tw @@ -761,22 +761,25 @@ <<switch $slaves[$i].pregControl>> <<case "slow gestation">> <<set $slaves[$i].chem += 1>> - <<if $slaves[$i].preg > 30>> + <<if $slaves[$i].preg >= 40>> $pronounCap is full term; gestation restriction agents @@.red;can't suppress labor@@ and $possessive regimen is ended to prevent health damage. <<set $slaves[$i].pregControl = "none">> - <<elseif $slaves[$i].preg > 0>> + <<elseif $slaves[$i].preg >= 16>> $possessiveCap belly feels very docile, $possessive gestation rate is @@.yellow;greatly reduced@@. + <<elseif $slaves[$i].preg > 0>> + $possessiveCap gestation rate is @@.yellow;greatly reduced,@@ delaying how long it will be until her pregnancy is visible. <</if>> <<case "speed up">> <<set $slaves[$i].chem += 2>> <<if $slaves[$i].assignment != "get treatment in the clinic" && $Nurse == 0>> <<if $slaves[$i].pregType > 1>><<set _childCount = "children are">><<else>><<set _childCount = "child is">><</if>> $possessiveCap _childCount growing rapidly within $possessive womb, far faster than $possessive @@.red;poor body can handle.@@<<if $slaves[$i].pregType >= 10>> $possessiveCap rate of growth is straining $possessive womb, she is @@.red;at risk of bursting!@@<</if>> - <<set $slaves[$i].health -= ($slaves[$i].preg+$slaves[$i].pregType)>> + <<set $slaves[$i].health -= ($slaves[$i].preg+$slaves[$i].pregType-$slaves[$i].bellySag)>> <<if $slaves[$i].health <= -100>> - $possessiveCap critically poor health @@.orange;caused her to miscarry.@@ - <<if lastPregRule($slaves[$i],$defaultRules)>><<set $slaves[$i].preg = -1>><<else>><<set $slaves[$i].preg = 0>><</if>> - <<if $slaves[$i].fetish != "mindbroken" && $slaves[$i].fuckdoll == 0>> + $possessiveCap critically poor health @@.orange;caused her to miscarry.@@ + <<if lastPregRule($slaves[$i],$defaultRules)>><<set $slaves[$i].preg = -1>><<else>><<set $slaves[$i].preg = 0>><</if>> + <<set $slaves[$i].pregType = 0, $slaves[$i].pregSource = 0, $slaves[$i].pregWeek = 0, $slaves[$i].pregKnown = 0>><<SetBellySize $slaves[$i]>> + <<if $slaves[$i].fetish != "mindbroken" && $slaves[$i].fuckdoll == 0>> $pronounCap is <<if $slaves[$i].devotion < -50>> @@.mediumorchid;filled with violent, consuming hatred@@ and @@.gold;fear.@@ Even though $pronoun knew $possessive baby was destined for a slave orphanage, it seems $pronoun cared for it and views you as its killer. @@ -793,21 +796,21 @@ @@.hotpink;pleased by this stark development@@, since $pronoun is so attentive to your will. $pronounCap also expects $pronoun will be able to fuck better now once her health recovers. <<set $slaves[$i].devotion += 4>> <</if>> - <</if>> + <</if>> <</if>> <</if>> <<case "labor supressors">> <<set $slaves[$i].chem += 2>> - <<if $slaves[$i].preg > 44>> + <<if $slaves[$i].preg > 60>> <<set $slaves[$i].health -= 20>> <<set $slaves[$i].labor = 1>> <<set $slaves[$i].induce = 1>> <<set $birthee = 1>> - $pronounCap has been ready to give birth for some time now. Supressing birth for so long @@.red;greatly affects $possessive health@@. $pronounCap may @@.red;have trouble@@ giving birth to $possessive oversized child. $pronounCap seems to be in distress, $possessive body is @@.red;forcing $possessive child out!@@ - <<elseif $slaves[$i].preg > 40>> + $pronounCap has been ready to give birth for some time now. Supressing birth for so long @@.red;greatly affects $possessive health@@. $pronounCap may @@.red;have trouble@@ giving birth to $possessive oversized child<<if $slaves[$i].pregType > 1>>ren<</if>>. $pronounCap seems to be in distress, $possessive body is @@.red;forcing $possessive child<<if $slaves[$i].pregType > 1>>ren<</if>> out!@@ + <<elseif $slaves[$i].preg > 50>> <<set $slaves[$i].health -= 20>> - $pronounCap has been ready to give birth for some time now. Supressing birth for so long @@.red;greatly affects $possessive health@@. $pronounCap may @@.red;have trouble@@ giving birth to $possessive oversized child. - <<elseif $slaves[$i].preg > 30>> + $pronounCap has been ready to give birth for some time now. Supressing birth for so long @@.red;greatly affects $possessive health@@. $pronounCap may @@.red;have trouble@@ giving birth to $possessive oversized child<<if $slaves[$i].pregType > 1>>ren<</if>>. + <<elseif $slaves[$i].preg > 40>> <<set $slaves[$i].health -= 10>> Labor suppressing agents @@.red;negatively affect $possessive health@@. <</if>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 8a5f7576da8..d07f53b1f1d 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -3857,7 +3857,7 @@ <<if $slaves[$i].preg == 15>> <<if $slaves[$i].pregKnown == 0>> $possessiveCap areolae have oddly darkened. Some cursory tests reveal @@.lime;she is about fifteen weeks pregnant;@@ - <<set $slaves[$i].pregKnown == 1>> + <<set $slaves[$i].pregKnown = 1>> <<else>> $possessiveCap areolae darken with $possessive progressing pregnancy. <</if>> @@ -4125,7 +4125,7 @@ <</if>> <<if $slaves[$i].pregSource != 0>> A quick scan after a bout of morning nausea reveals that @@.lime;$pronoun has become pregnant@@. - <<set $slaves[$i].preg = 1, $slaves[$i].pregWeek = 1, $slaves[$i].pregKnown = 1>><<SetPregType $slaves[$i]>>>> + <<set $slaves[$i].preg = 1, $slaves[$i].pregWeek = 1, $slaves[$i].pregKnown = 1>><<SetPregType $slaves[$i]>> <</if>> <</if>> /* closes random chance and non-zero sex acts check */ <</switch>> /* closes assignment checks */ diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw index 10bfe93f60f..0dee7e73665 100644 --- a/src/uncategorized/servantsQuartersReport.tw +++ b/src/uncategorized/servantsQuartersReport.tw @@ -47,7 +47,8 @@ <<for _dI = 0; _dI < _DL; _dI++>> <<set $i = $slaveIndices[$ServQiIDs[_dI]]>> <<if (canImpreg($slaves[$i], $Stewardess))>> - <<set $slaves[$i].preg = 1, $slaves[$i].pregSource = $Stewardess.ID, $slaves[$i].vagina = Math.clamp($slaves[$i].vagina,1,10), _stewardessImpregnated++, $slaves[$i].vaginalCount += 10, $vaginalTotal += 10>> + <<KnockMeUp $slaves[$i] 100 2 $Stewardess.ID>> + <<set $slaves[$i].vagina = Math.clamp($slaves[$i].vagina,1,10), _stewardessImpregnated++, $slaves[$i].vaginalCount += 10, $vaginalTotal += 10>> <</if>> <</for>> <<if _stewardessImpregnated > 0>> @@ -154,7 +155,7 @@ <</if>> <</if>> <<case "She is remembered for winning best in show as a breeder.">> - <<if $slaves[$i].preg > 20>> + <<if $slaves[$i].bellyPreg >= 10000>> $slaves[$i].slaveName's big pregnant belly frequently gets in the way of her work. However, $Stewardess.slaveName is willing to overlook it, as well as allow her easy jobs, due to how valuable her womb is. <</if>> <</switch>> -- GitLab