From 41acc0e0700b07d7d5b983cfe6ee98431ea52089 Mon Sep 17 00:00:00 2001 From: pregmodfan <pregmodfan@cock.li> Date: Fri, 30 Nov 2018 19:30:06 +0200 Subject: [PATCH] WombBirth and WombBirthReady now use pregData too --- src/pregmod/csec.tw | 2 +- src/pregmod/widgets/seBirthWidgets.tw | 4 ++-- src/uncategorized/pCoupAttempt.tw | 4 ++-- src/uncategorized/pCoupCollaboration.tw | 4 ++-- src/uncategorized/pCoupLoss.tw | 4 ++-- src/uncategorized/pTraitorMessage.tw | 4 ++-- src/uncategorized/reBoomerang.tw | 4 ++-- src/uncategorized/saDrugs.tw | 6 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw index a51f5d76ba6..2288b065db4 100644 --- a/src/pregmod/csec.tw +++ b/src/pregmod/csec.tw @@ -10,7 +10,7 @@ <<set $activeSlave.pregControl = "none">> <<set _beforeSize = WombGetVolume($activeSlave)>> -<<set $activeSlave.curBabies = WombBirth($activeSlave, 34)>> /* 34 week is minimal gestation time for live birth. Here we take only ready to survive. With others we will deal later in code. */ +<<set $activeSlave.curBabies = WombBirth($activeSlave, $activeSlave.pregData.minLiveBirth)>> /* 34 week is minimal gestation time for human live birth. Here we take only ready to survive. With others we will deal later in code. */ <<set $activeSlave.curStillBirth = 0 >> <<set _curBabies = $activeSlave.curBabies.length>> /*just to improve speed and usability here.*/ diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw index 48128dcc17f..297c33696ed 100644 --- a/src/pregmod/widgets/seBirthWidgets.tw +++ b/src/pregmod/widgets/seBirthWidgets.tw @@ -297,9 +297,9 @@ <<if $slaves[$i].broodmother > 0>> <<set $slaves[$i].curBabies = WombBirth($slaves[$i], 37)>> /*broodmothers - give birth for all 37+ week fetuses.*/ <<elseif $slaves[$i].prematureBirth == 1>> - <<set $slaves[$i].curBabies = WombBirth($slaves[$i], 22)>> + <<set $slaves[$i].curBabies = WombBirth($slaves[$i], $activeSlave.pregData.minLiveBirth/1.5)>> /*around 22 weeks for human*/ <<else>> - <<set $slaves[$i].curBabies = WombBirth($slaves[$i], 34)>> /*Normal pregnancy - 34 week is minimal gestation time for live birth.*/ + <<set $slaves[$i].curBabies = WombBirth($slaves[$i], $activeSlave.pregData.minLiveBirth)>> /*Normal human pregnancy - 34 week is minimal gestation time for live birth.*/ <</if>> <<set $slaves[$i].curStillBirth = 0 >> diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw index 0084e0742fa..256b03af319 100644 --- a/src/uncategorized/pCoupAttempt.tw +++ b/src/uncategorized/pCoupAttempt.tw @@ -7,8 +7,8 @@ <<set WombProgress($traitor, _pregWeeks)>> /* In all cases should be done */ <<set WombUpdatePregVars($traitor)>> - <<if WombBirthReady($traitor, 40) > 0 >> /* normal birth case, partial birthers not supported*/ - <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, 40), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0>> + <<if WombBirthReady($traitor, $traitor.pregData.normalBirth) > 0 >> /* normal birth case, partial birthers not supported*/ + <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, $traitor.pregData.normalBirth), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0>> <<set WombFlush($traitor)>> <<else>>/* still pregnant slave */ <<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/ diff --git a/src/uncategorized/pCoupCollaboration.tw b/src/uncategorized/pCoupCollaboration.tw index 2c9b37a9b72..0a6afe6549c 100644 --- a/src/uncategorized/pCoupCollaboration.tw +++ b/src/uncategorized/pCoupCollaboration.tw @@ -6,8 +6,8 @@ <<set WombProgress($traitor, _pregWeeks)>> /* In all cases should be done */ <<set WombUpdatePregVars($traitor)>> -<<if WombBirthReady($traitor, 40) > 0 >> /* normal birth case, partial birthers not supported*/ - <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, 40), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0>> +<<if WombBirthReady($traitor, $traitor.pregData.normalBirth) > 0 >> /* normal birth case, partial birthers not supported*/ + <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, $traitor.pregData.normalBirth), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0>> <<set WombFlush($traitor)>> <<else>>/* still pregnant slave */ <<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/ diff --git a/src/uncategorized/pCoupLoss.tw b/src/uncategorized/pCoupLoss.tw index 7ed6d537207..e6ea560ff93 100644 --- a/src/uncategorized/pCoupLoss.tw +++ b/src/uncategorized/pCoupLoss.tw @@ -5,8 +5,8 @@ <<set WombProgress($traitor, _pregWeeks)>> /* In all cases should be done */ <<set WombUpdatePregVars($traitor)>> -<<if WombBirthReady($traitor, 40) > 0 >> /* normal birth case, partial birthers not supported*/ - <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, 40), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0>> +<<if WombBirthReady($traitor, $traitor.pregData.normalBirth) > 0 >> /* normal birth case, partial birthers not supported*/ + <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, $traitor.pregData.normalBirth), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0>> <<set WombFlush($traitor)>> <<else>>/* still pregnant slave */ <<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/ diff --git a/src/uncategorized/pTraitorMessage.tw b/src/uncategorized/pTraitorMessage.tw index 377cc4d96a3..5127bb2c218 100644 --- a/src/uncategorized/pTraitorMessage.tw +++ b/src/uncategorized/pTraitorMessage.tw @@ -17,8 +17,8 @@ <<if $traitor.broodmother > 0>> /* Broodmother implant is assumed as removed.*/ <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, 37), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0, $traitor.broodmother == 0, $traitor.broodmotherFetuses = 0>> <<set WombFlush($traitor)>> -<<elseif WombBirthReady($traitor, 40) > 0 >> /* normal birth case, partial birthers not supported*/ - <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, 40), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0>> +<<elseif WombBirthReady($traitor, $traitor.pregData.normalBirth) > 0 >> /* normal birth case, partial birthers not supported*/ + <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, $traitor.pregData.normalBirth), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0>> <<set WombFlush($traitor)>> <<else>>/* still pregnant slave */ <<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/ diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw index 88b471d7163..4ad507423d5 100644 --- a/src/uncategorized/reBoomerang.tw +++ b/src/uncategorized/reBoomerang.tw @@ -25,8 +25,8 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against <<if $activeSlave.broodmother > 0>> /* Broodmother implant is assumed as removed.*/ <<set $activeSlave.preg = -1, $activeSlave.birthsTotal += WombBirthReady($activeSlave, 37), $activeSlave.pregType = 0, $activeSlave.pregSource = 0, $activeSlave.pregWeek = 0, $activeSlave.pregKnown = 0, $activeSlave.broodmother == 0, $activeSlave.broodmotherFetuses = 0>> <<set WombFlush($activeSlave)>> -<<elseif WombBirthReady($activeSlave, 40) > 0 >> /* normal birth case, partial birthers not supported*/ - <<set $activeSlave.preg = -1, $activeSlave.birthsTotal += WombBirthReady($activeSlave, 40), $activeSlave.pregType = 0, $activeSlave.pregSource = 0, $activeSlave.pregWeek = 0, $activeSlave.pregKnown = 0>> +<<elseif WombBirthReady($activeSlave, $activeSlave.pregData.normalBirth) > 0 >> /* normal birth case, partial birthers not supported*/ + <<set $activeSlave.preg = -1, $activeSlave.birthsTotal += WombBirthReady($activeSlave, $activeSlave.pregData.normalBirth), $activeSlave.pregType = 0, $activeSlave.pregSource = 0, $activeSlave.pregWeek = 0, $activeSlave.pregKnown = 0>> <<set WombFlush($activeSlave)>> <<else>>/* still pregnant slave */ <<set $activeSlave.preg = WombMaxPreg($activeSlave)>> /*most ready fetus is a base*/ diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw index 24846995881..33e71509759 100644 --- a/src/uncategorized/saDrugs.tw +++ b/src/uncategorized/saDrugs.tw @@ -1104,16 +1104,16 @@ <<case "labor supressors">> <<set $slaves[$i].chem += 2>> - <<if WombBirthReady($slaves[$i], 60) > 0>> + <<if WombBirthReady($slaves[$i], $activeSlave.pregData.normalBirth*1.5) > 0>> <<set $slaves[$i].health -= 20>> <<set $slaves[$i].labor = 1>> <<set $slaves[$i].induce = 1>> <<set $birthee = 1>> $He has been ready to give birth for some time now. Suppressing birth for so long @@.red;greatly affects $his health.@@ $He may @@.red;have trouble@@ giving birth to $his oversized child<<if $slaves[$i].pregType > 1>>ren<</if>>. $He seems to be in distress, $his body is @@.red;forcing $his child<<if $slaves[$i].pregType > 1>>ren<</if>> out!@@ - <<elseif WombBirthReady($slaves[$i], 50) > 0>> + <<elseif WombBirthReady($slaves[$i], $activeSlave.pregData.normalBirth*1.25) > 0>> <<set $slaves[$i].health -= 20>> $He has been ready to give birth for some time now. Suppressing birth for so long @@.red;greatly affects $his health.@@ $He may @@.red;have trouble@@ giving birth to $his oversized child<<if $slaves[$i].pregType > 1>>ren<</if>>. - <<elseif WombBirthReady($slaves[$i], 40) > 0>> + <<elseif WombBirthReady($slaves[$i], $activeSlave.pregData.normalBirth) > 0>> <<set $slaves[$i].health -= 10>> Labor suppressing agents @@.red;negatively affect $his health.@@ <</if>> -- GitLab