From 918744cd3e67148036faf21df43d4280145903fb Mon Sep 17 00:00:00 2001 From: pregmodfan <pregmodfan@cock.li> Date: Fri, 16 Feb 2018 13:26:20 +0200 Subject: [PATCH] slave next week update --- src/uncategorized/slaveAssignmentsReport.tw | 23 +++++++++++---------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw index d247417e87a..ed05cf24add 100644 --- a/src/uncategorized/slaveAssignmentsReport.tw +++ b/src/uncategorized/slaveAssignmentsReport.tw @@ -316,25 +316,26 @@ <<if $slaves[$i].bellyPain != 0>> <<set $slaves[$i].bellyPain = 0>> <</if>> -/* preg speed control changes*/ + +/* preg speed and advance*/ <<if $slaves[$i].preg > 0>> + <<set _pregSpeed = 1>> //base speed is normal + <<if $slaves[$i].pregControl == "slow gestation">> + <<set pregSpeed = 0.5>> + <<elseif $slaves[$i].pregControl == "speed up">> + <<set _pregSpeed += 2>> + <<set WombProgress($slaves[$i], _pregSpeed)>> <<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>> - <<if $slaves[$i].pregControl == "slow gestation">> - <<set $slaves[$i].preg += 0.5>> - <<set $slaves[$i].preg = (Math.ceil($slaves[$i].preg*10)/10)>> /* trick to avoid precision lost error showed like week: 29.499999999999998*/ - <<elseif $slaves[$i].pregControl == "speed up">> - <<set $slaves[$i].preg += 2>> - <<else>> - <<set $slaves[$i].preg++>> - <</if>> - <<SetBellySize $slaves[$i]>> + <<SetBellySize $slaves[$i]>> //here will be also set through WombGetSize .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>> -/* end of preg speed control changes*/ +/* end of preg speed and advance*/ + <<if $slaves[$i].pregWeek < 0>> <<set $slaves[$i].pregWeek++>> <</if>> -- GitLab