From 22ac1f9140052d01cad20209b3b312adeeb57d86 Mon Sep 17 00:00:00 2001
From: DCoded <dicoded@email.com>
Date: Thu, 18 Nov 2021 09:48:24 -0500
Subject: [PATCH] Minor code cleanup
---
src/facilities/arcade/arcade.js | 6 ++++--
src/facilities/brothel/brothel.js | 6 ++++--
src/facilities/cellblock/cellblock.js | 6 ++++--
src/facilities/clinic/clinic.js | 6 ++++--
src/facilities/club/club.js | 8 +++++---
src/facilities/farmyard/farmyard.js | 6 ++++--
src/facilities/masterSuite/masterSuite.js | 6 ++++--
src/facilities/schoolroom/schoolroom.js | 6 ++++--
src/facilities/servantsQuarters/servantsQuarters.js | 6 ++++--
src/facilities/spa/spa.js | 6 ++++--
10 files changed, 41 insertions(+), 21 deletions(-)
diff --git a/src/facilities/arcade/arcade.js b/src/facilities/arcade/arcade.js
index 01554939571..be14a153b63 100644
--- a/src/facilities/arcade/arcade.js
+++ b/src/facilities/arcade/arcade.js
@@ -77,11 +77,13 @@ App.Facilities.Arcade.arcade = class Arcade extends App.Facilities.Facility {
"": ``,
};
- 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 5075abf7012..f6645625f66 100644
--- a/src/facilities/brothel/brothel.js
+++ b/src/facilities/brothel/brothel.js
@@ -66,11 +66,13 @@ App.Facilities.Brothel.brothel = class Brothel extends App.Facilities.Facility {
"": ``,
};
- 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 f67ac8a9d1a..850d8753251 100644
--- a/src/facilities/cellblock/cellblock.js
+++ b/src/facilities/cellblock/cellblock.js
@@ -73,11 +73,13 @@ App.Facilities.Cellblock.cellblock = class Cellblock extends App.Facilities.Faci
"": ``,
};
- 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 e73ea66f944..0304604a889 100644
--- a/src/facilities/clinic/clinic.js
+++ b/src/facilities/clinic/clinic.js
@@ -78,11 +78,13 @@ App.Facilities.Clinic.clinic = class Clinic extends App.Facilities.Facility {
"": ``,
};
- 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 31870d8101a..ba44a89f45e 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.`);
@@ -244,11 +244,13 @@ App.Facilities.Club.club = class Club extends App.Facilities.Facility {
"": ``,
};
- 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 ffe025ec518..0120b6b15a0 100644
--- a/src/facilities/farmyard/farmyard.js
+++ b/src/facilities/farmyard/farmyard.js
@@ -116,11 +116,13 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
"": ``,
};
- 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/masterSuite/masterSuite.js b/src/facilities/masterSuite/masterSuite.js
index ffc54a98735..ff1df8b69e9 100644
--- a/src/facilities/masterSuite/masterSuite.js
+++ b/src/facilities/masterSuite/masterSuite.js
@@ -241,11 +241,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/schoolroom/schoolroom.js b/src/facilities/schoolroom/schoolroom.js
index ec2868c0947..033231fe48e 100644
--- a/src/facilities/schoolroom/schoolroom.js
+++ b/src/facilities/schoolroom/schoolroom.js
@@ -76,11 +76,13 @@ App.Facilities.Schoolroom.schoolroom = class Schoolroom extends App.Facilities.F
"": ``,
};
- 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 4616bd215d9..3531e909672 100644
--- a/src/facilities/servantsQuarters/servantsQuarters.js
+++ b/src/facilities/servantsQuarters/servantsQuarters.js
@@ -73,11 +73,13 @@ App.Facilities.ServantsQuarters.servantsQuarters = class ServantsQuarters extend
"": ``,
};
- 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 c0baafe4e22..414f19194bb 100644
--- a/src/facilities/spa/spa.js
+++ b/src/facilities/spa/spa.js
@@ -79,11 +79,13 @@ App.Facilities.Spa.spa = class Spa extends App.Facilities.Facility {
"": ``,
};
- 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} */
--
GitLab