diff --git a/src/pregmod/generateChild.tw b/src/pregmod/generateChild.tw index 14bd4d4a1bebe22d9d70f82e0263a166d8888619..12a18eb1f34a2f72f1648e1eb99ed93039acf740 100644 --- a/src/pregmod/generateChild.tw +++ b/src/pregmod/generateChild.tw @@ -25,6 +25,7 @@ <<if $babyGender == 1>> <<display "Generate XX Slave">> <<if $PC.pregSource < 1>> + <<set $activeSlave.slaveName = "My daughter">> <<set $activeSlave.mother = -1>> <<set $activeSlave.father = $missingParentID>> <<set $missingParentID-->> @@ -56,6 +57,7 @@ <<break>> <</if>> <</for>> + <<set $activeSlave.slaveName = String("My and " + $mergeDad.slaveName + "'s daughter")>> <<set $activeSlave.mother = -1>> <<set $activeSlave.father = $mergeDad.ID>> <<if $PC.nationality == $mergeDad.nationality>> @@ -132,6 +134,7 @@ <<elseif $babyGender == 2>> <<display "Generate XY Slave">> <<if $PC.pregSource < 1>> + <<set $activeSlave.slaveName = "My son">> <<set $activeSlave.mother = -1>> <<set $activeSlave.father = $missingParentID>> <<set $missingParentID-->> @@ -163,6 +166,7 @@ <<break>> <</if>> <</for>> + <<set $activeSlave.slaveName = String("My and " + $mergeDad.slaveName + "'s son")>> <<set $activeSlave.mother = -1>> <<set $activeSlave.father = $mergeDad.ID>> <<if $PC.nationality == $mergeDad.nationality>> @@ -251,11 +255,14 @@ <<set $activeSlave.mother = $mergeMom.ID>> <<if $mergeMom.pregSource > 0>> <<set $activeSlave.father = $mergeDad.ID>> + <<set $activeSlave.slaveName = String($mergeMom.slaveName + " and " + $mergeDad.slaveName + "'s child")>> <<elseif $mergeMom.pregSource == -1>> <<set $activeSlave.father = -1>> + <<set $activeSlave.slaveName = String($mergeMom.slaveName + " and my child")>> <<else>> <<set $activeSlave.father = $missingParentID>> <<set $missingParentID-->> + <<set $activeSlave.slaveName = String($mergeMom.slaveName + "'s slut child")>> <</if>> <<if $mergeMom.nationality == $mergeDad.nationality>> <<set $activeSlave.nationality = $mergeDad.nationality>> @@ -453,6 +460,7 @@ <<set $activeSlave.origin = "Shortly after birth, she was sealed in an aging tank until she was of age. She knows nothing of the world outside of what the tank imprinted her with.">> <<set $activeSlave.career = "a slave since birth">> <<set $activeSlave.intelligenceImplant = 0>> +<<set $activeSlave.navelPiercing = 0>> <<set $activeSlave.devotion = 0>> <<set $activeSlave.trust = 0>> <<set $activeSlave.weekAcquired to $week>> diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw index af91a78cdcb2b71b387a58891978383ac9928e94..92d54b148a5816a82192275c525484d097de4ead 100644 --- a/src/pregmod/incubator.tw +++ b/src/pregmod/incubator.tw @@ -74,12 +74,11 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu <<if $incubatorSlaves > 0>> <<for $i to 0; $i < $tanks.length; $i++>> - <<set $tanks[$i].birthName = $tanks[$i].slaveName>> <<if $tanks[$i].growTime <= 0>> <<set $readySlaves = 1>> - <br><br>$tanks[$i].slaveName is ready to be released from her tank. + <br><br>@@color:pink;$tanks[$i].slaveName@@ is ready to be released from her tank. <<else>> - <br><br><<print $tanks[$i].slaveName>>'s growth is currently being accelerated. She will be ready for release in about <<print Math.round($tanks[$i].growTime/$incubatorUpgradeSpeed)>> weeks. + <br><br>@@color:pink;<<print $tanks[$i].slaveName>>'s@@ growth is currently being accelerated. She will be ready for release in about <<print Math.round($tanks[$i].growTime/$incubatorUpgradeSpeed)>> weeks. <</if>> <<if $incubatorUpgradeWeight == 1>> <br> diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw index 7fb998c8dfb888ad997aed7545f1d4030d57f08c..73e1605903149291310ead0ae540401ac7e6c278 100644 --- a/src/pregmod/incubatorReport.tw +++ b/src/pregmod/incubatorReport.tw @@ -14,9 +14,9 @@ <<set $incubatorSlaves += 1>> <<if $tanks[$i].growTime > 0>> <<set $tanks[$i].growTime -= $incubatorUpgradeSpeed>> - <br><<print $tanks[$i].slaveName>>'s growth is currently being accelerated. She <<if Math.round($tanks[$i].growTime/$incubatorUpgradeSpeed) == 0>>is @@color:lime;ready for release.@@ She will be ejected from her tank upon your approach<<else>>will be ready for release in about <<print Math.round($tanks[$i].growTime/$incubatorUpgradeSpeed)>> weeks<</if>>. + <br>@@color:pink;<<print $tanks[$i].slaveName>>'s@@ growth is currently being accelerated. She <<if Math.round($tanks[$i].growTime/$incubatorUpgradeSpeed) == 0>>is @@color:lime;ready for release.@@ She will be ejected from her tank upon your approach<<else>>will be ready for release in about <<print Math.round($tanks[$i].growTime/$incubatorUpgradeSpeed)>> weeks<</if>>. <<else>> - $tanks[$i].slaveName is @@color:lime;ready for release.@@ She will be ejected from her tank upon your approach. + @@color:pink;$tanks[$i].slaveName@@ is @@color:lime;ready for release.@@ She will be ejected from her tank upon your approach. <</if>> <<if $incubatorUpgradeWeight == 1>> @@ -551,6 +551,12 @@ <<if $tanks[$i].dick > 1>> <<set $tanks[$i].dick -= 5>> <</if>> + <<if $tanks[$i].balls <= 0>> + <<set $tanks[$i].balls = 1>> + <</if>> + <<if $tanks[$i].dick <= 0>> + <<set $tanks[$i].dick = 1>> + <</if>> <</if>> <<if $tanks[$i].boobs > 0>> <<set $tanks[$i].boobs -= 500>> @@ -567,6 +573,12 @@ <<if $tanks[$i].dick > 1>> <<set $tanks[$i].dick -= 5>> <</if>> + <<if $tanks[$i].balls <= 0>> + <<set $tanks[$i].balls = 1>> + <</if>> + <<if $tanks[$i].dick <= 0>> + <<set $tanks[$i].dick = 1>> + <</if>> <</if>> <<if $tanks[$i].boobs > 0>> <<set $tanks[$i].boobs -= 500>> diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw index a28b81590d351d80204571c2af1e3f38f19d49d5..a4b978c6d04a8a11e09b0b9e8e8d49b724764b8f 100644 --- a/src/pregmod/newChildIntro.tw +++ b/src/pregmod/newChildIntro.tw @@ -38,8 +38,8 @@ You completed the legalities before heading to $incubatorName, knowing the tank will release her on your approach, and instruct $assistantName to notify the new girl's parents to meet you in your office. As the tank exumes the disoriented girl, you help her to her feet<<if $incubatorReproductionSetting > 1>>, making sure to feel-up her overdeveloped body,<</if>> and walk her to your penthouse. Though first you must decide upon a name for the new girl; it won't take long to reach your office, so you have only @@color:orange;one chance to name her@@ before you arrive. <span id="naming"> -<br>Choose a name for her. <<textbox "$activeSlave.slaveName" $activeSlave.slaveName "New Child Intro">> -<br><<click "Have you PA assign her a random name">> +<br>Choose a name for her. /*<<textbox "$activeSlave.slaveName" $activeSlave.slaveName "New Child Intro">>*/ Disabled until problems are resolved. For now use rename. +<br><<click "Have your PA assign her a random name">> <<replace "#naming">> <<NationalityToName $activeSlave>> <<set $activeSlave.birthName = $activeSlave.slaveName>>