diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 045b9036fdcc868f2cb49177d5ce798c0dbe88b1..69473ed827ea6953b0cad6d645d25ebf8432a8da 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -543,7 +543,6 @@ App.Data.resetOnNGPlus = {
brothelAdsPreg: 0,
brothelAdsXX: 0,
brothelName: "the Brothel",
- brothelNameCaps: "The Brothel",
brothel: 0,
brothelBoost: {
selected: 0, eligible: 0
@@ -575,7 +574,6 @@ App.Data.resetOnNGPlus = {
bioreactorsXY: 0,
bioreactorsBarren: 0,
dairyName: "the Dairy",
- dairyNameCaps: "The Dairy",
dairy: 0,
cumSlaves: 0,
clubDecoration: "standard",
@@ -588,13 +586,11 @@ App.Data.resetOnNGPlus = {
clubAdsPreg: 0,
clubAdsXX: 0,
clubName: "the Club",
- clubNameCaps: "The Club",
club: 0,
servantsQuartersDecoration: "standard",
servantsQuartersUpgradeMonitoring: 0,
servantsQuarters: 0,
servantsQuartersName: "the Servants' Quarters",
- servantsQuartersNameCaps: "The Servants' Quarters",
schoolroomDecoration: "standard",
schoolroomUpgradeSkills: 0,
schoolroomUpgradeLanguage: 0,
@@ -602,14 +598,12 @@ App.Data.resetOnNGPlus = {
schoolroomRemodelBimbo: 0,
schoolroom: 0,
schoolroomName: "the Schoolroom",
- schoolroomNameCaps: "The Schoolroom",
spaDecoration: "standard",
spa: 0,
spaSpots: 0,
spaUpgrade: 0,
spaFix: 0,
spaName: "the Spa",
- spaNameCaps: "The Spa",
// Incubator Subsection
incubator: 0,
@@ -633,7 +627,6 @@ App.Data.resetOnNGPlus = {
incubatorPregAdaptationPower: 0,
incubatorName: "the Incubator",
- incubatorNameCaps: "The Incubator",
reservedChildren: 0,
tanks: [],
@@ -646,21 +639,18 @@ App.Data.resetOnNGPlus = {
clinicInflateBelly: 0,
clinicSpeedGestation: 0,
clinicName: "the Clinic",
- clinicNameCaps: "The Clinic",
arcadeDecoration: "standard",
arcadeUpgradeInjectors: 0,
arcadeUpgradeFuckdolls: 0,
arcadeUpgradeCollectors: 0,
arcadeUpgradeHealth: -1,
arcadeName: "the Arcade",
- arcadeNameCaps: "The Arcade",
arcade: 0,
fuckdollsSold: 0,
cellblockDecoration: "standard",
cellblockUpgrade: 0,
cellblock: 0,
cellblockName: "the Cellblock",
- cellblockNameCaps: "The Cellblock",
cellblockWardenCumsInside: 1,
masterSuiteDecoration: "standard",
masterSuiteUpgradeLuxury: 0,
@@ -672,7 +662,6 @@ App.Data.resetOnNGPlus = {
masterSuiteHyperPregnancy: 0,
masterSuite: 0,
masterSuiteName: "the Master Suite",
- masterSuiteNameCaps: "The Master Suite",
// Nursery Subsection
/** Counts the number of children the nursery can support */
@@ -693,7 +682,6 @@ App.Data.resetOnNGPlus = {
nurseryMusclesSetting: 0,
nurseryHormonesSetting: 0,
nurseryName: "the Nursery",
- nurseryNameCaps: "The Nursery",
reservedChildrenNursery: 0,
/** Array of children in the Nursery */
cribs: [],
@@ -772,7 +760,6 @@ App.Data.resetOnNGPlus = {
hooved: [],
felines: [],
farmyardName: "the Farmyard",
- farmyardNameCaps: "The Farmyard",
HGSuite: 0,
HGSuiteSurgery: 1,
@@ -780,7 +767,6 @@ App.Data.resetOnNGPlus = {
HGSuiteHormones: 1,
HGSuiteEquality: 0,
HGSuiteName: "the Head Girl Suite",
- HGSuiteNameCaps: "The Head Girl Suite",
fighterIDs: [],
pitBG: 0,
pitAnimal: 0,
@@ -791,7 +777,6 @@ App.Data.resetOnNGPlus = {
pitFought: 0,
pit: 0,
pitName: "the Pit",
- pitNameCaps: "The Pit",
dojo: 0,
feeder: 0,
cockFeeder: 0,
diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js
index b608daf8d56dab7381a0c8de41d0ee4f913e1f03..a76fba489c4d1c8bfde4778a72c7c1de5c1a11f6 100644
--- a/src/002-config/fc-version.js
+++ b/src/002-config/fc-version.js
@@ -2,5 +2,5 @@ App.Version = {
base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed.
pmod: "3.7.1",
commitHash: null,
- release: 1097
-};
\ No newline at end of file
+ release: 1098
+};
diff --git a/src/004-base/facility.js b/src/004-base/facility.js
index 6e4b59140ce9d4d2b18bd9c4b5a3fb9c2a247ba1..250f93f6f1d0d2195505a23d8bc43cba4338af53 100644
--- a/src/004-base/facility.js
+++ b/src/004-base/facility.js
@@ -268,14 +268,12 @@ App.Entity.Facilities.Facility = class {
/** @returns {string} */
get nameCaps() {
- const res = V[this.desc.baseName + "NameCaps"];
- return res ? res : this.name.replace("the ", "The ");
+ return capFirstChar(this.desc.baseName);
}
/** @returns {string} */
get UIName() {
- const nameCaps = this.nameCaps;
- return nameCaps === "The " + this.genericName ? this.genericName : nameCaps;
+ return capFirstChar(this.genericName);
}
/** Facility generic name ("Brothel", "Schoolroom", etc.)
diff --git a/src/Mods/SecExp/attackOptions.tw b/src/Mods/SecExp/attackOptions.tw
index a00ba603a4d3db5724d0134ffe1beab0d38cc453..1d0c840eec313e349628949f3ec0d38ccff15136 100644
--- a/src/Mods/SecExp/attackOptions.tw
+++ b/src/Mods/SecExp/attackOptions.tw
@@ -158,7 +158,7 @@ approximately <strong><<print _estimatedMen>> men</strong> are coming, they seem
<<case "mercenary">>
<<set _leader = "The mercenary commander will">>
<<case "colonel">>
- <<set _leader = App.SF.Caps() +"'s Colonel will">>
+ <<set _leader = capFirstChar($SF.Lower || "the special force") +"'s Colonel will">>
<</switch>>
/* leader assignment */
@@ -211,7 +211,7 @@ approximately <strong><<print _estimatedMen>> men</strong> are coming, they seem
|
<<link "Let The Colonel lead the troops">>
<<set $leadingTroops = "colonel">>
- <<set _leader = App.SF.Caps() +"'s Colonel will">>
+ <<set _leader = capFirstChar($SF.Lower || "the special force") +"'s Colonel will">>
<<replace "#leader">><strong><<print _leader>></strong><</replace>>
<</link>>
<</if>>
diff --git a/src/Mods/SecExp/edicts.tw b/src/Mods/SecExp/edicts.tw
index f263e9c48af7facc5eb0247fb12794ce09bf52e6..504d0eab5ee5b685559a870077638f96eee3c957 100644
--- a/src/Mods/SecExp/edicts.tw
+++ b/src/Mods/SecExp/edicts.tw
@@ -605,35 +605,36 @@
<<if $SF.Toggle && $SF.Active >= 1>>
<br><br>__Special Force:__
+ <<set _capSF = capFirstChar($SF.Lower || "the special force")>>
<<if $SecExp.edicts.SFSupportLevel > 0>>
<<if $SecExp.edicts.SFSupportLevel === 1>>
- <br>''Equipment provision:'' <<= App.SF.Caps()>> is providing the security HQ with advanced equipment, boosting its efficiency.
+ <br>''Equipment provision:'' _capSF is providing the security HQ with advanced equipment, boosting its efficiency.
<<elseif $SecExp.edicts.SFSupportLevel === 2>>
- <br>''Personnel training:'' <<= App.SF.Caps()>> is currently providing advanced equipment and training to security HQ personnel.
+ <br>''Personnel training:'' _capSF is currently providing advanced equipment and training to security HQ personnel.
<<elseif $SecExp.edicts.SFSupportLevel === 3>>
- <br>''Troops detachment:'' <<= App.SF.Caps()>> has currently transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
+ <br>''Troops detachment:'' _capSF has currently transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
<<elseif $SecExp.edicts.SFSupportLevel === 4>>
- <br>''Full support:'' <<= App.SF.Caps()>> is currently providing its full support to the security department, while transferring troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
+ <br>''Full support:'' _capSF is currently providing its full support to the security department, while transferring troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
<<elseif $SecExp.edicts.SFSupportLevel === 5>>
- <br>''Network assistance:'' <<= App.SF.Caps()>> is currently assisting with a local install of its custom network full support and has transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
+ <br>''Network assistance:'' _capSF is currently assisting with a local install of its custom network full support and has transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
<</if>>
[[Repeal|edicts][$SecExp.edicts.SFSupportLevel--]]
<</if>>
<<if $SecExp.edicts.SFSupportLevel < 5>>
<<if $SecExp.edicts.SFSupportLevel === 0 && App.SecExp.Check.reqMenials() > 5>>
- <br>''Equipment provision:'' <<= App.SF.Caps()>> will provide the security HQ with advanced equipment.
+ <br>''Equipment provision:'' _capSF will provide the security HQ with advanced equipment.
<br> //Will lower the amount of personnel necessary to man the security HQ by 5, but will incur upkeep costs.//
<<elseif $SecExp.edicts.SFSupportLevel === 1 && $SF.Squad.Firebase >= 4 && App.SecExp.Check.reqMenials() > 5>>
- <br>''Personnel training:'' <<= App.SF.Caps()>> will provide the security HQ personnel with advanced training.
+ <br>''Personnel training:'' _capSF will provide the security HQ personnel with advanced training.
<br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.//
<<elseif $SecExp.edicts.SFSupportLevel === 2 && $SF.Squad.Firebase >= 6 && App.SecExp.Check.reqMenials() > 5>>
- <br>''Troops detachment:'' <<= App.SF.Caps()>> will provide troops to the security department.
+ <br>''Troops detachment:'' _capSF will provide troops to the security department.
<br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.//
<<elseif $SecExp.edicts.SFSupportLevel === 3 && $SF.Squad.Firebase >= 6 && App.SecExp.Check.reqMenials() > 5>>
- <br>''Full Support:'' <<= App.SF.Caps()>> will give the security department its full support.
+ <br>''Full Support:'' _capSF will give the security department its full support.
<br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.//
<<elseif $SecExp.edicts.SFSupportLevel === 4 && $SF.Squad.Firebase === 10 && App.SecExp.Check.reqMenials() > 5>>
- <br>''Network assistance:'' <<= App.SF.Caps()>> will assist the security department with installing a local version of their custom network.
+ <br>''Network assistance:'' _capSF will assist the security department with installing a local version of their custom network.
<br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.//
<</if>>
<</if>>
diff --git a/src/Mods/SecExp/unitsRebellionReport.tw b/src/Mods/SecExp/unitsRebellionReport.tw
index 56e3694e378eb3785b100ea70ec8b03ff7116d12..0c154b5ab55b499e62e0812f9a6177feb4ceb98b 100644
--- a/src/Mods/SecExp/unitsRebellionReport.tw
+++ b/src/Mods/SecExp/unitsRebellionReport.tw
@@ -159,7 +159,7 @@
<<if $SF.Toggle && $SF.Active >= 1>>
<<set _loss = _lossesList.pluck()>>
<<set _loss = Math.clamp(_loss,0,$SF.ArmySize)>>
- <p> <<= App.SF.Caps()>>, $SF.ArmySize strong, is called to join the battle:
+ <p> <<= capFirstChar($SF.Lower || "the special force")>>, $SF.ArmySize strong, is called to join the battle:
<<set $SF.ArmySize -= _loss>>
<<if _loss <= 0>>
no casualties
diff --git a/src/Mods/SpecialForce/SpecialForce.js b/src/Mods/SpecialForce/SpecialForce.js
index 925056507f20227381a80f963512a9bef1433a74..4459044a86a3f6163a093835a96d06abf2762871 100644
--- a/src/Mods/SpecialForce/SpecialForce.js
+++ b/src/Mods/SpecialForce/SpecialForce.js
@@ -1,8 +1,4 @@
// T=SugarCube.State.temporary;
-App.SF.Caps = function() {
- return capFirstChar(V.SF.Lower || "the special force");
-};
-
App.SF.weeklyGift = function(input) {
V.SF.Gift = input;
let value,
@@ -2395,7 +2391,8 @@ App.SF.AAR = function(endWeekCall = 1) {
V.SF.Upgrade = 0;
r += `<h3>Week ${V.week} (AO: ${V.terrain}) operational report for ${V.SF.Lower}:</h3>`;
- r += `${App.SF.Caps()} focused their ${num(V.SF.ArmySize)} troops on `;
+ const capSF = capFirstChar(V.SF.Lower || "the special force");
+ r += `${capSF} focused their ${num(V.SF.ArmySize)} troops on `;
if (V.SF.Target === "recruit") {
r += `recruiting and training more personnel. Smaller parties ventured out to protect the arcology's trade routes and strike targets of opportunity.`;
@@ -2415,14 +2412,14 @@ App.SF.AAR = function(endWeekCall = 1) {
if (profit > 0) {
r += `<span class='green'>more than sufficient to cover expenses.</span> Excess material and human assets totaling <span class='yellowgreen'>${cashFormat(profit)}</span> (after liquidation) and paying expenses were transferred to your accounts.`;
if (V.economy < 100) {
- r += ` The rapidly degrading global economy has one upside,<span class='green'> ${App.SF.Caps()} was able to more easily use more 'persuasive' techniques thus leading to an increase in profit.</span>`;
+ r += ` The rapidly degrading global economy has one upside,<span class='green'> ${capSF} was able to more easily use more 'persuasive' techniques thus leading to an increase in profit.</span>`;
}
} else {
r += `<span class='red'>barely enough to cover expenses.</span> More growth will be needed to ensure profitability, <span class='yellow'>hopefully purchasing more upgrades will help.</span>`;
r += ` Per the estimates that ${App.SF.SFC()} provides, an additional <span class='yellowgreen'>${cashFormat(profit)}</span> is required for sufficient cover.`;
}
- r += ` ${App.SF.Caps()} managed to recruit ${FNG} new soldiers this week, and your reputation has <span class='green'>increased through the improvement of trade security.</span>`;
+ r += ` ${capSF} managed to recruit ${FNG} new soldiers this week, and your reputation has <span class='green'>increased through the improvement of trade security.</span>`;
r += `<h3>Your instructions to ${App.SF.SFC()}:</h3>`;
r += ` Deployment focus: `;
@@ -2565,17 +2562,17 @@ App.SF.Interactions = function() {
C = V.SF.Colonel;
if (V.SF.Gift > 0) {
if (V.SF.Gift === 1) {
- choice += `${App.SF.Caps()} is turning over spare capital in tribute this week. `;
+ choice += `${capSF} is turning over spare capital in tribute this week. `;
if (C.Talk + C.Fun !== 1) {
choice += `"I think I can find <span class='yellowgreen'>${cashFormat(App.SF.weeklyGift(1))}</span> for you, boss."`;
}
} else if (V.SF.Gift === 2) {
- choice += `${App.SF.Caps()} will be throwing a military parade this week. `;
+ choice += `${capSF} will be throwing a military parade this week. `;
if (C.Talk + C.Fun !== 1) {
choice += `"I expect the <span class='green'>public to enjoy</span> the parade, boss."`;
}
} else if (V.SF.Gift === 3) {
- choice += `${App.SF.Caps()} will be conducting corporate sabotage on rival arcologies' businesses. `;
+ choice += `${capSF} will be conducting corporate sabotage on rival arcologies' businesses. `;
if (C.Talk + C.Fun !== 1) {
choice += `"Our interests should see a <span class='yellowgreen'>big boost,</span> boss."`;
}
diff --git a/src/Mods/SpecialForce/WeeklyChoices.tw b/src/Mods/SpecialForce/WeeklyChoices.tw
index 956faa2a90f81e3167f2cb48bd7a225c800823c7..df532a741343108fc9f677d1ad720815e467d76e 100644
--- a/src/Mods/SpecialForce/WeeklyChoices.tw
+++ b/src/Mods/SpecialForce/WeeklyChoices.tw
@@ -17,7 +17,7 @@
<br>We've had some good prizes turn up, that's made us some extra money we could turn over.
<<else>>
<br>He looks down a list on his tablet. "<<= properTitle()>>, how can $SF.Lower help you this week?
- <br> <<= App.SF.Caps()>> can spare some profits from our recent operations.
+ <br> <<= capFirstChar($SF.Lower || "the special force")>> can spare some profits from our recent operations.
<</if>>
| <<link "Request cash" "Firebase">>
<<run cashX(App.SF.weeklyGift(1), "specialForcesCap")>>
diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index 8c304a9c01e0adee05584c12b2fed5442e257b95..ae955a09e5b932325677c73ddc16879855aad1ce 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -1560,35 +1560,20 @@ globalThis.FacilityDatatypeCleanup = (function() {
function FacilityNameCleanup() {
V.arcologies[0].name = V.arcologies[0].name || "Arcology X-4";
V.brothelName = V.brothelName || "the Brothel";
- V.brothelNameCaps = V.brothelNameCaps || "The Brothel";
V.dairyName = V.dairyName || "the Dairy";
- V.dairyNameCaps = V.dairyNameCaps || "The Dairy";
V.clubName = V.clubName || "the Club";
- V.clubNameCaps = V.clubNameCaps || "The Club";
V.servantsQuartersName = V.servantsQuartersName || "the Servants' Quarters";
- V.servantsQuartersNameCaps = V.servantsQuartersNameCaps || "The Servants' Quarters";
V.schoolroomName = V.schoolroomName || "the Schoolroom";
- V.schoolroomNameCaps = V.schoolroomNameCaps || "The Schoolroom";
V.spaName = V.spaName || "the Spa";
- V.spaNameCaps = V.spaNameCaps || "The Spa";
V.nurseryName = V.nurseryName || "the Nursery";
- V.nurseryNameCaps = V.nurseryNameCaps || "The Nursery";
V.clinicName = V.clinicName || "the Clinic";
- V.clinicNameCaps = V.clinicNameCaps || "The Clinic";
V.arcadeName = V.arcadeName || "the Arcade";
- V.arcadeNameCaps = V.arcadeNameCaps || "The Arcade";
V.cellblockName = V.cellblockName || "the Cellblock";
- V.cellblockNameCaps = V.cellblockNameCaps || "The Cellblock";
V.masterSuiteName = V.masterSuiteName || "the Master Suite";
- V.masterSuiteNameCaps = V.masterSuiteNameCaps || "The Master Suite";
V.HGSuiteName = V.HGSuiteName || "the Head Girl Suite";
- V.HGSuiteNameCaps = V.HGSuiteNameCaps || "The Head Girl Suite";
V.pitName = V.pitName || "the Pit";
- V.pitNameCaps = V.pitNameCaps || "The Pit";
V.incubatorName = V.incubatorName || "the Incubator";
- V.incubatorNameCaps = V.incubatorNameCaps || "The Incubator";
V.farmyardName = V.farmyardName || "the Farmyard";
- V.farmyardNameCaps = V.farmyardNameCaps || "The Farmyard";
}
function BrothelDatatypeCleanup() {
diff --git a/src/endWeek/clinicReport.js b/src/endWeek/clinicReport.js
index 8af1f061c142b8e30a459c18906bbcfbba52d85d..a7900245147b9046f010663ae1dac942ad1b0dd7 100644
--- a/src/endWeek/clinicReport.js
+++ b/src/endWeek/clinicReport.js
@@ -406,7 +406,7 @@ App.EndWeek.clinicReport = function() {
if (V.clinicDecoration !== "standard") {
const decorationEffects = App.UI.DOM.appendNewElement("p", frag, '', "indent");
- $(decorationEffects).append(`${V.clinicNameCaps}'s ${V.clinicDecoration} atmosphere <span class="hotpink">had an impact on them</span> while they were getting treatment.`);
+ $(decorationEffects).append(`${capFirstChar(V.clinicName)}'s ${V.clinicDecoration} atmosphere <span class="hotpink">had an impact on them</span> while they were getting treatment.`);
}
}
diff --git a/src/endWeek/reports/nurseryReport.js b/src/endWeek/reports/nurseryReport.js
index a16fb07e58cc03db4c504dc358221514b4d98aaf..698b1df07b0247c9e59a09ca817dbde1f92b44c2 100644
--- a/src/endWeek/reports/nurseryReport.js
+++ b/src/endWeek/reports/nurseryReport.js
@@ -239,7 +239,7 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
if (V.nurseryDecoration !== "standard") {
const decorationEffects = App.UI.DOM.appendNewElement("p", frag, '', "indent");
- $(decorationEffects).append(`${V.nurseryNameCaps}'s ${V.nurseryDecoration} atmosphere <span class="devotion inc">has a minor impact on your servants.</span>`);
+ $(decorationEffects).append(`${capFirstChar(V.nurseryName)}'s ${V.nurseryDecoration} atmosphere <span class="devotion inc">has a minor impact on your servants.</span>`);
}
return frag;
diff --git a/src/endWeek/saRest.js b/src/endWeek/saRest.js
index d377582a76ab9b1dac99843167d749f00b9b0c01..06f0b9ac8b9ec40c58a7525c2e4f1b01caabd3a7 100644
--- a/src/endWeek/saRest.js
+++ b/src/endWeek/saRest.js
@@ -82,7 +82,7 @@ App.SlaveAssignment.rest = function(slave) {
if (slave.health.tired > 30) {
if (slave.assignment === window.Job.SPA) {
if (V.spaUpgrade > 0) {
- t += ` ${V.spaNameCaps}'s luxuries help ${him} relax.`;
+ t += ` ${capFirstChar(V.spaName)}'s luxuries help ${him} relax.`;
}
if (S.Attendant) {
t += ` ${S.Attendant.slaveName}'s fingers know just how to refresh ${his} tired body.`;
diff --git a/src/endWeek/schoolroomReport.js b/src/endWeek/schoolroomReport.js
index d60e965e297803d0ab9a0c7115e52b03eb925f01..2f6588cc9d0365471017d166aa971431ab48c4e7 100644
--- a/src/endWeek/schoolroomReport.js
+++ b/src/endWeek/schoolroomReport.js
@@ -261,7 +261,7 @@ App.EndWeek.schoolroomReport = function() {
if (V.schoolroomDecoration !== "standard") {
const decorationEffects = App.UI.DOM.appendNewElement("p", frag, '', "indent");
- $(decorationEffects).append(`${V.schoolroomNameCaps}'s ${V.schoolroomDecoration} atmosphere <span class="hotpink">has a minor impact on the students.</span>`);
+ $(decorationEffects).append(`${capFirstChar(V.schoolroomName)}'s ${V.schoolroomDecoration} atmosphere <span class="hotpink">has a minor impact on the students.</span>`);
if (App.Entity.facilities.schoolroom.revivalistLanguageDecorationBonus()) {
$(decorationEffects).append(` They also <span class="positive">learn ${V.language} more quickly</span> in this environment.`);
}
diff --git a/src/endWeek/servantsQuartersReport.js b/src/endWeek/servantsQuartersReport.js
index f35722e3122c78c1ff7b95258522b1b56e009831..2c45c6d9de33b883b63d6c3ad95ec0b708183d6a 100644
--- a/src/endWeek/servantsQuartersReport.js
+++ b/src/endWeek/servantsQuartersReport.js
@@ -326,7 +326,7 @@ App.EndWeek.servantsQuartersReport = function() {
if (V.servantsQuartersDecoration !== "standard") {
const decorationEffects = App.UI.DOM.appendNewElement("p", frag, '', "indent");
- $(decorationEffects).append(`${V.servantsQuartersNameCaps}'s ${V.servantsQuartersDecoration} atmosphere <span class="hotpink">has a minor impact on your servants.</span>`);
+ $(decorationEffects).append(`${capFirstChar(V.servantsQuartersName)}'s ${V.servantsQuartersDecoration} atmosphere <span class="hotpink">has a minor impact on your servants.</span>`);
}
V.servantMilkersMultiplier = 1;
diff --git a/src/endWeek/slaveAssignmentReport.js b/src/endWeek/slaveAssignmentReport.js
index 362dea6afc9d7ef5cebdc329fcb91124550e5d3f..61d6a58d34012a5f4f03fd70a808ebb1fbe1c7ee 100644
--- a/src/endWeek/slaveAssignmentReport.js
+++ b/src/endWeek/slaveAssignmentReport.js
@@ -349,7 +349,7 @@ App.EndWeek.slaveAssignmentReport = function() {
}
} else {
return {
- name: ar[1].nameCaps,
+ name: capFirstChar(ar[1].name)
established: ar[1].established,
entriesNumberInitial: initialEmployeesCount[ar[1].desc.baseName],
entriesNumber: ar[1].hostedSlaves,
diff --git a/src/facilities/ads.js b/src/facilities/ads.js
index 2cc8ec00a2051e9e1a134e9101c87b5943f29c6b..9488c7982c8176d010883554a08af5024f2d3b36 100644
--- a/src/facilities/ads.js
+++ b/src/facilities/ads.js
@@ -1175,7 +1175,7 @@ App.Ads.report = function(building, preview) {
t += `working in the ${building}.</div>`;
} else {
if (building === "club") {
- t += `<div>${V.clubNameCaps} does not offer enough variety to satisfy all visitors.</div>`;
+ t += `<div>${capFirstChar(V.clubName)} does not offer enough variety to satisfy all visitors.</div>`;
}
}
return t;
diff --git a/src/facilities/farmyard/farmyard.js b/src/facilities/farmyard/farmyard.js
index 3fc69417fd65d32aeb1abba61dcd762d21be8d32..7a1bc262d24d950ff1422ef83c15f4299eaefe19 100644
--- a/src/facilities/farmyard/farmyard.js
+++ b/src/facilities/farmyard/farmyard.js
@@ -7,10 +7,6 @@ App.Facilities.Farmyard.farmyard = function() {
V.returnTo = "Farmyard";
V.encyclopedia = "Farmyard";
- if (V.farmyardName !== "the Farmyard") {
- V.farmyardNameCaps = V.farmyardName.replace("the ", "The ");
- }
-
App.UI.DOM.appendNewElement("div", frag, intro(), "farmyard-intro");
App.UI.DOM.appendNewElement("div", frag, expand(), "farmyard-expand");
App.UI.DOM.appendNewElement("div", frag, menials(), "farmyard-menials");
@@ -31,7 +27,8 @@ App.Facilities.Farmyard.farmyard = function() {
count = App.Entity.facilities.farmyard.totalEmployeesCount;
- desc.append(`${V.farmyardNameCaps} is an oasis of growth in the midst of the jungle of steel and concrete that is ${V.arcologies[0].name}. Animals are kept in pens, tended to by your slaves, while ${V.farmyardUpgrades.hydroponics ? `rows of hydroponics equipment` : `makeshift fields`} grow crops. `);
+ const farmyardNameCaps = capFirstChar(V.farmyardName);
+ desc.append(`${farmyardNameCaps} is an oasis of growth in the midst of the jungle of steel and concrete that is ${V.arcologies[0].name}. Animals are kept in pens, tended to by your slaves, while ${V.farmyardUpgrades.hydroponics ? `rows of hydroponics equipment` : `makeshift fields`} grow crops. `);
switch (V.farmyardDecoration) {
case "Roman Revivalist":
@@ -112,13 +109,13 @@ App.Facilities.Farmyard.farmyard = function() {
}
if (count > 2) {
- desc.append(` ${V.farmyardNameCaps} is bustling with activity. Farmhands are hurrying about, on their way to feed animals and maintain farming equipment.`);
+ desc.append(` ${farmyardNameCaps} is bustling with activity. Farmhands are hurrying about, on their way to feed animals and maintain farming equipment.`);
} else if (count) {
- desc.append(` ${V.farmyardNameCaps} is working steadily. Farmhands are moving about, looking after the animals and crops.`);
+ desc.append(` ${farmyardNameCaps} is working steadily. Farmhands are moving about, looking after the animals and crops.`);
} else if (S.Farmer) {
desc.append(` ${S.Farmer.slaveName} is alone in $farmyardName, and has nothing to do but look after the animals and crops.`);
} else {
- desc.append(` ${V.farmyardNameCaps} is empty and quiet.`);
+ desc.append(` ${farmyardNameCaps} is empty and quiet.`);
}
link.append(App.UI.DOM.passageLink(`Decommission ${V.farmyardName}`, "Main", () => {
@@ -250,7 +247,7 @@ App.Facilities.Farmyard.farmyard = function() {
}
if (farmMenialsSpace) {
- frag.append(`You ${menials ? `own ${num(menials)}` : `don't own any`} free menial slaves. ${V.farmyardNameCaps} can house ${farmMenialsSpace} menial slaves total, with ${farmMenialsSpace - farmMenials} free spots. `);
+ frag.append(`You ${menials ? `own ${num(menials)}` : `don't own any`} free menial slaves. ${farmyardNameCaps} can house ${farmMenialsSpace} menial slaves total, with ${farmMenialsSpace - farmMenials} free spots. `);
}
if (farmMenialsSpace && farmMenials < farmMenialsSpace) {
@@ -287,9 +284,9 @@ App.Facilities.Farmyard.farmyard = function() {
}));
}
} else if (!farmMenialsSpace) {
- frag.append(`${V.farmyardNameCaps} cannot currently house any menial slaves. `);
+ frag.append(`${farmyardNameCaps} cannot currently house any menial slaves. `);
} else {
- frag.append(`${V.farmyardNameCaps} has all the menial slaves it can currently house assigned to it. `);
+ frag.append(`${farmyardNameCaps} has all the menial slaves it can currently house assigned to it. `);
}
if (farmMenials) {
@@ -517,7 +514,7 @@ App.Facilities.Farmyard.farmyard = function() {
"pump"
);
- desc.append(`${V.farmyardNameCaps} is currently using the basic water pump that it came with.`);
+ desc.append(`${farmyardNameCaps} is currently using the basic water pump that it came with.`);
frag.append(desc, upgrade);
} else {
@@ -539,7 +536,7 @@ App.Facilities.Farmyard.farmyard = function() {
} else {
const desc = document.createElement("div");
- desc.append(`${V.farmyardNameCaps} is using a higher-quality fertilizer, moderately increasing the amount of crops it produces and raising slightly raising upkeep costs.`);
+ desc.append(`${farmyardNameCaps} is using a higher-quality fertilizer, moderately increasing the amount of crops it produces and raising slightly raising upkeep costs.`);
frag.append(desc);
@@ -555,7 +552,7 @@ App.Facilities.Farmyard.farmyard = function() {
} else {
const desc = document.createElement("div");
- desc.append(`${V.farmyardNameCaps} is outfitted with an advanced hydroponics system, reducing the amount of water your crops consume and thus moderately reducing upkeep costs.`);
+ desc.append(`${farmyardNameCaps} is outfitted with an advanced hydroponics system, reducing the amount of water your crops consume and thus moderately reducing upkeep costs.`);
frag.append(desc);
@@ -571,7 +568,7 @@ App.Facilities.Farmyard.farmyard = function() {
} else {
const desc = document.createElement("div");
- desc.append(`${V.farmyardNameCaps} is using genetically modified seeds, significantly increasing the amount of crops it produces and moderately increasing upkeep costs.`);
+ desc.append(`${farmyardNameCaps} is using genetically modified seeds, significantly increasing the amount of crops it produces and moderately increasing upkeep costs.`);
frag.append(desc);
diff --git a/src/facilities/farmyard/reports/farmyardReport.js b/src/facilities/farmyard/reports/farmyardReport.js
index 1e90b377303d595882f9956a1cf57c39fbf25b31..ff1cec85125d029eafaf2e7e742534db9ffc4669 100644
--- a/src/facilities/farmyard/reports/farmyardReport.js
+++ b/src/facilities/farmyard/reports/farmyardReport.js
@@ -471,11 +471,11 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
// TODO: add checks for the different FSs
if (V.farmyardDecoration !== 'standard') {
- const decorationEffects = App.UI.DOM.appendNewElement("p", frag, '', "indent");
+ const decorationEffects = App.UI.DOM.appendNewElement("p", frag, '', "indent"), farmyardNameCaps = capFirstChar(V.farmyardName);
$(decorationEffects).append(document.createElement("br"));
- r.push(`${V.farmyardNameCaps}'s customer's enjoyed`);
+ r.push(`${farmyardNameCaps}'s customer's enjoyed`);
if (V.seeBestiality && V.policies.bestialityOpenness && (V.canines || V.hooved || V.felines)) {
r.push(`<span class="green">watching farmhands fuck animals in ${V.farmyardDecoration} surroundings.</span>`);
@@ -499,7 +499,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
$(profitContent).append(document.createElement("br"));
if (profit || food) {
- r.push(V.farmyardNameCaps);
+ r.push(farmyardNameCaps);
if (profit) {
r.push(`makes you <span class="yellowgreen">${cashFormat(Math.trunc(profit))}</span>`);
diff --git a/src/facilities/headGirlSuite/headGirlSuiteFramework.js b/src/facilities/headGirlSuite/headGirlSuiteFramework.js
index 66d1ad168c549eb03d9850dedface192ff62ffe0..13549f2a2bba07eee511aed03525ea6b96566225 100644
--- a/src/facilities/headGirlSuite/headGirlSuiteFramework.js
+++ b/src/facilities/headGirlSuite/headGirlSuiteFramework.js
@@ -33,12 +33,6 @@ App.Entity.Facilities.HeadGirlSuite = class extends App.Entity.Facilities.Single
super(App.Data.Facilities.headGirlSuite);
}
- /** @override */
- get UIName() {
- const nameCaps = this.nameCaps;
- return nameCaps === "The Head Girl Suite" ? "Head Girl Suite" : nameCaps;
- }
-
/** @override */
occupancyReport(long) {
return this.manager.currentEmployee
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 933e30739df400b8bf13612ed0dd716544def283..a0198826b30b59a55c8e1221daa3c0ec8cb10abf 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -4,13 +4,10 @@
<<set $targetAgeNursery = Number($targetAgeNursery) || $minimumSlaveAge>>
<<set $targetAgeNursery = Math.clamp($targetAgeNursery, $minimumSlaveAge, 42)>>
-<<if $nurseryName != "the Nursery">>
- <<set $nurseryNameCaps = $nurseryName.replace("the ", "The ")>>
-<</if>>
-
<<set $nurseryChildren = $cribs.length, _freecribs = $nursery - $nurseryChildren, _NL = App.Entity.facilities.nursery.employeesIDs().size, _SL = $slaves.length, _eligibility = 0, $reservedChildren = FetusGlobalReserveCount("incubator"), $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
<p class="scene-intro">
- $nurseryNameCaps
+ <<set _nurseryNameCaps = capFirstChar($nurseryName)>>
+ _nurseryNameCaps
<<switch $nurseryDecoration>>
<<case "Roman Revivalist">>
is run with the Roman dream in mind, with wide open windows exposing the babies to the elements. The sleek marble halls bring a sense of serenity and duty as wet nurses wander the halls.
@@ -77,14 +74,14 @@
<</if>>
<<if _NL > 2>>
- $nurseryNameCaps is bustling with activity. Nannies are busily moving about, feeding babies and changing diapers.
+ _nurseryNameCaps is bustling with activity. Nannies are busily moving about, feeding babies and changing diapers.
<<elseif _NL > 0>>
- $nurseryNameCaps is working steadily. Nannies are moving about, cleaning up and feeding hungry children.
+ _nurseryNameCaps is working steadily. Nannies are moving about, cleaning up and feeding hungry children.
<<set $nannyInfluence = 1>>
<<elseif $MatronID>>
_S.Matron.slaveName is alone in $nurseryName, and keeps the place clean and looks after the children $himself.
<<elseif (_NL <= 0) && ($nurseryChildren <= 0)>>
- $nurseryNameCaps is empty and quiet.
+ _nurseryNameCaps is empty and quiet.
<div class="choices" style="font-style:normal">
<<link "Decommission the Nursery" "Main">>
<<set $nursery = 0, $nurseryNannies = 0, $nannyInfluence = 0, $nurseryDecoration = "standard", $cribs = [], $reservedChildrenNursery = 0>>
@@ -123,7 +120,7 @@
</div>
<<else>>
<span class="note">
- $nurseryNameCaps can support a maximum of 5 slaves
+ _nurseryNameCaps can support a maximum of 5 slaves
</span>
<</if>>
@@ -316,7 +313,7 @@
</div>
<<else>>
<span class="note">
- $nurseryNameCaps can support a maximum of 50 children
+ _nurseryNameCaps can support a maximum of 50 children
</span>
<</if>>
@@ -334,9 +331,9 @@
<hr style="margin:0">
<<if $extremeUnderage>>
<<if $nurserySex>>
- $nurseryNameCaps staff are ''allowed'' to molest the children. [[Forbid|Nursery][$nurserySex = 0]]
+ _nurseryNameCaps staff are ''allowed'' to molest the children. [[Forbid|Nursery][$nurserySex = 0]]
<<else>>
- $nurseryNameCaps staff are ''not allowed'' to molest the children. [[Allow|Nursery][$nurserySex = 1]]
+ _nurseryNameCaps staff are ''not allowed'' to molest the children. [[Allow|Nursery][$nurserySex = 1]]
<</if>>
<</if>>
<br>
diff --git a/src/gui/quicklinks.js b/src/gui/quicklinks.js
index 5e8aa11d778f2b395fa6c2f07aaad94989343097..7bc4d2644e314d8acd2df3e181790f9702a4c702 100644
--- a/src/gui/quicklinks.js
+++ b/src/gui/quicklinks.js
@@ -129,7 +129,7 @@ App.UI.quickMenu = (function() {
edicts: "Edicts",
Farmyard: () => App.Entity.facilities.farmyard.UIName,
"Find Slave": "Locate Slave",
- Firebase: () => `${App.SF.Caps()}'s Firebase`,
+ Firebase: () => `${capFirstChar($SF.Lower || "the special force")}'s Firebase`,
"Future Society": "Future Societies",
"Head Girl Suite": () => App.Entity.facilities.headGirlSuite.UIName,
Incubator: () => App.Entity.facilities.incubator.UIName,
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index 0b5f70a369651b8d82c9b33dc06900d20edb4758..c70df4dff5b8b0acc7a655da90c64e4f61a1da97 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -983,6 +983,7 @@ App.UI.SlaveInteract.useSlaveDisplay = function(slave) {
const sexOptions = [];
const fillFaceOptions = [];
const fillAssOptions = [];
+ const dairyNameCaps = capFirstChar(V.dairyName);
// if no scene, it's just text, no link. Italicize it.
if (slave.fuckdoll === 0) {
@@ -1083,8 +1084,8 @@ App.UI.SlaveInteract.useSlaveDisplay = function(slave) {
}
}
} else {
- fillAssOptions.push({text: `Milk`, disabled: `${V.dairyNameCaps} is not producing enough milk to pump through the pipes`});
- fillFaceOptions.push({text: `Milk`, disabled: `${V.dairyNameCaps} is not producing enough milk to pump through the pipes`});
+ fillAssOptions.push({text: `Milk`, disabled: `${dairyNameCaps} is not producing enough milk to pump through the pipes`});
+ fillFaceOptions.push({text: `Milk`, disabled: `${dairyNameCaps} is not producing enough milk to pump through the pipes`});
}
if ((V.cumPipeline > 88 && V.cumPipeline !== 0) || V.arcologies[0].FSPastoralistLaw === 1) {
if ((slave.inflation < 3 && slave.pregKnown === 0 && slave.bellyImplant < 1500) || slave.inflation < 1) {
@@ -1094,8 +1095,8 @@ App.UI.SlaveInteract.useSlaveDisplay = function(slave) {
}
}
} else {
- fillAssOptions.push({text: `Cum`, disabled: `${V.dairyNameCaps} is not producing enough cum to pump through the pipes`});
- fillFaceOptions.push({text: `Cum`, disabled: `${V.dairyNameCaps} is not producing enough cum to pump through the pipes`});
+ fillAssOptions.push({text: `Cum`, disabled: `${dairyNameCaps} is not producing enough cum to pump through the pipes`});
+ fillFaceOptions.push({text: `Cum`, disabled: `${dairyNameCaps} is not producing enough cum to pump through the pipes`});
}
} /* dairyPiping === 1 */
if (V.boughtItem.toys.enema === 1) {
diff --git a/src/npc/children/childInteract.tw b/src/npc/children/childInteract.tw
index 898b15b2a104d27e3c23c26bd2a6703f40067a7f..9a87dfe89c4ee65dffb8c5abf099f883acf1b718 100644
--- a/src/npc/children/childInteract.tw
+++ b/src/npc/children/childInteract.tw
@@ -10,6 +10,7 @@
<<setLocalPronouns $activeChild>>
<<run Enunciate($activeChild)>>
+<<set _dairyNameCaps = capFirstChar($dairyName)>>
/* TODO: the encyclopedia will most likely need to be updated for children as well */
<<set $encyclopedia = either("Costs Summary", "Disease in the Free Cities", "Drugs and Their Effects", "From Rebellious to Devoted", "Gender", "Independent Slaves", "Modern Anal", "Nymphomania", "Slave Couture")>>
@@ -226,7 +227,7 @@ FIXME:
<</if>>
<</if>>
<<else>>
- | //$dairyNameCaps is not producing enough milk to pump through the pipes//
+ | //_dairyNameCaps is not producing enough milk to pump through the pipes//
<</if>>
<<if ($cumPipeline > 88 && $cumPipeline != 0) || $arcologies[0].FSPastoralistLaw>>
<<if ($activeChild.inflation < 3 && $activeChild.pregKnown == 0 && $activeChild.bellyImplant < 1500) || ($activeChild.inflation < 1)>>
@@ -246,7 +247,7 @@ FIXME:
<</if>>
<</if>>
<<else>>
- | //$dairyNameCaps is not producing enough cum to pump through the pipes//
+ | //_dairyNameCaps is not producing enough cum to pump through the pipes//
<</if>>
<</if>>
<<if $wcPiping == 1>>
diff --git a/src/npc/children/longChildDescription.js b/src/npc/children/longChildDescription.js
index 1ba47693ebfd2681e86c577589fb1717160abd10..4c61de8d87e7df14066a60ae4fe0cdb63fac3a4f 100644
--- a/src/npc/children/longChildDescription.js
+++ b/src/npc/children/longChildDescription.js
@@ -6178,10 +6178,11 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event
if (!market) {
if (V.clinic && V.clinicUpgradeScanner) {
+ r += `${capFirstChar(V.clinicName))}'s scanners `
if (child.chem > 15) {
- r += `${V.clinicNameCaps}'s scanners score long term carcinogenic buildup in ${his} body at <span class="cyan">${Math.ceil(child.chem/10)}.</span> `;
+ r += `score long term carcinogenic buildup in ${his} body at <span class="cyan">${Math.ceil(child.chem/10)}.</span> `;
} else {
- r += `${V.clinicNameCaps}'s scanners confirm that ${he} has good prospects for long term health. `;
+ r += `confirm that ${he} has good prospects for long term health. `;
}
}
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index 019d2157436ec4e0f592c60c7e6e2923d5e69b9f..615e53ddea16d13ac5f1649fc673f0eb0adfe640 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -4,15 +4,13 @@
<<set $targetAge = Number($targetAge) || $minimumSlaveAge>>
<<set $targetAge = Math.clamp($targetAge, $minimumSlaveAge, 42)>>
-<<if $incubatorName != "the Incubator">>
- <<set $incubatorNameCaps = $incubatorName.replace("the ", "The ")>>
-<</if>>
<<if $incubatorImprintSetting == 0>><<set $incubatorImprintSetting = "trust">><</if>>
<<set $readySlaves = 0, $readySlave = 0, $incubatorSlaves = $tanks.length, _freeTanks = $incubator - $incubatorSlaves, _SL = $slaves.length, _eligibility = 0, $reservedChildren = FetusGlobalReserveCount("incubator"), $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
<br><br>
-$incubatorNameCaps is a clean, cold hall designed to be lined with tanks and their connected monitoring systems.
+<<set _incubatorNameCaps = capFirstChar($incubatorName)>>
+_incubatorNameCaps is a clean, cold hall designed to be lined with tanks and their connected monitoring systems.
<<if $incubatorSlaves > 2>>
It's well used. The hum of active tanks fill the air.
@@ -336,15 +334,15 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<<else>>
The highly controlled environment inside incubation tube coupled with the greatly accelerated growth process is the perfect opportunity to push the boundaries of a body's ability to sustain pregnancy. This will include injections of specialized serums and mechanical manipulation of their reproductive system through a special set of manipulators, probes, nozzles and syringes supervised by a powerful monitoring program. Costly to maintain.<br>
<<if $incubatorUpgradeReproduction < 1>> /* Now with reports - what is lacking for construction */
- $incubatorNameCaps lacks advanced monitoring and hormone injection systems. Construction not possible.
+ _incubatorNameCaps lacks advanced monitoring and hormone injection systems. Construction not possible.
<<elseif $incubatorUpgradeOrgans < 1>>
- $incubatorNameCaps lacks the ability to extract tissue samples. Construction not possible.
+ _incubatorNameCaps lacks the ability to extract tissue samples. Construction not possible.
<<elseif $dispensaryUpgrade < 1>>
- $incubatorNameCaps lacks a connection to an advanced pharmaceutical fabricator. Cutting-edge targeted serums production needed as integral part. Construction not possible.
+ _incubatorNameCaps lacks a connection to an advanced pharmaceutical fabricator. Cutting-edge targeted serums production needed as integral part. Construction not possible.
<<elseif $bellyImplants < 1>>
- $incubatorNameCaps lacks a connection with an implant manufacturing to construct fillable abdominal implants to simulate expansion. Construction not possible.
+ _incubatorNameCaps lacks a connection with an implant manufacturing to construct fillable abdominal implants to simulate expansion. Construction not possible.
<<elseif $incubatorUpgradeGrowthStims < 1>>
- $incubatorNameCaps lacks advanced monitoring and stimulant injection systems. Construction not possible.
+ _incubatorNameCaps lacks advanced monitoring and stimulant injection systems. Construction not possible.
<<else>>
[[Manufacture and install this subsystem|Incubator][cashX(forceNeg(Math.trunc(2000000*$upgradeMultiplierArcology)), "capEx"), $incubatorUpgradePregAdaptation = 1]] //Costs <<print cashFormat(Math.trunc(2000000*$upgradeMultiplierArcology))>> and will increase upkeep costs//
<</if>>
diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw
index 8bbd6203a00662bb2c9491a2c161b05d45810674..0ad62693d05b33cba4e052df4d7e414661344a3c 100644
--- a/src/pregmod/incubatorReport.tw
+++ b/src/pregmod/incubatorReport.tw
@@ -814,7 +814,7 @@
<</for>>
/*
<<if $incubatorSlaves == 0>>
-$incubatorNameCaps is currently unused.
+<<= capFirstChar($incubatorName)>> is currently unused.
<</if>>
*/
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index 4ec0d543d468d0bee18c71b9f2c2b66faeb2f86a..29a33948822996144b6fcda47594822a16a7322d 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -2,11 +2,9 @@
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Arcade", $encyclopedia = "Arcade", _AL = App.Entity.facilities.arcade.employeesIDs().size>>
+<<set _arcadeNameCaps = capFirstChar($arcadeName)>>
<p class="scene-intro">
- <<if $arcadeName != "the Arcade">>
- <<set $arcadeNameCaps = $arcadeName.replace("the ", "The ")>>
- <</if>>
- $arcadeNameCaps
+ _arcadeNameCaps
<<switch $arcadeDecoration>>
<<case "Roman Revivalist">>
is built out as a Roman street restaurant, with the bar containing the inmates. Citizens can amuse themselves at either side of the bar while enjoying some wine and olives and talking over the day's events.
@@ -155,7 +153,7 @@
</div>
<div>
- $arcadeNameCaps is
+ _arcadeNameCaps is
<<if $arcadeUpgradeFuckdolls == 1>>
equipped to convert inmates into standard Fuckdolls. The converter can be put to work on your order.
<div class="choices">
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index 845205a31c747f4f672a2a46114fa41ac9693cf2..d96e85f6980a6a0f43fa91eba54dd3a197c3f605 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -8,6 +8,7 @@
<!-- Statistics gathering -->
<<set $facility = $facility || {}, $facility.arcade = initFacilityStatistics($facility.arcade)>>
+<<set _arcadeNameCaps = capFirstChar($arcadeName)>>
<<if (_DL > 1)>>''There are _DL inmates confined in $arcadeName.''<<else>>''There is one inmate confined in $arcadeName.''<</if>>
<<if ($arcologies[0].FSDegradationist > 20)>>
@@ -20,7 +21,7 @@
The tenants located near the arcade consider it an @@.red;intolerable@@ establishment.
<</if>>
<<if $arcadeDecoration != "standard">>
- <br><br> $arcadeNameCaps's customers enjoy @@.green;getting off in $arcadeDecoration surroundings.@@
+ <br><br> _arcadeNameCaps's customers enjoy @@.green;getting off in $arcadeDecoration surroundings.@@
<</if>>
<<for _slave range _slaves>>
@@ -265,7 +266,7 @@
<<set $fuckdolls++, _SL-->>
<</if>>
<<else>>
- <br> No slaves have failed quality inspection for Fuckdoll conversion. $arcadeNameCaps will remain overcrowded this week.
+ <br> No slaves have failed quality inspection for Fuckdoll conversion. _arcadeNameCaps will remain overcrowded this week.
<</if>>
<</if>>
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index aac3931c860102538dcfc3e1c120bc31ffed9195..c1ec0e0c67b106f22885a4ef362231aae25251c8 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -3,10 +3,8 @@
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Brothel", $encyclopedia = "Brothel", _BL = App.Entity.facilities.brothel.employeesIDs().size>>
<p class="scene-intro">
- <<if $brothelName != "the Brothel">>
- <<set $brothelNameCaps = $brothelName.replace("the ", "The ")>>
- <</if>>
- $brothelNameCaps
+ <<set _brothelNameCaps = capFirstChar($brothelName)>>
+ _brothelNameCaps
<<switch $brothelDecoration>>
<<case "Roman Revivalist">>
is decorated as a Roman whorehouse. Refreshments are served at a bar, and someone is playing pipes in the back.
@@ -137,13 +135,13 @@
<</if>>
<<if _BL > 2>>
- $brothelNameCaps is bustling with activity. Customers are coming and going and slave girls are displaying themselves. When a slave catches a customer's eye, he leads her back into a little cubicle.
+ _brothelNameCaps is bustling with activity. Customers are coming and going and slave girls are displaying themselves. When a slave catches a customer's eye, he leads her back into a little cubicle.
<<elseif _BL > 0>>
- $brothelNameCaps is working steadily. Customers are present and slave girls are on offer. When a slave catches a customer's eye, he leads her back into a little cubicle.
+ _brothelNameCaps is working steadily. Customers are present and slave girls are on offer. When a slave catches a customer's eye, he leads her back into a little cubicle.
<<elseif $MadamID != 0>>
_S.Madam.slaveName is alone in $brothelName, and has nothing to do but keep the place clean and plan future sales efforts.
<<else>>
- $brothelNameCaps is empty and desolate.
+ _brothelNameCaps is empty and desolate.
<div class="choices" style="font-style:normal">
<<link "Decommission the brothel" "Main">>
<<set $brothel = 0, $brothelUpgradeDrugs = 0, $brothelDecoration = "standard", $brothelAdsSpending = 0>>
@@ -158,7 +156,7 @@
<div>
<<set _Tmult0 = Math.trunc($brothel*1000*$upgradeMultiplierArcology)>>
- $brothelNameCaps can support $brothel whores. Currently there
+ _brothelNameCaps can support $brothel whores. Currently there
<<if _BL == 1>>
is
<<else>>
@@ -237,7 +235,7 @@
</div>
<div>
- $brothelNameCaps
+ _brothelNameCaps
<<if $brothelAdsSpending > 0>>
is the subject of an active ad campaign.
<<else>>
diff --git a/src/uncategorized/brothelAdvertisement.tw b/src/uncategorized/brothelAdvertisement.tw
index cf03039aafb9c8617bbfb9073dcbcee7efbec6a7..0251e92ecdcc756147336a07d7ae646cf95ff643 100644
--- a/src/uncategorized/brothelAdvertisement.tw
+++ b/src/uncategorized/brothelAdvertisement.tw
@@ -2,62 +2,63 @@
<p class="scene-intro">
<<switch $brothelDecoration>>
+ <<set _brothelNameCaps = capFirstChar($brothelName)>>
<<case "Roman Revivalist">>
- $brothelNameCaps is decorated as a Roman whorehouse. Refreshments are served at a bar, and someone is playing pipes in the back.
+ _brothelNameCaps is decorated as a Roman whorehouse. Refreshments are served at a bar, and someone is playing pipes in the back.
<<case "Aztec Revivalist">>
- $brothelNameCaps is decorated as an Aztec ode to fertility and nature. Clients may sacrifice a bit of blood to honor the goddess of Filth or to partake in a fertility ritual before joining the girl of their choosing.
+ _brothelNameCaps is decorated as an Aztec ode to fertility and nature. Clients may sacrifice a bit of blood to honor the goddess of Filth or to partake in a fertility ritual before joining the girl of their choosing.
<<case "Egyptian Revivalist">>
- $brothelNameCaps is decorated as an ancient Egyptian fertility temple. Customers are bade relax on couches next to running water so that slaves may dance to entice them.
+ _brothelNameCaps is decorated as an ancient Egyptian fertility temple. Customers are bade relax on couches next to running water so that slaves may dance to entice them.
<<case "Edo Revivalist">>
- $brothelNameCaps is furnished as an Edo period pleasure house, seedy by the standards of the time. Still, girls usually keep their clothes on until they lead patrons back behind the sliding paper screens, though this does not stop silhouettes of the activities within from being visible on them.
+ _brothelNameCaps is furnished as an Edo period pleasure house, seedy by the standards of the time. Still, girls usually keep their clothes on until they lead patrons back behind the sliding paper screens, though this does not stop silhouettes of the activities within from being visible on them.
<<case "Arabian Revivalist">>
- $brothelNameCaps is furnished as an Arabian slave market, with the merchandise standing on little platforms, prices visible. Customers are permitted to fondle before making a decision and dragging a girl back behind a curtain.
+ _brothelNameCaps is furnished as an Arabian slave market, with the merchandise standing on little platforms, prices visible. Customers are permitted to fondle before making a decision and dragging a girl back behind a curtain.
<<case "Chinese Revivalist">>
- $brothelNameCaps is furnished as an old Chinese pleasure house, with each girl set up in her own low room. They stand outside the doors, luring customers back one by one.
+ _brothelNameCaps is furnished as an old Chinese pleasure house, with each girl set up in her own low room. They stand outside the doors, luring customers back one by one.
<<case "Chattel Religionist">>
- $brothelNameCaps is decorated as a place of worship. The air is scented by censers, and the slaves here maintain an air of holiness even when being sodomized in public.
+ _brothelNameCaps is decorated as a place of worship. The air is scented by censers, and the slaves here maintain an air of holiness even when being sodomized in public.
<<case "Degradationist">>
- $brothelNameCaps is decorated to look like a dungeon. The décor involves a lot of black leather and burnished steel, and the slaves on offer are mostly chained to beds and walls.
+ _brothelNameCaps is decorated to look like a dungeon. The décor involves a lot of black leather and burnished steel, and the slaves on offer are mostly chained to beds and walls.
<<case "Repopulation Focus">>
- $brothelNameCaps is clean and full of soft couches and chairs for its' pregnant whores to lounge upon while showing off their assets. Several of the rooms are prepped to allow a whore to give birth in front of an audience. A supply of freshly squeezed breast milk is available on tap.
+ _brothelNameCaps is clean and full of soft couches and chairs for its' pregnant whores to lounge upon while showing off their assets. Several of the rooms are prepped to allow a whore to give birth in front of an audience. A supply of freshly squeezed breast milk is available on tap.
<<case "Eugenics">>
- $brothelNameCaps is decorated to look like a club. Loud music is playing, and the whores that aren't with customers are stripping and pole dancing on a stage. Safe sex is greatly encouraged. The real action happens in several reserved rooms dedicated to society's best, since the loud music drowns out private conversations.
+ _brothelNameCaps is decorated to look like a club. Loud music is playing, and the whores that aren't with customers are stripping and pole dancing on a stage. Safe sex is greatly encouraged. The real action happens in several reserved rooms dedicated to society's best, since the loud music drowns out private conversations.
<<case "Asset Expansionist">>
- $brothelNameCaps is decorated to look like a club. Loud music is playing, and the whores that aren't with customers are stripping and pole dancing on a stage.
+ _brothelNameCaps is decorated to look like a club. Loud music is playing, and the whores that aren't with customers are stripping and pole dancing on a stage.
<<case "Transformation Fetishist">>
- $brothelNameCaps is sterile and clean. Interactive screens on the walls list the whores and their modifications in clinical detail.
+ _brothelNameCaps is sterile and clean. Interactive screens on the walls list the whores and their modifications in clinical detail.
<<case "Gender Radicalist">>
- $brothelNameCaps is decorated to look like an old world bordello. The rich décor includes erotic photography and pornographic statuary, depicting every possible combination of human sexual congress.
+ _brothelNameCaps is decorated to look like an old world bordello. The rich décor includes erotic photography and pornographic statuary, depicting every possible combination of human sexual congress.
<<case "Gender Fundamentalist">>
- $brothelNameCaps is decorated to look like an old world whorehouse. Screens on the walls are showing pornography starring the whores, with prices flashing after each sex act.
+ _brothelNameCaps is decorated to look like an old world whorehouse. Screens on the walls are showing pornography starring the whores, with prices flashing after each sex act.
<<case "Physical Idealist">>
- $brothelNameCaps is decorated to look like a club. Loud music is playing, and the whores that aren't with customers are stripping on a stage. There is a distinct smell of sweat, and there is as much emphasis on the strippers' muscles as their breasts.
+ _brothelNameCaps is decorated to look like a club. Loud music is playing, and the whores that aren't with customers are stripping on a stage. There is a distinct smell of sweat, and there is as much emphasis on the strippers' muscles as their breasts.
<<case "Subjugationist">>
- $brothelNameCaps is decorated to celebrate the degradation of $arcologies[0].FSSubjugationistRace whores. The whores greet customers in stereotypical $arcologies[0].FSSubjugationistRace accents.
+ _brothelNameCaps is decorated to celebrate the degradation of $arcologies[0].FSSubjugationistRace whores. The whores greet customers in stereotypical $arcologies[0].FSSubjugationistRace accents.
<<case "Supremacist">>
- $brothelNameCaps is decorated like an old world gentleman's club. The pictures on the wall depict degradation of every race on earth, except $arcologies[0].FSSupremacistRace people.
+ _brothelNameCaps is decorated like an old world gentleman's club. The pictures on the wall depict degradation of every race on earth, except $arcologies[0].FSSupremacistRace people.
<<case "Paternalist">>
- $brothelNameCaps is decorated to look like a normal bar. Whores are encouraged to meet customers for a drink and get to know them a little before heading back into a private room.
+ _brothelNameCaps is decorated to look like a normal bar. Whores are encouraged to meet customers for a drink and get to know them a little before heading back into a private room.
<<case "Maturity Preferentialist">>
- $brothelNameCaps is decorated to look like a refined bar. It has a row of sturdy backless barstools, perfect for a delectable selection of succulent MILFs to perch on.
+ _brothelNameCaps is decorated to look like a refined bar. It has a row of sturdy backless barstools, perfect for a delectable selection of succulent MILFs to perch on.
<<case "Youth Preferentialist">>
- $brothelNameCaps is decorated to look like a the sort of bar old world students visit on spring break. Vapid music is playing, and when whores aren't with customers, they dance and make out with each other to attract some.
+ _brothelNameCaps is decorated to look like a the sort of bar old world students visit on spring break. Vapid music is playing, and when whores aren't with customers, they dance and make out with each other to attract some.
<<case "Body Purist">>
- $brothelNameCaps is decorated to look like an old world bordello. The rich décor includes erotic photography and pornographic statuary, depicting idealized human forms in the act of love.
+ _brothelNameCaps is decorated to look like an old world bordello. The rich décor includes erotic photography and pornographic statuary, depicting idealized human forms in the act of love.
<<case "Slimness Enthusiast">>
- $brothelNameCaps is decorated to look like an old world bordello. The rich décor includes erotic photography and pornographic statuary, depicting slim, girlish figures playing, dancing, and loving.
+ _brothelNameCaps is decorated to look like an old world bordello. The rich décor includes erotic photography and pornographic statuary, depicting slim, girlish figures playing, dancing, and loving.
<<case "Pastoralist">>
- $brothelNameCaps is decorated to look like a dairy. Though it isn't one, there is an intense sexual focus on boobs and lactation, and all the whores have their sizes proudly posted.
+ _brothelNameCaps is decorated to look like a dairy. Though it isn't one, there is an intense sexual focus on boobs and lactation, and all the whores have their sizes proudly posted.
<<case "Hedonistic">>
- $brothelNameCaps is comfortable and full of soft couches and chairs for its overweight whores to lounge upon between clients <<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>and enjoy a plate of snacks<<else>>and enjoy a big cup of slave food<</if>>. The smells of fresh baked goods are pumped into the facility to mask the smell of sweat. It's not unusual for a client to fuck a whore right on her chosen couch, since the effort of moving is often too much.
+ _brothelNameCaps is comfortable and full of soft couches and chairs for its overweight whores to lounge upon between clients <<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>and enjoy a plate of snacks<<else>>and enjoy a big cup of slave food<</if>>. The smells of fresh baked goods are pumped into the facility to mask the smell of sweat. It's not unusual for a client to fuck a whore right on her chosen couch, since the effort of moving is often too much.
<<case "Intellectual Dependency">>
- $brothelNameCaps is decorated to look like a club. The sexually charged atmosphere has the whores horny and making out with each other. Customers are expected to come in, grab a bimbo to their tastes, and pull them off to have a good time.
+ _brothelNameCaps is decorated to look like a club. The sexually charged atmosphere has the whores horny and making out with each other. Customers are expected to come in, grab a bimbo to their tastes, and pull them off to have a good time.
<<case "Slave Professionalism">>
- $brothelNameCaps is decorated to look like a high-class bordello. Courtesans are expected to greet and entice customers to join them for a night they'll never forget.
+ _brothelNameCaps is decorated to look like a high-class bordello. Courtesans are expected to greet and entice customers to join them for a night they'll never forget.
<<case "Petite Admiration">>
- $brothelNameCaps is decorated to look like an old world whorehouse. The whores have personal platforms to stand on for inspection from their taller customers.
+ _brothelNameCaps is decorated to look like an old world whorehouse. The whores have personal platforms to stand on for inspection from their taller customers.
<<case "Statuesque Glorification">>
- $brothelNameCaps is decorated to look like an old world bordello. The rich décor specializes in pornographic statuary, depicting towering human forms in the act of love.
+ _brothelNameCaps is decorated to look like an old world bordello. The rich décor specializes in pornographic statuary, depicting towering human forms in the act of love.
<</switch>>
<<if $brothelAdsSpending > 0>>
@@ -151,7 +152,7 @@
</div>
</p>
-<h2>Design $brothelNameCaps Ad Campaign</h2>
+<h2>Design _brothelNameCaps Ad Campaign</h2>
<div class="note">
Will replace relevant variety bonuses
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index b258bd5a46e1274fe74b2a1d3f26d4eeb75dd88a..2ad469a189123d7187da71592ec2f31945585723 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -10,6 +10,7 @@
<!-- Statistics gathering -->
<<set $facility = $facility || {}, $facility.brothel = initFacilityStatistics($facility.brothel)>>
+<<set _brothelNameCaps = capFirstChar($brothelName)>>
<<if ($MadamID != 0)>>
<<if (_S.Madam.health.condition < -80)>>
@@ -337,11 +338,11 @@
b.profit = b.totalIncome - b.totalExpenses;
<</script>>
- $brothelNameCaps makes you <span class="cash inc"><<print cashFormat(_profits)>></span> this week.
+ _brothelNameCaps makes you <span class="cash inc"><<print cashFormat(_profits)>></span> this week.
<<if $brothelDecoration != "standard">>
<p>
- $brothelNameCaps's customers enjoyed <span class="reputation inc">fucking whores in $brothelDecoration surroundings.</span>
+ _brothelNameCaps's customers enjoyed <span class="reputation inc">fucking whores in $brothelDecoration surroundings.</span>
</p>
<</if>>
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index b43410d627008ae4c753e1c3fe005929202e1acc..eab05fc5270c0a7b851a397218fe6e84c63bed05 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -2,12 +2,9 @@
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Cellblock", $encyclopedia = "Cellblock", _CL = App.Entity.facilities.cellblock.employeesIDs().size>>
-<<if $cellblockName != "the Cellblock">>
- <<set $cellblockNameCaps = $cellblockName.replace("the ", "The ")>>
-<</if>>
-
<p class="scene-intro">
- $cellblockNameCaps
+ <<set _cellblockNameCaps = capFirstChar($cellblockName)>>
+ _cellblockNameCaps
<<switch $cellblockDecoration>>
<<case "Roman Revivalist">>
is designed to resemble the holding pens beneath the old Coliseum. Whenever there's a fight in the arcology, screens in each cell helpfully keep inmates informed of what awaits (otherwise) useless slaves.
@@ -70,9 +67,9 @@
<</switch>>
<<if _CL > 2>>
- $cellblockNameCaps is full of slaves, though it's difficult to tell at first. In many of the cells, a scene of loneliness and misery may be witnessed, but not one sound escapes them in fear of the punishment that would follow.
+ _cellblockNameCaps is full of slaves, though it's difficult to tell at first. In many of the cells, a scene of loneliness and misery may be witnessed, but not one sound escapes them in fear of the punishment that would follow.
<<elseif _CL > 0>>
- $cellblockNameCaps holds a few slaves, though it's difficult to tell at first. In several of the cells, a scene of loneliness and misery may be witnessed, but not one sound escapes them in fear of the punishment that would follow.
+ _cellblockNameCaps holds a few slaves, though it's difficult to tell at first. In several of the cells, a scene of loneliness and misery may be witnessed, but not one sound escapes them in fear of the punishment that would follow.
<<elseif _S.Wardeness>>
_S.Wardeness.slaveName is alone in the cellblock, and seems rather lonely without anyone to oppress.
<<else>>
@@ -88,7 +85,7 @@
<</if>>
<div>
<<set _Tmult0 = Math.trunc($cellblock*1000*$upgradeMultiplierArcology)>>
- $cellblockNameCaps has room for $cellblock slaves to be kept in close confinement.
+ _cellblockNameCaps has room for $cellblock slaves to be kept in close confinement.
There <<if _CL == 1>>is<<else>>are<</if>> currently _CL slaves<<if _CL != 1>>s<</if>> kept in close confinement in $cellblockName.
<div class="choices">
[[Expand the cellblock|Cellblock][cashX(forceNeg(_Tmult0), "capEx"), $cellblock += 5, $PC.skill.engineering += .1]]
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 57feb429d1df09123af30ed83936ed01c44610eb..81824035590da10175c685c511bd708761064a22 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -8,6 +8,7 @@
<<else>>
<<set _devBonus = 0>>
<</if>>
+<<set _cellblockNameCaps = capFirstChar($cellblockName)>>
<<if (_S.Wardeness)>>
<<setLocalPronouns _S.Wardeness>>
@@ -283,7 +284,7 @@
<<if (_softenedQuirks) || (_brokenSlaves)>>
<br><br>
<<if (_softenedQuirks > 0)>>
- $cellblockNameCaps's advanced compliance systems successfully softened
+ _cellblockNameCaps's advanced compliance systems successfully softened
<<if (_softenedQuirks == 1)>>
one slave's mental flaw into an @@.green;appealing quirk,@@ though the constant correction caused them @@.mediumorchid;considerable anguish.@@
<<else>>
@@ -297,7 +298,7 @@
_brokenSlaves slaves are now willing to @@.hotpink;do as they're told@@ and have been released.
<</if>>
<<if $cellblockDecoration != "standard">>
- <br><br> $cellblockNameCaps's $cellblockDecoration atmosphere @@.hotpink;had an impact on them while they were@@ imprisoned.
+ <br><br> _cellblockNameCaps's $cellblockDecoration atmosphere @@.hotpink;had an impact on them while they were@@ imprisoned.
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index e01db18bbe022234c36b03ef14382aaf0eca724e..95d0e21913db96303f5e5abd22d544aeb3ad50ea 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -2,11 +2,9 @@
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Clinic", $encyclopedia = "Clinic", _CL = App.Entity.facilities.clinic.employeesIDs().size>>
-<<if $clinicName != "the Clinic">>
- <<set $clinicNameCaps = $clinicName.replace("the ", "The ")>>
-<</if>>
<p class="scene-intro">
- $clinicNameCaps
+ <<set _clinicNameCaps = capFirstChar($clinicName)>>
+ _clinicNameCaps
<<switch $clinicDecoration>>
<<case "Roman Revivalist">>
is open and airy; a breeze wafts through the space, and Roman theories on natural cleanliness are very much on display.
@@ -69,13 +67,13 @@
<</switch>>
<<if _CL > 2>>
- $clinicNameCaps is busy. Patients occupy many of the beds; most are alert, but a few are dozing under medication designed to promote healing through deep rest.
+ _clinicNameCaps is busy. Patients occupy many of the beds; most are alert, but a few are dozing under medication designed to promote healing through deep rest.
<<elseif _CL > 0>>
- $clinicNameCaps is sparsely populated. Patients occupy a few of the beds; most are alert, but a few are dozing under medication designed to promote healing through deep rest.
+ _clinicNameCaps is sparsely populated. Patients occupy a few of the beds; most are alert, but a few are dozing under medication designed to promote healing through deep rest.
<<elseif _S.Nurse>>
_S.Nurse.slaveName is alone in the clinic, and has nothing to do but keep the place spotlessly clean and ready for its next patients.
<<else>>
- $clinicNameCaps is empty and quiet.
+ _clinicNameCaps is empty and quiet.
<div class="choices" style="font-style:normal">
[[Decommission the Clinic|Main][$clinic = 0, $clinicDecoration = "standard", $clinicUpgradeScanner = 0, $clinicUpgradeFilters = 0, $clinicUpgradePurge = 0, $clinicInflateBelly = 0, $clinicSpeedGestation = 0]]
</div>
@@ -84,7 +82,7 @@
<div>
<<set _Tmult0 = Math.trunc($clinic*1000*$upgradeMultiplierArcology)>>
- $clinicNameCaps has room to support $clinic slaves while they receive treatment.
+ _clinicNameCaps has room to support $clinic slaves while they receive treatment.
There <<if _CL == 1>>is<<else>>are<</if>> currently _CL slave<<if _CL != 1>>s<</if>> receiving treatment in $clinicName.
<div class="choices">
[[Expand the clinic|Clinic][cashX(forceNeg(_Tmult0), "capEx"), $clinic += 5, $PC.skill.engineering += .1]]
@@ -101,7 +99,7 @@
<div>
<<if $clinicUpgradeScanner == 1>>
- $clinicNameCaps's scanners have been upgraded with a sampling system that can estimate carcinogenic damage to a slave's body.
+ _clinicNameCaps's scanners have been upgraded with a sampling system that can estimate carcinogenic damage to a slave's body.
<<else>>
<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology*Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier))>>
It mounts powerful medical scanning technology.
@@ -162,12 +160,12 @@
<<if $bellyImplants == 1 && !_S.Nurse>>
A resident nurse could be used to safely regulate the rate a slave's fillable belly implant for maximum size with minimum health loss.
<<elseif $bellyImplants == 1 && $clinicInflateBelly == 1>>
- $clinicNameCaps is useful for keeping slaves healthy during long term procedures. Slaves in $clinicName with inflatable belly implants will be filled during their time under _S.Nurse.slaveName's supervision to maximize growth with minimized health complications.
+ _clinicNameCaps is useful for keeping slaves healthy during long term procedures. Slaves in $clinicName with inflatable belly implants will be filled during their time under _S.Nurse.slaveName's supervision to maximize growth with minimized health complications.
<div class="choices">
[[Do not fill belly implants|Clinic][$clinicInflateBelly = 0]]
</div>
<<elseif $bellyImplants == 1 && _S.Nurse && $clinicInflateBelly != 1>>
- $clinicNameCaps is useful for keeping slaves healthy during long term procedures. _S.Nurse.slaveName can supervise weekly filling regimens for clinic slaves with fillable belly implants during their stay to maximize growth with minimal health complications.
+ _clinicNameCaps is useful for keeping slaves healthy during long term procedures. _S.Nurse.slaveName can supervise weekly filling regimens for clinic slaves with fillable belly implants during their stay to maximize growth with minimal health complications.
<div class="choices">
[[Fill belly implants|Clinic][$clinicInflateBelly = 1]]
</div>
@@ -199,7 +197,7 @@
[[Limit rapid gestation agents to selected slaves only|Clinic][$clinicSpeedGestation = 0]]
</div>
<<elseif $pregSpeedControl == 1 && _S.Nurse && $clinicSpeedGestation != 1>>
- $clinicNameCaps is currently not applying rapid gestation agents to pregnant patients. Only individually selected slaves will undergo this procedure
+ _clinicNameCaps is currently not applying rapid gestation agents to pregnant patients. Only individually selected slaves will undergo this procedure
<div class="choices">
[[Speed up gestation for all pregnant patients|Clinic][$clinicSpeedGestation = 1]]
</div>
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index 5be3dcb382d28b46755ffd2017ebcf6689b6f644..5dcc565858a87827b1f4b54efff15002af549d94 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -3,10 +3,8 @@
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Club", $encyclopedia = "Club", _CL = App.Entity.facilities.club.employeesIDs().size>>
<p class="scene-intro">
- <<if $clubName != "the Club">>
- <<set $clubNameCaps = $clubName.replace("the ", "The ")>>
- <</if>>
- $clubNameCaps
+ <<set _clubNameCaps = capFirstChar($clubName)>>
+ _clubNameCaps
<<switch $clubDecoration>>
<<case "Roman Revivalist">>
is decorated like a Roman villa's entertainment rooms. There is a lot of white stone, plaster, and terracotta.
@@ -69,7 +67,7 @@
<</switch>>
<<if $clubAdsSpending > 0>>
- Screens outside the entrance are showing softcore music videos to advertise $clubNameCaps.
+ Screens outside the entrance are showing softcore music videos to advertise _clubNameCaps.
<<if $clubAdsOld == 1>>
The featured strippers are all MILFs.
<<elseif $clubAdsOld == -1>>
@@ -137,14 +135,14 @@
<</if>>
<<if _CL > 2>>
- $clubNameCaps is dotted with pretty, flirtatious slaves, stripping on stages, serving drinks, and dancing. They're very willing to suck patrons off in the open or give a public handjob, and there are little private rooms for them to use when engaging in heavier intercourse.
+ _clubNameCaps is dotted with pretty, flirtatious slaves, stripping on stages, serving drinks, and dancing. They're very willing to suck patrons off in the open or give a public handjob, and there are little private rooms for them to use when engaging in heavier intercourse.
<<elseif _CL > 0>>
There are a few pretty, flirtatious slaves, stripping on stages, serving drinks, and dancing. They're very willing to suck patrons off in the open or give a public handjob, and there are little private rooms for them to use when engaging in heavier intercourse.
<<elseif _S.DJ>>
<<setLocalPronouns _S.DJ>>
- $clubNameCaps is doing business normally, without a complement of sex slaves to spice things up. _S.DJ.slaveName is alone in $clubName, and can accomplish little by $himself.
+ _clubNameCaps is doing business normally, without a complement of sex slaves to spice things up. _S.DJ.slaveName is alone in $clubName, and can accomplish little by $himself.
<<else>>
- $clubNameCaps is doing business normally, without a complement of sex slaves to spice things up.
+ _clubNameCaps is doing business normally, without a complement of sex slaves to spice things up.
<div class="choices" style="font-style:normal">
<<link "Decommission the club" "Main">>
<<set $club = 0, $clubDecoration = "standard", $clubUpgradePDAs = 0, $clubAdsSpending = 0>>
@@ -243,7 +241,7 @@
<div>
<<if $clubUpgradePDAs == 1>>
- $clubNameCaps has been wired for unobtrusive personal data assistants to let your sluts pass tips about enslavable people to your recruiter.
+ _clubNameCaps has been wired for unobtrusive personal data assistants to let your sluts pass tips about enslavable people to your recruiter.
<<else>>
<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology*$HackingSkillMultiplier)>>
The rooms are standard.
@@ -278,9 +276,9 @@
<div>
<<if $clubAdsSpending > 0>>
- $clubNameCaps is the subject of an active ad campaign.
+ _clubNameCaps is the subject of an active ad campaign.
<<else>>
- $clubNameCaps is not being advertised.
+ _clubNameCaps is not being advertised.
<</if>>
<div class="choices">
<<link "Manage club advertisements" "Club Advertisement">>
diff --git a/src/uncategorized/clubAdvertisement.tw b/src/uncategorized/clubAdvertisement.tw
index c63b53f4bbc8a0961ac2def40496334e4548cf76..ab433ab4ab72b2f655e3212462a0a65e6d9244e8 100644
--- a/src/uncategorized/clubAdvertisement.tw
+++ b/src/uncategorized/clubAdvertisement.tw
@@ -2,62 +2,63 @@
<p class="scene-intro">
<<switch $clubDecoration>>
+ <<set _clubNameCaps = capFirstChar($clubName)>>
<<case "Roman Revivalist">>
- $clubNameCaps is decorated like a Roman villa's entertainment rooms. There is a lot of white stone, plaster, and terracotta.
+ _clubNameCaps is decorated like a Roman villa's entertainment rooms. There is a lot of white stone, plaster, and terracotta.
<<case "Aztec Revivalist">>
- $clubNameCaps is decorated with obsidian figures inserted in the lime walls and giant oak pillars that give a homey feeling to the otherwise cold building.
+ _clubNameCaps is decorated with obsidian figures inserted in the lime walls and giant oak pillars that give a homey feeling to the otherwise cold building.
<<case "Egyptian Revivalist">>
- $clubNameCaps is decorated like a room in an ancient Egyptian palace. There are columns of warm stone and pools of clear water full of aquatic plants.
+ _clubNameCaps is decorated like a room in an ancient Egyptian palace. There are columns of warm stone and pools of clear water full of aquatic plants.
<<case "Edo Revivalist">>
- $clubNameCaps is furnished as an Edo period theater. Performances of the traditional Japanese arts can be seen here, though more modern dancing happens in the evenings. In either case, geisha girls are present and willing.
+ _clubNameCaps is furnished as an Edo period theater. Performances of the traditional Japanese arts can be seen here, though more modern dancing happens in the evenings. In either case, geisha girls are present and willing.
<<case "Arabian Revivalist">>
- $clubNameCaps is designed like an open plaza in an Arabian palace, with a raised stage in the center for erotic dancing. Diaphanous, flowing curtains billow across the space, dispersing the narcotic smoke billowing from a score of hookahs.
+ _clubNameCaps is designed like an open plaza in an Arabian palace, with a raised stage in the center for erotic dancing. Diaphanous, flowing curtains billow across the space, dispersing the narcotic smoke billowing from a score of hookahs.
<<case "Chinese Revivalist">>
- $clubNameCaps is furnished as an old Chinese disorderly house. It's intentionally packed in so that closeness and good cheer is obligatory here; prominent citizens share tables while their hangers-on jostle for room.
+ _clubNameCaps is furnished as an old Chinese disorderly house. It's intentionally packed in so that closeness and good cheer is obligatory here; prominent citizens share tables while their hangers-on jostle for room.
<<case "Chattel Religionist">>
- $clubNameCaps isn't a religious establishment, but it almost looks like one. It's clean and proper, with beams of natural light that come down to highlight holy sex slaves' bodies.
+ _clubNameCaps isn't a religious establishment, but it almost looks like one. It's clean and proper, with beams of natural light that come down to highlight holy sex slaves' bodies.
<<case "Degradationist">>
- $clubNameCaps has a perverted, debauched appearance. The décor is utilitarian so it can be cleaned easily, and the reason is obvious. Many patrons have brought their own slaves to publicly rape here.
+ _clubNameCaps has a perverted, debauched appearance. The décor is utilitarian so it can be cleaned easily, and the reason is obvious. Many patrons have brought their own slaves to publicly rape here.
<<case "Repopulation Focus">>
- $clubNameCaps has a gaudy appearance. There are lots of deep soft chairs for pregnant patrons and slaves to rest in and screens showing girls with large bellies lining the walls.
+ _clubNameCaps has a gaudy appearance. There are lots of deep soft chairs for pregnant patrons and slaves to rest in and screens showing girls with large bellies lining the walls.
<<case "Eugenics">>
- $clubNameCaps has a gaudy appearance. There are screens lining the walls discouraging unprotected slave sex. The real action happens in the several exclusive rooms reserved for society's best.
+ _clubNameCaps has a gaudy appearance. There are screens lining the walls discouraging unprotected slave sex. The real action happens in the several exclusive rooms reserved for society's best.
<<case "Asset Expansionist">>
- $clubNameCaps has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing off big tits and plush asses.
+ _clubNameCaps has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing off big tits and plush asses.
<<case "Transformation Fetishist">>
- $clubNameCaps has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing off huge fake tits and plastic dick sucking lips.
+ _clubNameCaps has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing off huge fake tits and plastic dick sucking lips.
<<case "Gender Radicalist">>
- $clubNameCaps has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing closeups of cocks fucking every imaginable orifice.
+ _clubNameCaps has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing closeups of cocks fucking every imaginable orifice.
<<case "Gender Fundamentalist">>
- $clubNameCaps has an old world appearance, a decidedly throwback atmosphere harking back to the glory days of cultures past.
+ _clubNameCaps has an old world appearance, a decidedly throwback atmosphere harking back to the glory days of cultures past.
<<case "Physical Idealist">>
- $clubNameCaps isn't a gym, but it smells like one. The dancing is rough and competitive, and the drinks are rich with protein.
+ _clubNameCaps isn't a gym, but it smells like one. The dancing is rough and competitive, and the drinks are rich with protein.
<<case "Supremacist">>
- $clubNameCaps is decorated like an upper-class gentleman's club in the old countries of $arcologies[0].FSSupremacistRace people.
+ _clubNameCaps is decorated like an upper-class gentleman's club in the old countries of $arcologies[0].FSSupremacistRace people.
<<case "Subjugationist">>
- $clubNameCaps is decorated like an upper-class gentleman's club in the old countries which favored $arcologies[0].FSSubjugationistRace slaves.
+ _clubNameCaps is decorated like an upper-class gentleman's club in the old countries which favored $arcologies[0].FSSubjugationistRace slaves.
<<case "Paternalist">>
- $clubNameCaps is handsome and well-kept, even romantic. Though the slaves here are sex slaves, every provision is made to encourage them to enjoy themselves.
+ _clubNameCaps is handsome and well-kept, even romantic. Though the slaves here are sex slaves, every provision is made to encourage them to enjoy themselves.
<<case "Body Purist">>
- $clubNameCaps is gorgeous, decorated and kept in the height of fashionable night establishment style. The music is cutting edge and everything and everyone is elegant.
+ _clubNameCaps is gorgeous, decorated and kept in the height of fashionable night establishment style. The music is cutting edge and everything and everyone is elegant.
<<case "Slimness Enthusiast">>
- $clubNameCaps is distinctly gaudy, with lots of sugary drinks on offer. The music and décor are of a decidedly bubblegum quality.
+ _clubNameCaps is distinctly gaudy, with lots of sugary drinks on offer. The music and décor are of a decidedly bubblegum quality.
<<case "Pastoralist">>
- $clubNameCaps is decorated to resemble a frontier disorderly house. The drinks are pounded straight, and there's a set of swinging doors for bad men to part dramatically as they enter.
+ _clubNameCaps is decorated to resemble a frontier disorderly house. The drinks are pounded straight, and there's a set of swinging doors for bad men to part dramatically as they enter.
<<case "Maturity Preferentialist">>
- $clubNameCaps is surprisingly elegant. The music consists of refined remixes of traditional dance music, offering slaves and citizens the chance to dance beautifully together.
+ _clubNameCaps is surprisingly elegant. The music consists of refined remixes of traditional dance music, offering slaves and citizens the chance to dance beautifully together.
<<case "Youth Preferentialist">>
- $clubNameCaps is deafeningly loud. There's a bright light show running, offering staccato glimpses of the scene out on the dance floor.
+ _clubNameCaps is deafeningly loud. There's a bright light show running, offering staccato glimpses of the scene out on the dance floor.
<<case "Hedonistic">>
- $clubNameCaps has a gaudy appearance. The dance floor is extra large to accommodate its extra wide dancers, though bodies grinding against each other is an inevitability. Plenty of roomy, comfortable booths encircle the room for an exhausted citizen to relax with his plush dance partner, and a wide selection of greasy food accompanies the drinks. <<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>Platters of food are complementary for feeding slaves<<else>>Feeders are available in the booths to feed tired slaves<</if>> while they get fondled.
+ _clubNameCaps has a gaudy appearance. The dance floor is extra large to accommodate its extra wide dancers, though bodies grinding against each other is an inevitability. Plenty of roomy, comfortable booths encircle the room for an exhausted citizen to relax with his plush dance partner, and a wide selection of greasy food accompanies the drinks. <<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>Platters of food are complementary for feeding slaves<<else>>Feeders are available in the booths to feed tired slaves<</if>> while they get fondled.
<<case "Intellectual Dependency">>
- $clubNameCaps is distinctly gaudy and easy for slaves to move around in. The dancing is as energetic and sexual, and the drinks sugary and sweet.
+ _clubNameCaps is distinctly gaudy and easy for slaves to move around in. The dancing is as energetic and sexual, and the drinks sugary and sweet.
<<case "Slave Professionalism">>
- $clubNameCaps is decorated like an upper-class gentleman's club. It is where a true courtesan works their craft.
+ _clubNameCaps is decorated like an upper-class gentleman's club. It is where a true courtesan works their craft.
<<case "Petite Admiration">>
- $clubNameCaps has a gaudy appearance. The dance floor is surrounded by raised platforms so even the shortest slave can be seen by the crowd.
+ _clubNameCaps has a gaudy appearance. The dance floor is surrounded by raised platforms so even the shortest slave can be seen by the crowd.
<<case "Statuesque Glorification">>
- $clubNameCaps has a tiered appearance. The booths and bar are positioned overlooking the dance floor so patrons may loom over the dancing slaves even when seated.
+ _clubNameCaps has a tiered appearance. The booths and bar are positioned overlooking the dance floor so patrons may loom over the dancing slaves even when seated.
<</switch>>
<<if $clubAdsSpending > 0>>
@@ -148,7 +149,7 @@
</div>
</p>
-<h2>Design $clubNameCaps Ad Campaign</h2>
+<h2>Design _clubNameCaps Ad Campaign</h2>
<div class="note">
Will replace relevant variety bonuses
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 69eec9d13f0daa5ae35a71d09a86248453187634..ebe641ececb340b2a50e8f44a892872a32afdf2b 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -242,7 +242,7 @@
<</script>>
<<if $clubDecoration != "standard">>
<p>
- $clubNameCaps's customers enjoy @@.green;having sex in $clubDecoration surroundings.@@
+ <<= capFirstChar($clubName)>>'s customers enjoy @@.green;having sex in $clubDecoration surroundings.@@
</p>
<</if>>
diff --git a/src/uncategorized/costsBudget.js b/src/uncategorized/costsBudget.js
index 7d4b53daaa94041583a0a097a8b3d703c5528e0e..664e716c4b3d9a5ed9a8201b06ea8dc091b8a5c2 100644
--- a/src/uncategorized/costsBudget.js
+++ b/src/uncategorized/costsBudget.js
@@ -44,7 +44,7 @@ App.UI.Budget.Cost = function() {
// HEAD GIRL
// find passage name for HGSuite
- addToggle(generateRowGroup(V.HGSuiteNameCaps, "HEADGIRLSUITE"), [
+ addToggle(generateRowGroup(capFirstChar(V.HGSuiteName), "HEADGIRLSUITE"), [
generateRowCategory("Head Girl", "slaveAssignmentHeadgirl"),
generateRowCategory("Head Girl Fucktoys", "slaveAssignmentHeadgirlsuite")
]);
@@ -74,13 +74,13 @@ App.UI.Budget.Cost = function() {
]);
// ARCADE
- addToggle(generateRowGroup(V.arcadeNameCaps, "ARCADE"), [
+ addToggle(generateRowGroup(capFirstChar(V.arcadeName), "ARCADE"), [
generateRowCategory("Arcade Operation", "arcade"),
generateRowCategory("Arcade Fuckdolls", "slaveAssignmentArcade")
]);
// BROTHEL
- addToggle(generateRowGroup(V.brothelNameCaps, "BROTHEL"), [
+ addToggle(generateRowGroup(capFirstChar(V.brothelName), "BROTHEL"), [
generateRowCategory("Brothel Operation", "brothel"),
generateRowCategory("Brothel Madam", "slaveAssignmentMadam"),
generateRowCategory("Brothel MadamVign", "slaveAssignmentMadamVign"),
@@ -90,14 +90,14 @@ App.UI.Budget.Cost = function() {
]);
// CELLBLOCK
- addToggle(generateRowGroup(V.cellblockNameCaps, "CELLBLOCK"), [
+ addToggle(generateRowGroup(capFirstChar(V.cellblockName), "CELLBLOCK"), [
generateRowCategory("Cellblock Operation", "cellblock"),
generateRowCategory("Cellblock Warden", "slaveAssignmentWarden"),
generateRowCategory("Cellblock Slaves", "slaveAssignmentCellblock")
]);
// CLUB
- addToggle(generateRowGroup(V.clubNameCaps, "CLUB"), [
+ addToggle(generateRowGroup(capFirstChar(V.clubName), "CLUB"), [
generateRowCategory("Club Operation", "club"),
generateRowCategory("Club DJ", "slaveAssignmentDj"),
generateRowCategory("Club DJVign", "slaveAssignmentDjVign"),
@@ -107,14 +107,14 @@ App.UI.Budget.Cost = function() {
]);
// CLINIC
- addToggle(generateRowGroup(V.clinicNameCaps, "CLINIC"), [
+ addToggle(generateRowGroup(capFirstChar(V.clinicName), "CLINIC"), [
generateRowCategory("Clinic Operation", "clinic"),
generateRowCategory("Clinic Nurse", "slaveAssignmentNurse"),
generateRowCategory("Clinic Slaves", "slaveAssignmentClinic")
]);
// DAIRY
- addToggle(generateRowGroup(V.dairyNameCaps, "DAIRY"), [
+ addToggle(generateRowGroup(capFirstChar(V.dairyName), "DAIRY"), [
generateRowCategory("Dairy Operation", "dairy"),
generateRowCategory("Dairy Milkmaid", "slaveAssignmentMilkmaid"),
generateRowCategory("Dairy Cows", "slaveAssignmentDairy"),
@@ -122,7 +122,7 @@ App.UI.Budget.Cost = function() {
]);
// FARMYARD
- addToggle(generateRowGroup(V.farmyardNameCaps, "FARMYARD"), [
+ addToggle(generateRowGroup(capFirstChar(V.farmyardName), "FARMYARD"), [
generateRowCategory("Farmyard Operation", "farmyard"),
generateRowCategory("Farmyard Farmer", "slaveAssignmentFarmer"),
generateRowCategory("Farmyard Farmhands", "slaveAssignmentFarmyard"),
@@ -130,13 +130,13 @@ App.UI.Budget.Cost = function() {
]);
// INCUBATOR
- addToggle(generateRowGroup(V.incubatorNameCaps, "INCUBATOR"), [
+ addToggle(generateRowGroup(capFirstChar(V.incubatorName)), "INCUBATOR"), [
generateRowCategory("Incubator Operation", "incubator"),
generateRowCategory("Incubator Babies", "incubatorSlaves")
]);
// NURSERY
- addToggle(generateRowGroup(V.nurseryNameCaps, "NURSERY"), [
+ addToggle(generateRowGroup(capFirstChar(V.nurseryName), "NURSERY"), [
generateRowCategory("Nursery Operation", "nursery"),
generateRowCategory("Nursery Matron", "slaveAssignmentMatron"),
generateRowCategory("Nursery Nannies", "slaveAssignmentNursery"),
@@ -144,7 +144,7 @@ App.UI.Budget.Cost = function() {
]);
// PIT
- addToggle(generateRowGroup(V.pitNameCaps, "PIT"), [
+ addToggle(generateRowGroup(capFirstChar(V.pitName), "PIT"), [
generateRowCategory("Pit Operation", "pit")
]);
@@ -157,14 +157,14 @@ App.UI.Budget.Cost = function() {
]);
// SCHOOLROOM
- addToggle(generateRowGroup(V.schoolroomNameCaps, "SCHOOLROOM"), [
+ addToggle(generateRowGroup(capFirstChar(V.schoolroomName), "SCHOOLROOM"), [
generateRowCategory("Schoolroom Operation", "school"),
generateRowCategory("Schoolroom Teacher", "slaveAssignmentTeacher"),
generateRowCategory("Schoolroom Students", "slaveAssignmentSchool")
]);
// SERVANTS' QUARTERS
- addToggle(generateRowGroup(V.servantsQuartersNameCaps, "SERVANTSQUARTERS"), [
+ addToggle(generateRowGroup(capFirstChar(V.servantsQuartersName), "SERVANTSQUARTERS"), [
generateRowCategory("Servants' Quarters Operation", "servantsQuarters"),
generateRowCategory("Servants' Quarters Steward", "slaveAssignmentSteward"),
generateRowCategory("Servants' Quarters Servants", "slaveAssignmentQuarter"),
@@ -172,7 +172,7 @@ App.UI.Budget.Cost = function() {
]);
// SPA
- addToggle(generateRowGroup(V.spaNameCaps, "SPA"), [
+ addToggle(generateRowGroup(capFirstChar(V.spaName), "SPA"), [
generateRowCategory("Spa Operation", "spa"),
generateRowCategory("Spa Attendant", "slaveAssignmentAttendant"),
generateRowCategory("Spa Slaves", "slaveAssignmentSpa")
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index f6926859cd7c3d67eff9b3c49367c8e51c2cc66b..b7f2e8bd59d5ca990b5d741447d16ab2f50ca828 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -3,9 +3,7 @@
<<set _slaves = App.Utils.sortedEmployees(App.Entity.facilities.dairy)>>
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Dairy", $encyclopedia = "Dairy", _SL = $slaves.length, _DL = _slaves.length>>
-<<if $dairyName != "the Dairy">>
- <<set $dairyNameCaps = $dairyName.replace("the ", "The ")>>
-<</if>>
+<<set _dairyNameCaps = capFirstChar($dairyName)>>
<<if ($dairyRestraintsSetting != 2) || ($dairyRestraintsUpgrade != 1)>>
<<if $dairyStimulatorsSetting == 2>>
@@ -157,7 +155,7 @@
<p class="scene-intro">
<<if ($dairyRestraintsSetting > 1)>>
- $dairyNameCaps is an industrial facility, but there's a viewing gallery for visitors.
+ _dairyNameCaps is an industrial facility, but there's a viewing gallery for visitors.
<<switch $dairyDecoration>>
<<case "Roman Revivalist">>
The screens there review each slave's liquid contributions to the state in minute detail.
@@ -219,7 +217,7 @@
Fascinated visitors may peruse each slave's productivity statistics on a corresponding touchscreen.
<</switch>>
<<else>>
- $dairyNameCaps
+ _dairyNameCaps
<<switch $dairyDecoration>>
<<case "Roman Revivalist">>
is functional and clean, using traditional methods wherever possible. At one end of the long row of stalls there is an alcove with a shrine to the Roman goddess of bountiful harvests.
@@ -283,7 +281,7 @@
<</if>>
<<if _DL > 2>>
- $dairyNameCaps is working steadily.
+ _dairyNameCaps is working steadily.
<<if ($dairyRestraintsUpgrade == 1) && ($dairyRestraintsSetting > 1)>>
Each cow is strapped into their own milking machine. The machines are set up in rows, alternating forward and backward so that the cows are interleaved as closely as possible without touching.
<<if ($dairyFeedersUpgrade == 1) && ($dairyFeedersSetting > 0)>>
@@ -325,13 +323,13 @@
<</if>>
<</if>>
<<elseif $bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren > 0>>
- $dairyNameCaps is quiet and calm. The only sounds are faint sucking and gushing noises.
+ _dairyNameCaps is quiet and calm. The only sounds are faint sucking and gushing noises.
<<elseif _DL > 0>>
- $dairyNameCaps is sparsely populated.
+ _dairyNameCaps is sparsely populated.
<<elseif $MilkmaidID != 0>>
_S.Milkmaid.slaveName is alone in $dairyName, and has nothing to do but clean and maintain the equipment.
<<else>>
- $dairyNameCaps is empty and desolate.
+ _dairyNameCaps is empty and desolate.
<div class="choices" style="font-style:normal">
<<link "Decommission the dairy" "Main">>
<<set $dairy = 0, $dairyFeedersUpgrade = 0, $dairyPregUpgrade = 0, $dairyStimulatorsUpgrade = 0, $dairyDecoration = "standard", $dairyFeedersSetting = 0, $dairyPregSetting = 0, $dairyStimulatorsSetting = 0, $dairyHyperPregRemodel = 0, $cumPipeline = 0, $milkPipeline = 0>>
@@ -343,7 +341,7 @@
<div>
<<set _Tmult0 = Math.trunc($dairy*1000*$upgradeMultiplierArcology)>>
- $dairyNameCaps can support $dairy milkers.
+ _dairyNameCaps can support $dairy milkers.
There<<if _DL == 1>>is<<else>>are<</if>> currently _DL cow<<if _DL != 1>>s<</if>>.
<div class="choices">
[[Expand the dairy|Dairy][cashX(forceNeg(_Tmult0), "capEx"), $dairy += 5, $PC.skill.engineering += .1]]
@@ -379,7 +377,7 @@
<</if>>
</div>
<<else>>
- $dairyNameCaps is equipped to feed and clean slaves normally.
+ _dairyNameCaps is equipped to feed and clean slaves normally.
<div class="choices">
[[Upgrade the milking machines with intubators|Dairy][cashX(forceNeg(_Tmult1), "capEx"), $dairyFeedersUpgrade = 1, $PC.skill.engineering += 0.1]]
<span class="note">
@@ -393,7 +391,7 @@
<<if $seePreg != 0>>
<<set _Tmult3 = Math.trunc(2500*$upgradeMultiplierArcology)>>
<<if $dairyPregUpgrade == 1>>
- $dairyNameCaps can support cow pregnancies.
+ _dairyNameCaps can support cow pregnancies.
<div class="choices">
Fertile cows' wombs are
<<if $dairyPregSetting == 3>>
@@ -416,7 +414,7 @@
<</if>>
</div>
<<else>>
- $dairyNameCaps is not prepared to support cow pregnancies, and therefore cannot be used to contract out fertile slaves' wombs.
+ _dairyNameCaps is not prepared to support cow pregnancies, and therefore cannot be used to contract out fertile slaves' wombs.
<div class="choices">
[[Upgrade the dairy to support pregnancies|Dairy][cashX(forceNeg(_Tmult3), "capEx"), $dairyPregUpgrade = 1]]
<span class="note">
@@ -447,7 +445,7 @@
<</if>>
</div>
<<else>>
- $dairyNameCaps does not automatically sodomize.
+ _dairyNameCaps does not automatically sodomize.
<div class="choices">
[[Upgrade the cockmilking machines with sodomizers|Dairy][cashX(forceNeg(_Tmult1), "capEx"), $dairyStimulatorsUpgrade = 1, $PC.skill.engineering += 0.1]]
<span class="note">
@@ -461,9 +459,9 @@
<<set _Tmult2 = Math.trunc(5000*$upgradeMultiplierArcology)>>
<<if ($dairyPregSetting == 2) || ($dairyStimulatorsSetting == 2)>>
<<if $dairyPrepUpgrade == 1>>
- $dairyNameCaps features a preparatory raper designed to gape slaves for integration.
+ _dairyNameCaps features a preparatory raper designed to gape slaves for integration.
<<else>>
- $dairyNameCaps's industrial machines can only accept slaves with loose holes.
+ _dairyNameCaps's industrial machines can only accept slaves with loose holes.
<div class="choices">
[[Install a preparatory raper|Dairy][cashX(forceNeg(_Tmult2), "capEx"), $dairyPrepUpgrade = 1, $PC.skill.engineering += 0.1]]
<span class="note">
@@ -476,7 +474,7 @@
<div>
<<if $dairyRestraintsUpgrade == 1>>
- $dairyNameCaps is equipped to restrain cows.
+ _dairyNameCaps is equipped to restrain cows.
<div class="choices">
The cows are restrained
<<if $dairyRestraintsSetting == 2>>
@@ -492,7 +490,7 @@
<</if>>
</div>
<<else>>
- $dairyNameCaps is not equipped to restrain recalcitrant cows.
+ _dairyNameCaps is not equipped to restrain recalcitrant cows.
<div class="choices">
[[Equip the dairy with milking racks|Dairy][cashX(forceNeg(_Tmult2), "capEx"), $dairyRestraintsUpgrade = 1]]
<span class="note">
@@ -505,9 +503,9 @@
<div>
<<if ($seeHyperPreg == 1) && ($dairyRestraintsSetting == 2) && ($dairyStimulatorsSetting == 2) && ($dairyFeedersSetting == 2) && ($dairyPregSetting >= 1)>>
<<if $dairyHyperPregRemodel == 1>>
- $dairyNameCaps's milking racks have been remodeled to allow cows' abnormal pregnancies room to grow.
+ _dairyNameCaps's milking racks have been remodeled to allow cows' abnormal pregnancies room to grow.
<<else>>
- $dairyNameCaps's milking racks can be remodeled to hold hyper-pregnant cattle.
+ _dairyNameCaps's milking racks can be remodeled to hold hyper-pregnant cattle.
<div class="choices">
[[Expand the milking racks|Dairy][cashX(forceNeg(_Tmult1), "capEx"), $dairyHyperPregRemodel = 1]]
<span class="note">
@@ -520,7 +518,7 @@
<div>
<<if ($bioreactorsAnnounced != 0) && ($dairyRestraintsSetting == 2) && ($dairyStimulatorsSetting == 2) && ($dairyFeedersSetting == 2)>>
- $dairyNameCaps will
+ _dairyNameCaps will
<div class="choices">
<<if $createBioreactors == 1>>
''convert perfected cows into equipment,'' removing them from slave status, permanently.
@@ -538,7 +536,7 @@
<<if $dairySlimMaintainUpgrade == 1>>
Thanks to advances precipitated by the arcology's commitment to the fashion of slimmer slaves, $dairyName has been updated with optimized milkers for small breasts, and a customized drug regimen to extract maximum output while maintaining small breast sizes.
<<if $dairySlimMaintain == 1>>
- $dairyNameCaps is currently set to limit the breast growth of slimmer slaves while maximizing their milk output.
+ _dairyNameCaps is currently set to limit the breast growth of slimmer slaves while maximizing their milk output.
<div class="choices">
[[Return to Normal Operation|Dairy][$dairySlimMaintain = 0]]
<span class="note">
@@ -546,7 +544,7 @@
</span>
</div>
<<else>>
- $dairyNameCaps is currently set to normal operation, and will allow the breasts of slimmer slaves to expand due to milking.
+ _dairyNameCaps is currently set to normal operation, and will allow the breasts of slimmer slaves to expand due to milking.
<div class="choices">
[[Set milkers to preserve small breast sizes|Dairy][$dairySlimMaintain = 1]]
<span class="note">
@@ -567,7 +565,7 @@
<<if $dairySlimMaintainUpgrade == 1>>
Thanks to advances precipitated by the arcology's commitment to the fashion of slimmer slaves, $dairyName has been re-engineered so that its milking process can now prevent the unwanted breast expansion of fashionably slim slaves.
<<if $dairySlimMaintain == 1>>
- $dairyNameCaps is currently set to limit the breast growth of slimmer slaves.
+ _dairyNameCaps is currently set to limit the breast growth of slimmer slaves.
<div class="choices">
[[Return to Normal Operation|Dairy][$dairySlimMaintain = 0]]
<span class="note">
@@ -575,7 +573,7 @@
</span>
</div>
<<else>>
- $dairyNameCaps is currently set to normal operation, and will allow the breasts of slimmer slaves to expand due to milking.
+ _dairyNameCaps is currently set to normal operation, and will allow the breasts of slimmer slaves to expand due to milking.
<div class="choices">
[[Set milkers to preserve small breast sizes|Dairy][$dairySlimMaintain = 1]]
<span class="note">
@@ -638,14 +636,14 @@
<<set _note = "">>
<</if>>
<<if $dairyWeightSetting == 0>>
- $dairyNameCaps is keeping cows at least chubby.
+ _dairyNameCaps is keeping cows at least chubby.
<div class="choices">
[[Increase Weight Target|Dairy][$dairyWeightSetting = 1]] |
[[Disable Dietary Control|Dairy][$dairyWeightSetting = -1]]
<<print _note>>
</div>
<<elseif $dairyWeightSetting == 1>>
- $dairyNameCaps aims to keep cows overweight.
+ _dairyNameCaps aims to keep cows overweight.
<div class="choices">
[[Increase Weight Target|Dairy][$dairyWeightSetting = 2]] |
[[Decrease Weight Target|Dairy][$dairyWeightSetting = 0]] |
@@ -653,7 +651,7 @@
<<print _note>>
</div>
<<elseif $dairyWeightSetting == 2>>
- $dairyNameCaps aims to keep cows fat.
+ _dairyNameCaps aims to keep cows fat.
<div class="choices">
[[Increase Weight Target|Dairy][$dairyWeightSetting = 3]] |
[[Decrease Weight Target|Dairy][$dairyWeightSetting = 1]] |
@@ -661,7 +659,7 @@
<<print _note>>
</div>
<<elseif $dairyWeightSetting == 3>>
- $dairyNameCaps aims to keep cows very fat.
+ _dairyNameCaps aims to keep cows very fat.
<div class="choices">
[[Increase Weight Target|Dairy][$dairyWeightSetting = 4]] |
[[Decrease Weight Target|Dairy][$dairyWeightSetting = 2]] |
@@ -669,14 +667,14 @@
<<print _note>>
</div>
<<elseif $dairyWeightSetting == 4>>
- $dairyNameCaps aims to keep cows so fat they can barely move.
+ _dairyNameCaps aims to keep cows so fat they can barely move.
<div class="choices">
[[Decrease Weight Target|Dairy][$dairyWeightSetting = 3]] |
[[Disable Dietary Control|Dairy][$dairyWeightSetting = -1]]
<<print _note>>
</div>
<<else>>
- $dairyNameCaps is currently not monitoring slave diets and will allow you full control.
+ _dairyNameCaps is currently not monitoring slave diets and will allow you full control.
<div class="choices">
[[Enable Dietary Control|Dairy][$dairyWeightSetting = 0]]
<<print _note>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 6015cec9bd8f42c1bb0d8d3c39971f37fcca2254..1823e3be5ccd684df140cee37692f90310fa3e3a 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -11,6 +11,8 @@
<!-- Statistics gathering -->
<<set $facility = $facility || {}, $facility.dairy = initFacilityStatistics($facility.dairy)>>
+<<set _dairyNameCaps = capFirstChar($dairyName)>>
+
<<if ($MilkmaidID != 0)>>
<<set _FLs = $slaveIndices[$MilkmaidID]>>
<<set _milkmaidImpregnated = 0, _milkers = 0, _cummers = 0, _breeders = 0, _prostateStim = 0>>
@@ -1077,7 +1079,7 @@
<<else>>
<<set _outputCum = 0>>
<</if>>
-$dairyNameCaps produced <<print _milkWeek+_outputMilk>> liters of milk<<if _cumWeek > 0>> and <<print _cumWeek+_outputCum>> liters of cum<</if>> this week.
+_dairyNameCaps produced <<print _milkWeek+_outputMilk>> liters of milk<<if _cumWeek > 0>> and <<print _cumWeek+_outputCum>> liters of cum<</if>> this week.
<<if $inflatedSlavesMilk > 0>>
_outputMilk liters of milk were pumped into your penthouse for filling slaves this week.
<</if>>
@@ -1196,7 +1198,7 @@ $dairyNameCaps produced <<print _milkWeek+_outputMilk>> liters of milk<<if _cumW
<</if>>
<<if $dairyDecoration != "standard">>
- <br><br> $dairyNameCaps's @@.green;$dairyDecoration style is well known.@@
+ <br><br> _dairyNameCaps's @@.green;$dairyDecoration style is well known.@@
<</if>>
<<if _DL > 0>>
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index f714ca03b4d67d399444c9d178a0b198fc2c8465..e84e11eeba32c4c1c7961cc1fb68690d2dec45c9 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -1721,61 +1721,61 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<run FutureSocieties.DecorationCleanup()>>
<<if $brothel > 0>>
- <div>$brothelNameCaps is decorated in $brothelDecoration style.</div>
+ <div><<= capFirstChar($brothelName)>> is decorated in $brothelDecoration style.</div>
<<SetFacilityDecoration "brothelDecoration">>
<</if>>
<<if $club > 0>>
- <div>$clubNameCaps is decorated in $clubDecoration style.</div>
+ <div><<= capFirstChar($clubName)>> is decorated in $clubDecoration style.</div>
<<SetFacilityDecoration "clubDecoration">>
<</if>>
<<if $dairy > 0>>
- <div>$dairyNameCaps is decorated in $dairyDecoration style.</div>
+ <div><<= capFirstChar($dairyName)>> is decorated in $dairyDecoration style.</div>
<<SetFacilityDecoration "dairyDecoration">>
<</if>>
<<if $farmyard > 0>>
- <div>$farmyardNameCaps is decorated in $farmyardDecoration style.</div>
+ <div><<= capFirstChar($farmyardName)>> is decorated in $farmyardDecoration style.</div>
<<SetFacilityDecoration "farmyardDecoration">>
<</if>>
<<if $spa > 0>>
- <div>$spaNameCaps is decorated in $spaDecoration style.</div>
+ <div><<= capFirstChar($spaName)>> is decorated in $spaDecoration style.</div>
<<SetFacilityDecoration "spaDecoration">>
<</if>>
<<if $nursery > 0>>
- <div>$nurseryNameCaps is decorated in $nurseryDecoration style.</div>
+ <div><<= capFirstChar($nurseryName)>> is decorated in $nurseryDecoration style.</div>
<<SetFacilityDecoration "nurseryDecoration">>
<</if>>
<<if $clinic > 0>>
- <div>$clinicNameCaps is decorated in $clinicDecoration style.</div>
+ <div><<= capFirstChar($clinicName)>> is decorated in $clinicDecoration style.</div>
<<SetFacilityDecoration "clinicDecoration">>
<</if>>
<<if $schoolroom > 0>>
- <div>$schoolroomNameCaps is decorated in $schoolroomDecoration style.</div>
+ <div><<= capFirstChar($schoolroomName)>> is decorated in $schoolroomDecoration style.</div>
<<SetFacilityDecoration "schoolroomDecoration">>
<</if>>
<<if $cellblock > 0>>
- <div>$cellblockNameCaps is decorated in $cellblockDecoration style.</div>
+ <div><<= capFirstChar($cellblockName)>> is decorated in $cellblockDecoration style.</div>
<<SetFacilityDecoration "cellblockDecoration">>
<</if>>
<<if $servantsQuarters > 0>>
- <div>$servantsQuartersNameCaps is decorated in $servantsQuartersDecoration style.</div>
+ <div><<= capFirstChar($servantsQuartersName)>> is decorated in $servantsQuartersDecoration style.</div>
<<SetFacilityDecoration "servantsQuartersDecoration">>
<</if>>
<<if $arcade > 0>>
- <div>$arcadeNameCaps is decorated in $arcadeDecoration style.</div>
+ <div><<<= capFirstChar($arcadeName)>> is decorated in $arcadeDecoration style.</div>
<<SetFacilityDecoration "arcadeDecoration">>
<</if>>
<<if $masterSuite > 0>>
- <div>$masterSuiteNameCaps is decorated in $masterSuiteDecoration style.</div>
+ <div><<= capFirstChar($masterSuiteName)>> is decorated in $masterSuiteDecoration style.</div>
<<SetFacilityDecoration "masterSuiteDecoration">>
<</if>>
diff --git a/src/uncategorized/headGirlSuite.tw b/src/uncategorized/headGirlSuite.tw
index d9c0f55a06568459c9f292e2dc1365de8733b25d..b1cac58867df720e01074d3c3b94935ee8411bbf 100644
--- a/src/uncategorized/headGirlSuite.tw
+++ b/src/uncategorized/headGirlSuite.tw
@@ -2,9 +2,6 @@
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Head Girl Suite", $encyclopedia = "Head Girl Suite", _SL = $slaves.length>>
-<<if $HGSuiteName != "the Head Girl Suite">>
- <<set $HGSuiteNameCaps = $HGSuiteName.replace("the ", "The ")>>
-<</if>>
<<set _i = $slaves.findIndex(function(s) { return s.assignment == "live with your Head Girl"; })>>
<p class="scene-intro">
diff --git a/src/uncategorized/hgSelect.tw b/src/uncategorized/hgSelect.tw
index 50bf5f532d7704bd7c28b61f7f92a8d622cbac8b..948219fd110cba414ed7a4647c3cdd1c1febf7b3 100644
--- a/src/uncategorized/hgSelect.tw
+++ b/src/uncategorized/hgSelect.tw
@@ -10,7 +10,7 @@
<<set _HGName = SlaveFullName(_S.HeadGirl)>>
<span class='slave-name'>_HGName</span> is serving as your Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort; it is $his role to serve and comfort you at your side, in addition to performing normal Head Girl duties<</if>>.
<<if ($HGSuite)>>
- <br> Currently $he lives in <<link "$HGSuiteNameCaps""Head Girl Suite">><</link>>
+ <br> Currently $he lives in <<link "<<= capFirstChar($HGSuiteName)>>""Head Girl Suite">><</link>>
<</if>>
<br><br>
<</if>>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index cdfa51eb437b8e1c558ff7163fca9c1c84039091..00633c6fc6440faec3e2188b5e8133ac771ff5f0 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -3,10 +3,6 @@
<<set _slaves = App.Utils.sortedEmployees(App.Entity.facilities.masterSuite)>>
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Master Suite", $encyclopedia = "Master Suite", _SL = $slaves.length, _MsL = _slaves.length>>
-<<if $masterSuiteName != "the Master Suite">>
- <<set $masterSuiteNameCaps = $masterSuiteName.replace("the ", "The ")>>
-<</if>>
-
<<set $masterSuiteAverageEnergy = 0, _masterSuiteAverageCum = 0, _masterSuiteAverageDick = 0, _masterSuiteAverageDom = 0, _masterSuiteAverageMilk = 0, _masterSuiteAveragePreg = 0, _masterSuiteAverageSadism = 0, _masterSuitePregnantSlaves = 0, _masterSuitePregnantSlavesMultiple = 0>>
<<if (_S.Concubine && _S.Concubine.pregKnown == 1)>>
@@ -54,8 +50,10 @@
<<set _Tmult3 = Math.trunc(15000*$upgradeMultiplierArcology)>>
<<if $masterSuiteUpgradeLuxury == 1>>
+<<set _masterSuiteNameCaps = capFirstChar($masterSuiteName)>>
+
<p class="scene-intro">
- $masterSuiteNameCaps is furnished
+ _masterSuiteNameCaps is furnished
<<switch $masterSuiteDecoration>>
<<case "Roman Revivalist">>
as a Roman emperor's apartment. There is a small shrine to the old gods the <<= properMaster()>> favors in a side room, and the flooring is erotic mosaic. Pride of place is given to a set of low couches placed together, capable of accommodating many nude bodies.
@@ -141,7 +139,7 @@
<<elseif $masterSuiteUpgradeLuxury == 2>>
-$masterSuiteNameCaps is furnished
+_masterSuiteNameCaps is furnished
<<switch $masterSuiteDecoration>>
<<case "Roman Revivalist">>
as a Roman emperor's apartment. There is a small shrine to the old gods the <<= properTitle()>> favors in a side room, and the flooring is erotic mosaic.
@@ -240,7 +238,7 @@ The true focus of the suite is, however, the fuckpit. This stepped depression in
<<else>>
-$masterSuiteNameCaps is furnished
+_masterSuiteNameCaps is furnished
<<switch $masterSuiteDecoration>>
<<case "Roman Revivalist">>
as a Roman patrician's apartment. There is a small shrine to the old gods the <<= properTitle()>> favors in a side room, and the flooring is erotic mosaic.
@@ -319,7 +317,7 @@ $masterSuiteNameCaps is furnished
<</if>>
-<br>$masterSuiteNameCaps has room for $masterSuite slaves to live comfortably<<if $masterSuiteUpgradeLuxury == 2>> in the moments when they're not in the fuckpit<<elseif $masterSuiteUpgradeLuxury == 1>> on its huge bed<</if>>. There <<if _MsL == 1>>is<<else>>are<</if>> currently _MsL slave<<if _MsL != 1>>s<</if>> in $masterSuiteName.
+<br>_masterSuiteNameCaps has room for $masterSuite slaves to live comfortably<<if $masterSuiteUpgradeLuxury == 2>> in the moments when they're not in the fuckpit<<elseif $masterSuiteUpgradeLuxury == 1>> on its huge bed<</if>>. There <<if _MsL == 1>>is<<else>>are<</if>> currently _MsL slave<<if _MsL != 1>>s<</if>> in $masterSuiteName.
<<set _Tmult0 = Math.trunc($masterSuite*1000*$upgradeMultiplierArcology)>>
<div class="choices" style="font-style:normal">
[[Expand the Master Suite|Master Suite][cashX(forceNeg(_Tmult0), "capEx"), $masterSuite += 2, $PC.skill.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 6986eabda3b61dcd9aaa6199fb7352f7d93ed8e9..81f42587039c9e2a8b4f4ff51559efc92008a655 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -413,7 +413,7 @@
<</if>>
<<if $masterSuiteDecoration != "standard">>
- <br><br> $masterSuiteNameCaps's $masterSuiteDecoration atmosphere @@.hotpink;has a minor impact on your fucktoys.@@
+ <br><br> <<= capFirstChar($masterSuiteName)>>'s $masterSuiteDecoration atmosphere @@.hotpink;has a minor impact on your fucktoys.@@
<</if>>
<</if>>
<<if _DL > 0 || _S.Concubine>>
diff --git a/src/uncategorized/pePitFightInvite.tw b/src/uncategorized/pePitFightInvite.tw
index 0ea1fc396dfe452fd17c0363f79fd88041171054..a082308731b793dae033f46eb7d462c372f52c06 100644
--- a/src/uncategorized/pePitFightInvite.tw
+++ b/src/uncategorized/pePitFightInvite.tw
@@ -11,7 +11,7 @@
<p>Gladiatorial combat between slaves has not yet reached the level of social acceptability it once enjoyed in Rome, but it's growing in popularity. For now, most fights are discreet affairs limited to select guests. Displaying a slave bodyguard is an excellent way to get yourself invited to participate, and $assistant.name has just passed on an invitation to a private fight next week, should you be willing to hazard a bodyguard.</p>
<<if $pit === 1>>
- <p>Of course, $pitNameCaps in $arcologies[0].name sees regular fights<<if $pitLethal === 1>> to the death<</if>>, but there's something extra special about attending these outside fights<<if $pitLethal === 0>>, especially with the very real risk of violent death<</if>>.</p>
+ <p>Of course, <<= capFirstChar($pitName)>> in $arcologies[0].name sees regular fights<<if $pitLethal === 1>> to the death<</if>>, but there's something extra special about attending these outside fights<<if $pitLethal === 0>>, especially with the very real risk of violent death<</if>>.</p>
<</if>>
<span id="result">
diff --git a/src/uncategorized/pit.tw b/src/uncategorized/pit.tw
index 8ca6957340c2612260c4da0a1c301f00824c57c3..1a8a8c250550349e5a1d63a04aaba84a5b75e48a 100644
--- a/src/uncategorized/pit.tw
+++ b/src/uncategorized/pit.tw
@@ -1,14 +1,11 @@
:: Pit [nobr jump-to-safe jump-from-safe]
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Pit", $encyclopedia = "Pit", _DL = $fighterIDs.length, _SL = $slaves.length, _CL = $canines.length, _HL = $hooved.length, _FL = $felines.length>>
-<<if $pitName != "the Pit">>
- <<set $pitNameCaps = $pitName.replace("the ", "The ")>>
-<</if>>
<<if $pitBG == 1 && $fighterIDs.includes($BodyguardID)>>
<<set $fighterIDs.delete($BodyguardID), _DL-->>
<</if>>
-$pitNameCaps is clean and ready,
+<<= capFirstChar($pitName)>> is clean and ready,
<<if _DL > 2>>
with a pool of slaves assigned to fight in the week's bout.
<<elseif _DL == 1>>
diff --git a/src/uncategorized/reBrothelFunction.tw b/src/uncategorized/reBrothelFunction.tw
index aa9c07e51a93f08aaddd0772e17a3b36715816e5..0fe31d2cc2a160efac15a4f71a882db6ee22bac5 100644
--- a/src/uncategorized/reBrothelFunction.tw
+++ b/src/uncategorized/reBrothelFunction.tw
@@ -3,7 +3,8 @@
<<set $nextButton = "Continue">>
<<set $nextLink = "RIE Eligibility Check">>
-$brothelNameCaps is a reputable establishment in $arcologies[0].name, a veritable bedrock to sexual life in your arcology. As is befitting of its position, requests to rent out your brothel for one function or another come across your desk with some regularity. On this particular day, $assistant.name has laid out a number of potential clients for your perusal. Given the importance of $brothelNameCaps in the arcology's sex trade, it would be unwise to indulge more than one of these requests at this time.
+<<set _brothelNameCaps = capFirstChar($brothelName)>>
+_brothelNameCaps is a reputable establishment in $arcologies[0].name, a veritable bedrock to sexual life in your arcology. As is befitting of its position, requests to rent out your brothel for one function or another come across your desk with some regularity. On this particular day, $assistant.name has laid out a number of potential clients for your perusal. Given the importance of _brothelNameCaps in the arcology's sex trade, it would be unwise to indulge more than one of these requests at this time.
<br><br>
One request comes to you written on a letterhead featuring the logo of a fellow arcology owner. She describes her husband's preference for your hard working brothel whores, whom he patronizes on his regular business trips to your arcology. Such indulgences have been a distraction to her husband of late, and she has dispatched him to undertake a task in your arcology that simply cannot go poorly. With this in mind, she beseeches you to close down your brothel for a single day out of solidarity for a fellow arcology owner — and for the significant sum of <<print cashFormat(10000)>>.
<br><br>
@@ -16,7 +17,7 @@ The last of these requests comes in the form of a letter, stamped with the heral
<span id="result">
<<link "Acquiesce to the arcology owner's request">>
<<replace "#result">>
- Though you close down $brothelNameCaps for a day, it's far from a day off for your hard-working brothel slaves. In the absence of the convenient center for the sale of sexual services that a brothel represents, you disperse them onto the streets to sell their bodies the old fashioned way. At the end of the day you receive a brief message of gratitude from your fellow arcology owner while your whores @@.hotpink;appreciate the opportunity to stretch their legs on the street@@ for a change of pace.
+ Though you close down _brothelNameCaps for a day, it's far from a day off for your hard-working brothel slaves. In the absence of the convenient center for the sale of sexual services that a brothel represents, you disperse them onto the streets to sell their bodies the old fashioned way. At the end of the day you receive a brief message of gratitude from your fellow arcology owner while your whores @@.hotpink;appreciate the opportunity to stretch their legs on the street@@ for a change of pace.
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].assignment == "work in the brothel">>
<<set $slaves[$i].devotion += 4>>
diff --git a/src/uncategorized/reBusyBrothel.tw b/src/uncategorized/reBusyBrothel.tw
index 4812e27841be06f90ffe3d1fd5666653e9ce2096..6859fbdfdd3c31ecf16f0843339ebb2824f69161 100644
--- a/src/uncategorized/reBusyBrothel.tw
+++ b/src/uncategorized/reBusyBrothel.tw
@@ -3,7 +3,7 @@
<<set $nextButton = "Continue">>
<<set $nextLink = "RIE Eligibility Check">>
-$brothelNameCaps is well staffed, and does a busy trade in flesh 24 hours a day. With so many sex slaves in the Free Cities, brothels occupy a functional, nearly mechanical part of the sexual landscape. Free citizens and sometimes even favored slaves visit the brothel, select from the available merchandise, relieve their sexual needs, and leave. Affection, companionship, and emotional needs are available elsewhere.
+<<= capFirstChar($brothelName)>> is well staffed, and does a busy trade in flesh 24 hours a day. With so many sex slaves in the Free Cities, brothels occupy a functional, nearly mechanical part of the sexual landscape. Free citizens and sometimes even favored slaves visit the brothel, select from the available merchandise, relieve their sexual needs, and leave. Affection, companionship, and emotional needs are available elsewhere.
<br><br>
diff --git a/src/uncategorized/reBusyDairy.tw b/src/uncategorized/reBusyDairy.tw
index d0c3307746154632124c834a91f80f1955d0e281..515278d877c5b90c3bac894ec5178831705f8efa 100644
--- a/src/uncategorized/reBusyDairy.tw
+++ b/src/uncategorized/reBusyDairy.tw
@@ -3,7 +3,7 @@
<<set $nextButton = "Continue">>
<<set $nextLink = "RIE Eligibility Check">>
-$dairyNameCaps is working away steadily. Its high-quality product @@.green;reflects well on you,@@<<run repX(500, "event")>> you muse one day as you inspect the premises. The gentle pneumatic sounds of the milkers and the whimpers of the cows being milked are a pleasant background for the thought.
+<<= capFirstChar($dairyName)>> is working away steadily. Its high-quality product @@.green;reflects well on you,@@<<run repX(500, "event")>> you muse one day as you inspect the premises. The gentle pneumatic sounds of the milkers and the whimpers of the cows being milked are a pleasant background for the thought.
<br><br>
diff --git a/src/uncategorized/repBudget.tw b/src/uncategorized/repBudget.tw
index 0d7fc6ae55d2b7954db06e2859649b59c57abf01..18342657bcbd9a48ba2d5b9954a1377c763ec3c4 100644
--- a/src/uncategorized/repBudget.tw
+++ b/src/uncategorized/repBudget.tw
@@ -66,27 +66,27 @@
</tr>
<<set _L = App.Utils.countFacilityWorkers(["arcade", "brothel", "club", "servantsQuarters", "spa"])>>
- <<print budgetLine("arcade", "<<if $arcade>>[[$arcadeNameCaps|Arcade][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>>$arcadeNameCaps<</if>> (_L.arcade slaves)")>>
+ <<print budgetLine("arcade", "<<if $arcade>>[[<<= capFirstChar($arcadeName)>>|Arcade][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>><<= capFirstChar($arcadeName)>><</if>> (_L.arcade slaves)")>>
<<print budgetLine("gloryholeArcade", "Free arcade")>>
- <<print budgetLine("brothel", "<<if $brothel>>[[$brothelNameCaps|Brothel][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>>$brothelNameCaps<</if>> (_L.brothel slaves)")>>
+ <<print budgetLine("brothel", "<<if $brothel>>[[<<= capFirstChar($brothelName)>>|Brothel][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>><<= capFirstChar($brothelName)>><</if>> (_L.brothel slaves)")>>
- <<print budgetLine("club", "<<if $club>>[[$clubNameCaps|Club][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>>$clubNameCaps<</if>> (_L.club slaves)")>>
+ <<print budgetLine("club", "<<if $club>>[[<<= capFirstChar($clubName)>>|Club][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>><<= capFirstChar($clubName)>><</if>> (_L.club slaves)")>>
<<print budgetLine("publicServantClub", "Club servants")>>
- <<print budgetLine("clubAds", "<<if $club>>[[Club ads|Club Advertisement][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>>$clubNameCaps<</if>>")>>
+ <<print budgetLine("clubAds", "<<if $club>>[[Club ads|Club Advertisement][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>><<= capFirstChar($clubName)>><</if>>")>>
<<if $club > 0>>
<br>
<</if>>
- <<print budgetLine("pit", "<<if $pit>>[[$pitNameCaps|Pit][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>>$pitNameCaps<</if>> ($fighterIDs.length slaves)")>>
+ <<print budgetLine("pit", "<<if $pit>>[[<<= capFirstChar($pitName)>> |Pit][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>><<= capFirstChar($pitName)>><</if>> ($fighterIDs.length slaves)")>>
<<print budgetLine("servantsQuarters", "<<if $servantsQuarters>>[[Servants' Quarters][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>>Servants' Quarters<</if>> (_L.servantsQuarters slaves)")>>
- <<print budgetLine("spa", "<<if $spa>>[[$spaNameCaps|Spa][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>>$spaNameCaps<</if>> (_L.spa slaves)")>>
+ <<print budgetLine("spa", "<<if $spa>>[[<<= capFirstChar($spaName)>>|Spa][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>><<= capFirstChar($spaName)>><</if>> (_L.spa slaves)")>>
<<print budgetLine("architecture", "[[Architecture|Manage Arcology][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]")>>
diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw
index 1c8bf929f93fe3bf84fcefab7779bdfe043932cf..973b33062afe675eae03d39406a27e6dbe6dd16c 100644
--- a/src/uncategorized/schoolroom.tw
+++ b/src/uncategorized/schoolroom.tw
@@ -2,11 +2,9 @@
<<set _DL = App.Entity.facilities.schoolroom.employeesIDs().size, $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Schoolroom", $encyclopedia = "Schoolroom">>
-<<if $schoolroomName != "the Schoolroom">>
- <<set $schoolroomNameCaps = $schoolroomName.replace("the ", "The ")>>
-<</if>>
+<<set _schoolroomNameCaps = capFirstChar($schoolroomName)>>
<p class="scene-intro">
- $schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These are currently
+ _schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These are currently
<<switch $schoolroomDecoration>>
<<case "Roman Revivalist">>
showing the story of a famous Roman slave who sacrificed her life for the life of her <<= properMaster()>>.
@@ -69,9 +67,9 @@
<</switch>>
<<if _DL > 2>>
- $schoolroomNameCaps is busy with slaves, repeating their lessons out loud to drill the instruction home. A few students are maintaining uncomfortable positions in the corner as punishment for poor work.
+ _schoolroomNameCaps is busy with slaves, repeating their lessons out loud to drill the instruction home. A few students are maintaining uncomfortable positions in the corner as punishment for poor work.
<<elseif _DL > 0>>
- $schoolroomNameCaps is sparsely populated, the few students repeating their lessons out loud to drill the instruction home. One slave is maintaining an uncomfortable position in the corner as punishment for poor work.
+ _schoolroomNameCaps is sparsely populated, the few students repeating their lessons out loud to drill the instruction home. One slave is maintaining an uncomfortable position in the corner as punishment for poor work.
<<elseif _S.Schoolteacher>>
<<setLocalPronouns _S.Schoolteacher>>
_S.Schoolteacher.slaveName is alone in $schoolroomName, and has nothing to do but work on $his lesson plans.
@@ -85,7 +83,7 @@
<div>
<<set _Tmult0 = Math.trunc($schoolroom*1000*$upgradeMultiplierArcology)>>
- $schoolroomNameCaps has room to house $schoolroom slaves while they learn. There <<if _DL == 1>>is<<else>>are<</if>> currently _DL slave<<if _DL != 1>>s<</if>> learning in $schoolroomName.
+ _schoolroomNameCaps has room to house $schoolroom slaves while they learn. There <<if _DL == 1>>is<<else>>are<</if>> currently _DL slave<<if _DL != 1>>s<</if>> learning in $schoolroomName.
<div class="choices">
[[Expand the schoolroom|Schoolroom][cashX(forceNeg(_Tmult0), "capEx"), $schoolroom += 5, $PC.skill.engineering += .1]]
<span class="note">
@@ -102,10 +100,10 @@
<div>
<<if $schoolroomUpgradeSkills == 1>>
- $schoolroomNameCaps provides slaves with some intermediate skills, including a solid foundation in sex, efficient and safe prostitution, and the rudiments of courtesanship.
+ _schoolroomNameCaps provides slaves with some intermediate skills, including a solid foundation in sex, efficient and safe prostitution, and the rudiments of courtesanship.
<<else>>
<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology)>>
- $schoolroomNameCaps inculcates the basic skills necessary to a sex slave.
+ _schoolroomNameCaps inculcates the basic skills necessary to a sex slave.
<div class="choices">
[[Upgrade the curriculum to cover some intermediate skills|Schoolroom][cashX(forceNeg(_Tmult1), "capEx"), $schoolroomUpgradeSkills = 1]]
<span class="note">
@@ -118,9 +116,9 @@
<div>
<<set _Tmult2 = Math.trunc(5000*$upgradeMultiplierArcology*$HackingSkillMultiplier)>>
<<if $schoolroomUpgradeLanguage == 1>>
- $schoolroomNameCaps boasts state of the art linguistic interfaces that allow it to teach the basics of the arcology's lingua franca with increased success.
+ _schoolroomNameCaps boasts state of the art linguistic interfaces that allow it to teach the basics of the arcology's lingua franca with increased success.
<<else>>
- $schoolroomNameCaps includes only basic language classes in its curriculum.
+ _schoolroomNameCaps includes only basic language classes in its curriculum.
<div class="choices">
[[Install advanced linguistic interfaces to efficiently teach the arcology's lingua franca|Schoolroom][cashX(forceNeg(_Tmult2), "capEx"), $schoolroomUpgradeLanguage = 1, $PC.skill.hacking += 0.1]]
<span class="note">
@@ -134,16 +132,16 @@
<<if $schoolroomRemodelBimbo == 1>>
<<set _Tmult3 = Math.trunc(7500*$upgradeMultiplierArcology*$HackingSkillMultiplier)>>
<div>
- $schoolroomNameCaps is designed with moronic slaves in mind and seeks to dumb down slaves by providing them a confusing, contradictory education that retards decision making skills and undoes existing schooling. [[Restore the curriculum to the standard|Schoolroom][cashX(forceNeg(_Tmult3), "capEx"), $schoolroomRemodelBimbo = 0]]
+ _schoolroomNameCaps is designed with moronic slaves in mind and seeks to dumb down slaves by providing them a confusing, contradictory education that retards decision making skills and undoes existing schooling. [[Restore the curriculum to the standard|Schoolroom][cashX(forceNeg(_Tmult3), "capEx"), $schoolroomRemodelBimbo = 0]]
<span class="note">
Costs <<print cashFormat(_Tmult3)>>
</span>
</div>
<div>
<<if $schoolroomUpgradeRemedial == 1>>
- $schoolroomNameCaps has been upgraded with advanced teaching tools to help even the smartest slave learn at an acceptable pace. Dumb slaves won't learn much faster as a result, but smarties will benefit a great deal.
+ _schoolroomNameCaps has been upgraded with advanced teaching tools to help even the smartest slave learn at an acceptable pace. Dumb slaves won't learn much faster as a result, but smarties will benefit a great deal.
<<else>>
- $schoolroomNameCaps teaches woefully smart slaves using its modified methods. [[Purchase specialized materials to help smart slaves get on the right track|Schoolroom][cashX(forceNeg(_Tmult2), "capEx"), $schoolroomUpgradeRemedial = 1]]
+ _schoolroomNameCaps teaches woefully smart slaves using its modified methods. [[Purchase specialized materials to help smart slaves get on the right track|Schoolroom][cashX(forceNeg(_Tmult2), "capEx"), $schoolroomUpgradeRemedial = 1]]
<span class="note">
Costs <<print cashFormat(_Tmult2)>>
</span>
@@ -153,7 +151,7 @@
<div>
<<if $arcologies[0].FSIntellectualDependency > 80>>
<<set _Tmult3 = Math.trunc(7500*$upgradeMultiplierArcology*$HackingSkillMultiplier)>>
- $schoolroomNameCaps is designed with intelligent slaves in mind and seeks to smarten slaves by providing them with an education.
+ _schoolroomNameCaps is designed with intelligent slaves in mind and seeks to smarten slaves by providing them with an education.
<div class="choices">
[[Redesign the curriculum to undo pesky educations and retard slaves while benefiting the most simple of minds|Schoolroom][cashX(forceNeg(_Tmult3), "capEx"), $schoolroomRemodelBimbo = 1]]
<span class="note">
@@ -164,9 +162,9 @@
</div>
<div>
<<if $schoolroomUpgradeRemedial == 1>>
- $schoolroomNameCaps has been upgraded with advanced teaching tools to help even the stupidest slave learn at an acceptable pace. Intelligent slaves won't learn much faster as a result, but idiots will benefit a great deal.
+ _schoolroomNameCaps has been upgraded with advanced teaching tools to help even the stupidest slave learn at an acceptable pace. Intelligent slaves won't learn much faster as a result, but idiots will benefit a great deal.
<<else>>
- $schoolroomNameCaps teaches idiots using standard methods.
+ _schoolroomNameCaps teaches idiots using standard methods.
<div class="choices">
[[Purchase specialized materials to help stupid slaves learn good|Schoolroom][cashX(forceNeg(_Tmult2), "capEx"), $schoolroomUpgradeRemedial = 1]]
<span class="note">
diff --git a/src/uncategorized/servantsQuarters.tw b/src/uncategorized/servantsQuarters.tw
index 3c4025199986587b73564da4fa757a5865e76258..867c5a246dff258d62e8266e88855344d24a1c2c 100644
--- a/src/uncategorized/servantsQuarters.tw
+++ b/src/uncategorized/servantsQuarters.tw
@@ -2,11 +2,9 @@
<<set _DL = App.Entity.facilities.servantsQuarters.employeesIDs().size, $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Servants' Quarters", $encyclopedia = "Servants' Quarters">>
-<<if $servantsQuartersName != "the Servants' Quarters">>
- <<set $servantsQuartersNameCaps = $servantsQuartersName.replace("the ", "The ")>>
-<</if>>
+<<set _servantsQuartersNameCaps = capFirstChar($servantsQuartersName)>>
<p class="scene-intro">
- $servantsQuartersNameCaps
+ _servantsQuartersNameCaps
<<switch $servantsQuartersDecoration>>
<<case "Roman Revivalist">>
are spartan, yet functional. At one end of the long dormitory there is an alcove with a shrine to the Roman goddess of domesticity.
@@ -69,7 +67,7 @@
<</switch>>
<<if _DL > 2>>
- $servantsQuartersNameCaps are busy with hurrying slaves. One shift of servants is eating, cleaning the quarters, and bathing. The second is sleeping, and the third is out in the penthouse cleaning and serving.
+ _servantsQuartersNameCaps are busy with hurrying slaves. One shift of servants is eating, cleaning the quarters, and bathing. The second is sleeping, and the third is out in the penthouse cleaning and serving.
<<elseif _DL > 0>>
A few slaves are working out of the servants' quarters. They must split their scant time between looking after their own needs and the superior needs of everyone else.
<<elseif _S.Stewardess>>
@@ -85,7 +83,7 @@
<div>
<<set _Tmult0 = Math.trunc($servantsQuarters*1000*$upgradeMultiplierArcology)>>
- $servantsQuartersNameCaps has room to keep $servantsQuarters slaves while they serve.
+ _servantsQuartersNameCaps has room to keep $servantsQuarters slaves while they serve.
There <<if _DL == 1>>is<<else>>are<</if>> currently _DL slave<<if _DL != 1>>s<</if>> serving in $servantsQuartersName.
<div class="choices">
[[Expand the Servants' Quarters|Servants' Quarters][cashX(forceNeg(_Tmult0), "capEx"), $servantsQuarters += 5, $PC.skill.engineering += .1]]
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index 1709621c55cb92629607b812c193eee1a003693f..75e555bb00d2c780ce76ee69e082c11b82c0dcfd 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -2,11 +2,9 @@
<<set _DL = App.Entity.facilities.spa.employeesIDs().size, $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Spa", $encyclopedia = "Spa">>
-<<if $spaName != "the Spa">>
- <<set $spaNameCaps = $spaName.replace("the ", "The ")>>
-<</if>>
+<<set _spaNameCaps = capFirstChar($spaName)>>
<p class="scene-intro">
- $spaNameCaps
+ _spaNameCaps
<<switch $spaDecoration>>
<<case "Roman Revivalist">>
is built as a Roman bath. The flooring is pleasantly warm due to a modernized version of hypocaust heating, and is covered in mosaic depicting slaves enjoying sex.
@@ -94,7 +92,7 @@
<div>
<<set _Tmult0 = Math.trunc($spa*1000*$upgradeMultiplierArcology)>>
- $spaNameCaps can house $spa slaves while they recuperate here. There <<if _DL == 1>>is<<else>>are<</if>> currently _DL slave<<if _DL != 1>>s<</if>> recuperating in $spaName.
+ _spaNameCaps can house $spa slaves while they recuperate here. There <<if _DL == 1>>is<<else>>are<</if>> currently _DL slave<<if _DL != 1>>s<</if>> recuperating in $spaName.
<div class="choices">
[[Expand the spa|Spa][cashX(forceNeg(_Tmult0), "capEx"), $spa += 5]]
<span class="note">
@@ -110,10 +108,10 @@
<div>
<<if $spaUpgrade == 1>>
- $spaNameCaps has been upgraded with state of the art temperature treatment options, from hot and cold mineral water pools to baking saunas and dense steam rooms.
+ _spaNameCaps has been upgraded with state of the art temperature treatment options, from hot and cold mineral water pools to baking saunas and dense steam rooms.
<<else>>
<<set _Tmult1 = Math.trunc($spa*1000*$upgradeMultiplierArcology)>>
- $spaNameCaps is a standard spa.
+ _spaNameCaps is a standard spa.
<div class="choices">
[[Upgrade the spa with saunas, steam rooms, and mineral water baths|Spa][cashX(forceNeg(_Tmult1), "capEx"), $spaUpgrade = 1]]
<span class="note">
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 32add953350b26c5a0190e4faf0750c904b1cccb..0b6552eb9a02f4e86e12e47aef4169c2cbe88baa 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -369,7 +369,7 @@
_restedSlaves slaves have rested until they reached a state of @@.hotpink;devotion@@ and @@.mediumaquamarine;trust@@ and will leave the spa before the end of the week.
<</if>>
<<if $spaDecoration != "standard">>
- <br><br> $spaNameCaps's $spaDecoration atmosphere @@.hotpink;had an impact on <<if _restedSlaves == 1>>$him while $he was<<else>>them while they were<</if>>@@ resting.
+ <br><br> <<= capFirstChar($spaName)>>'s $spaDecoration atmosphere @@.hotpink;had an impact on <<if _restedSlaves == 1>>$him while $he was<<else>>them while they were<</if>>@@ resting.
<</if>>
<</if>>
<<if _DL > 0 || _S.Attendant>>