From f9cf018f9e4b521ad93a7ba6ef84b9793d86af2a Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Thu, 19 Apr 2018 13:02:28 -0400 Subject: [PATCH] tweaked lawCompliance to not apply pregnant to household liquidators - needs special case --- src/uncategorized/lawCompliance.tw | 40 ++++++++++++++++-------------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/src/uncategorized/lawCompliance.tw b/src/uncategorized/lawCompliance.tw index f1e58d5e55a..7cab93c1622 100644 --- a/src/uncategorized/lawCompliance.tw +++ b/src/uncategorized/lawCompliance.tw @@ -6,25 +6,29 @@ She has been kept on a rigorous diet for sale, has been required to exercise regularly, and has had excellent care taken of her health. <</if>> <<if $arcologies[0].FSRepopulationFocusSMR == 1>> - <<if $activeSlave.physicalAge < $fertilityAge>> - <<if $precociousPuberty == 1 >> - <<set $activeSlave.pubertyAgeXX = $activeSlave.physicalAge>> + <<if passage() != "Household Liquidator">> + <<if $activeSlave.physicalAge < $fertilityAge>> + <<if $precociousPuberty == 0>> + <<set $activeSlave.physicalAge = $fertilityAge>> + <<set $activeSlave.visualAge = $fertilityAge>> + <<set $activeSlave.actualAge = $fertilityAge>> + <<set $activeSlave.ovaryAge = $fertilityAge>> + <</if>> + <</if>> <<set $activeSlave.pubertyXX = 1>> - <<else>> - <<set $activeSlave.physicalAge = $fertilityAge>> - <<set $activeSlave.visualAge = $fertilityAge>> - <<set $activeSlave.actualAge = $fertilityAge>> - <</if>> - <</if>> - <<if $activeSlave.preg < 1>> /* "if" needed here to avoid conflicts with already pregnant slaves from repopulation FS arcologies markets */ - <<set $activeSlave.ovaries = 1>> - <<set $activeSlave.vagina = either(0, 0, 1, 1, 1, 1, 1, 2, 2, 3)>> - <<set $activeSlave.pregType = either(1, 1, 1, 1, 2, 2, 2, 3, 3, 4, 5)>> - <<set $activeSlave.preg = random(5,38)>> - <<set $activeSlave.pregKnown = 1>> - <<SetBellySize $activeSlave>> - <</if>> - If she was unable to become pregnant before, she has been made to now. She is fertilized surgically to insure a healthy pregnancy. + <<if $activeSlave.preg < 1>> /* "if" needed here to avoid conflicts with already pregnant slaves from repopulation FS arcologies markets */ + <<set $activeSlave.ovaries = 1>> + <<set $activeSlave.vagina = either(0, 0, 1, 1, 1, 1, 1, 2, 2, 3)>> + <<set $activeSlave.pregType = either(1, 1, 1, 1, 2, 2, 2, 3, 3, 4, 5)>> + <<set $activeSlave.preg = random(5,38)>> + <<set $activeSlave.pregKnown = 1>> + <<SetBellySize $activeSlave>> + <</if>> + If she was unable to become pregnant before, she has been made to now. She is fertilized surgically to insure a healthy pregnancy. + <<else>> + <<set $activeSlave.pubertyXX = 1>> + If she was unable to become pregnant before, she certainly can now. + <</if>> <</if>> <<if $arcologies[0].FSAssetExpansionistSMR == 1>> <<set $activeSlave.clit = either(0, 0, 0, 1, 1, 2)>> -- GitLab