From 87dbc7a6548c102d94a960b9f33e07a88d60b223 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Sun, 15 Oct 2017 02:34:19 -0400 Subject: [PATCH] puberty fix --- src/gui/Encyclopedia/encyclopedia.tw | 2 +- src/uncategorized/multiImplant.tw | 36 ++++++++++++++++++------- src/uncategorized/remoteSurgery.tw | 40 +++++++++++++++++++++------- 3 files changed, 58 insertions(+), 20 deletions(-) diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw index c5a35d47e80..3489ab0d281 100644 --- a/src/gui/Encyclopedia/encyclopedia.tw +++ b/src/gui/Encyclopedia/encyclopedia.tw @@ -2581,7 +2581,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr <br>''onithyr'' for various little tweaks and additions. <br>''anonNeo'' for spellchecking. <br>''Utopia'' for dirty dealings gang leader focus and updates to it. -<br>''hexall90'' for height growth drugs. +<br>''hexall90'' for height growth drugs, incubator organ farm support and detailing, the dispensary cleanup, and the Security Expansion Mod (not yet added). <br>''laziestman'' for sexy spats. <br>''Bane70'' optimized huge swaths of code with notable professionalism. <br>''Circle Tritagonist'' provided several new collars and outfits. diff --git a/src/uncategorized/multiImplant.tw b/src/uncategorized/multiImplant.tw index b5a70b3b6b9..36b361d284e 100644 --- a/src/uncategorized/multiImplant.tw +++ b/src/uncategorized/multiImplant.tw @@ -40,7 +40,9 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized <</if>> <<if $activeSlave.pubertyXY == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $potencyAge>> + <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $potencyAge>> <<set $activeSlave.pubertyXY = 1>> @@ -97,7 +99,9 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized <</if>> <<if $activeSlave.pubertyXX == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $fertilityAge>> <<set $activeSlave.pubertyXX = 1>> @@ -187,7 +191,9 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized <</if>> <<if $activeSlave.pubertyXY == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $potencyAge>> + <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $potencyAge>> <<set $activeSlave.pubertyXY = 1>> @@ -213,7 +219,9 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized <</if>> <<if $activeSlave.pubertyXY == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $potencyAge>> + <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $potencyAge>> <<set $activeSlave.pubertyXY = 1>> @@ -240,7 +248,9 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized <</if>> <<if $activeSlave.pubertyXX == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $fertilityAge>> <<set $activeSlave.pubertyXX = 1>> @@ -266,7 +276,9 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized <</if>> <<if $activeSlave.pubertyXX == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $fertilityAge>> <<set $activeSlave.pubertyXX = 1>> @@ -292,7 +304,9 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized <</if>> <<if $activeSlave.pubertyXX == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $fertilityAge>> <<set $activeSlave.pubertyXX = 1>> @@ -318,7 +332,9 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized <</if>> <<if $activeSlave.pubertyXX == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $fertilityAge>> <<set $activeSlave.pubertyXX = 1>> @@ -344,7 +360,9 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized <</if>> <<if $activeSlave.pubertyXX == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $fertilityAge>> <<set $activeSlave.pubertyXX = 1>> diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 98b70c49fa0..939a7451fdb 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -1422,7 +1422,9 @@ The fabricator has completed $possessive $activeOrgan.type. <</if>> <<if $activeSlave.pubertyXY == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $potencyAge>> + <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $potencyAge>> <<set $activeSlave.pubertyXY = 1>> @@ -1449,7 +1451,9 @@ The fabricator has completed $possessive $activeOrgan.type. <</if>> <<if $activeSlave.pubertyXY == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $potencyAge>> + <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $potencyAge>> <<set $activeSlave.pubertyXY = 1>> @@ -1490,7 +1494,9 @@ The fabricator has completed $possessive $activeOrgan.type. <</if>> <<if $activeSlave.pubertyXY == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $potencyAge>> + <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $potencyAge>> <<set $activeSlave.pubertyXY = 1>> @@ -1531,7 +1537,9 @@ The fabricator has completed $possessive $activeOrgan.type. <</if>> <<if $activeSlave.pubertyXY == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $potencyAge>> + <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $potencyAge>> <<set $activeSlave.pubertyXY = 1>> @@ -1621,7 +1629,9 @@ The fabricator has completed $possessive $activeOrgan.type. <</if>> <<if $activeSlave.pubertyXX == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $fertilityAge>> <<set $activeSlave.pubertyXX = 1>> @@ -1666,7 +1676,9 @@ The fabricator has completed $possessive $activeOrgan.type. <</if>> <<if $activeSlave.pubertyXX == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $fertilityAge>> <<set $activeSlave.pubertyXX = 1>> @@ -1711,7 +1723,9 @@ The fabricator has completed $possessive $activeOrgan.type. <</if>> <<if $activeSlave.pubertyXX == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $fertilityAge>> <<set $activeSlave.pubertyXX = 1>> @@ -1811,7 +1825,9 @@ The fabricator has completed $possessive $activeOrgan.type. <</if>> <<if $activeSlave.pubertyXX == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $fertilityAge>> <<set $activeSlave.pubertyXX = 1>> @@ -1848,7 +1864,9 @@ The fabricator has completed $possessive $activeOrgan.type. <</if>> <<if $activeSlave.pubertyXX == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $fertilityAge>> <<set $activeSlave.pubertyXX = 1>> @@ -1885,7 +1903,9 @@ The fabricator has completed $possessive $activeOrgan.type. <</if>> <<if $activeSlave.pubertyXX == 0>> <<if $precociousPuberty == 1>> - <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <</if>> <<else>> <<if $activeSlave.physicalAge >= $fertilityAge>> <<set $activeSlave.pubertyXX = 1>> -- GitLab