From 4cc9470174366dfeb5130a7190f7735994cd3078 Mon Sep 17 00:00:00 2001
From: pregmodfan <pregmodfan@cock.li>
Date: Sun, 18 Feb 2018 03:02:23 +0200
Subject: [PATCH] Function name, and some logic fixes
---
src/js/wombJS.tw | 2 +-
src/pregmod/widgets/seBirthWidgets.tw | 5 +++--
src/uncategorized/endWeek.tw | 2 +-
src/uncategorized/slaveAssignmentsReport.tw | 3 ++-
src/utility/miscWidgets.tw | 3 ++-
5 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/js/wombJS.tw b/src/js/wombJS.tw
index 9fba1f1a03e..e49a4ffe8bc 100644
--- a/src/js/wombJS.tw
+++ b/src/js/wombJS.tw
@@ -168,7 +168,7 @@ window.WombGetVolume = function(actor) //most code from pregJS.tw with minor ada
}
}catch(err){
WombInit($actor);
- alert("WombGetSize error");
+ alert("WombGetVolume error");
}
if (wombSize < 0) //catch for strange cases, to avoid messing with outside code.
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index 1f6c07247ff..cae92e78d0a 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -275,7 +275,7 @@
<<widget "seBirthCalc">>
<<set $slaves[$i].pregControl = "none">>
-<<set _beforeSize = WombGetSize($slaves[$i])>>
+<<set _beforeSize = WombGetVolume($slaves[$i])>>
<<if $slaves[$i].broodmother > 0>>
<<set $slaves[$i].curBabies = WombBirth($slaves[$i], 37)>> //broodmothers - give birth for all 37+ week fetuses.
<<else>>
@@ -305,7 +305,7 @@
<</if>>
<</if>>
-<<set _afterSize = WombGetSize($slaves[$i])>>
+<<set _afterSize = WombGetVolume($slaves[$i])>>
<<set $diffSize = _beforeSize / (1 + _afterSize)>> // 1 used to avoid devide by zero error.
<</widget>>
@@ -714,6 +714,7 @@ All in all,
<br><br>
<<if _curBabies > 0>>
After placing reserved child<<if _cToIncub > 1>>ren<</if>> to the incubator, it's time to care about other<<if _curBabies > 0>>'s<</if>>.
+ <</if>>
<</if>>
diff --git a/src/uncategorized/endWeek.tw b/src/uncategorized/endWeek.tw
index e6403abf60e..5a5988a06e1 100644
--- a/src/uncategorized/endWeek.tw
+++ b/src/uncategorized/endWeek.tw
@@ -138,7 +138,7 @@
<<if $PC.preg > 0>>
<<set $PC.preg++, $PC.pregWeek = $PC.preg>>
<<set WombProgress($PC)>>
- <<set _newBelly = WombGetSize($PC)>>
+ <<set _newBelly = WombGetVolume($PC)>>
<<if _newBelly >= $PC.belly>>
<<set $PC.belly = _newBelly>>
<<elseif $PC.belly > 500>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 2392eaa5f33..8fd7ab227a3 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -325,12 +325,13 @@
<<elseif $slaves[$i].pregControl == "speed up">>
<<set _pregSpeed += 2>>
<<set WombProgress($slaves[$i], _pregSpeed)>>
+ <<set $slaves[$i].preg += _pregSpeed)>> //should be removed later if swithed to fetus.age as master time control.
<<if $slaves[$i].pregWeek <= 0 || $slaves[$i].pregWeek > $slaves[$i].preg>> /* at .preg = 1, .pregWeek should be 1 also */
<<set $slaves[$i].pregWeek = $slaves[$i].preg>>
<<else>>
<<set $slaves[$i].pregWeek++>>
<</if>>
- <<SetBellySize $slaves[$i]>> //here will be also set through WombGetSize .bellyPreg, .pregType, to current values.
+ <<SetBellySize $slaves[$i]>> //here will be also set through WombGetVolume .bellyPreg, .pregType, to current values.
<<set $slaves[$i].preg = (Math.ceil($slaves[$i].preg*10)/10)>> /* trick to avoid precision lost error showed like week: 29.499999999999998*/
<<set $slaves[$i].pregKnown = 1>>
<</if>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 8887659f185..29943a1a7d1 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -2408,8 +2408,9 @@ This experience
This block now relpaced with universal code
*/
<<set WombInit($args[0])>>
- <<set $args[0].bellyPreg = WombGetSize($args[0])>>
+ <<set $args[0].bellyPreg = WombGetVolume($args[0])>>
<<set $args[0].pregType = $args[0].womb.length>>
+ //<<set $args[0].preg = $args[0].womb[0].age>> //for future usage, placeholder
<<if $args[0].bellyImplant > 0>>
<<set _implantSize = $args[0].bellyImplant>>
--
GitLab