diff --git a/src/js/PenthouseNaming.tw b/src/js/PenthouseNaming.tw
new file mode 100644
index 0000000000000000000000000000000000000000..dc084faf450d5190bde984c2b33cdcd173d9b876
--- /dev/null
+++ b/src/js/PenthouseNaming.tw
@@ -0,0 +1,65 @@
+:: PenthouseNaming [script]
+window.MS = function() {
+ const V = State.variables;
+ var name = "";
+ if (V.masterSuiteNameCaps === "The Master Suite")
+ name = "Master Suite"
+ else
+ name = V.masterSuiteNameCaps;
+ return `<<link "${name}""Master Suite">><</link>> `}
+window.HS = function() {
+ const V = State.variables;
+ var name = "";
+ if (V.HGSuiteNameCaps === "The Head Girl Suite")
+ name = "Head Girl Suite"
+ else
+ name = V.HGSuiteNameCaps;
+ return `<<link "${name}""Head Girl Suite">><</link>> `}
+window.SQ = function() {
+ const V = State.variables;
+ var name = "";
+ if (V.servantsQuartersNameCaps === "The Servants' Quarters")
+ name = "Servants' Quarters"
+ else
+ name = V.servantsQuartersNameCaps;
+ return `<<link "${name}""Servants' Quarters">><</link>> `}
+window.S = function() {
+ const V = State.variables;
+ var name = "";
+ if (V.spaNameCaps === "The Spa")
+ name = "Spa"
+ else
+ name = V.spaNameCaps;
+ return `<<link "${name}""Spa">><</link>> `}
+window.CI = function() {
+ const V = State.variables;
+ var name = "";
+ if (V.clinicNameCaps === "The Clinic")
+ name = "Clinic"
+ else
+ name = V.clinicNameCaps;
+ return `<<link "${name}""Clinic">><</link>> `}
+window.SC = function() {
+ const V = State.variables;
+ var name = "";
+ if (V.schoolroomNameCaps === "The Schoolroom")
+ name = "Schoolroom"
+ else
+ name = V.schoolroomNameCaps;
+ return `<<link "${name}""Schoolroom">><</link>> `}
+window.CB = function() {
+ const V = State.variables;
+ var name = "";
+ if (V.cellblockNameCaps === "The Cellblock")
+ name = "Cellblock"
+ else
+ name = V.cellblockNameCaps;
+ return `<<link "${name}""Cellblock">><</link>> `}
+window.I = function() {
+ const V = State.variables;
+ var name = "";
+ if (V.incubatorNameCaps === "The Incubator")
+ name = "Incubator"
+ else
+ name = V.incubatorNameCaps;
+ return `<<link "${name}""Incubator">><</link>> `}
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index c0c894db56753f8a26621b2b6317cc603c2665da..1ec10e92c3bed8cff67937272d9f7b697a1a204a 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -19,19 +19,19 @@ Yes, I am aware this is horrible. If anyone can figure out how to get widgets to
empty-cells: hide;
width: 70%;
}
-
+
table.arcology td {
margin: 1px;
}
-
+
table.arcology col {
width: 8%;
}
-
+
table.arcology td {
border: 5px solid transparent;
}
-
+
td#Empty { border-color: lightgray; }
td#Private { border-color: red; }
td#Shops { border-color: thistle; }
@@ -71,16 +71,16 @@ if(!Macro.has('sectorblock')) {
sectors: {
LuxuryApartments: { base: 'Apartments' },
DenseApartments: { base: 'Apartments' },
- Club: { extra: ' ($clubSlaves/<<print $club>><<if $DJ>>, L<</if>>)' },
- Brothel: { extra: ' ($brothelSlaves/<<print $brothel>><<if $Madam>>,L<</if>>)' },
+ Club: { extra: ' <<if $clubNameCaps != "The Club">>$clubNameCaps<</if>> ($clubSlaves/<<print $club>><<if $DJ>>, L<</if>>)' },
+ Brothel: { extra: ' <<if $brothelNameCaps != "The Brothel">>$brothelNameCaps<</if>> ($brothelSlaves/<<print $brothel>><<if $Madam>>,L<</if>>)' },
CorporateMarket: { base: 'Corporate Market' },
- Pit: { extra: ' ($fighterIDs.length)'},
- Arcade: { extra: ' ($arcadeSlaves/<<print $arcade>>)'},
- Dairy: { extra: '<<set _SCapT9 = $bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>> ($dairySlaves<<if _SCapT9>>+_SCapT9<</if>>/<<print $dairy>><<if $Milkmaid>>,L<</if>>)' },
+ Pit: { extra: ' <<if $pitNameCaps != "The Pit">>$pitNameCaps<</if>> ($fighterIDs.length)'},
+ Arcade: { extra: ' <<if $arcadeNameCaps != "The Arcade">>$arcadeNameCaps<</if>> ($arcadeSlaves/<<print $arcade>>)'},
+ Dairy: { extra: ' <<if $dairyNameCaps != "The Dairy">>$dairyNameCaps<</if>> <<set _SCapT9 = $bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>> ($dairySlaves<<if _SCapT9>>+_SCapT9<</if>>/<<print $dairy>><<if $Milkmaid>>,L<</if>>)' },
Sweatshops: { base: 'Manufacturing' },
weapManu: { base: 'weaponsManufacturing', name: 'Weapons manufacturing', cls: 'weapManu' },
transportHub: { base: 'transportHub', name: 'Transport Hub', cls: 'transportHub' },
- Barracks: { base: 'Barracks', name: 'Armory' },
+ Barracks: { base: 'Barracks', name: 'The armory', extra: ' of $mercenariesTitle' },
/* speciality shop types */
'Subjugationist': { base: 'Shops', name: 'Subjugationist Shops', cls: 'FSShops' },
'Supremacist': { base: 'Shops', name: 'Supremacist Shops', cls: 'FSShops' },
@@ -107,7 +107,7 @@ if(!Macro.has('sectorblock')) {
'Eugenics': { base: 'Shops', name: 'Eugenics Shops', cls: 'FSShops' },
'Hedonism': { base: 'Shops', name: 'Hedonistic Shops', cls: 'FSShops' },
},
-
+
handler() {
let sec = this.args[0];
if(!sec || !sec.type) {
@@ -117,7 +117,7 @@ if(!Macro.has('sectorblock')) {
let type = sec.ownership === 1 ? (meta.cls || sec.type) : 'Private';
let basetype = sec.ownership === 1 ? (meta.base || sec.type) : 'Private';
let name = meta.name || sec.type.replace(/([a-z])([A-Z])/g, '$1 $2');
- let text =
+ let text =
'<td colspan="2" id="' + type + '">'
+ '[[' + name + '|' + basetype + '][$AS=' + this.args[1] + ']]'
+ (meta.extra || '') + (this.args[2] || '')
@@ -135,15 +135,15 @@ if(!Macro.has('sectorblock')) {
<<link "Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>> @@.cyan;[P]@@
<<if $masterSuite||$HGSuite||$dojo||$servantsQuarters||$spa||$clinic||$schoolroom||$cellblock||$incubator||$researchLab.built=="true">>
<br>
- <<if $masterSuite>>[[Suite|Master Suite]] ($masterSuiteSlaves/$masterSuite<<if $Concubine>>, C<</if>>)<</if>>
- <<if $HGSuite>>[[HG Suite|Head Girl Suite]] <<if $HeadGirl != 0>>(HG<<if $HGSuiteSlaves > 0>>, 1)<<else>>)<</if>><</if>><</if>>
+ <<if $masterSuite>> <<print MS()>> ($masterSuiteSlaves/$masterSuite<<if $Concubine>>, C<</if>>)<</if>>
+ <<if $HGSuite>> <<print HS()>> <<if $HeadGirl != 0>>(HG<<if $HGSuiteSlaves > 0>>, 1)<<else>>)<</if>><</if>><</if>>
<<if $dojo > 1>>[[Armory|BG Select]] <<if $Bodyguard != 0>>(BG)<</if>> <</if>>
- <<if $servantsQuarters>>[[Quarters|Servants' Quarters]] ($servantsQuartersSlaves/$servantsQuarters<<if $Stewardess>>, L<</if>>)<</if>>
- <<if $spa>>[[Spa]] ($spaSlaves/$spa<<if $Attendant>>, L<</if>>)<</if>>
- <<if $clinic>>[[Clinic]] ($clinicSlaves/$clinic<<if $Nurse>>, L<</if>>)<</if>>
- <<if $schoolroom>>[[Schoolroom]] ($schoolroomSlaves/$schoolroom<<if $Schoolteacher>>, L<</if>>)<</if>>
- <<if $cellblock>>[[Cellblock]] ($cellblockSlaves/$cellblock<<if $Wardeness>>, L<</if>>)<</if>>
- <<if $incubator>>[[Incubator]] (<<if $incubator-$incubatorSlaves == 0>>No empty tanks<<elseif $incubator-$incubatorSlaves == 1>>1 empty tank<<else>><<print $incubator-$incubatorSlaves>> empty tanks<</if>>)<</if>>
+ <<if $servantsQuarters>> <<print SQ()>> ($servantsQuartersSlaves/$servantsQuarters<<if $Stewardess>>, L<</if>>)<</if>>
+ <<if $spa>> <<print S()>> ($spaSlaves/$spa<<if $Attendant>>, L<</if>>)<</if>>
+ <<if $clinic>> <<print CI()>> ($clinicSlaves/$clinic<<if $Nurse>>, L<</if>>)<</if>>
+ <<if $schoolroom>> <<print SC()>> ($schoolroomSlaves/$schoolroom<<if $Schoolteacher>>, L<</if>>)<</if>>
+ <<if $cellblock>> <<print CB()>> ($cellblockSlaves/$cellblock<<if $Wardeness>>, L<</if>>)<</if>>
+ <<if $incubator>> <<print I()>> (<<if $incubator-$incubatorSlaves == 0>>No empty tanks<<elseif $incubator-$incubatorSlaves == 1>>1 empty tank<<else>><<print $incubator-$incubatorSlaves>> empty tanks<</if>>)<</if>>
<<if $researchLab.built == "true">>[[Research Lab][$temp = 0]]<</if>>
<</if>>
</td>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index b518bdf37210cb33c817a712c37c535875e76ef1..673970c0a2e414260eb5521e827c38862e8e70b7 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -387,7 +387,7 @@
<<if (_Pass == "Main")>>
<<if $newModelUI == 0>>
<<if ($HGSuite)>>
- <br>[[$HGSuiteNameCaps|Head Girl Suite]]
+ <br> <<link "$HGSuiteNameCaps""Head Girl Suite">><</link>>
<<if $abbreviateSidebar == 2>>
<<if $HeadGirl != 0>>(HG<<if $HGSuiteSlaves > 0>>, 1)<<else>>)<</if>><</if>>
<<else>>
@@ -401,7 +401,7 @@
<</if>>
<</if>>
<<if ($brothel)>>
- <br>[[$brothelNameCaps|Brothel]]
+ <br> <<link "$brothelNameCaps""Brothel">><</link>>
<<if $abbreviateSidebar == 2>>
($brothelSlaves/<<print $brothel>> whores<<if $Madam>>, madam<</if>>)
<<else>>
@@ -409,7 +409,7 @@
<</if>>
<</if>>
<<if ($club)>>
- <br>[[$clubNameCaps|Club]]
+ <br> <<link "$clubNameCaps""Club">><</link>>
<<if $abbreviateSidebar == 2>>
($clubSlaves/<<print $club>> sluts<<if $DJ>>, DJ<</if>>)
<<else>>
@@ -417,7 +417,7 @@
<</if>>
<</if>>
<<if ($arcade)>>
- <br>[[$arcadeNameCaps|Arcade]]
+ <br> <<link "$arcadeNameCaps""Arcade">><</link>>
<<if $abbreviateSidebar == 2>>
($arcadeSlaves/<<print $arcade>> inmates)
<<else>>
@@ -425,7 +425,7 @@
<</if>>
<</if>>
<<if ($dairy)>>
- <br>[[$dairyNameCaps|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>>)
@@ -434,7 +434,7 @@
<</if>>
<</if>>
<<if ($servantsQuarters)>>
- <br>[[$servantsQuartersNameCaps|Servants' Quarters]]
+ <br> <<link "$servantsQuartersNameCaps""Servants' Quarters">><</link>>
<<if $abbreviateSidebar == 2>>
($servantsQuartersSlaves/$servantsQuarters servants<<if $Stewardess>>, stewardess<</if>>)
<<else>>
@@ -442,7 +442,7 @@
<</if>>
<</if>>
<<if ($masterSuite)>>
- <br>[[$masterSuiteNameCaps|Master Suite]]
+ <br> <<link "$masterSuiteNameCaps""Master Suite">><</link>>
<<if $abbreviateSidebar == 2>>
($masterSuiteSlaves/$masterSuite <<if $masterSuiteSlaves != 1>>fucktoys<<else>>fucktoy<</if>><<if $Concubine>>, Concubine<</if>>)
<<else>>
@@ -450,7 +450,7 @@
<</if>>
<</if>>
<<if ($schoolroom)>>
- <br>[[$schoolroomNameCaps|Schoolroom]]
+ <br> <<link "$schoolroomNameCaps""Schoolroom">><</link>>
<<if $abbreviateSidebar == 2>>
($schoolroomSlaves/$schoolroom <<if $schoolroomSlaves != 1>>students<<else>>student<</if>><<if $Schoolteacher>>, schoolteacher<</if>>)
<<else>>
@@ -458,7 +458,7 @@
<</if>>
<</if>>
<<if ($spa)>>
- <br>[[$spaNameCaps|Spa]]
+ <br> <<link "$spaNameCaps""Spa">><</link>>
<<if $abbreviateSidebar == 2>>
($spaSlaves/$spa <<if $spaSlaves != 1>>bathers<<else>>bathing<</if>><<if $Attendant>>, attendant<</if>>)
<<else>>
@@ -466,7 +466,7 @@
<</if>>
<</if>>
<<if ($clinic)>>
- <br>[[$clinicNameCaps|Clinic]]
+ <br> <<link "$clinicNameCaps""Clinic">><</link>>
<<if $abbreviateSidebar == 2>>
($clinicSlaves/$clinic <<if $clinicSlaves != 1>>patients<<else>>patient<</if>><<if $Nurse>>, nurse<</if>>)
<<else>>
@@ -474,7 +474,7 @@
<</if>>
<</if>>
<<if ($cellblock)>>
- <br>[[$cellblockNameCaps|Cellblock]]
+ <br> <<link "$cellblockNameCaps""Cellblock">><</link>>
<<if $abbreviateSidebar == 2>>
($cellblockSlaves/$cellblock <<if $cellblockSlaves != 1>>prisoners<<else>>prisoner<</if>><<if $Wardeness>>, wardeness<</if>>)
<<else>>
@@ -482,7 +482,7 @@
<</if>>
<</if>>
<<if ($incubator)>>
- <br>[[$incubatorNameCaps|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>>
@@ -490,7 +490,7 @@
<</if>>
<</if>>
<<if ($pit)>>
- <br>[[$pitNameCaps|Pit]]
+ <br> <<link "$pitNameCaps""Pit">><</link>>
<<set _SCapT = $fighterIDs.length>>
<<if $abbreviateSidebar == 2>>
(_SCapT <<if _SCapT != 1>>combatants<<else>>combatant<</if>>)
@@ -500,7 +500,7 @@
<</if>>
<br>
<<if ($securityForceActive)>>
- <br><span id="SFMButton"><<link [[SF Barracks|SFM Barracks]]>><</link>></span> @@.cyan;[Z]@@
+ <br><span id="SFMButton"> <<link "$securityForceName's Barracks""SFM Barracks">><</link>> </span> @@.cyan;[Z]@@
<</if>>
<br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@
<<else>>
@@ -525,9 +525,9 @@
<br>[[Manage Research Lab|Research Lab][$temp = 0]]
<</if>>
<<if ($securityForceActive)>>
- <br><span id="SFMButton"><<link [[SF Barracks|SFM Barracks]]>><</link>></span> @@.cyan;[Z]@@
+ <br><span id="SFMButton"> <<link "$securityForceName's Barracks""SFM Barracks">><</link>> </span> @@.cyan;[Z]@@
<</if>>
-
+
<br>
<br><span id="PAOButton"><<link [[Personal Assistant|Personal assistant options]]>><</link>></span> @@.cyan;[T]@@
<br><span id="policyButton"><<link [[Policies]]>><</link>></span> @@.cyan;[Y]@@
@@ -538,12 +538,12 @@
<br><span id="FSButton"><<link [[Future Societies|Future Society]]>><</link>></span> @@.cyan;[F]@@ <<if $FSCredits > 0>>@@.yellow;[!]@@<</if>>
<</if>>
<br><span id="URButton"><<link [[Universal Rules]]>><</link>></span> @@.cyan;[V]@@
-
+
<br>
<br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@
<</if>>
<br>
-
+
<<elseif _Pass == "Manage Arcology">>
<br>
<br><span id="managePenthouse"><<link "Manage Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>></span> @@.cyan;[P]@@
@@ -566,8 +566,8 @@
<br>[[Manage Research Lab|Research Lab][$temp = 0]]
<</if>>
<<if ($securityForceActive)>>
- <br><span id="SFMButton"><<link [[SF Barracks|SFM Barracks]]>><</link>></span> @@.cyan;[Z]@@
- <</if>>
+ <br><span id="SFMButton"> <<link "$securityForceName's Barracks""SFM Barracks">><</link>> </span> @@.cyan;[Z]@@
+ <</if>>
<br>
<br><span id="PAOButton"><<link [[Personal Assistant|Personal assistant options]]>><</link>></span> @@.cyan;[T]@@