diff --git a/src/facilities/arcade/arcade.js b/src/facilities/arcade/arcade.js index 01554939571b30f54a399647ee68a55624604eb8..be14a153b63a84611552288d567956ed1bbfbc00 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 5075abf7012dd78f363ec4dd6959e6d36c83a17e..f6645625f668f18139f5e1444c9cf28f5d4c0015 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 f67ac8a9d1a4134497b9185a77e8aec627432051..850d8753251424c30149da399c898617222a02fd 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 e73ea66f94429bd5cb34948a365d7edecf07dead..0304604a889fe9cbec7c653f2d1d07ac1d970b46 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 31870d8101a62545b5c0fb13540f0d5a5f5a6b74..ba44a89f45e433e70019a24a03f4a1693aecdc97 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 ffe025ec518e6522ef3092d22ed41b811d1dacba..0120b6b15a0121562854347afb798e1fca825964 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 ffc54a987353ee31adb1d1b4a7e8af07476b2a20..ff1df8b69e999c4abaa4368419218474c0df7a15 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 ec2868c09478fb54c90e54cf64af6a3877245682..033231fe48e730fd955882ae2a1c4d4f7df7ead4 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 4616bd215d93f303176fc6bb7629dd45794468f4..3531e909672f42249a28caa09e4724cc5fe898cd 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 c0baafe4e225604508747c2195cb6ea0e54a06eb..414f19194bb7f35b8e7dfbd1bb71e5d64c304a49 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} */