diff --git a/src/uncategorized/storyCaption.tw b/src/gui/storyCaption.tw
similarity index 62%
rename from src/uncategorized/storyCaption.tw
rename to src/gui/storyCaption.tw
index 9166f2c5304a632f359bb3d482b93952a6c8c719..86ece3245a0b39964df4039aaf616fee0906c3ad 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/gui/storyCaption.tw
@@ -60,17 +60,15 @@
<<if $ui != "start" || _Pass == "Encyclopedia">> <<userButton>> <br> <</if>>
<<if $ui != "start" && _Pass != "Encyclopedia">>
- <<if $cheatMode || $debugMode>>
+ <<if $cheatMode || $debugMode>>
<div>_Pass</div>
- <</if>>
- <div>
+ <</if>>
+ <div>
<span id="week">''Week $week''</span>
<<if $week > 52>> (<<= years($week)>>) <</if>>
- </div>
- <div>
- Week of <<= asDateString($week) >>
- </div>
- <<if (_Pass == "Main") && ($cheatMode) && ($cheatModeM)>>
+ </div>
+ <div> Week of <<= asDateString($week)>> </div>
+ <<if _Pass == "Main" && $cheatMode && $cheatModeM>>
<<set _TWeek = $week>>
<<textbox "$week" $week>>
<<link "Apply">>
@@ -78,151 +76,90 @@
<<if $week < 1>><<set $week = 1>><</if>>
<<replace "#week">>''Week $week''<</replace>>
<</link>>
+ <</if>>
+ <div>
+ <<if $weatherToday.severity == 1>>
+ <i>@@.cyan; $weatherToday.name@@</i>
+ <<elseif $weatherToday.severity == 2>>
+ <i>@@.yellow; $weatherToday.name@@</i>
+ <<elseif $weatherToday.severity == 3>>
+ <i>@@.orange; $weatherToday.name@@</i>
+ <<else>>
+ <i>@@.red; $weatherToday.name@@</i>
<</if>>
- <div>
- <<if $weatherToday.severity == 1>>
- <i>@@.cyan; $weatherToday.name@@</i>
- <<elseif $weatherToday.severity == 2>>
- <i>@@.yellow; $weatherToday.name@@</i>
- <<elseif $weatherToday.severity == 3>>
- <i>@@.orange; $weatherToday.name@@</i>
- <<else>>
- <i>@@.red; $weatherToday.name@@</i>
- <</if>>
- </div>
+ </div>
- <<if $sideBarOptions.Cash > 0>>
+ <<if $sideBarOptions.Cash > 0>>
<<set $cash = Math.trunc($cash)>>
- <span id="cash">
<<if $cash > 0>>
- @@.yellowgreen;Cash@@
- | @@.yellowgreen;<<print cashFormat($cash)>>@@
+ @@.yellowgreen;Cash@@ | @@.yellowgreen;<<= cashFormat($cash)>>@@
<<else>>
- __@@.red;Cash@@__
- | @@.red;<<print cashFormat($cash)>>@@
+ __@@.red;Cash@@__ | @@.red;<<= cashFormat($cash)>>@@
<</if>>
- </span>
- <<if _Pass == "Main">> <br>
+ <<if _Pass == "Main">> <div>
<<set _TCash2 = ($cash-$cashLastWeek)>>
- <span id="oldcash">
- <<if _TCash2 > 0>>
- (@@.green;<<print cashFormat(_TCash2)>>@@
- <<else>>
- (@@.red;<<print cashFormat(_TCash2)>>@@
+ <<if _TCash2 > 0>> (@@.green;<<= cashFormat(_TCash2)>>@@
+ <<else>> (@@.red;<<= cashFormat(_TCash2)>>@@
<</if>>
- </span>
since last week)
- <<if ($cheatMode) && ($cheatModeM)>>
+ <<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>>
+ </div> <</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))>>
- <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 $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 _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 _Pass == "Main">> <br>
+ <<set _TFood2 = ($food-$foodLastWeek)>>
+ <<if _TFood2 < 0>> (@@.red;<<= massFormat(_TFood2)>>@@
+ <<else>> (@@.chocolate;+<<= massFormat(_TFood2)>>@@
<</if>>
- <</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@@
+ 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>>
+ <</link>>
<</if>>
- | <<print massFormat($food)>>
- </span>
<</if>>
<</if>>
<<if $sideBarOptions.Upkeep > 0>>
<div>
- <<if _Pass === "Main">> [[Upkeep|Costs Budget]] |
+ <<if _Pass == "Main">> [[Upkeep|Costs Budget]] |
<<else>> Upkeep |
<</if>>
- @@.red;<<print cashFormat($costs)>>@@
+ @@.red;<<= cashFormat($costs)>>@@
</div>
<</if>>
<<if $sideBarOptions.SexSlaveCount > 0>>
- <div>@@.pink;Total Sex Slaves@@ | <<print $slaves.length>></div>
+ <div>@@.pink;Total Sex Slaves@@ | <<= $slaves.length>></div>
<</if>>
<<if $sideBarOptions.roomPop > 0>>
- <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>
+ <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>
<</if>>
<<if _Pass != "Manage Penthouse">>
@@ -236,10 +173,9 @@
<<if $sideBarOptions.Rep > 0>>
<div>
- <<if _Pass === "Main">> [[Rep|Rep Budget]] |
- <<else>> @@.green;Rep@@ |
- <</if>>
- <span id="rep">
+ <<if _Pass == "Main">> [[Rep|Rep Budget]] |
+ <<else>> @@.green;Rep@@ |
+ <</if>>
<<if $rep > 19000>>
@@color:rgb(0,145,0);worshipped@@
<<elseif $rep > 18000>>
@@ -287,66 +223,13 @@
<<else>>
@@color:rgb(0,255,0);unknown@@
<</if>>
- (<<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>>
+ (<<= num($rep)>>)
+ <<if _Pass == "Main" && $cheatMode && $cheatModeM>>
+ <<set _TRep = $rep>>
+ <<textbox "$rep" $rep>>
+ <<link "Apply">>
+ <<set $rep = Math.clamp(Math.trunc(Number($rep) || _TRep), 0, 20000), $cheater = 1>>
+ <</link>>
<</if>>
</div>
<</if>>
@@ -356,7 +239,6 @@
<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>>
@@ -398,99 +280,39 @@
<<else>>
@@color:rgb(211,0,204);harmless@@
<</if>>
- (<<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>>
+ (<<= num($SecExp.core.authority)>>)
+ <<if _Pass == "Main" && $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>>
+ <</link>>
<</if>>
</div>
<</if>>
<<if $sideBarOptions.Security > 0>>
<div>
- <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>>
+ @@.deepskyblue;Security@@ | @@.deepskyblue;<<= Math.trunc($SecExp.security.cap)>>%@@
+ <<if _Pass == "Main" && $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>>
+ <</link>>
<</if>>
</div>
<</if>>
<<if $sideBarOptions.Crime > 0>>
<div>
- <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>>
+ @@.orangered;Crime@@ | @@.orangered;<<= Math.trunc($SecExp.core.crimeLow)>>%@@
+ <<if _Pass == "Main" && $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>>
+ <</link>>
<</if>>
</div>
<</if>>
@@ -522,13 +344,13 @@
<<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>>
<</if>>
- <<if _Pass === "Main">>
+ <<if _Pass == "Main">>
<span id="findSlave"> <br>
<<link [[Locate Slave|Find Slave]]>><</link>>
</span>
<</if>>
- <<if $sideBarOptions.compact === 0 && _Pass === "Main" || $sideBarOptions.compact === 1 && _Pass === "Manage Arcology">> <br>
+ <<if $sideBarOptions.compact == 0 && _Pass == "Main" || $sideBarOptions.compact == 1 && _Pass == "Manage Arcology">> <br>
<<if $FSAnnounced>>
<span id="FSButton"> <br>
<<link [[Future Societies|Future Society][$nextButton = "Back", $nextLink = "Main"]]>><</link>>
@@ -540,7 +362,7 @@
</span> @@.cyan;[T]@@
<</if>>
- <<if _Pass === "Main" && $newModelUI === 0>>
+ <<if _Pass == "Main" && $newModelUI == 0>>
<<if ($HGSuite)>>
<br> <<link "$HGSuiteNameCaps""Head Girl Suite">><</link>>
<<if $abbreviateSidebar == 2>>
@@ -559,35 +381,35 @@
<<if ($brothel)>>
<br> <<link "$brothelNameCaps""Brothel">><</link>>
<<if $abbreviateSidebar == 2>>
- ($BrothiIDs.length/<<print $brothel>> whores<<if $Madam>>, madam<</if>>)
+ ($BrothiIDs.length/<<= $brothel>> whores<<if $Madam>>, madam<</if>>)
<<else>>
- ($BrothiIDs.length/<<print $brothel>><<if $Madam>>, L<</if>>)
+ ($BrothiIDs.length/<<= $brothel>><<if $Madam>>, L<</if>>)
<</if>>
<</if>>
<<if ($club)>>
<br> <<link "$clubNameCaps""Club">><</link>>
<<if $abbreviateSidebar == 2>>
- ($ClubiIDs.length/<<print $club>> sluts<<if $DJ>>, DJ<</if>>)
+ ($ClubiIDs.length/<<= $club>> sluts<<if $DJ>>, DJ<</if>>)
<<else>>
- ($ClubiIDs.length/<<print $club>><<if $DJ>>, L<</if>>)
+ ($ClubiIDs.length/<<= $club>><<if $DJ>>, L<</if>>)
<</if>>
<</if>>
<<if ($arcade)>>
<br> <<link "$arcadeNameCaps""Arcade">><</link>>
<<if $abbreviateSidebar == 2>>
- ($ArcadeiIDs.length/<<print $arcade>> inmates)
+ ($ArcadeiIDs.length/<<= $arcade>> inmates)
<<else>>
- ($ArcadeiIDs.length/<<print $arcade>>)
+ ($ArcadeiIDs.length/<<= $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>>/<<print $dairy>> cows<<if $Milkmaid>>, milkmaid<</if>>)
+ ($DairyiIDs.length<<if _SCapT9>>+_SCapT9<</if>>/<<= $dairy>> cows<<if $Milkmaid>>, milkmaid<</if>>)
<<else>>
- ($DairyiIDs.length<<if _SCapT9>>+_SCapT9<</if>>/<<print $dairy>><<if $Milkmaid>>, L<</if>>)
+ ($DairyiIDs.length<<if _SCapT9>>+_SCapT9<</if>>/<<= $dairy>><<if $Milkmaid>>, L<</if>>)
<</if>>
<</if>>
@@ -636,7 +458,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>><<print $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>><<= $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>>
@@ -662,7 +484,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>><<print $incubator-$incubatorSlaves>> empty tanks<</if>>)
+ (<<if $incubator-$incubatorSlaves == 0>>No empty tanks<<elseif $incubator-$incubatorSlaves == 1>>1 empty tank<<else>><<= $incubator-$incubatorSlaves>> empty tanks<</if>>)
<<else>>
($incubatorSlaves/$incubator)
<</if>>
@@ -678,9 +500,9 @@
<</if>>
<br>
<</if>>
- <</if>> /* closes _Pass === "Main" && $newModelUI === 0 */
+ <</if>> /* closes _Pass == "Main" && $newModelUI == 0 */
- <<if $sideBarOptions.compact === 0 && _Pass === "Main" || $sideBarOptions.compact === 1 && _Pass === "Manage Arcology">>
+ <<if $sideBarOptions.compact == 0 && _Pass == "Main" || $sideBarOptions.compact == 1 && _Pass == "Manage Arcology">>
<span id="policyButton"> <br>
<<link [[Policies]]>><</link>>
</span> @@.cyan;[Y]@@
@@ -698,14 +520,12 @@
<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>>
- <<if _Pass === "Manage Penthouse">>
+ <<if _Pass == "Manage Penthouse">>
<span id="URButton"> <br><br>
<<link [[Universal Rules]]>><</link>>
</span> @@.cyan;[V]@@
@@ -723,7 +543,7 @@
<<if $rep >= 10000>>
<br>[[Black Market|The Black Market]]
<<else>>
- <br>You lack the reputation (<<print num(10000)>>) to be invited to the underground Black Market.
+ <br>You lack the reputation (<<= num(10000)>>) to be invited to the underground Black Market.
<</if>>
<<elseif ["Dispensary", "Organ Farm", "Implant Manufactory", "Gene Lab", "Prosthetic Lab"].includes(_Pass)>>
@@ -751,7 +571,7 @@
</span> @@.cyan;[O]@@
<<else>>
<<if _Pass != "Summary Options">> [[Summary Options]] <</if>>
- <<if _Pass === "Options">> <br> <</if>>
+ <<if _Pass == "Options">> <br> <</if>>
<<if _Pass != "Description Options">> [[Description Options]] <</if>>
<</if>>
@@ -808,4 +628,4 @@
<<if _Pass != "Encyclopedia" && ($showEncyclopedia > 0 || $ui != "start" && $nextButton != "Continue")>>
//''FCE'':// [[$encyclopedia|Encyclopedia][$nextButton = "Back", $nextLink = _Pass]]
-<</if>>
+<</if>>
\ No newline at end of file
diff --git a/src/js/slaveInteract.js b/src/js/slaveInteract.js
index e169d9de9a15cc5bcbfb6c894e87a382d62fa4d7..556fad1be8ff69322b62d8021c267eb79710d909 100644
--- a/src/js/slaveInteract.js
+++ b/src/js/slaveInteract.js
@@ -145,9 +145,9 @@ App.UI.SlaveInteract.drugs = function(slave) {
} else if (slave.intelligence > -100) {
drugOptions.push({text: `Psychosuppressants`, disabled: `Cannot suppress indentured slave`});
} else if (slave.indentureRestrictions < 1) {
- drugOptions.push({text: `Psychosuppressants`, disabled: `Too stupid to supress`});
+ drugOptions.push({text: `Psychosuppressants`, disabled: `Too stupid to suppress`});
} else {
- drugOptions.push({text: `Psychosuppressants`, disabled: `Too stupid and indentured to supress`});
+ drugOptions.push({text: `Psychosuppressants`, disabled: `Too stupid and indentured to suppress`});
}
if (V.arcologies[0].FSSlaveProfessionalismResearch === 1) {
if (canImproveIntelligence(slave)) {
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index cdc6800b86477a330918dff62111274028b48ec3..48961b20db2adc0f9c151f3f2e99f057f9498463 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -574,19 +574,17 @@ window.generatePlayerPronouns = function(PC) {
};
window.generateAssistantPronouns = function() {
- if (V.assistant === 0) {
+ if (V.assistant === 0 || V.assistantAppearance === "normal") {
V.assistantPronouns.pronoun = App.Data.Pronouns.Kind.ai;
- } else if ((V.assistantAppearance === "incubus") && (V.diversePronouns === 1)) {
+ V.marketAssistantPronouns.pronoun = App.Data.Pronouns.Kind.ai;
+ } else if (V.assistantAppearance === "incubus" && V.diversePronouns === 1) {
V.assistantPronouns.pronoun = App.Data.Pronouns.Kind.male;
- } else {
+ V.marketAssistantPronouns.pronoun = App.Data.Pronouns.Kind.female;
+ } else if (V.assistantAppearance === "succubus" && V.diversePronouns === 1) {
V.assistantPronouns.pronoun = App.Data.Pronouns.Kind.female;
- }
-
- if (V.assistant === 0) {
- V.marketAssistantPronouns.pronoun = App.Data.Pronouns.Kind.ai;
- } else if ((V.assistantAppearance === "succubus") && (V.diversePronouns === 1)) {
V.marketAssistantPronouns.pronoun = App.Data.Pronouns.Kind.male;
} else {
+ V.assistantPronouns.pronoun = App.Data.Pronouns.Kind.female;
V.marketAssistantPronouns.pronoun = App.Data.Pronouns.Kind.female;
}
};
diff --git a/src/js/utilsFC.js b/src/js/utilsFC.js
index aa55fb2171af2fcc7d016ee49dc8e38c282a5612..3f6607a557af17ba8c725405ffd6910eea2f3bb5 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
+ * @param {boolean} [printText=false] (optional)
* @returns {string}
*/
window.num = function(x, printText = false) {
diff --git a/src/js/utilsSC.js b/src/js/utilsSC.js
index 684f625b4f41699463cf0a97aa698f34a96d8ea2..0750f1ffeae7d7b18fae4b2d91d08dd24c327d8a 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']
+ * @param {string} [tag='div'] (optional)
* @returns {string}
*/
App.UI.htag = function(text, attributes, tag = 'div') {
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index 0ff4bef0ee62c11098fd27c6625804b0d500d354..a2b871ac1e8dc8a62245612b0e265f2a280ae7ec 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -1462,7 +1462,7 @@ You look over the details of the report. It would require another rather expansi
<<link "Yes, use the alternate personality">>
<<replace "#result">>
<<set $assistant = 1>>
- <<run generateAssistantPronouns($assistant)>>
+ <<run generateAssistantPronouns()>>
<<setAssistantPronouns>>
Your sultry-voiced assistant requests a slave to demonstrate what it — now _heA — means. You bring in a slave and a fuckmachine, and tell _himU to get on it. The lovely voice croons and talks dirty to the slave as _heU uses the machine, acting as though _heA is the machine's voice. The pace of the machine is different, too, irregular and more lifelike. The slave certainly enjoys _himselfU, even if $assistantName is just simulating sex.
<</replace>>
@@ -1574,7 +1574,7 @@ __Personal assistant appearances:__
<</link>>
<br><<link "Go back to the standard personality">>
<<set $assistant = 0>>
- <<run generateAssistantPronouns($assistant)>>
+ <<run generateAssistantPronouns()>>
<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
<<replace "#result">>
You tell $assistantName to reduce _hisA lewdness by ninety percent. _HeA reverts to _hisA genderless, emotionless affect.
@@ -1656,7 +1656,7 @@ __Personal assistant appearances:__
<</link>>
<br><<link "Go back to the standard personality">>
<<set $assistant = 0>>
- <<run generateAssistantPronouns($assistant)>>
+ <<run generateAssistantPronouns()>>
<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
<<replace "#result">>
You tell $assistantName to reduce _hisA lewdness by ninety percent. _HeA reverts to _hisA genderless, emotionless affect.