diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index 70b1d2c67bf3d492d8c760635b1694b5d5d7a10a..109db811aba47c9e062ae3a2bdcf704efcdfeadb 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -839,8 +839,4 @@ Image display <br><br> [[Cheat Start|init Nationalities][$cash += 1000000,$girls = 3,$rep += 10000,$dojo += 1,$cheatMode = 1,$seeDesk = 0, $seeFCNN = 0, $sortSlavesBy = "devotion",$sortSlavesOrder = "descending",$sortSlavesMain = 0,$rulesAssistantMain = 1,$abbreviateDevotion = 1,$abbreviateRules = 1,$abbreviateClothes = 2,$abbreviateHealth = 1,$abbreviateDiet = 1,$abbreviateDrugs = 1,$abbreviateRace = 1,$abbreviateNationality = 1,$abbreviateGenitalia = 1,$abbreviatePhysicals = 1,$abbreviateSkills = 1,$abbreviateMental = 2,$PC.trading = 100,$PC.warfare = 100,$PC.slaving = 100,$PC.engineering = 100,$PC.medicine = 100]] | //Intended for debugging: may have unexpected effects// -/* -<br><br> -[[Aging Test Start|init Nationalities][$cash += 1000000,$girls = 3,$rep += 10000,$cheatMode = 1,$minimumSlaveAge = 3,$loliGrowth = 1,$ageMode = 1]] | //Intended for debugging the buggy slave aging feature: may have unexpected effects// -*/ diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw index aa12f5e3c03b89f1d2ed91cdfed407055ec65a3d..5b0754a1cd5696f0fe4b8025476ab1ed6a065392 100644 --- a/src/pregmod/managePersonalAffairs.tw +++ b/src/pregmod/managePersonalAffairs.tw @@ -366,9 +366,19 @@ __Rumors__ <</if>> <<if $familyTesting == 1>> -<<if totalPlayerRelatives($PC) > 0>> - <<PlayerFamily>> -<</if>> + <br><br> + <span id="family"> + <<link "Pull up the file on your family tree.">> + <<replace #family>> + <div id="editFamily"><div id="graph"></div></div> + <<run updateFamilyTree(null, $slaves, $PC)>> + <script>updateFamilyTree()</script> + <</replace>> + <</link>> + </span> + <<if totalPlayerRelatives($PC) > 0>> + <<PlayerFamily>> + <</if>> <</if>> <<if $PC.vagina == 1>> diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw index 229b1c34a1673742ab29f111e0cdb1082f7bed4f..7ecf7a63a1042e4b753259ddcf33e5002770193b 100644 --- a/src/uncategorized/buildingWidgets.tw +++ b/src/uncategorized/buildingWidgets.tw @@ -93,7 +93,7 @@ Yes, I am aware this is horrible. If anyone can figure out how to get widgets to <td></td> <td id="Penthouse" colspan="4"> <<link "Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>> - <<if $servantsQuarters||$spa||$clinic||$schoolroom||$cellblock||$incubator>> + <<if $masterSuite||$servantsQuarters||$spa||$clinic||$schoolroom||$cellblock||$incubator||$HGSuite>> <br> <<if $masterSuite>>[[Suite|Master Suite]] ($masterSuiteSlaves/$masterSuite<<if $Concubine>>, C<</if>>)<</if>> <<if $servantsQuarters>>[[Quarters|Servants' Quarters]] ($servantsQuartersSlaves/$servantsQuarters<<if $Stewardess>>, L<</if>>)<</if>> @@ -102,7 +102,7 @@ Yes, I am aware this is horrible. If anyone can figure out how to get widgets to <<if $schoolroom>>[[Schoolroom]] ($schoolroomSlaves/$schoolroom<<if $Schoolteacher>>, L<</if>>)<</if>> <<if $cellblock>>[[Cellblock]] ($cellblockSlaves/$cellblock<<if $Wardeness>>, L<</if>>)<</if>> <<if $incubator>>[[Incubator]] (<<if $incubator-$incubatorSlaves == 0>>No empty tanks<<elseif $incubator-$incubatorSlaves == 1>>1 empty tank<<else>><<print $incubator-$incubatorSlaves>> empty tanks<</if>>)<</if>> - <<if $HGSuite>>[HG Suite|Head Girl Suite]] ($HGSuiteSlaves)<</if>> + <<if $HGSuite>>[[HG Suite|Head Girl Suite]] ($HGSuiteSlaves)<</if>> <</if>> </td> <td></td> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 5087a0c7354785399e5ee06609bae42337885d63..89a3b931ce071ad3a6ff87de2d865295313cdf62 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -312,9 +312,9 @@ <span id="family"> <<link "Pull up the file on her family tree.">> <<replace #family>> - <div id="graph"></div> - <<run updateFamilyTree($activeSlave, $slaves, $PC)>> - <script>updateFamilyTree()</script> + <div id="editFamily"><div id="graph"></div></div> + <<run updateFamilyTree($activeSlave, $slaves, $PC)>> + <script>updateFamilyTree()</script> <</replace>> <</link>> </span> diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw index 1a42472e8f8e0fc5587ba6fe6b689a7b296f11c6..4d363f43404a954664d75407045cc429caaaea86 100644 --- a/src/uncategorized/storyCaption.tw +++ b/src/uncategorized/storyCaption.tw @@ -548,72 +548,6 @@ _Pass $nextLink <br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@ <<elseif _Pass == "Manage Penthouse">> <br> - <<if ($masterSuite)>> - <br>[[$masterSuiteNameCaps|Master Suite]] - <<if $abbreviateSidebar == 2>> - ($masterSuiteSlaves/$masterSuite <<if $masterSuiteSlaves != 1>>fucktoys<<else>>fucktoy<</if>><<if $Concubine>>, Concubine<</if>>) - <<else>> - ($masterSuiteSlaves/$masterSuite<<if $Concubine>>, C<</if>>) - <</if>> - <</if>> - <<if ($servantsQuarters)>> - <br>[[$servantsQuartersNameCaps|Servants' Quarters]] - <<if $abbreviateSidebar == 2>> - ($servantsQuartersSlaves/$servantsQuarters servants<<if $Stewardess>>, stewardess<</if>>) - <<else>> - ($servantsQuartersSlaves/$servantsQuarters<<if $Stewardess>>, L<</if>>) - <</if>> - <</if>> - <<if ($schoolroom)>> - <br>[[$schoolroomNameCaps|Schoolroom]] - <<if $abbreviateSidebar == 2>> - ($schoolroomSlaves/$schoolroom <<if $schoolroomSlaves != 1>>students<<else>>student<</if>><<if $Schoolteacher>>, schoolteacher<</if>>) - <<else>> - ($schoolroomSlaves/$schoolroom<<if $Schoolteacher>>, L<</if>>) - <</if>> - <</if>> - <<if ($spa)>> - <br>[[$spaNameCaps|Spa]] - <<if $abbreviateSidebar == 2>> - ($spaSlaves/$spa <<if $spaSlaves != 1>>bathers<<else>>bathing<</if>><<if $Attendant>>, attendant<</if>>) - <<else>> - ($spaSlaves/$spa<<if $Attendant>>, L<</if>>) - <</if>> - <</if>> - <<if ($clinic)>> - <br>[[$clinicNameCaps|Clinic]] - <<if $abbreviateSidebar == 2>> - ($clinicSlaves/$clinic <<if $clinicSlaves != 1>>patients<<else>>patient<</if>><<if $Nurse>>, nurse<</if>>) - <<else>> - ($clinicSlaves/$clinic<<if $Nurse>>, L<</if>>) - <</if>> - <</if>> - <<if ($cellblock)>> - <br>[[$cellblockNameCaps|Cellblock]] - <<if $abbreviateSidebar == 2>> - ($cellblockSlaves/$cellblock <<if $cellblockSlaves != 1>>prisoners<<else>>prisoner<</if>><<if $Wardeness>>, wardeness<</if>>) - <<else>> - ($cellblockSlaves/$cellblock<<if $Wardeness>>, L<</if>>) - <</if>> - <</if>> - <<if ($incubator)>> - <br>[[$incubatorNameCaps|Incubator]] - <<if $abbreviateSidebar == 2>> - (<<if $incubator-$incubatorSlaves == 0>>No empty tanks<<elseif $incubator-$incubatorSlaves == 1>>1 empty tank<<else>><<print $incubator-$incubatorSlaves>> empty tanks<</if>>) - <<else>> - ($incubatorSlaves/$incubator) - <</if>> - <</if>> - <<if ($HGSuite)>> - <br>[[$HGSuiteNameCaps|Head Girl Suite]] - <<if $HGSuiteSlaves>> - <<if $abbreviateSidebar == 2>> - ($HGSuiteSlaves slave) - <<else>> - ($HGSuiteSlaves) - <</if>> - <</if>> - <</if>> <br><<link [[Wardrobe]]>><</link>> <br>[[Pharmaceutical Fabricator|Dispensary]] <br><br><br><br><br>