From c33672c842173c0cb84fe45c2aa529724d03ee16 Mon Sep 17 00:00:00 2001 From: Lemongrab <> Date: Fri, 28 Sep 2018 14:21:14 -0700 Subject: [PATCH] Indent and comment fixes --- src/pregmod/csec.tw | 3 +- src/pregmod/incubatorReport.tw | 168 +++++++++++++------------- src/pregmod/sePlayerBirth.tw | 9 +- src/pregmod/widgets/seBirthWidgets.tw | 3 +- 4 files changed, 96 insertions(+), 87 deletions(-) diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw index 849905b9a64..6368a539ec3 100644 --- a/src/pregmod/csec.tw +++ b/src/pregmod/csec.tw @@ -146,7 +146,8 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a <</for>> <<if _shiftDegree > 0>> <<for _csec = 0; _csec < _shiftDegree; _csec++>> - <<set $mom.curBabies.shift()>> /*for now child generation metod for incubator not changed. But here children for incubator removed from array of birthed babies. If we decide later - we can use them for incubator as real objects here. For now they just discarded silently */ + /* For now, children only get full slave objects when they enter the incubator, and nothing from their unborn self is retained, so that's discarded here. Later we might transfer some data instead. */ + <<set $mom.curBabies.shift()>> <</for>> <</if>> <<set $activeSlave = $mom>> diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw index 06602b94521..1c3cecf44cc 100644 --- a/src/pregmod/incubatorReport.tw +++ b/src/pregmod/incubatorReport.tw @@ -142,54 +142,54 @@ <br> <<set _heightLimit = Math.trunc(Math.clamp((Height.mean($tanks[_inc].height) * 1.25),0,274))>> <<set _heightLimitAge = Height.forAge($tanks[_inc].height, $tanks[_inc])>> - <<if $tanks[_inc].inducedNCS == 1>> - /* - ** NCS should block physical growth beyond that of a toddler, but some players might like - ** a little more or less. So using $minimumSlaveAge or 8, whichever is lesser. - */ - <<set _limitAge = Math.min(8, $minimumSlaveAge)>> - <<set _heightLimitAge = Height.forAge($tanks[_inc].height, _limitAge, $tanks[_inc].genes)>> - <<set _heightLimit = _heightLimitAge>> - <</if>> + <<if $tanks[_inc].inducedNCS == 1>> + /* + ** NCS should block physical growth beyond that of a toddler, but some players might like + ** a little more or less. So using $minimumSlaveAge or 8, whichever is lesser. + */ + <<set _limitAge = Math.min(8, $minimumSlaveAge)>> + <<set _heightLimitAge = Height.forAge($tanks[_inc].height, _limitAge, $tanks[_inc].genes)>> + <<set _heightLimit = _heightLimitAge>> + <</if>> <<if $tanks[_inc].height >= _heightLimit>> The monitoring system detects $his body is not able to support further increases in height, so it carefully regulates stimulant injections to @@.yellow;maintain $his current stature.@@ <<set $tanks[_inc].height = _heightLimit>> <<elseif $incubatorGrowthStimsSetting == 2>> - <<if $tanks[_inc].inducedNCS == 1>> - The monitoring system floods $his body with growth stimulants, but $his @@.orange;NCS prevents an increase in $his growth rate.@@ - <<set $tanks[_inc].height = _heightLimitAge>> - <<else>> - The monitoring system floods $his body with growth stimulants, causing @@.green;a sharp increase in growth rate.@@ - <<if $incubatorWeightSetting >= 1 && $incubatorMusclesSetting <= 1 && $incubatorReproductionSetting <= 1>> - <<if $incubatorUpgradeSpeed == 52>> - <<set $tanks[_inc].height += random(3,6)>> - <<elseif $incubatorUpgradeSpeed == 18>> - <<set $tanks[_inc].height += random(2,5)>> - <<elseif $incubatorUpgradeSpeed == 9>> - <<set $tanks[_inc].height += random(1,4)>> - <<elseif $incubatorUpgradeSpeed == 6>> - <<set $tanks[_inc].height += random(1,3)>> - <<elseif $incubatorUpgradeSpeed == 5>> - <<set $tanks[_inc].height += random(1,2)>> - <</if>> - <<else>> - <<if $incubatorUpgradeSpeed == 52>> - <<set $tanks[_inc].height += random(2,5)>> - <<elseif $incubatorUpgradeSpeed == 18>> - <<set $tanks[_inc].height += random(1,4)>> - <<elseif $incubatorUpgradeSpeed == 9>> - <<set $tanks[_inc].height += random(1,3)>> - <<elseif $incubatorUpgradeSpeed == 6>> - <<set $tanks[_inc].height += random(1,2)>> - <<elseif $incubatorUpgradeSpeed == 5>> - <<set $tanks[_inc].height += random(0,1)>> - <</if>> - <</if>> - <</if>> + <<if $tanks[_inc].inducedNCS == 1>> + The monitoring system floods $his body with growth stimulants, but $his @@.orange;NCS prevents an increase in $his growth rate.@@ + <<set $tanks[_inc].height = _heightLimitAge>> + <<else>> + The monitoring system floods $his body with growth stimulants, causing @@.green;a sharp increase in growth rate.@@ + <<if $incubatorWeightSetting >= 1 && $incubatorMusclesSetting <= 1 && $incubatorReproductionSetting <= 1>> + <<if $incubatorUpgradeSpeed == 52>> + <<set $tanks[_inc].height += random(3,6)>> + <<elseif $incubatorUpgradeSpeed == 18>> + <<set $tanks[_inc].height += random(2,5)>> + <<elseif $incubatorUpgradeSpeed == 9>> + <<set $tanks[_inc].height += random(1,4)>> + <<elseif $incubatorUpgradeSpeed == 6>> + <<set $tanks[_inc].height += random(1,3)>> + <<elseif $incubatorUpgradeSpeed == 5>> + <<set $tanks[_inc].height += random(1,2)>> + <</if>> + <<else>> + <<if $incubatorUpgradeSpeed == 52>> + <<set $tanks[_inc].height += random(2,5)>> + <<elseif $incubatorUpgradeSpeed == 18>> + <<set $tanks[_inc].height += random(1,4)>> + <<elseif $incubatorUpgradeSpeed == 9>> + <<set $tanks[_inc].height += random(1,3)>> + <<elseif $incubatorUpgradeSpeed == 6>> + <<set $tanks[_inc].height += random(1,2)>> + <<elseif $incubatorUpgradeSpeed == 5>> + <<set $tanks[_inc].height += random(0,1)>> + <</if>> + <</if>> + <</if>> <<elseif $incubatorGrowthStimsSetting == 1>> - <<if $tanks[_inc].inducedNCS == 1>> + <<if $tanks[_inc].inducedNCS == 1>> The monitoring system detects $he is near the expected height for $his @@.orange;NCS@@ condition, so it carefully regulates stimulants injections to @@.yellow;maintain $his current stature.@@ - <<set $tanks[_inc].height = _heightLimitAge>> + <<set $tanks[_inc].height = _heightLimitAge>> <<elseif $tanks[_inc].height > _heightLimitAge>> The monitoring system detects $he is near the expected height, so it carefully regulates stimulants injections to @@.yellow;maintain $his current stature.@@ <<if random(1,10) == 10>> @@ -243,8 +243,8 @@ <<set $tanks[_inc].readyOva = random(3,8)>> <</if>> <<if $tanks[_inc].inducedNCS == 1>> - /* NCS blocks hormonal growth of all secondary sexual characteristics */ - $His @@.orange;NCS blocks all growth@@ despite the excess estrogen-laced growth hormones flooding $his body. + /* NCS blocks hormonal growth of all secondary sexual characteristics */ + $His @@.orange;NCS blocks all growth@@ despite the excess estrogen-laced growth hormones flooding $his body. <<elseif $incubatorUpgradeSpeed == 52>> <<if $tanks[_inc].boobs < 8000>> The excess estrogen-laced growth hormones @@.green;rapidly balloon $his breasts.@@ @@ -317,8 +317,8 @@ <<set $tanks[_inc].hormoneBalance -= 100>> <</if>> <<if $tanks[_inc].inducedNCS == 1>> - /* NCS blocks hormonal growth of all secondary sexual characteristics */ - $His @@.orange;NCS blocks all growth@@ despite the excess testosterone-laced growth hormones flooding $his body. + /* NCS blocks hormonal growth of all secondary sexual characteristics */ + $His @@.orange;NCS blocks all growth@@ despite the excess testosterone-laced growth hormones flooding $his body. <<elseif $incubatorUpgradeSpeed == 52>> <<if $tanks[_inc].balls < 40>> The excess testosterone-laced growth hormones @@.green;cause $his balls to balloon for extra cum production.@@ @@ -379,8 +379,8 @@ <<set $tanks[_inc].readyOva = random(2,6)>> <</if>> <<if $tanks[_inc].inducedNCS == 1>> - /* NCS blocks hormonal growth of all secondary sexual characteristics */ - $His @@.orange;NCS blocks all growth@@ despite the excess estrogen-laced growth hormones flooding $his body. + /* NCS blocks hormonal growth of all secondary sexual characteristics */ + $His @@.orange;NCS blocks all growth@@ despite the excess estrogen-laced growth hormones flooding $his body. <<elseif $incubatorUpgradeSpeed == 52>> <<if $tanks[_inc].boobs < 4000>> The excess estrogen-laced growth hormones @@.green;rapidly balloon $his breasts.@@ @@ -453,14 +453,16 @@ <<set $tanks[_inc].hormoneBalance -= 100>> <</if>> <<if $tanks[_inc].inducedNCS == 1>> - /* NCS blocks hormonal growth of all secondary sexual characteristics */ - $His @@.orange;NCS blocks all growth@@ despite the excess testosterone-laced growth hormones flooding $his body. + /* NCS blocks hormonal growth of all secondary sexual characteristics */ + $His @@.orange;NCS blocks all growth@@ despite the excess testosterone-laced growth hormones flooding $his body. <<elseif $incubatorUpgradeSpeed == 52>> <<if $tanks[_inc].balls < 10>> - The excess testosterone-laced growth hormones @@.green;cause $his balls to balloon for extra cum production.@@ + The excess testosterone-laced growth hormones @@.green + cause $his balls to balloon for extra cum production.@@ <<set $tanks[_inc].balls += 3>> <</if>> - <<if $tanks[_inc].dick < 7 && random(1,100) > 20>> + < + if $tanks[_inc].dick < 7 && random(1,100) > 20>> The excess testosterone-laced growth hormones @@.green;cause $his penis to swell.@@ <<set $tanks[_inc].dick += 2>> <</if>> @@ -515,8 +517,8 @@ <<set $tanks[_inc].readyOva = random(2,4)>> <</if>> <<if $tanks[_inc].inducedNCS == 1>> - /* NCS blocks hormonal growth of all secondary sexual characteristics */ - $His @@.orange;NCS blocks all growth@@ despite the excess estrogen-laced growth hormones flooding $his body. + /* NCS blocks hormonal growth of all secondary sexual characteristics */ + $His @@.orange;NCS blocks all growth@@ despite the excess estrogen-laced growth hormones flooding $his body. <<elseif $incubatorUpgradeSpeed == 52>> <<if $tanks[_inc].boobs < 2000>> The excess estrogen-laced growth hormones @@.green;rapidly balloon $his breasts.@@ @@ -589,8 +591,8 @@ <<set $tanks[_inc].hormoneBalance -= 100>> <</if>> <<if $tanks[_inc].inducedNCS == 1>> - /* NCS blocks hormonal growth of all secondary sexual characteristics */ - $His @@.orange;NCS blocks all growth@@ despite the excess testosterone-laced growth hormones flooding $his body. + /* NCS blocks hormonal growth of all secondary sexual characteristics */ + $His @@.orange;NCS blocks all growth@@ despite the excess testosterone-laced growth hormones flooding $his body. <<elseif $incubatorUpgradeSpeed == 52>> <<if $tanks[_inc].balls < 6>> The excess testosterone-laced growth hormones @@.green;cause $his balls to grow for extra cum production.@@ @@ -644,38 +646,38 @@ <<if $tanks[_inc].ovaries == 1>> <<set $tanks[_inc].pubertyXX = 1>> <<set $tanks[_inc].hormoneBalance = 250>> - <<if $tanks[_inc].inducedNCS == 1>> - /* NCS blocks hormonal growth of all secondary sexual characteristics */ - $His @@.orange;NCS blocks growth@@ despite the added estrogen. - <<else>> - <<if $tanks[_inc].boobs < 400 && random(1,100) > 60>> - The added estrogen @@.green;causes $his breasts to swell.@@ - <<set $tanks[_inc].boobs += 50>> - <</if>> - <<if $tanks[_inc].hips < 2 && random(1,100) > 90>> - The added estrogen @@.green;causes $his hips to widen.@@ - <<set $tanks[_inc].hips++>> - <</if>> - <<if $tanks[_inc].butt < 5 && random(1,100) > 80>> - The added estrogen @@.green;causes $his butt to grow.@@ - <<set $tanks[_inc].butt++>> - <</if>> + <<if $tanks[_inc].inducedNCS == 1>> + /* NCS blocks hormonal growth of all secondary sexual characteristics */ + $His @@.orange;NCS blocks growth@@ despite the added estrogen. + <<else>> + <<if $tanks[_inc].boobs < 400 && random(1,100) > 60>> + The added estrogen @@.green;causes $his breasts to swell.@@ + <<set $tanks[_inc].boobs += 50>> + <</if>> + <<if $tanks[_inc].hips < 2 && random(1,100) > 90>> + The added estrogen @@.green;causes $his hips to widen.@@ + <<set $tanks[_inc].hips++>> + <</if>> + <<if $tanks[_inc].butt < 5 && random(1,100) > 80>> + The added estrogen @@.green;causes $his butt to grow.@@ + <<set $tanks[_inc].butt++>> + <</if>> <</if>> <<elseif $tanks[_inc].balls > 0>> <<set $tanks[_inc].pubertyXY = 1>> <<set $tanks[_inc].hormoneBalance = -250>> - <<if $tanks[_inc].inducedNCS == 1>> - /* NCS blocks hormonal growth of all secondary sexual characteristics */ - $His @@.orange;NCS blocks all growth@@ despite the added testosterone. + <<if $tanks[_inc].inducedNCS == 1>> + /* NCS blocks hormonal growth of all secondary sexual characteristics */ + $His @@.orange;NCS blocks all growth@@ despite the added testosterone. <<else>> - <<if $tanks[_inc].balls < 3 && random(1,100) > 80>> - The added testosterone @@.green;causes $his balls to swell.@@ - <<set $tanks[_inc].balls++>> - <</if>> - <<if $tanks[_inc].dick < 3 && random(1,100) > 60>> - The added testosterone @@.green;causes $his penis to grow.@@ - <<set $tanks[_inc].dick++>> - <</if>> + <<if $tanks[_inc].balls < 3 && random(1,100) > 80>> + The added testosterone @@.green;causes $his balls to swell.@@ + <<set $tanks[_inc].balls++>> + <</if>> + <<if $tanks[_inc].dick < 3 && random(1,100) > 60>> + The added testosterone @@.green;causes $his penis to grow.@@ + <<set $tanks[_inc].dick++>> + <</if>> <</if>> <</if>> <<else>> diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw index 1fc487a439e..ba5404ae5a2 100644 --- a/src/pregmod/sePlayerBirth.tw +++ b/src/pregmod/sePlayerBirth.tw @@ -25,8 +25,13 @@ PC.pregSource documentation <<set _curBabies = $PC.curBabies.length>> <<set _stilBirth = $PC.womb.length>> <<set WombFlush($PC)>> -/* difference in code below: _curBabies - count of live babies after birth, $PC.pregType = all babies in PC. I assume that dead fetuses do not count to reputation, etc, and PC manages to hide them. This mainly for future possibilities, or early birth triggers. PC will not support partial birth - even she happens to be pregnant at different stages at once, undeveloped babies will be dead as result. _stilBirth currently not used - it's just for future improvements.*/ +/* Difference in code below: + * _curBabies - count of live babies after birth + * $PC.pregType = all babies in PC. + * I assume that dead fetuses do not count to reputation, etc, and PC manages to hide them. This mainly for future possibilities, or early birth triggers. + * PC will not support partial birth - even if she happens to be pregnant at different stages at once, undeveloped babies will be dead as result. + * _stilBirth currently not used - it's just for future improvements. */ <<set $PC.preg = 0, $PC.pregKnown = 0, $PC.labor = 0, $PC.births += _curBabies>> <<if $PC.pregSource == 0>> <<set $PC.birthOther += _curBabies>> @@ -560,7 +565,7 @@ You arrange yourself to give birth, relaxing until your body urges you to begin <</if>> <</if>> -/* -------------------- here curBabies is now will show only babies count remained after reserved ones is paced to incubator. Not all live birthed ones. */ +/* -------------------- Now curBabies counts live, birthed babies who haven't been placed in the incubator. */ <<set _curBabies = $PC.curBabies.length>> <<if _curBabies > 0>> diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw index 53de1439fd6..021e982d7ee 100644 --- a/src/pregmod/widgets/seBirthWidgets.tw +++ b/src/pregmod/widgets/seBirthWidgets.tw @@ -821,7 +821,8 @@ All in all, <</for>> <<if _shiftDegree > 0>> <<for _sbw = 0; _sbw < _shiftDegree; _sbw++>> - <<set $slaves[$i].curBabies.shift()>> /*for now child generation metod for incubator not changed. But here children for incubator removed from array of birthed babies. If we decide later - we can use them for incubator as real objects here. For now they just discarded silently */ + /* For now, children only get full slave objects when they enter the incubator, and nothing from their unborn self is retianed, so that's discarded here. Later we might transfer some data instead. */ + <<set $slaves[$i].curBabies.shift()>> <</for>> <</if>> <<set _curBabies = $slaves[$i].curBabies.length>> -- GitLab