From bfabaf88eab146d36fbf083e09a826e70aed249c Mon Sep 17 00:00:00 2001 From: pregmodfan <pregmodfan@cock.li> Date: Tue, 27 Feb 2018 16:17:10 +0200 Subject: [PATCH] saAgent logic fixes --- src/pregmod/saAgent.tw | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/pregmod/saAgent.tw b/src/pregmod/saAgent.tw index d2560d35360..034e8e2c7e2 100644 --- a/src/pregmod/saAgent.tw +++ b/src/pregmod/saAgent.tw @@ -109,7 +109,7 @@ <</if>> <<if ($slaves[$i].preg > 0)>> /*EFFECTS OF PREGNANCY*/ - <<if $slaves[$i].preg == 5>> + <<if $slaves[$i].preg == 5>> /* bad condition logic - with pregnancy control drugs can be not triggered. Or may be trigged by broodmother several times. Need to be revorked. */ <<if $slaves[$i].pregSource == -1>> <<set $PC.slavesKnockedUp++>> <<elseif $slaves[$i].pregSource > 0>> @@ -363,17 +363,16 @@ <<if ($slaves[$i].preg > 37) && ($slaves[$i].broodmother == 0) && (random(1,100) > 90)>> <<set $slaves[$i].birthsTotal += WombBirthReady($slaves[$i], 35), WombBirth($slaves[$i], 35), WombFlush($slaves[$i]), $slaves[$i].preg = 0, $slaves[$i].pregWeek = -4, $slaves[$i].pregSource = 0, $slaves[$i].pregType = 0, $slaves[$i].pregKnown = 0 >> - <<SetBellySize $slaves[$i]>> <<elseif ($slaves[$i].preg > 41) && ($slaves[$i].broodmother == 0)>> <<set $slaves[$i].birthsTotal += WombBirthReady($slaves[$i], 35), WombBirth($slaves[$i], 35), WombFlush($slaves[$i]), $slaves[$i].preg = 0, $slaves[$i].pregWeek = -4, $slaves[$i].pregSource = 0, $slaves[$i].pregType = 0, $slaves[$i].pregKnown = 0>> - <<SetBellySize $slaves[$i]>> <<elseif ($slaves[$i].preg > 37) && ($slaves[$i].broodmother > 0)>> <<if $slaves[$i].broodmother > 0>> - <<set $slaves[$i].birthsTotal += WombBirthReady($slaves[$i], 37), WombBirth($slaves[$i], 37) $slaves[$i].preg = 37>> + <<set $slaves[$i].birthsTotal += WombBirthReady($slaves[$i], 37), WombBirth($slaves[$i], 37), $slaves[$i].preg = WombMaxPreg($slaves[$i])>> <</if>> - <<SetBellySize $slaves[$i]>> <</if>> +<<SetBellySize $slaves[$i]>> /*Actually it's now better to set belly size without checking of any conditions. Just to be sure. Should correct forgotten variables too. */ + <<if ($slaves[$i].hStyle != "shaved" && $slaves[$i].bald != 1 && $slaves[$i].haircuts == 0) && ($slaves[$i].hLength < 150)>> <<set $slaves[$i].hLength += 1>> <</if>> \ No newline at end of file -- GitLab