diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 35d9b8a7bc4f6458848a63c40c6cdc4d89b256f6..217056379254eed3104183626f53ca49cbd377db 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -205,6 +205,27 @@ window.assignJob = function assignJob(slave, job) {
case "Egyptian Revivalist":
slave.livingRules = "spare";
break;
+ case "Slave Professionalism":
+ if (slave.intelligence + slave.intelligenceImplant > 15) {
+ slave.livingRules = "normal";
+ } else {
+ slave.livingRules = "spare";
+ }
+ break;
+ case "Petite Admiration":
+ if (heightPass(slave)) {
+ slave.livingRules = "normal";
+ } else {
+ slave.livingRules = "spare";
+ }
+ break;
+ case "Statuesque Glorification":
+ if (heightPass(slave)) {
+ slave.livingRules = "normal";
+ } else {
+ slave.livingRules = "spare";
+ }
+ break;
default:
slave.livingRules = "normal";
break;
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 748964e35e40b7dfdb3bf3b81a5c8b8f3bb23e2e..587a44afbd0988b98d8aa69352e0ea80ea6a5964 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -10,7 +10,7 @@ window.generateGenetics = (function() {
let V;
// intelligence and face parameters are the same so we can use the same distribution for both values
- const fuzzy = (a, b) => Math.clamp(normalRandInt((a+b)/2, 20), -100, 100);
+ const fuzzy = (a, b) => normalRandInt((a+b)/2, 20, -100, 100);
function generateGenetics(actor1, actor2, x) {
V = State.variables;
diff --git a/src/js/slaveStatsChecker.js b/src/js/slaveStatsChecker.js
index e2cc4af5707a469f16bb3455fb7053919dc0f4c2..14f447061bed66ae9454af13dcb04597442fedd7 100644
--- a/src/js/slaveStatsChecker.js
+++ b/src/js/slaveStatsChecker.js
@@ -235,6 +235,17 @@ window.slimLawPass = function(slave) {
return slimLawPass;
};
+/**
+ * Returns if slave is considered an acceptable height by arcology standards.
+ * @param {App.Entity.SlaveState} slave
+ * @returns {boolean}
+ */
+window.heihgtPass = function(slave) {
+ let measuresUp = false;
+ // to make the other js that calls this unfinished function not meltdown
+ return measuresUp;
+}
+
/**
* Returns if slave is considered stacked (big T&A) or not.
* @param {App.Entity.SlaveState} slave
diff --git a/src/npc/fBeg.tw b/src/npc/fBeg.tw
index 816044cdd96cb538b6dc5763893b564b61f0c5b8..fdc948123684f38398720b9363b0b1004827f870 100644
--- a/src/npc/fBeg.tw
+++ b/src/npc/fBeg.tw
@@ -1,6 +1,7 @@
:: FBeg [nobr]
/* things I need: checks for canWalk() to see how easily she can move, blindness checks, replacement for BoobsDesc, maybe devotion catches for certain flaws */
+/* priority! femPC support! */
<<set $desc = SlaveTitle($activeSlave)>>
<<run clearSummaryCache($activeSlave)>>
@@ -199,7 +200,7 @@ You then tell your slave to kneel at your feet.
<</if>>
<</if>>
<<if ($activeSlave.devotion < -20)>>
- The other slaves guide $him to adjust $his posture so $his eyes ar directly in line with your package.
+ The other slaves guide $him to adjust $his posture so $his eyes are directly in line with your package.
<<else>>
$He kneels so that $his eyes are directly level with your package.
<</if>>
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index 11897c9de6c846c26126fa65507dc7dac0e693eb..0a6b41d5268f50e05f1d3a6c3d35475f675ac0ce 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -55,6 +55,14 @@ $cellblockNameCaps
is torture for chubby slaves. Fat bitches that pass through here soon learn that they're going to be slim and pretty one day, but that it isn't going to be much fun getting there.
<<case "Hedonistic">>
is torture for thin slaves. The first thing they notice is the heavily reinforced cot they will reside upon. The second is the feeding tube that will be anchored in their stomach for the duration of their stay. Slaves imprisoned here will have their body stuffed to capacity with concentrated slave food, ensuring a plump, docile slave by the end of their sentence.
+<<case "Intellectual Dependency">>
+ is a straightforward prison, with one exception. Each cell comes equiped with sound dampening shutters so slaves may be cut off from all outside stimulation. They are forced to be alone with their thoughts for most of their stay.
+<<case "Slave Professionalism">>
+ is torture for dumb slaves. Everything in the cell is a puzzle, from the food dispenser to the cot cover. Slaves are frequently rotated so that they may never become accustomed to any solutions.
+<<case "Petite Admiration">>
+ is designed to make tall slaves know they are unwelcome. What amounts a basic prison for a short slave is positvely torturous when one is far too large to even move in it.
+<<case "Statuesque Glorification">>
+ is designed to make short slaves know they are unwelcome. Where a tall slave will find nothing more than a standard cell, the vertically challanged while will find an insurmountable trial designed to teach them their place.
<<default>>
could be mistaken for a modern prison. A close inspection, however, reveals restraints in each cell that will hold inmates in sexually compromising positions, and compliance systems to force them to place their wrists and ankles in them.
<</switch>>
diff --git a/src/uncategorized/servantsQuarters.tw b/src/uncategorized/servantsQuarters.tw
index 83caf01fe73bee2070b1df96c693c6a6a985a2c1..ee16ea43e16af75543dc025479d57aab2f710515 100644
--- a/src/uncategorized/servantsQuarters.tw
+++ b/src/uncategorized/servantsQuarters.tw
@@ -55,6 +55,14 @@ $servantsQuartersNameCaps
are comfortable and well-kept. There are pornographic pictures on the walls, depicting slender slaves earnestly enjoying sex.
<<case "Hedonistic">>
are comfortable and well-kept. There are plenty of soft couches to recline on between shifts and a number of feeders to keep servants full and happy. There are pornographic pictures on the walls, depicting fat slaves earnestly enjoying sex while stuffing their and their partners faces.
+<<case "Intellectual Dependency">>
+ are comfortable, but well equipped to corral wayward slaves. There are instructional screens in the common areas reviewing basic slave tasks like scrubbing a floor and not wandering off. Plenty of toys are available in an effort to keep minds focused on work and not solely on sex.
+<<case "Slave Professionalism">>
+ are comfortable and well-kept, assuming a slave is able to understand how to make use of the amenities. There are abundant menial tasks available to keep a mind busy and sharp.
+<<case "Petite Admiration">>
+ are comfortable and well-kept, assuming a slave is short enough, of course. Those that stand too tall find the accommodations cramped and the tools annoyingly short.
+<<case "Statuesque Glorification">>
+ are comfortable and well-kept, assuming a slave is tall enough, of course. Those that are too short find the accommodations out of reach and the tools painfully long.
<<default>>
are comfortable. Servants sleep together in a dormitory, eat together in a little kitchen, bathe together in a communal shower, and then head out into the penthouse to serve.
<</switch>>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index 138e19f61606ae543563a91bfdcb3fdbfe0e1678..8dcbe5ea3e339a6008111869035455cb7b40f1bc 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -247,6 +247,24 @@
<<switch $servantsQuartersDecoration>>
<<case "Arabian Revivalist" "Aztec Revivalist" "Chattel Religionist" "Chinese Revivalist" "Degradationist" "Edo Revivalist" "Egyptian Revivalist" "Roman Revivalist" "Subjugationist" "Supremacist">>
<<set $slaves[$i].livingRules = "spare">>
+ <<case "Slave Professionalism">>
+ <<if $slaves[$i].intelligence+$slaves[$i].intelligenceImplant > 15>>
+ <<set $slaves[$i].livingRules = "normal">>
+ <<else>>
+ <<set $slaves[$i].livingRules = "spare">>
+ <</if>>
+ <<case "Petite Admiration">>
+ <<if heightPass($slaves[$i])>>
+ <<set $slaves[$i].livingRules = "normal">>
+ <<else>>
+ <<set $slaves[$i].livingRules = "spare">>
+ <</if>>
+ <<case "Statuesque Glorification">>
+ <<if heightPass($slaves[$i])>>
+ <<set $slaves[$i].livingRules = "normal">>
+ <<else>>
+ <<set $slaves[$i].livingRules = "spare">>
+ <</if>>
<<default>>
<<set $slaves[$i].livingRules = "normal">>
<</switch>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 0ba9edef52f65a2e443216d21f592f4473ce35b0..2ed70a0f0e77919d2e4013e03321cdbe3d2d02bd 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -347,7 +347,9 @@
<</if>>
<<if ($activeSlave.fetish != "mindbroken") && (($activeSlave.amp != 1) || ($activeSlave.voice != 0)) && $activeSlave.accent != 4>>
| <<link "Ask $him about $his feelings">><<replace "#miniscene">><<include "FFeelings">><br> <</replace>><</link>>
- | <<link "Make $him beg">><<replace "#miniscene">><<include "FBeg">><br> <</replace>><</link>>
+ <<if $PC.dick > 0>>
+ | <<link "Make $him beg">><<replace "#miniscene">><<include "FBeg">><br> <</replace>><</link>>
+ <</if>>
<</if>>
<<if $activeSlave.devotion >= 100 && $activeSlave.relationship < 0 && $activeSlave.relationship > -3>>
| <<link "Talk to $him about relationships" "Matchmaking">><<set $subSlave = 0, $eventSlave = $activeSlave>><</link>>
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">