From 35629ed5c29cda4a325660af86bce76d16285027 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 17 Feb 2020 00:41:50 -0800
Subject: [PATCH] Revert "Merge branch 'minorCleaning' into 'pregmod-master'"
This reverts merge request !6134
---
src/js/utilsFC.js | 2 +-
src/js/utilsSC.js | 4 +-
src/uncategorized/storyCaption.tw | 320 +++++++++++++++++++++++-------
3 files changed, 246 insertions(+), 80 deletions(-)
diff --git a/src/js/utilsFC.js b/src/js/utilsFC.js
index 3f6607a557a..aa55fb2171a 100644
--- a/src/js/utilsFC.js
+++ b/src/js/utilsFC.js
@@ -948,7 +948,7 @@ window.Categorizer.prototype.cat = function(val, def) {
/**
* Returns numbers as text, e.g. 10 as "ten", according to the player's settings
* @param {number} x
- * @param {boolean} [printText=false] (optional)
+ * @param {boolean} printText
* @returns {string}
*/
window.num = function(x, printText = false) {
diff --git a/src/js/utilsSC.js b/src/js/utilsSC.js
index 0750f1ffeae..684f625b4f4 100644
--- a/src/js/utilsSC.js
+++ b/src/js/utilsSC.js
@@ -43,7 +43,7 @@ window.jsInclude = function(passageTitle) {
* // equal to [[Go to town|Town]]
* App.UI.passageLink("Go to town", "Town")
*/
-App.UI.passageLink = function(linkText, passage, setter = '', tooltip = '', elementType = 'a') {
+App.UI.passageLink = function(linkText, passage, setter, tooltip = '', elementType = 'a') {
let res = `<${elementType} data-passage="${passage}"`;
if (setter) {
res += ` data-setter="${App.Utils.escapeHtml(setter)}"`;
@@ -128,7 +128,7 @@ App.UI.replace = function(selector, newContent) {
* htag('test', {class: red, id: green}); // <div class="red" id="green">test</div>
* @param {string} text
* @param {string|object} attributes
- * @param {string} [tag='div'] (optional)
+ * @param {string} [tag='div']
* @returns {string}
*/
App.UI.htag = function(text, attributes, tag = 'div') {
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index d8290b1249c..9166f2c5304 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -2,26 +2,23 @@
<<set _Pass = passage()>>
<<widget "userButton">>
- <<if $ui != "start" || _Pass == "Encyclopedia">>
- /* Must use link so spacebar shortcut will work. */
- /* Don't remove these spans, it will break things. */
- <<if _Pass != "End Week">>
- <<if _Pass == "Main">>
- <strong> <span id="endWeekButton">
- <div><<link "$nextButton">> <<goto $nextLink>> <</link>> @@.cyan;[Ent]@@</div>
- </span> </strong>
- <<if $rulesAssistantAuto == 1 && DefaultRulesError()>>
- <div>@@.yellow;WARNING: Rules Assistant has rules with errors!@@</div>
- <</if>>
- <<else>>
- <strong> <span id="nextButton">
- <<if $nextButton != " ">>
- <div><<link "$nextButton">> <<goto $nextLink>> <</link>> @@.cyan;[Space]@@</div>
- <</if>>
- </span> </strong>
+ /* Must use link so spacebar shortcut will work. */
+ /* Don't remove these spans, it will break things. */
+ <<if _Pass != "End Week">>
+ <<if _Pass == "Main">>
+ <strong> <span id="endWeekButton">
+ <div><<link "$nextButton">> <<goto $nextLink>> <</link>> @@.cyan;[Ent]@@</div>
+ </span> </strong>
+ <<if $rulesAssistantAuto == 1 && DefaultRulesError()>>
+ <div>@@.yellow;WARNING: Rules Assistant has rules with errors!@@</div>
<</if>>
+ <<else>>
+ <strong> <span id="nextButton">
+ <<if $nextButton != " ">>
+ <div><<link "$nextButton">> <<goto $nextLink>> <</link>> @@.cyan;[Space]@@</div>
+ <</if>>
+ </span> </strong>
<</if>>
- <br>
<</if>>
<</widget>>
@@ -60,6 +57,8 @@
<</if>>
<</widget>>
+<<if $ui != "start" || _Pass == "Encyclopedia">> <<userButton>> <br> <</if>>
+
<<if $ui != "start" && _Pass != "Encyclopedia">>
<<if $cheatMode || $debugMode>>
<div>_Pass</div>
@@ -71,7 +70,7 @@
<div>
Week of <<= asDateString($week) >>
</div>
- <<if _Pass == "Main" && $cheatMode && $cheatModeM>>
+ <<if (_Pass == "Main") && ($cheatMode) && ($cheatModeM)>>
<<set _TWeek = $week>>
<<textbox "$week" $week>>
<<link "Apply">>
@@ -94,59 +93,117 @@
<<if $sideBarOptions.Cash > 0>>
<<set $cash = Math.trunc($cash)>>
+ <span id="cash">
<<if $cash > 0>>
- @@.yellowgreen;Cash@@ | @@.yellowgreen;<<= cashFormat($cash)>>@@
+ @@.yellowgreen;Cash@@
+ | @@.yellowgreen;<<print cashFormat($cash)>>@@
<<else>>
- __@@.red;Cash@@__ | @@.red;<<= cashFormat($cash)>>@@
+ __@@.red;Cash@@__
+ | @@.red;<<print cashFormat($cash)>>@@
<</if>>
+ </span>
<<if _Pass == "Main">> <br>
<<set _TCash2 = ($cash-$cashLastWeek)>>
- <<if _TCash2 > 0>> (@@.green;
- <<else>> (@@.red;
+ <span id="oldcash">
+ <<if _TCash2 > 0>>
+ (@@.green;<<print cashFormat(_TCash2)>>@@
+ <<else>>
+ (@@.red;<<print cashFormat(_TCash2)>>@@
<</if>>
- <<= cashFormat(_TCash2)>>@@ since last week)
+ </span>
+ since last week)
<<if ($cheatMode) && ($cheatModeM)>>
<<set _TCash1 = $cash>>
<<textbox "$cash" $cash>>
<<link "Apply">>
<<set $cash = Math.trunc(Number($cash) || _TCash1), $cheater = 1>>
+ <<replace "#cash">>
+ <<if $cash > 0>>
+ @@.yellowgreen;Cash@@
+ <<else>>
+ __@@.red;Cash@@__
+ <</if>>
+ | <<print cashFormat($cash)>>
+ <</replace>>
<<set _TCash2 = ($cash-$cashLastWeek)>>
+ <<replace "#oldcash">>
+ <<if _TCash2 > 0>>
+ (@@.green;<<print cashFormat(_TCash2)>>@@
+ <<else>>
+ (@@.red;<<print cashFormat(_TCash2)>>@@
+ <</if>>
+ <</replace>>
+ since last week)
<</link>>
<</if>>
<</if>>
- <</if>>
- <<if $foodMarket > 0>> <br>
- <<set $food = Math.trunc($food)>>
- <<set $foodConsumption = Math.trunc(($lowerClass*$foodRate.lower) + ($middleClass*$foodRate.middle) + ($upperClass*$foodRate.upper) + ($topClass*$foodRate.top))>>
- <<if $food > $foodConsumption>> /* if there is enough food for the next week */
- @@.chocolate;Food@@
- <<else>>
- @@.red;Food@@
- <</if>>
- <<if $food < 0>> <<set $food = 0>> <</if>>
- | @@.chocolate;<<= massFormat($food)>>@@
+ <<if $foodMarket > 0>> <br>
+ <<set $food = Math.trunc($food)>>
+ <<set $foodConsumption = Math.trunc(($lowerClass*$foodRate.lower) + ($middleClass*$foodRate.middle) + ($upperClass*$foodRate.upper) + ($topClass*$foodRate.top))>>
+ <span id="food">
+ <<if $food > $foodConsumption>> /* if there is enough food for the next week */
+ @@.chocolate;Food@@
+ <<else>>
+ @@.red;Food@@
+ <</if>>
+ <<if $food < 0>> <<set $food = 0>> <</if>>
+ | @@.chocolate;<<print massFormat($food)>>@@
+ </span>
- <<if _Pass === "Main">>
- <br>
- <<set _TFood2 = ($food-$foodLastWeek)>>
- <<if _TFood2 < 0>> (@@.red;
- <<else>> (@@.chocolate;+
+ <<if _Pass === "Main">>
+ <br>
+ <<set _TFood2 = ($food-$foodLastWeek)>>
+ <span id="oldfood">
+ <<if _TFood2 < 0>>
+ (@@.red;<<print massFormat(_TFood2)>>@@
+ <<else>>
+ (@@.chocolate;+<<print massFormat(_TFood2)>>@@
+ <</if>>
+ </span>
+ since last week)
+ <<if ($cheatMode) && ($cheatModeM)>>
+ <<set _TFood1 = $food>>
+ <<textbox "$food" $food>>
+ <<link "Apply">>
+ <<if $food < 0>>
+ <<set $food = 0>>
+ <<else>>
+ <<set $food = Math.trunc(Number($food) || _TFood1), $cheater = 1>>
+ <</if>>
+ <<replace "#food">>
+ <<if $food > $foodConsumption>> /* if there is enough food for the next week */
+ @@.chocolate;Food@@
+ <<else>>
+ __@@.red;Food@@__
+ <</if>>
+ | <<print massFormat($food)>>
+ <</replace>>
+ <<set _TFood2 = ($food-$foodLastWeek)>>
+ <<replace "#oldfood">>
+ <<if _TFood2 < 0>>
+ (@@.red;<<print massFormat(_TFood2)>>@@
+ <<else>>
+ (@@.chocolate;+<<print massFormat(_TFood2)>>@@
+ <</if>>
+ <</replace>>
+ since last week)
+ <</link>>
+ <</if>>
<</if>>
- <<= massFormat(_TFood2)>>@@ since last week)
- <<if ($cheatMode) && ($cheatModeM)>>
- <<set _TFood1 = $food>>
- <<textbox "$food" $food>>
- <<link "Apply">>
- <<if $food < 0>>
- <<set $food = 0>>
- <<else>>
- <<set $food = Math.trunc(Number($food) || _TFood1), $cheater = 1>>
- <</if>>
- <<set _TFood2 = ($food-$foodLastWeek)>>
- <</link>>
+ <</if>>
+ <<else>>
+ <<if $foodMarket > 0>>
+ <<set $food = Math.trunc($food)>>
+ <span id="food">
+ <<if $food > $foodConsumption>> /* if there is enough food for the next week */
+ @@.chocolate;Food@@
+ <<else>>
+ @@.red;Food@@
<</if>>
+ | <<print massFormat($food)>>
+ </span>
<</if>>
<</if>>
@@ -155,17 +212,17 @@
<<if _Pass === "Main">> [[Upkeep|Costs Budget]] |
<<else>> Upkeep |
<</if>>
- @@.red;<<= cashFormat($costs)>>@@
+ @@.red;<<print cashFormat($costs)>>@@
</div>
<</if>>
<<if $sideBarOptions.SexSlaveCount > 0>>
- <div>@@.pink;Total Sex Slaves@@ | <<= $slaves.length>></div>
+ <div>@@.pink;Total Sex Slaves@@ | <<print $slaves.length>></div>
<</if>>
<<if $sideBarOptions.roomPop > 0>>
- <div>@@.pink;Penthouse Beds@@ | <<if $dormitoryPopulation+$roomsPopulation > ($dormitory+$rooms)>>@@.red;<<= $dormitoryPopulation+$roomsPopulation>>@@<<else>><<= $dormitoryPopulation+$roomsPopulation>><</if>>/<<= ($dormitory+$rooms)>></div>
- <div>@@.pink;Dormitory Beds@@ | <<if $dormitoryPopulation > $dormitory>>@@.red;<<= $dormitoryPopulation>>@@<<else>><<= $dormitoryPopulation>><</if>>/<<= $dormitory>></div>
- <div>@@.pink;Luxury Rooms@@ | <<if $roomsPopulation > $rooms>>@@.red;<<= $roomsPopulation>>@@<<else>><<= $roomsPopulation>><</if>>/<<= $rooms>></div>
+ <div>@@.pink;Penthouse Beds@@ | <<if $dormitoryPopulation+$roomsPopulation > ($dormitory+$rooms)>>@@.red;<<print $dormitoryPopulation+$roomsPopulation>>@@<<else>><<print $dormitoryPopulation+$roomsPopulation>><</if>>/<<print ($dormitory+$rooms)>></div>
+ <div>@@.pink;Dormitory Beds@@ | <<if $dormitoryPopulation > $dormitory>>@@.red;<<print $dormitoryPopulation>>@@<<else>><<print $dormitoryPopulation>><</if>>/<<print $dormitory>></div>
+ <div>@@.pink;Luxury Rooms@@ | <<if $roomsPopulation > $rooms>>@@.red;<<print $roomsPopulation>>@@<<else>><<print $roomsPopulation>><</if>>/<<print $rooms>></div>
<</if>>
<<if _Pass != "Manage Penthouse">>
@@ -179,9 +236,10 @@
<<if $sideBarOptions.Rep > 0>>
<div>
- <<if _Pass === "Main">> [[Rep|Rep Budget]] |
- <<else>> @@.green;Rep@@ |
- <</if>>
+ <<if _Pass === "Main">> [[Rep|Rep Budget]] |
+ <<else>> @@.green;Rep@@ |
+ <</if>>
+ <span id="rep">
<<if $rep > 19000>>
@@color:rgb(0,145,0);worshipped@@
<<elseif $rep > 18000>>
@@ -229,13 +287,64 @@
<<else>>
@@color:rgb(0,255,0);unknown@@
<</if>>
- (<<= num($rep)>>)
+ (<<print num($rep)>>)
+ </span>
<<if (_Pass == "Main")>>
<<if ($cheatMode) && ($cheatModeM)>>
<<set _TRep = $rep>>
<<textbox "$rep" $rep>>
<<link "Apply">>
<<set $rep = Math.clamp(Math.trunc(Number($rep) || _TRep), 0, 20000), $cheater = 1>>
+ <<replace "#rep">>
+ <<if $rep > 19000>>
+ @@color:rgb(0,145,0);worshipped@@
+ <<elseif $rep > 18000>>
+ @@color:rgb(0,150,0);great@@
+ <<elseif $rep > 17000>>
+ @@color:rgb(0,155,0);exalted@@
+ <<elseif $rep > 16000>>
+ @@color:rgb(0,160,0);illustrious@@
+ <<elseif $rep > 15000>>
+ @@color:rgb(0,165,0);prestigious@@
+ <<elseif $rep > 14000>>
+ @@color:rgb(0,170,0);renowned@@
+ <<elseif $rep > 13000>>
+ @@color:rgb(0,175,0);famed@@
+ <<elseif $rep > 12000>>
+ @@color:rgb(0,180,0);celebrated@@
+ <<elseif $rep > 11000>>
+ @@color:rgb(0,185,0);honored@@
+ <<elseif $rep > 10000>>
+ @@color:rgb(0,190,0);acclaimed@@
+ <<elseif $rep > 9000>>
+ @@color:rgb(0,195,0);eminent@@
+ <<elseif $rep > 8250>>
+ @@color:rgb(0,200,0);prominent@@
+ <<elseif $rep > 7000>>
+ @@color:rgb(0,205,0);distinguished@@
+ <<elseif $rep > 6750>>
+ @@color:rgb(0,210,0);admired@@
+ <<elseif $rep > 6000>>
+ @@color:rgb(0,215,0);esteemed@@
+ <<elseif $rep > 5250>>
+ @@color:rgb(0,220,0);respected@@
+ <<elseif $rep > 4500>>
+ @@color:rgb(0,225,0);known@@
+ <<elseif $rep > 3750>>
+ @@color:rgb(0,230,0);recognized@@
+ <<elseif $rep > 3000>>
+ @@color:rgb(0,235,0);rumored@@
+ <<elseif $rep > 2250>>
+ @@color:rgb(0,240,0);envied@@
+ <<elseif $rep > 1500>>
+ @@color:rgb(0,245,0);resented@@
+ <<elseif $rep > 750>>
+ @@color:rgb(0,250,0);disliked@@
+ <<else>>
+ @@color:rgb(0,255,0);unknown@@
+ <</if>>
+ <<print num($rep)>>
+ <</replace>>
<</link>>
<</if>>
<</if>>
@@ -247,6 +356,7 @@
<div>
@@.darkviolet;Auth@@ |
<<set $SecExp.core.authority = Math.clamp(Math.trunc($SecExp.core.authority), 0, 20000)>>
+ <span id="auth">
<<if $SecExp.core.authority > 19500>>
@@color:rgb(148, 0, 211);divine will@@
<<elseif $SecExp.core.authority > 19000>>
@@ -288,13 +398,57 @@
<<else>>
@@color:rgb(211,0,204);harmless@@
<</if>>
- (<<= num($SecExp.core.authority)>>)
+ (<<print num($SecExp.core.authority)>>)
+ </span>
<<if (_Pass == "Main")>>
<<if ($cheatMode) && ($cheatModeM)>>
<<set _TAuth = $SecExp.core.authority>>
<<textbox "$SecExp.core.authority" $SecExp.core.authority>>
<<link "Apply">>
<<set $SecExp.core.authority = Math.clamp(Math.trunc(Number($SecExp.core.authority) || _TAuth), 0, 20000), $cheater = 1>>
+ <<replace "#auth">>
+ <<if $SecExp.core.authority > 19500>>
+ @@color:rgb(148, 0, 211);divine will@@
+ <<elseif $SecExp.core.authority > 19000>>
+ @@color:rgb(148, 0, 211);sovereign@@
+ <<elseif $SecExp.core.authority > 18000>>
+ @@color:rgb(148, 0, 211);monarch@@
+ <<elseif $SecExp.core.authority > 17000>>
+ @@color:rgb(148, 0, 211);tyrant@@
+ <<elseif $SecExp.core.authority > 15000>>
+ @@color:rgb(148, 0, 211);dictator@@
+ <<elseif $SecExp.core.authority > 14000>>
+ @@color:rgb(148, 0, 211);prince@@
+ <<elseif $SecExp.core.authority > 13000>>
+ @@color:rgb(183, 0, 211);master@@
+ <<elseif $SecExp.core.authority > 12000>>
+ @@color:rgb(183, 0, 211);leader@@
+ <<elseif $SecExp.core.authority > 11000>>
+ @@color:rgb(183, 0, 211);director@@
+ <<elseif $SecExp.core.authority > 10000>>
+ @@color:rgb(183, 0, 211);overseer@@
+ <<elseif $SecExp.core.authority > 9000>>
+ @@color:rgb(183, 0, 211);chief@@
+ <<elseif $SecExp.core.authority > 8000>>
+ @@color:rgb(183, 0, 211);manager@@
+ <<elseif $SecExp.core.authority > 7000>>
+ @@color:rgb(211,0,204);principal@@
+ <<elseif $SecExp.core.authority > 6000>>
+ @@color:rgb(211,0,204);auxiliary@@
+ <<elseif $SecExp.core.authority > 5000>>
+ @@color:rgb(211,0,204);subordinate@@
+ <<elseif $SecExp.core.authority > 4000>>
+ @@color:rgb(211,0,204);follower@@
+ <<elseif $SecExp.core.authority > 3000>>
+ @@color:rgb(211,0,204);powerless@@
+ <<elseif $SecExp.core.authority > 2000>>
+ @@color:rgb(211,0,204);toothless@@
+ <<elseif $SecExp.core.authority > 1000>>
+ @@color:rgb(211,0,204);mostly harmless@@
+ <<else>>
+ @@color:rgb(211,0,204);harmless@@
+ <</if>>
+ <</replace>>
<</link>>
<</if>>
<</if>>
@@ -303,13 +457,18 @@
<<if $sideBarOptions.Security > 0>>
<div>
- @@.deepskyblue;Security@@ | @@.deepskyblue;<<= Math.trunc($SecExp.security.cap)>>%@@
+ <span id="sec">
+ @@.deepskyblue;Security@@ | @@.deepskyblue;<<print Math.trunc($SecExp.security.cap)>>%@@
+ </span>
<<if (_Pass == "Main")>>
<<if ($cheatMode) && ($cheatModeM)>>
<<set _TSec = $SecExp.security.cap>>
<<textbox "$SecExp.security.cap" $SecExp.security.cap>>
<<link "Apply">>
<<set $SecExp.security.cap = Math.clamp(Math.trunc(Number($SecExp.security.cap) || _TSec), 0, 100), $cheater = 1>>
+ <<replace "#sec">>
+ <br>@@.deepskyblue;Security@@ | <<print Math.trunc($SecExp.security.cap)>>%
+ <</replace>>
<</link>>
<</if>>
<</if>>
@@ -318,13 +477,18 @@
<<if $sideBarOptions.Crime > 0>>
<div>
- @@.orangered;Crime@@ | @@.orangered;<<= Math.trunc($SecExp.core.crimeLow)>>%@@
+ <span id="crime">
+ @@.orangered;Crime@@ | @@.orangered;<<print Math.trunc($SecExp.core.crimeLow)>>%@@
+ </span>
<<if (_Pass == "Main")>>
<<if ($cheatMode) && ($cheatModeM)>>
<<set _TCrime = $SecExp.core.crimeLow>>
<<textbox "$SecExp.core.crimeLow" $SecExp.core.crimeLow>>
<<link "Apply">>
<<set $SecExp.core.crimeLow = Math.clamp(Math.trunc(Number($SecExp.core.crimeLow) || _TCrime), 0, 100), $cheater = 1>>
+ <<replace "#crime">>
+ <br>@@.orangered;Crime@@ | <<print Math.trunc($SecExp.core.crimeLow)>>%
+ <</replace>>
<</link>>
<</if>>
<</if>>
@@ -395,35 +559,35 @@
<<if ($brothel)>>
<br> <<link "$brothelNameCaps""Brothel">><</link>>
<<if $abbreviateSidebar == 2>>
- ($BrothiIDs.length/<<= $brothel>> whores<<if $Madam>>, madam<</if>>)
+ ($BrothiIDs.length/<<print $brothel>> whores<<if $Madam>>, madam<</if>>)
<<else>>
- ($BrothiIDs.length/<<= $brothel>><<if $Madam>>, L<</if>>)
+ ($BrothiIDs.length/<<print $brothel>><<if $Madam>>, L<</if>>)
<</if>>
<</if>>
<<if ($club)>>
<br> <<link "$clubNameCaps""Club">><</link>>
<<if $abbreviateSidebar == 2>>
- ($ClubiIDs.length/<<= $club>> sluts<<if $DJ>>, DJ<</if>>)
+ ($ClubiIDs.length/<<print $club>> sluts<<if $DJ>>, DJ<</if>>)
<<else>>
- ($ClubiIDs.length/<<= $club>><<if $DJ>>, L<</if>>)
+ ($ClubiIDs.length/<<print $club>><<if $DJ>>, L<</if>>)
<</if>>
<</if>>
<<if ($arcade)>>
<br> <<link "$arcadeNameCaps""Arcade">><</link>>
<<if $abbreviateSidebar == 2>>
- ($ArcadeiIDs.length/<<= $arcade>> inmates)
+ ($ArcadeiIDs.length/<<print $arcade>> inmates)
<<else>>
- ($ArcadeiIDs.length/<<= $arcade>>)
+ ($ArcadeiIDs.length/<<print $arcade>>)
<</if>>
<</if>>
<<if ($dairy)>>
<br> <<link "$dairyNameCaps""Dairy">><</link>>
<<set _SCapT9 = $bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>>
<<if $abbreviateSidebar == 2>>
- ($DairyiIDs.length<<if _SCapT9>>+_SCapT9<</if>>/<<= $dairy>> cows<<if $Milkmaid>>, milkmaid<</if>>)
+ ($DairyiIDs.length<<if _SCapT9>>+_SCapT9<</if>>/<<print $dairy>> cows<<if $Milkmaid>>, milkmaid<</if>>)
<<else>>
- ($DairyiIDs.length<<if _SCapT9>>+_SCapT9<</if>>/<<= $dairy>><<if $Milkmaid>>, L<</if>>)
+ ($DairyiIDs.length<<if _SCapT9>>+_SCapT9<</if>>/<<print $dairy>><<if $Milkmaid>>, L<</if>>)
<</if>>
<</if>>
@@ -472,7 +636,7 @@
<<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>><<= $nursery-$nurseryBabies>> empty rooms<</if>>, $NurseryiIDs.length/$nurseryNannies <<if $NurseryiIDs.length != 1>>nannies<<else>>nanny<</if>><<if $Matron>>, attendant<</if>>)
+ (<<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 $NurseryiIDs.length != 1>>nannies<<else>>nanny<</if>><<if $Matron>>, attendant<</if>>)
<<else>>
($nurseryBabies/$nursery, $NurseryiIDs.length/$nurseryNannies<<if $Matron>>, L<</if>>)
<</if>>
@@ -498,7 +662,7 @@
<<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>><<= $incubator-$incubatorSlaves>> empty tanks<</if>>)
+ (<<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>>
@@ -534,7 +698,9 @@
<span id="Security">
<<if ($secExpEnabled > 0 && ($SecExp.buildings.propHub.active + $secHQ + $SecExp.buildings.barracks.active + $riotCenter > 0)) || $SF.Toggle && $SF.Active >= 1>> <br>
- <<link "Manage Security">> <<replace "#Security">> <<security>> <</replace>> <</link>>
+ <<link "Manage Security">> <<replace "#Security">>
+ <<security>>
+ <</replace>> <</link>>
<</if>>
</span>
<</if>>
@@ -557,7 +723,7 @@
<<if $rep >= 10000>>
<br>[[Black Market|The Black Market]]
<<else>>
- <br>You lack the reputation (<<= num(10000)>>) to be invited to the underground Black Market.
+ <br>You lack the reputation (<<print num(10000)>>) to be invited to the underground Black Market.
<</if>>
<<elseif ["Dispensary", "Organ Farm", "Implant Manufactory", "Gene Lab", "Prosthetic Lab"].includes(_Pass)>>
@@ -642,4 +808,4 @@
<<if _Pass != "Encyclopedia" && ($showEncyclopedia > 0 || $ui != "start" && $nextButton != "Continue")>>
//''FCE'':// [[$encyclopedia|Encyclopedia][$nextButton = "Back", $nextLink = _Pass]]
-<</if>>
\ No newline at end of file
+<</if>>
--
GitLab