diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index f9715e6579abfa996fc2c213a3fb30fb906891b6..f9979189983220a2751f48b3be0753cfaa791959 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -280,6 +280,7 @@ You should have received a copy of the GNU General Public License along with thi <<set $showEWM = 1>> <<set $showVignettes = 1>> <<set $showAppraisal = 1>> + <<set $verticalizeArcologyLinks = 0>> <<set $positionMainLinks = -1>> <<set $showTipsFromEncy = 1>> <<set $displayAssignments = 1>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index b95a1ae0c5c389436ebcf4d677d64f8d9d9ba69a..be7c6f83744844c5083f5e8effb9a71130aa4527 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -194,6 +194,9 @@ <<if ndef $summaryStats>> <<set $summaryStats = 0>> <</if>> +<<if ndef $verticalizeArcologyLinks>> + <<set $verticalizeArcologyLinks = 0>> +<</if>> <<if ndef $positionMainLinks>> <<set $positionMainLinks = -1>> <</if>> diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw index 1738a2ba54d3ff2f1ec2739b6b63ec689ede1303..d02e71e8e59d3cafe1972dfe954520c557a95ccd 100644 --- a/src/uncategorized/buildingWidgets.tw +++ b/src/uncategorized/buildingWidgets.tw @@ -142,18 +142,50 @@ if(!Macro.has('sectorblock')) { <td id="Penthouse" colspan="4"> <<link "Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>> @@.cyan;[P]@@ <<if $masterSuite||$HGSuite||$dojo||$servantsQuarters||$spa||$nursery||$clinic||$schoolroom||$cellblock||$incubator||$researchLab.level > 0>> - <br> - <<if $masterSuite>> <<print MasterSuiteUIName()>> ($MastSiIDs.length/$masterSuite<<if $Concubine>>, C<</if>>)<</if>> - <<if $HGSuite>> <<print HeadGirlSuiteUIName()>> <<if $HeadGirl != 0>>(HG<<if $HGSuiteiIDs.length > 0>>, 1)<<else>>)<</if>><</if>><</if>> - <<if $dojo > 1>>[[Armory|BG Select]] <<if $Bodyguard != 0>>(BG)<</if>> <</if>> - <<if $servantsQuarters>> <<print ServantQuartersUIName()>> ($ServQiIDs.length/$servantsQuarters<<if $Stewardess>>, L<</if>>)<</if>> - <<if $spa>> <<print SpaUIName()>> ($SpaiIDs.length/$spa<<if $Attendant>>, L<</if>>)<</if>> - <<if $nursery>> <<print NurseryUIName()>> (<<if $nursery-$nurseryBabies == 0>>No empty rooms<<elseif $nursery-$nurseryBabies == 1>>1 empty room<<else>><<print $nursery-$nurseryBabies>> empty rooms<</if>>, $NurseryiIDs.length/$nurseryNannies<<if $Matron>>, L<</if>>) <<if $readyChildren > 0>>@@.yellow;[!]@@<</if>> <</if>> - <<if $clinic>> <<print ClinicUIName()>> ($CliniciIDs.length/$clinic<<if $Nurse>>, L<</if>>)<</if>> - <<if $schoolroom>> <<print SchoolRoomUIName()>> ($SchlRiIDs.length/$schoolroom<<if $Schoolteacher>>, L<</if>>)<</if>> - <<if $cellblock>> <<print CellblockUIName()>> ($CellBiIDs.length/$cellblock<<if $Wardeness>>, L<</if>>)<</if>> - <<if $incubator>> <<print IncubatorUIName()>> (<<if $incubator-$incubatorSlaves == 0>>No empty tanks<<elseif $incubator-$incubatorSlaves == 1>>1 empty tank<<else>><<print $incubator-$incubatorSlaves>> empty tanks<</if>>) <<if $readySlaves > 0>>@@.yellow;[!]@@<</if>> <</if>> - <<if $researchLab.level > 0>>[[Prosthetic Lab]]<</if>> + <<if $masterSuite>> + <<if $verticalizeArcologyLinks>><br><</if>> + <<print MasterSuiteUIName()>> ($MastSiIDs.length/$masterSuite<<if $Concubine>>, C<</if>>) + <</if>> + <<if $HGSuite>> + <<if $verticalizeArcologyLinks>><br><</if>> + <<print HeadGirlSuiteUIName()>> <<if $HeadGirl != 0>>(HG<<if $HGSuiteiIDs.length > 0>>, 1)<<else>>)<</if>><</if>> + <</if>> + <<if $dojo > 1>> + <<if $verticalizeArcologyLinks>><br><</if>> + [[Armory|BG Select]] <<if $Bodyguard != 0>>(BG)<</if>> + <</if>> + <<if $servantsQuarters>> + <<if $verticalizeArcologyLinks>><br><</if>> + <<print ServantQuartersUIName()>> ($ServQiIDs.length/$servantsQuarters<<if $Stewardess>>, L<</if>>) + <</if>> + <<if $spa>> + <<if $verticalizeArcologyLinks>><br><</if>> + <<print SpaUIName()>> ($SpaiIDs.length/$spa<<if $Attendant>>, L<</if>>) + <</if>> + <<if $nursery>> + <<if $verticalizeArcologyLinks>><br><</if>> + <<print NurseryUIName()>> (<<if $nursery-$nurseryBabies == 0>>No empty rooms<<elseif $nursery-$nurseryBabies == 1>>1 empty room<<else>><<print $nursery-$nurseryBabies>> empty rooms<</if>>, $NurseryiIDs.length/$nurseryNannies<<if $Matron>>, L<</if>>) <<if $readyChildren > 0>>@@.yellow;[!]@@<</if>> + <</if>> + <<if $clinic>> + <<if $verticalizeArcologyLinks>><br><</if>> + <<print ClinicUIName()>> ($CliniciIDs.length/$clinic<<if $Nurse>>, L<</if>>) + <</if>> + <<if $schoolroom>> + <<if $verticalizeArcologyLinks>><br><</if>> + <<print SchoolRoomUIName()>> ($SchlRiIDs.length/$schoolroom<<if $Schoolteacher>>, L<</if>>) + <</if>> + <<if $cellblock>> + <<if $verticalizeArcologyLinks>><br><</if>> + <<print CellblockUIName()>> ($CellBiIDs.length/$cellblock<<if $Wardeness>>, L<</if>>) + <</if>> + <<if $incubator>> + <<if $verticalizeArcologyLinks>><br><</if>> + <<print IncubatorUIName()>> (<<if $incubator-$incubatorSlaves == 0>>No empty tanks<<elseif $incubator-$incubatorSlaves == 1>>1 empty tank<<else>><<print $incubator-$incubatorSlaves>> empty tanks<</if>>) <<if $readySlaves > 0>>@@.yellow;[!]@@<</if>> + <</if>> + <<if $researchLab.level > 0>> + <<if $verticalizeArcologyLinks>><br><</if>> + [[Prosthetic Lab]] + <</if>> <</if>> </td> <td colspan="3"></td> diff --git a/src/uncategorized/descriptionOptions.tw b/src/uncategorized/descriptionOptions.tw index c2e2da51925f9cd1ba13bd86ed4389019ffa7b88..7412cc01b3c6d3defad12b42399f86e11025d561 100644 --- a/src/uncategorized/descriptionOptions.tw +++ b/src/uncategorized/descriptionOptions.tw @@ -3,7 +3,8 @@ <style> .subHeading { width: 85%; - text-align: center + text-align: center; + margin-top: 1.5em; } </style> @@ -126,4 +127,4 @@ <<else>> @@.yellow;WORDS.@@ //[[Integers|Description Options][$showNumbers = 2]]// | //[[Both|Description Options][$showNumbers = 1, $showNumbersMax = 20]]// <</if>> -</div> \ No newline at end of file +</div> diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw index 67a5e230704cbaa47e760052932618d49ae8ffc2..78e42db3508c48a95ad91ee39aa1372ee6fa0f43 100644 --- a/src/uncategorized/options.tw +++ b/src/uncategorized/options.tw @@ -6,25 +6,26 @@ } .subHeading { width: 85%; - text-align: center + text-align: center; + margin-top: 1.5em; } .rebellionOption { margin-top: -30px; width: 75%; - text-align: right + text-align: right; } .rebellionOption2 { margin-top: -30px; width: 63.2%; - text-align: right + text-align: right; } .scLink { width: 85%; - text-align: center + text-align: center; } .scLink2 { width: 73%; - text-align: center + text-align: center; } </style> @@ -160,12 +161,20 @@ This save was created using FC version $ver build $releaseID. <<option -1 "Below">> <</options>> + <br> + <<options $newModelUI>> New Model UI <<option 1 "Enabled">> <<option 0 "Disabled">> <</options>> + <<options $verticalizeArcologyLinks>> + Add linebreaks in the penthouse links (New Model UI) + <<option 1 "Enabled">> + <<option 0 "Disabled">> + <</options>> + <<options $seeArcology>> Main menu arcology description <<option 1 "Enabled">> @@ -286,7 +295,10 @@ This save was created using FC version $ver build $releaseID. <</options>> <</if>> - <br><br> + <div class="subHeading"> + ''Images'' + </div> + <<options $seeImages>> Images are <<option 1 "Enabled">> @@ -965,4 +977,4 @@ This save was created using FC version $ver build $releaseID. <</options>> <</if>> </div> -</div> \ No newline at end of file +</div>