diff --git a/src/facilities/arcade/arcade.js b/src/facilities/arcade/arcade.js
index f2995b95522f953ce95147d34cf1780d65742916..6972a1bc1d2fa4038d97929c3f9035a401459e63 100644
--- a/src/facilities/arcade/arcade.js
+++ b/src/facilities/arcade/arcade.js
@@ -76,11 +76,13 @@ App.Facilities.Arcade.arcade = class Arcade extends App.Facilities.Facility {
"standard": `is a standard Free Cities sex arcade: a pair of hallways extend away from the entrance, lined with doorless stalls like those in a public restroom. One hallway offers mouths, the other ${V.seeDicks !== 100 ? `vaginas and ` : ``}anuses.`,
};
- if (!Object.keys(FS).includes(V.arcadeDecoration)) {
+ const res = FS[V.arcadeDecoration];
+
+ if (!res) {
throw new Error(`Unknown V.arcadeDecoration value of '${V.arcadeDecoration}' found in decorations().`);
}
- return FS[V.arcadeDecoration];
+ return res;
}
/** @returns {FC.Facilities.Expand} */
diff --git a/src/facilities/brothel/brothel.js b/src/facilities/brothel/brothel.js
index 9f43b5bb2bf6e9444dce6b5197d91625cb8f62e4..edd77423508ef2a2af287bb9d80186e663c5d481 100644
--- a/src/facilities/brothel/brothel.js
+++ b/src/facilities/brothel/brothel.js
@@ -65,11 +65,13 @@ App.Facilities.Brothel.brothel = class Brothel extends App.Facilities.Facility {
"standard": `is utilitarian. There's a businesslike foyer with an area for the merchandise to stand. Customers make their selection (or selections) and then lead the whores back into little rooms.`,
};
- if (!Object.keys(FS).includes(V.brothelDecoration)) {
+ const res = FS[V.brothelDecoration];
+
+ if (!res) {
throw new Error(`Unknown V.brothelDecoration value of '${V.brothelDecoration}' found in decorations().`);
}
- return FS[V.brothelDecoration];
+ return res;
}
/** @returns {FC.Facilities.Expand} */
diff --git a/src/facilities/cellblock/cellblock.js b/src/facilities/cellblock/cellblock.js
index 7d0d2496189b120f6839860d74abc9538986dee0..3b8c73690cbfa46f2e63a3b07c0f9152ca9c024f 100644
--- a/src/facilities/cellblock/cellblock.js
+++ b/src/facilities/cellblock/cellblock.js
@@ -72,11 +72,13 @@ App.Facilities.Cellblock.cellblock = class Cellblock extends App.Facilities.Faci
"standard": `could be mistaken for a modern prison. A close inspection, however, reveals restraints in each cell that will hold inmates in sexually compromising positions, and compliance systems to force them to place their wrists and ankles in them.`,
};
- if (!Object.keys(FS).includes(V.cellblockDecoration)) {
+ const res = FS[V.cellblockDecoration];
+
+ if (!res) {
throw new Error(`Unknown V.cellblockDecoration value of '${V.cellblockDecoration}' found in decorations().`);
}
- return FS[V.cellblockDecoration];
+ return res;
}
/** @returns {FC.Facilities.Expand} */
diff --git a/src/facilities/clinic/clinic.js b/src/facilities/clinic/clinic.js
index 7f12356a1798de393883326d0596339f39e2041e..4383df66037fe547846823471ea98032cccbdd0c 100644
--- a/src/facilities/clinic/clinic.js
+++ b/src/facilities/clinic/clinic.js
@@ -77,11 +77,13 @@ App.Facilities.Clinic.clinic = class Clinic extends App.Facilities.Facility {
"standard": `is a well-equipped modern medical facility. Each patient has their own area, with heavy automation to provide them treatment without any human intervention at all.`,
};
- if (!Object.keys(FS).includes(V.clinicDecoration)) {
+ const res = FS[V.clinicDecoration];
+
+ if (!res) {
throw new Error(`Unknown V.clinicDecoration value of '${V.clinicDecoration}' found in decorations().`);
}
- return FS[V.clinicDecoration];
+ return res;
}
/** @returns {FC.Facilities.Expand} */
diff --git a/src/facilities/club/club.js b/src/facilities/club/club.js
index 029ec9bdab181455f6aafa92347e46541c29dfd6..1687f646ada61e01e965a19bb696ebe480ac361c 100644
--- a/src/facilities/club/club.js
+++ b/src/facilities/club/club.js
@@ -196,7 +196,7 @@ App.Facilities.Club.club = class Club extends App.Facilities.Facility {
text.push(`The faint sound of a slave giving head can be heard from one of the private rooms.`);
break;
case "Statuesque Glorification":
- text.push(`The faint banging of a patron banging a slave against the wall can be heard echoing from one of the private rooms.`);
+ text.push(`The faint thumping of a patron banging a slave against the wall can be heard echoing from one of the private rooms.`);
break;
default:
text.push(`The faint but unmistakable sound of a shrill climax can be heard from one of the private rooms.`);
@@ -243,11 +243,13 @@ App.Facilities.Club.club = class Club extends App.Facilities.Facility {
"standard": `is set up in an uncomplicated way. There's a bar for drinks, a dance floor for slave girls, and private rooms for slave sex.`,
};
- if (!Object.keys(FS).includes(V.clubDecoration)) {
+ const res = FS[V.clubDecoration];
+
+ if (!res) {
throw new Error(`Unknown V.clubDecoration value of '${V.clubDecoration}' found in decorations().`);
}
- return FS[V.clubDecoration];
+ return res;
}
/** @returns {FC.Facilities.Expand} */
diff --git a/src/facilities/farmyard/farmyard.js b/src/facilities/farmyard/farmyard.js
index 21a603315a015a11759f1fa13747111bfe8f6678..287f1df6ef37e3f339ad928299d6195a8117e389 100644
--- a/src/facilities/farmyard/farmyard.js
+++ b/src/facilities/farmyard/farmyard.js
@@ -115,11 +115,13 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
"standard": `It is very much a converted warehouse still, sectioned off in various 'departments'${V.farmyardUpgrades.machinery ? ` with machinery placed where it can be` : V.farmyardUpgrades.hydroponics ? ` and plumbing for the hydroponics system running every which way` : ``}.`,
};
- if (!Object.keys(FS).includes(V.farmyardDecoration)) {
+ const res = FS[V.farmyardDecoration];
+
+ if (!res) {
throw new Error(`Unknown V.farmyardDecoration value of '${V.farmyardDecoration}' found in decorations().`);
}
- return FS[V.farmyardDecoration];
+ return res;
}
/** @returns {FC.Facilities.Expand} */
diff --git a/src/facilities/incubator/incubatorInteract.js b/src/facilities/incubator/incubatorInteract.js
index 9cbff5f8aaf197535c9c70364e826bfd4242a445..3b257558f23cd9f0b4cb7cee1ae3c5dcce963223 100644
--- a/src/facilities/incubator/incubatorInteract.js
+++ b/src/facilities/incubator/incubatorInteract.js
@@ -13,10 +13,10 @@ App.UI.incubator = function() {
const introDiv = App.UI.DOM.appendNewElement("div", el, intro());
- const showPC = (V.PC.pregKnown === 1
- && (V.arcologies[0].FSRestart === "unset"
- || V.eugenicsFullControl === 1
- || (V.PC.pregSource !== -1 && V.PC.pregSource !== -6)
+ const showPC = (V.PC.pregKnown === 1 &&
+ (V.arcologies[0].FSRestart === "unset" ||
+ V.eugenicsFullControl === 1 ||
+ (V.PC.pregSource !== -1 && V.PC.pregSource !== -6)
));
const mothersContent = App.UI.DOM.makeElement('span', mothers());
const pcContent = App.UI.DOM.makeElement('span', PC());
diff --git a/src/facilities/masterSuite/masterSuite.js b/src/facilities/masterSuite/masterSuite.js
index 9fc731150b3ee96cf3e4c62ffea35f343d37d4e8..dd8414dc6ca76765be0c5d377fc294a42502b7b9 100644
--- a/src/facilities/masterSuite/masterSuite.js
+++ b/src/facilities/masterSuite/masterSuite.js
@@ -238,11 +238,13 @@ App.Facilities.MasterSuite.masterSuite = class MasterSuite extends App.Facilitie
};
}
- if (!Object.keys(FS).includes(V.masterSuiteDecoration)) {
+ const res = FS[V.masterSuiteDecoration];
+
+ if (!res) {
throw new Error(`Unknown V.masterSuiteDecoration value of '${V.masterSuiteDecoration}' found in decorations().`);
}
- return FS[V.masterSuiteDecoration];
+ return res;
}
/** @returns {FC.Facilities.Expand} */
diff --git a/src/facilities/pit/pit.js b/src/facilities/pit/pit.js
index 7b934982aa4d23a3d4f190904bd5a5fda17cdfc4..2aff80a9521f30eaad8e07b676c8b605b62a2e61 100644
--- a/src/facilities/pit/pit.js
+++ b/src/facilities/pit/pit.js
@@ -185,9 +185,9 @@ App.Facilities.Pit.pit = class Pit extends App.Facilities.Facility {
link: `Random`,
value: 'random',
prereqs: [
- () => (!!V.active.canine && !!V.active.hooved)
- || (!!V.active.canine && !!V.active.feline)
- || (!!V.active.hooved && !!V.active.feline)
+ () => (!!V.active.canine && !!V.active.hooved) ||
+ (!!V.active.canine && !!V.active.feline) ||
+ (!!V.active.hooved && !!V.active.feline)
],
},
],
diff --git a/src/facilities/schoolroom/schoolroom.js b/src/facilities/schoolroom/schoolroom.js
index f3828222be795d5841849c4273bb0163a848db89..c45e8183787eee36a68f60bd79d69ed80c37d2e5 100644
--- a/src/facilities/schoolroom/schoolroom.js
+++ b/src/facilities/schoolroom/schoolroom.js
@@ -75,11 +75,13 @@ App.Facilities.Schoolroom.schoolroom = class Schoolroom extends App.Facilities.F
"standard": `reviewing the often complex subject of how to address citizens other that one's owner.`,
};
- if (!Object.keys(FS).includes(V.schoolroomDecoration)) {
+ const res = FS[V.schoolroomDecoration];
+
+ if (!res) {
throw new Error(`Unknown V.schoolroomDecoration value of '${V.schoolroomDecoration}' found in decorations().`);
}
- return FS[V.schoolroomDecoration];
+ return res;
}
/** @returns {FC.Facilities.Expand} */
diff --git a/src/facilities/servantsQuarters/servantsQuarters.js b/src/facilities/servantsQuarters/servantsQuarters.js
index 872c79b0b307278b359ab9bc609109b78e89093c..68b4736d795aaa298ce1049c78c100807b41aa4c 100644
--- a/src/facilities/servantsQuarters/servantsQuarters.js
+++ b/src/facilities/servantsQuarters/servantsQuarters.js
@@ -72,11 +72,13 @@ App.Facilities.ServantsQuarters.servantsQuarters = class ServantsQuarters extend
"standard": `are comfortable. Servants sleep together in a dormitory, eat together in a little kitchen, bathe together in a communal shower, and then head out into the penthouse to serve.`,
};
- if (!Object.keys(FS).includes(V.servantsQuartersDecoration)) {
+ const res = FS[V.servantsQuartersDecoration];
+
+ if (!res) {
throw new Error(`Unknown V.servantsQuartersDecoration value of '${V.servantsQuartersDecoration}' found in decorations().`);
}
- return FS[V.servantsQuartersDecoration];
+ return res;
}
/** @returns {FC.Facilities.Expand} */
diff --git a/src/facilities/spa/spa.js b/src/facilities/spa/spa.js
index 3add926756fcef5a91fc5cb91deb3a45bc7b98bf..f337101287356fcaf692ff42081dd3e7b3227ed5 100644
--- a/src/facilities/spa/spa.js
+++ b/src/facilities/spa/spa.js
@@ -78,11 +78,13 @@ App.Facilities.Spa.spa = class Spa extends App.Facilities.Facility {
"standard": `is well-appointed, with massage tables, hot tubs, and a cold pool.`,
};
- if (!Object.keys(FS).includes(V.spaDecoration)) {
+ const res = FS[V.spaDecoration];
+
+ if (!res) {
throw new Error(`Unknown V.spaDecoration value of '${V.spaDecoration}' found in decorations().`);
}
- return FS[V.spaDecoration];
+ return res;
}
/** @returns {FC.Facilities.Expand} */