diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw index fb19526aa7f39f22cda22370f0fc56985e086280..a21f829b27bff256d5b3a932d00cb294a3aeca29 100644 --- a/src/uncategorized/storyCaption.tw +++ b/src/uncategorized/storyCaption.tw @@ -49,12 +49,12 @@ <<link [[($nextButton)|($nextLink)]]>><</link>> <</if>> </strong></span> - <<if _Pass === "Encyclopedia">> to Free Cities.<</if>> @@.cyan;[Space]@@<br><br> + <<if _Pass === "Encyclopedia">> to Free Cities.<</if>> @@.cyan;[Space]@@<br> <</if>> <</if>> <</if>> -<<if _Pass == "Encyclopedia">> +<<if _Pass == "Encyclopedia">> <br> /* Intro, new players, PC/Gameplay focused */ [[Playing Free Cities|Encyclopedia][$encyclopedia = "Playing Free Cities"]] <br>[[Design your master|Encyclopedia][$encyclopedia = "Design Your Master"]] @@ -519,7 +519,7 @@ <<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>> <</if>> - <<if (_Pass === "Main") && $newModelUI === 1>> <br> + <<if _Pass === "Main" || _Pass === "Manage Arcology">> <br> <<if $FSAnnounced>> <span id="FSButton"> <br> <<link [[Future Societies|Future Society][$nextButton = "Back", $nextLink = "Main"]]>><</link>> @@ -532,146 +532,147 @@ </span> @@.cyan;[T]@@ - <<elseif (_Pass === "Main") && $newModelUI === 0>> <br> - <<if ($HGSuite)>> - <br> <<link "$HGSuiteNameCaps""Head Girl Suite">><</link>> - <<if $abbreviateSidebar == 2>> - <<if $HeadGirl != 0>>(HG<<if $HGSuiteSlaves > 0>>, 1)<<else>>)<</if>><</if>> - <<else>> - <<if $HeadGirl != 0>>(HG<<if $HGSuiteSlaves > 0>> and slave<<else>>)<</if>><</if>> + <<if $newModelUI === 0>> <br> + <<if ($HGSuite)>> + <br> <<link "$HGSuiteNameCaps""Head Girl Suite">><</link>> + <<if $abbreviateSidebar == 2>> + <<if $HeadGirl != 0>>(HG<<if $HGSuiteSlaves > 0>>, 1)<<else>>)<</if>><</if>> + <<else>> + <<if $HeadGirl != 0>>(HG<<if $HGSuiteSlaves > 0>> and slave<<else>>)<</if>><</if>> + <</if>> <</if>> - <</if>> - <<if ($dojo > 1)>> - <br>[[Armory|BG Select]] - <<if $Bodyguard != 0>> - (BG) + <<if ($dojo > 1)>> + <br>[[Armory|BG Select]] + <<if $Bodyguard != 0>> + (BG) + <</if>> <</if>> - <</if>> - <<if ($brothel)>> - <br> <<link "$brothelNameCaps""Brothel">><</link>> - <<if $abbreviateSidebar == 2>> - ($brothelSlaves/<<print $brothel>> whores<<if $Madam>>, madam<</if>>) - <<else>> - ($brothelSlaves/<<print $brothel>><<if $Madam>>, L<</if>>) + <<if ($brothel)>> + <br> <<link "$brothelNameCaps""Brothel">><</link>> + <<if $abbreviateSidebar == 2>> + ($brothelSlaves/<<print $brothel>> whores<<if $Madam>>, madam<</if>>) + <<else>> + ($brothelSlaves/<<print $brothel>><<if $Madam>>, L<</if>>) + <</if>> <</if>> - <</if>> - <<if ($club)>> - <br> <<link "$clubNameCaps""Club">><</link>> - <<if $abbreviateSidebar == 2>> - ($clubSlaves/<<print $club>> sluts<<if $DJ>>, DJ<</if>>) - <<else>> - ($clubSlaves/<<print $club>><<if $DJ>>, L<</if>>) + <<if ($club)>> + <br> <<link "$clubNameCaps""Club">><</link>> + <<if $abbreviateSidebar == 2>> + ($clubSlaves/<<print $club>> sluts<<if $DJ>>, DJ<</if>>) + <<else>> + ($clubSlaves/<<print $club>><<if $DJ>>, L<</if>>) + <</if>> <</if>> - <</if>> - <<if ($arcade)>> - <br> <<link "$arcadeNameCaps""Arcade">><</link>> - <<if $abbreviateSidebar == 2>> - ($arcadeSlaves/<<print $arcade>> inmates) - <<else>> - ($arcadeSlaves/<<print $arcade>>) + <<if ($arcade)>> + <br> <<link "$arcadeNameCaps""Arcade">><</link>> + <<if $abbreviateSidebar == 2>> + ($arcadeSlaves/<<print $arcade>> inmates) + <<else>> + ($arcadeSlaves/<<print $arcade>>) + <</if>> <</if>> - <</if>> - <<if ($dairy)>> - <br> <<link "$dairyNameCaps""Dairy">><</link>> - <<set _SCapT9 = $bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>> - <<if $abbreviateSidebar == 2>> - ($dairySlaves<<if _SCapT9>>+_SCapT9<</if>>/<<print $dairy>> cows<<if $Milkmaid>>, milkmaid<</if>>) - <<else>> - ($dairySlaves<<if _SCapT9>>+_SCapT9<</if>>/<<print $dairy>><<if $Milkmaid>>, L<</if>>) + <<if ($dairy)>> + <br> <<link "$dairyNameCaps""Dairy">><</link>> + <<set _SCapT9 = $bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>> + <<if $abbreviateSidebar == 2>> + ($dairySlaves<<if _SCapT9>>+_SCapT9<</if>>/<<print $dairy>> cows<<if $Milkmaid>>, milkmaid<</if>>) + <<else>> + ($dairySlaves<<if _SCapT9>>+_SCapT9<</if>>/<<print $dairy>><<if $Milkmaid>>, L<</if>>) + <</if>> <</if>> - <</if>> - <<if ($farmyard)>> - <br> <<link "$farmyardNameCaps""Farmyard">><</link>> - <<if $abbreviateSidebar == 2>> - ($farmyardSlaves/$farmyard farmhands<<if $Farmer>>, farmer<</if>>) - <<else>> - ($farmyardSlaves/$farmyard<<if $Farmer>>, L<</if>>) + <<if ($farmyard)>> + <br> <<link "$farmyardNameCaps""Farmyard">><</link>> + <<if $abbreviateSidebar == 2>> + ($farmyardSlaves/$farmyard farmhands<<if $Farmer>>, farmer<</if>>) + <<else>> + ($farmyardSlaves/$farmyard<<if $Farmer>>, L<</if>>) + <</if>> <</if>> - <</if>> - <<if ($servantsQuarters)>> - <br> <<link "$servantsQuartersNameCaps""Servants' Quarters">><</link>> - <<if $abbreviateSidebar == 2>> - ($servantsQuartersSlaves/$servantsQuarters servants<<if $Stewardess>>, stewardess<</if>>) - <<else>> - ($servantsQuartersSlaves/$servantsQuarters<<if $Stewardess>>, L<</if>>) + <<if ($servantsQuarters)>> + <br> <<link "$servantsQuartersNameCaps""Servants' Quarters">><</link>> + <<if $abbreviateSidebar == 2>> + ($servantsQuartersSlaves/$servantsQuarters servants<<if $Stewardess>>, stewardess<</if>>) + <<else>> + ($servantsQuartersSlaves/$servantsQuarters<<if $Stewardess>>, L<</if>>) + <</if>> <</if>> - <</if>> - <<if ($masterSuite)>> - <br> <<link "$masterSuiteNameCaps""Master Suite">><</link>> - <<if $abbreviateSidebar == 2>> - ($masterSuiteSlaves/$masterSuite <<if $masterSuiteSlaves != 1>>fucktoys<<else>>fucktoy<</if>><<if $Concubine>>, Concubine<</if>>) - <<else>> - ($masterSuiteSlaves/$masterSuite<<if $Concubine>>, C<</if>>) + <<if ($masterSuite)>> + <br> <<link "$masterSuiteNameCaps""Master Suite">><</link>> + <<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>> - <<if ($schoolroom)>> - <br> <<link "$schoolroomNameCaps""Schoolroom">><</link>> - <<if $abbreviateSidebar == 2>> - ($schoolroomSlaves/$schoolroom <<if $schoolroomSlaves != 1>>students<<else>>student<</if>><<if $Schoolteacher>>, schoolteacher<</if>>) - <<else>> - ($schoolroomSlaves/$schoolroom<<if $Schoolteacher>>, L<</if>>) + <<if ($schoolroom)>> + <br> <<link "$schoolroomNameCaps""Schoolroom">><</link>> + <<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>> - <<if ($spa)>> - <br> <<link "$spaNameCaps""Spa">><</link>> - <<if $abbreviateSidebar == 2>> - ($spaSlaves/$spa <<if $spaSlaves != 1>>bathers<<else>>bathing<</if>><<if $Attendant>>, attendant<</if>>) - <<else>> - ($spaSlaves/$spa<<if $Attendant>>, L<</if>>) + <<if ($spa)>> + <br> <<link "$spaNameCaps""Spa">><</link>> + <<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>> - <<if ($nursery)>> - <br> <<link "$nurseryNameCaps""Nursery">><</link>> - <<if $abbreviateSidebar == 2>> - (<<if $nursery-$nurseryBabies == 0>>No empty rooms<<elseif $nursery-$nurseryBabies == 1>>1 empty room<<else>><<print $nursery-$nurseryBabies>> empty rooms<</if>>, $nurserySlaves/$nurseryNannies <<if $nurserySlaves != 1>>nannies<<else>>nanny<</if>><<if $Matron>>, attendant<</if>>) - <<else>> - ($nurseryBabies/$nursery, $nurserySlaves/$nurseryNannies<<if $Matron>>, L<</if>>) + <<if ($nursery)>> + <br> <<link "$nurseryNameCaps""Nursery">><</link>> + <<if $abbreviateSidebar == 2>> + (<<if $nursery-$nurseryBabies == 0>>No empty rooms<<elseif $nursery-$nurseryBabies == 1>>1 empty room<<else>><<print $nursery-$nurseryBabies>> empty rooms<</if>>, $nurserySlaves/$nurseryNannies <<if $nurserySlaves != 1>>nannies<<else>>nanny<</if>><<if $Matron>>, attendant<</if>>) + <<else>> + ($nurseryBabies/$nursery, $nurserySlaves/$nurseryNannies<<if $Matron>>, L<</if>>) + <</if>> <</if>> - <</if>> - <<if ($clinic)>> - <br> <<link "$clinicNameCaps""Clinic">><</link>> - <<if $abbreviateSidebar == 2>> - ($clinicSlaves/$clinic <<if $clinicSlaves != 1>>patients<<else>>patient<</if>><<if $Nurse>>, nurse<</if>>) - <<else>> - ($clinicSlaves/$clinic<<if $Nurse>>, L<</if>>) + <<if ($clinic)>> + <br> <<link "$clinicNameCaps""Clinic">><</link>> + <<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>> - <<if ($cellblock)>> - <br> <<link "$cellblockNameCaps""Cellblock">><</link>> - <<if $abbreviateSidebar == 2>> - ($cellblockSlaves/$cellblock <<if $cellblockSlaves != 1>>prisoners<<else>>prisoner<</if>><<if $Wardeness>>, wardeness<</if>>) - <<else>> - ($cellblockSlaves/$cellblock<<if $Wardeness>>, L<</if>>) + <<if ($cellblock)>> + <br> <<link "$cellblockNameCaps""Cellblock">><</link>> + <<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>> - <<if ($incubator)>> - <br> <<link "$incubatorNameCaps""Incubator">><</link>> - <<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 ($incubator)>> + <br> <<link "$incubatorNameCaps""Incubator">><</link>> + <<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 $readySlaves > 0>> @@.yellow;[!]@@ <</if>> <</if>> - <<if $readySlaves > 0>> @@.yellow;[!]@@ <</if>> - <</if>> - <<if ($pit)>> - <br> <<link "$pitNameCaps""Pit">><</link>> - <<set _SCapT = $fighterIDs.length>> - <<if $abbreviateSidebar == 2>> - (_SCapT <<if _SCapT != 1>>combatants<<else>>combatant<</if>>) - <<else>> - (_SCapT) + <<if ($pit)>> + <br> <<link "$pitNameCaps""Pit">><</link>> + <<set _SCapT = $fighterIDs.length>> + <<if $abbreviateSidebar == 2>> + (_SCapT <<if _SCapT != 1>>combatants<<else>>combatant<</if>>) + <<else>> + (_SCapT) + <</if>> + <br> <</if>> - <br> - <</if>> - <</if>> /* Closes UI state check */ + <</if>> /* Closes UI state check */ + <</if>> /* _Pass === "Main" || _Pass === "Manage Arcology"*/ <<if _Pass === "Manage Arcology">> <span id="Security">