diff --git a/devTools/types/FC/facilities.d.ts b/devTools/types/FC/facilities.d.ts
index d506384103756c3cad822b247186462f4e2a3beb..0e884609c141ffce5f35457119301563662d5295 100644
--- a/devTools/types/FC/facilities.d.ts
+++ b/devTools/types/FC/facilities.d.ts
@@ -34,9 +34,9 @@ declare namespace FC {
*
* If none are given, the upgrade will always be available.
*/
- prereqs?: Array<() => boolean>
+ prereqs?: boolean[];
/** Any additional nodes to attach. */
- nodes?: Array<string|HTMLElement|DocumentFragment>
+ nodes?: Array<string|HTMLElement|DocumentFragment>;
}
namespace Facilities {
@@ -47,9 +47,9 @@ declare namespace FC {
interface Rule {
/** The variable name of the rule. */
- property: string
+ property: string;
/** Any prerequisites that must be met for the rule to be displayed. */
- prereqs: Array<() => boolean>
+ prereqs: boolean[];
/** Properties pertaining to any options available. */
options: Array<{
/** The text displayed when the rule is active. */
@@ -63,10 +63,10 @@ declare namespace FC {
/** Any additional information to display with on the link. */
note?: string;
/** Any prerequisites that must be met for the option to be displayed. */
- prereqs?: Array<() => boolean>;
- }>
+ prereqs?: boolean[];
+ }>;
/** Any additional nodes to attach. */
- nodes?: Array<string|HTMLElement|DocumentFragment>
+ nodes?: Array<string|HTMLElement|DocumentFragment>;
/** Any object the rule property is part of, if not the default `V`. */
object?: Object;
}
diff --git a/src/004-base/facilityFramework.js b/src/004-base/facilityFramework.js
index 107d6fb6285cac7a13825428156261c5341448a3..3b28365077a1b1ed3128866a9bdca8ec52bd309f 100644
--- a/src/004-base/facilityFramework.js
+++ b/src/004-base/facilityFramework.js
@@ -231,16 +231,16 @@ App.Facilities.Facility = class Facility {
_makeRules() {
const div = document.createElement("div");
- if (this.rules.length > 0 && this.rules.some(rule => rule.prereqs.every(prereq => prereq()))) {
+ if (this.rules.length > 0 && this.rules.some(rule => rule.prereqs.every(prereq => prereq === true))) {
App.UI.DOM.appendNewElement("h2", div, `Rules`);
this._rules.forEach(rule => {
- if (rule.prereqs.every(prereq => prereq())) {
+ if (rule.prereqs.every(prereq => prereq === true)) {
const options = new App.UI.OptionsGroup();
const option = options.addOption(null, rule.property, rule.object || V);
rule.options.forEach(o => {
- if (!o.prereqs || o.prereqs.every(prereq => prereq())) {
+ if (!o.prereqs || o.prereqs.every(prereq => prereq === true)) {
option.addValue(o.link, o.value);
if (o.handler) {
option.addCallback(o.handler);
diff --git a/src/facilities/arcade/arcade.js b/src/facilities/arcade/arcade.js
index c559c2327e9760c250ce85690525cddd5a31f23f..cb309e04f6e3517a483d098a1841de302d886690 100644
--- a/src/facilities/arcade/arcade.js
+++ b/src/facilities/arcade/arcade.js
@@ -115,7 +115,7 @@ App.Facilities.Arcade.arcade = class Arcade extends App.Facilities.Facility {
`is mutually exclusive with the collectors`,
],
prereqs: [
- () => V.arcadeUpgradeCollectors < 1,
+ V.arcadeUpgradeCollectors < 1,
],
},
{
@@ -125,7 +125,7 @@ App.Facilities.Arcade.arcade = class Arcade extends App.Facilities.Facility {
link: `Apply aphrodisiacs`,
handler: () => V.PC.skill.engineering += .1,
prereqs: [
- () => V.arcadeUpgradeCollectors < 1,
+ V.arcadeUpgradeCollectors < 1,
],
},
{
@@ -153,7 +153,7 @@ App.Facilities.Arcade.arcade = class Arcade extends App.Facilities.Facility {
`is mutually exclusive with the injectors`,
],
prereqs: [
- () => V.arcadeUpgradeInjectors < 1,
+ V.arcadeUpgradeInjectors < 1,
],
},
{
@@ -207,8 +207,8 @@ App.Facilities.Arcade.arcade = class Arcade extends App.Facilities.Facility {
{
property: "arcadeUpgradeFuckdolls",
prereqs: [
- () => V.arcadeUpgradeFuckdolls > 0,
- () => App.Entity.facilities.arcade.hostedSlaves > 0,
+ V.arcadeUpgradeFuckdolls > 0,
+ App.Entity.facilities.arcade.hostedSlaves > 0,
],
options: [
{
@@ -237,7 +237,7 @@ App.Facilities.Arcade.arcade = class Arcade extends App.Facilities.Facility {
{
property: "arcadeUpgradeHealth",
prereqs: [
- () => V.arcadeUpgradeHealth > -1,
+ V.arcadeUpgradeHealth > -1,
],
options: [
{
@@ -266,7 +266,7 @@ App.Facilities.Arcade.arcade = class Arcade extends App.Facilities.Facility {
{
property: "arcadeUpgradeFuckdolls",
prereqs: [
- () => V.arcadeUpgradeFuckdolls > 0,
+ V.arcadeUpgradeFuckdolls > 0,
],
options: [
{
diff --git a/src/facilities/brothel/brothel.js b/src/facilities/brothel/brothel.js
index f1807bb98c678ade01573a225701205239d9d6e4..541bbc8ef47c856298404af038c670ab5db09ae7 100644
--- a/src/facilities/brothel/brothel.js
+++ b/src/facilities/brothel/brothel.js
@@ -219,7 +219,7 @@ App.Facilities.Brothel.brothel = class Brothel extends App.Facilities.Facility {
{
property: "brothelUpgradeDrugs",
prereqs: [
- () => V.brothelUpgradeDrugs > 0,
+ V.brothelUpgradeDrugs > 0,
],
options: [
{
@@ -248,7 +248,7 @@ App.Facilities.Brothel.brothel = class Brothel extends App.Facilities.Facility {
{
property: "MadamIgnoresFlaws",
prereqs: [
- () => !!S.Madam,
+ !!S.Madam,
],
options: [
{
@@ -272,7 +272,7 @@ App.Facilities.Brothel.brothel = class Brothel extends App.Facilities.Facility {
{
property: "MadamNoSex",
prereqs: [
- () => !!S.Madam,
+ !!S.Madam,
],
options: [
{
diff --git a/src/facilities/cellblock/cellblock.js b/src/facilities/cellblock/cellblock.js
index 5240c175c7fe8ec142b51f38924df1a8f5a72999..a42b6f6b587b500b1284331659278314048b8fdd 100644
--- a/src/facilities/cellblock/cellblock.js
+++ b/src/facilities/cellblock/cellblock.js
@@ -123,8 +123,8 @@ App.Facilities.Cellblock.cellblock = class Cellblock extends App.Facilities.Faci
{
property: "cellblockWardenCumsInside",
prereqs: [
- () => !!S.Wardeness,
- () => !!S.Wardeness && canPenetrate(S.Wardeness),
+ !!S.Wardeness,
+ !!S.Wardeness && canPenetrate(S.Wardeness),
],
options: [
{
diff --git a/src/facilities/clinic/clinic.js b/src/facilities/clinic/clinic.js
index ffa099a63148740ca1504f37953e1681fbaf9f5c..72ac69dedb26ebe27bfd5b141c4fde7e07cf04a6 100644
--- a/src/facilities/clinic/clinic.js
+++ b/src/facilities/clinic/clinic.js
@@ -147,7 +147,7 @@ App.Facilities.Clinic.clinic = class Clinic extends App.Facilities.Facility {
cost: 30000 * V.upgradeMultiplierArcology * Math.min(V.upgradeMultiplierMedicine, V.HackingSkillMultiplier),
notes: [`helps prevent and fight illness in large slave populations`],
prereqs: [
- () => V.geneticMappingUpgrade > 0
+ V.geneticMappingUpgrade > 0
]
},
{
@@ -171,7 +171,7 @@ App.Facilities.Clinic.clinic = class Clinic extends App.Facilities.Facility {
handler: () => V.PC.skill.hacking += 0.1,
notes: [`may cause health problems in slaves`],
prereqs: [
- () => V.clinicUpgradeFilters > 0,
+ V.clinicUpgradeFilters > 0,
],
},
{
@@ -201,7 +201,7 @@ App.Facilities.Clinic.clinic = class Clinic extends App.Facilities.Facility {
{
property: "clinicInflateBelly",
prereqs: [
- () => !!S.Nurse,
+ !!S.Nurse,
],
options: [
{
@@ -235,7 +235,7 @@ App.Facilities.Clinic.clinic = class Clinic extends App.Facilities.Facility {
{
property: "clinicRegularCheckups",
prereqs: [
- () => !!S.Nurse,
+ !!S.Nurse,
],
options: [
{
@@ -253,7 +253,7 @@ App.Facilities.Clinic.clinic = class Clinic extends App.Facilities.Facility {
{
property: "clinicSpeedGestation",
prereqs: [
- () => !!S.Nurse,
+ !!S.Nurse,
],
options: [
{
diff --git a/src/facilities/club/club.js b/src/facilities/club/club.js
index bccf3b33b65a38649dfa25da4342803251215ecf..5281ad5941352891ad6e049d70bd52c6431e1ed6 100644
--- a/src/facilities/club/club.js
+++ b/src/facilities/club/club.js
@@ -291,7 +291,7 @@ App.Facilities.Club.club = class Club extends App.Facilities.Facility {
{
property: "DJignoresFlaws",
prereqs: [
- () => !!S.DJ,
+ !!S.DJ,
],
options: [
{
@@ -313,7 +313,7 @@ App.Facilities.Club.club = class Club extends App.Facilities.Facility {
{
property: "DJnoSex",
prereqs: [
- () => !!S.DJ,
+ !!S.DJ,
],
options: [
{
diff --git a/src/facilities/dairy/dairy.js b/src/facilities/dairy/dairy.js
index c340f700bc9815f8794a72188ad7638af5d3c01f..121df95f2a121733b05c45ded8e0929e3c15963e 100644
--- a/src/facilities/dairy/dairy.js
+++ b/src/facilities/dairy/dairy.js
@@ -274,7 +274,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
cost: 5000 * V.upgradeMultiplierArcology,
handler: () => V.PC.skill.engineering += 0.1,
prereqs: [
- () => (V.dairyPregSetting === 2 || V.dairyStimulatorsSetting === 2)
+ (V.dairyPregSetting === 2 || V.dairyStimulatorsSetting === 2)
],
},
{
@@ -311,11 +311,11 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
cost: 10000 * V.upgradeMultiplierArcology,
handler: () => V.PC.skill.engineering += 0.1,
prereqs: [
- () => !!V.seeHyperPreg,
- () => V.dairyRestraintsSetting === 2,
- () => V.dairyStimulatorsSetting === 2,
- () => V.dairyFeedersSetting === 2,
- () => V.dairyPregSetting > 0,
+ !!V.seeHyperPreg,
+ V.dairyRestraintsSetting === 2,
+ V.dairyStimulatorsSetting === 2,
+ V.dairyFeedersSetting === 2,
+ V.dairyPregSetting > 0,
],
},
{
@@ -338,7 +338,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
V.dairySlimMaintain = 1;
},
prereqs: [
- () => V.arcologies[0].FSSlimnessEnthusiast > 80,
+ V.arcologies[0].FSSlimnessEnthusiast > 80,
],
},
{
@@ -352,8 +352,8 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
V.dairySlimMaintain = 1;
},
prereqs: [
- () => V.arcologies[0].FSSlimnessEnthusiast > 20,
- () => V.arcologies[0].FSSlimnessEnthusiast <= 80,
+ V.arcologies[0].FSSlimnessEnthusiast > 20,
+ V.arcologies[0].FSSlimnessEnthusiast <= 80,
],
},
{
@@ -375,7 +375,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
cost: 5000 * V.upgradeMultiplierArcology,
handler: () => V.PC.skill.engineering += 0.1,
prereqs: [
- () => V.arcologies[0].FSPaternalist === "unset",
+ V.arcologies[0].FSPaternalist === "unset",
],
},
{
@@ -395,7 +395,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
{
property: "dairyFeedersSetting",
prereqs: [
- () => V.dairyFeedersUpgrade > 0,
+ V.dairyFeedersUpgrade > 0,
],
options: [
{
@@ -416,7 +416,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
value: 2,
handler: App.UI.DialogHandler(() => this._getEffect("feeders")),
prereqs: [
- () => V.dairyRestraintsSetting > 1,
+ V.dairyRestraintsSetting > 1,
],
},
],
@@ -424,7 +424,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
{
property: "dairyPregSetting",
prereqs: [
- () => V.dairyPregUpgrade > 0,
+ V.dairyPregUpgrade > 0,
],
options: [
{
@@ -445,7 +445,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
value: 2,
handler: App.UI.DialogHandler(() => this._getEffect("preg")),
prereqs: [
- () => V.dairyRestraintsSetting > 1,
+ V.dairyRestraintsSetting > 1,
],
},
{
@@ -454,10 +454,10 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
value: 3,
handler: App.UI.DialogHandler(() => this._getEffect("preg")),
prereqs: [
- () => V.seeExtreme > 0,
- () => V.seeHyperPreg > 0,
- () => V.dairyRestraintsSetting > 1,
- () => V.dairyHyperPregRemodel === 1,
+ V.seeExtreme > 0,
+ V.seeHyperPreg > 0,
+ V.dairyRestraintsSetting > 1,
+ V.dairyHyperPregRemodel === 1,
],
},
],
@@ -465,7 +465,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
{
property: "dairyStimulatorsSetting",
prereqs: [
- () => V.dairyStimulatorsUpgrade > 0,
+ V.dairyStimulatorsUpgrade > 0,
],
options: [
{
@@ -486,8 +486,8 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
value: 2,
handler: App.UI.DialogHandler(() => this._getEffect("stimulators")),
prereqs: [
- () => !!V.seeExtreme,
- () => V.dairyRestraintsSetting > 1,
+ !!V.seeExtreme,
+ V.dairyRestraintsSetting > 1,
],
},
],
@@ -495,7 +495,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
{
property: "dairyRestraintsSetting",
prereqs: [
- () => V.dairyFeedersUpgrade > 0,
+ V.dairyFeedersUpgrade > 0,
],
options: [
{
@@ -521,10 +521,10 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
{
property: "createBioreactors",
prereqs: [
- () => V.bioreactorsAnnounced !== 0,
- () => V.dairyRestraintsSetting === 2,
- () => V.dairyStimulatorsSetting === 2,
- () => V.dairyFeedersSetting === 2,
+ V.bioreactorsAnnounced !== 0,
+ V.dairyRestraintsSetting === 2,
+ V.dairyStimulatorsSetting === 2,
+ V.dairyFeedersSetting === 2,
],
options: [
{
@@ -543,7 +543,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
{
property: "dairySlimMaintain",
prereqs: [
- () => !!V.dairySlimMaintainUpgrade,
+ !!V.dairySlimMaintainUpgrade,
],
options: [
{
@@ -563,7 +563,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
{
property: "dairyImplantsSetting",
prereqs: [
- () => V.dairySlimMaintain === 0,
+ V.dairySlimMaintain === 0,
],
options: [
{
@@ -642,7 +642,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
{
property: "milkmaidImpregnates",
prereqs: [
- () => !!S.Milkmaid,
+ !!S.Milkmaid,
],
options: [
{
diff --git a/src/facilities/farmyard/farmyard.js b/src/facilities/farmyard/farmyard.js
index ef13c786155f9f80f1ea2b45bca68ffbef9e880f..5ffd5c219c0af54ece832539a0473643b2096edc 100644
--- a/src/facilities/farmyard/farmyard.js
+++ b/src/facilities/farmyard/farmyard.js
@@ -185,7 +185,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
`slightly increases upkeep costs`,
],
prereqs: [
- () => V.farmyardUpgrades.pump > 0,
+ V.farmyardUpgrades.pump > 0,
],
},
{
@@ -213,7 +213,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
`moderately decreases upkeep costs`,
],
prereqs: [
- () => V.farmyardUpgrades.fertilizer > 0,
+ V.farmyardUpgrades.fertilizer > 0,
],
},
{
@@ -242,7 +242,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
`slightly increases upkeep costs`,
],
prereqs: [
- () => V.farmyardUpgrades.hydroponics > 0,
+ V.farmyardUpgrades.hydroponics > 0,
],
},
{
@@ -271,7 +271,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
`slightly increases upkeep costs`,
],
prereqs: [
- () => V.farmyardUpgrades.seeds > 0
+ V.farmyardUpgrades.seeds > 0
],
},
{
@@ -290,8 +290,8 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
{
property: "farmyardShows",
prereqs: [
- () => this.facility.hostedSlaves > 0,
- () => V.farmyardKennels > 0 || V.farmyardStables > 0 || V.farmyardCages > 0,
+ this.facility.hostedSlaves > 0,
+ V.farmyardKennels > 0 || V.farmyardStables > 0 || V.farmyardCages > 0,
],
options: [
{
@@ -314,9 +314,9 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
{
property: "farmyardBreeding",
prereqs: [
- () => !!V.seeBestiality,
- () => !!V.farmyardShows,
- () => !!V.animals.canine || !!V.animals.hooved || !!V.animals.feline,
+ !!V.seeBestiality,
+ !!V.farmyardShows,
+ !!V.animals.canine || !!V.animals.hooved || !!V.animals.feline,
],
options: [
{
@@ -334,8 +334,8 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
{
property: "farmyardRestraints",
prereqs: [
- () => !!V.farmyardBreeding,
- () => V.farmyardShows !== 0,
+ !!V.farmyardBreeding,
+ V.farmyardShows !== 0,
],
options: [
{
diff --git a/src/facilities/headGirlSuite/headGirlSuite.js b/src/facilities/headGirlSuite/headGirlSuite.js
index c47653f56f4b2d04c799f39daee4debf10729d97..1a5abf715089c41b5d550660ba05e49b36fedc4c 100644
--- a/src/facilities/headGirlSuite/headGirlSuite.js
+++ b/src/facilities/headGirlSuite/headGirlSuite.js
@@ -78,7 +78,7 @@ App.Facilities.HGSuite.headGirlSuite = class HeadGirlSuite extends App.Facilitie
{
property: "HGSuiteSurgery",
prereqs: [
- () => !V.HGSuiteEquality,
+ !V.HGSuiteEquality,
],
options: [
{
@@ -96,7 +96,7 @@ App.Facilities.HGSuite.headGirlSuite = class HeadGirlSuite extends App.Facilitie
{
property: "HGSuiteAbortion",
prereqs: [
- () => !V.HGSuiteEquality,
+ !V.HGSuiteEquality,
],
options: [
{
@@ -114,7 +114,7 @@ App.Facilities.HGSuite.headGirlSuite = class HeadGirlSuite extends App.Facilitie
{
property: "HGSuiteDrugs",
prereqs: [
- () => !V.HGSuiteEquality,
+ !V.HGSuiteEquality,
],
options: [
{
@@ -132,7 +132,7 @@ App.Facilities.HGSuite.headGirlSuite = class HeadGirlSuite extends App.Facilitie
{
property: "HGSuiteHormones",
prereqs: [
- () => !V.HGSuiteEquality,
+ !V.HGSuiteEquality,
],
options: [
{
diff --git a/src/facilities/masterSuite/masterSuite.js b/src/facilities/masterSuite/masterSuite.js
index d9b7c76cb11c4ece1d2812bc5c67c4bb3421c95b..54755e170d68b5b9b408a50dce8eb07810b5960f 100644
--- a/src/facilities/masterSuite/masterSuite.js
+++ b/src/facilities/masterSuite/masterSuite.js
@@ -325,7 +325,7 @@ App.Facilities.MasterSuite.masterSuite = class MasterSuite extends App.Facilitie
App.UI.reload();
},
prereqs: [
- () => !!V.seePreg,
+ !!V.seePreg,
],
},
{
@@ -343,7 +343,7 @@ App.Facilities.MasterSuite.masterSuite = class MasterSuite extends App.Facilitie
{
property: "masterSuitePregnancySlaveLuxuries",
prereqs: [
- () => V.masterSuiteUpgradePregnancy > 0,
+ V.masterSuiteUpgradePregnancy > 0,
],
options: [
{
@@ -385,7 +385,7 @@ App.Facilities.MasterSuite.masterSuite = class MasterSuite extends App.Facilitie
{
property: "masterSuiteHyperPregnancy",
prereqs: [
- () => V.masterSuitePregnancyFertilityDrugs > 0,
+ V.masterSuitePregnancyFertilityDrugs > 0,
],
options: [
{
@@ -407,7 +407,7 @@ App.Facilities.MasterSuite.masterSuite = class MasterSuite extends App.Facilitie
{
property: "masterSuitePregnancyFertilitySupplements",
prereqs: [
- () => V.masterSuitePregnancyFertilityDrugs === 1 || V.masterSuiteHyperPregnancy === 1,
+ V.masterSuitePregnancyFertilityDrugs === 1 || V.masterSuiteHyperPregnancy === 1,
],
options: [
{
diff --git a/src/facilities/nursery/nursery.js b/src/facilities/nursery/nursery.js
index c8723e569509e44c892cf9278086fecf671e86dd..aa752ec3675204657df8a320e01915174077bfd8 100644
--- a/src/facilities/nursery/nursery.js
+++ b/src/facilities/nursery/nursery.js
@@ -162,7 +162,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
{
property: "MatronIgnoresFlaws",
prereqs: [
- () => !!S.Matron,
+ !!S.Matron,
],
options: [
{
@@ -180,7 +180,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
{
property: "nurserySex",
prereqs: [
- () => !!V.extremeUnderage,
+ !!V.extremeUnderage,
],
options: [
{
@@ -199,7 +199,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
{
property: "nurseryWeightSetting",
prereqs: [
- () => !!V.nurseryWeight,
+ !!V.nurseryWeight,
],
options: [
{
@@ -217,7 +217,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
{
property: "nurseryMusclesSetting",
prereqs: [
- () => !!V.nurseryMuscles,
+ !!V.nurseryMuscles,
],
options: [
{
@@ -235,7 +235,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
{
property: "nurseryHormonesSetting",
prereqs: [
- () => !!V.nurseryHormones,
+ !!V.nurseryHormones,
],
options: [
{
diff --git a/src/facilities/pit/pit.js b/src/facilities/pit/pit.js
index a4efa0f2f0e0814a6ee1a6b540fd303facbfc9e3..1d0e0dcf2bc7528b061f1e20525622d3bfa5ffc3 100644
--- a/src/facilities/pit/pit.js
+++ b/src/facilities/pit/pit.js
@@ -172,7 +172,7 @@ App.Facilities.Pit.pit = class Pit extends App.Facilities.Facility {
link: `Bodyguard`,
value: 1,
prereqs: [
- () => !!S.Bodyguard,
+ !!S.Bodyguard,
],
},
{
@@ -180,7 +180,7 @@ App.Facilities.Pit.pit = class Pit extends App.Facilities.Facility {
link: `Animal`,
value: 2,
prereqs: [
- () => !!animal,
+ !!animal,
],
handler: () => {
if (!V.pit.animal) {
@@ -195,7 +195,7 @@ App.Facilities.Pit.pit = class Pit extends App.Facilities.Facility {
link: `Random`,
value: 3,
prereqs: [
- () => !!S.Bodyguard || !!animal,
+ !!S.Bodyguard || !!animal,
],
},
{
@@ -218,8 +218,8 @@ App.Facilities.Pit.pit = class Pit extends App.Facilities.Facility {
{
property: "animal",
prereqs: [
- () => V.pit.fighters === 2 || V.pit.fighters === 3,
- () => !!animal,
+ V.pit.fighters === 2 || V.pit.fighters === 3,
+ !!animal,
],
options: [
{
@@ -227,8 +227,8 @@ App.Facilities.Pit.pit = class Pit extends App.Facilities.Facility {
get link() { return capFirstChar(V.active.canine); },
value: V.active.canine,
prereqs: [
- () => !!V.active.canine,
- () => !["beagle", "French bulldog", "poodle", "Yorkshire terrier"].includes(V.active.canine),
+ !!V.active.canine,
+ !["beagle", "French bulldog", "poodle", "Yorkshire terrier"].includes(V.active.canine),
],
},
{
@@ -236,7 +236,7 @@ App.Facilities.Pit.pit = class Pit extends App.Facilities.Facility {
get link() { return capFirstChar(V.active.hooved); },
value: V.active.hooved,
prereqs: [
- () => !!V.active.hooved,
+ !!V.active.hooved,
],
},
{
@@ -244,8 +244,8 @@ App.Facilities.Pit.pit = class Pit extends App.Facilities.Facility {
get link() { return capFirstChar(V.active.feline); },
value: V.active.feline,
prereqs: [
- () => !!V.active.feline,
- () => getAnimal(V.active.feline).species !== "cat",
+ !!V.active.feline,
+ getAnimal(V.active.feline).species !== "cat",
],
},
{
@@ -253,7 +253,7 @@ 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.hooved) ||
(!!V.active.canine && !!V.active.feline) ||
(!!V.active.hooved && !!V.active.feline),
],
@@ -289,8 +289,8 @@ App.Facilities.Pit.pit = class Pit extends App.Facilities.Facility {
{
property: "virginities",
prereqs: [
- () => V.pit.fighters !== 2,
- () => !V.pit.lethal,
+ V.pit.fighters !== 2,
+ !V.pit.lethal,
],
options: [
{
diff --git a/src/facilities/schoolroom/schoolroom.js b/src/facilities/schoolroom/schoolroom.js
index f095f86ecb3e856846841feba6b2af4897745496..1c28db4fa9c2460ed6083bf75a603ff96ff5d1f5 100644
--- a/src/facilities/schoolroom/schoolroom.js
+++ b/src/facilities/schoolroom/schoolroom.js
@@ -144,7 +144,7 @@ App.Facilities.Schoolroom.schoolroom = class Schoolroom extends App.Facilities.F
App.UI.reload();
},
prereqs: [
- () => V.arcologies[0].FSIntellectualDependency > 80,
+ V.arcologies[0].FSIntellectualDependency > 80,
],
},
{
@@ -172,14 +172,14 @@ App.Facilities.Schoolroom.schoolroom = class Schoolroom extends App.Facilities.F
cost: 5000 * V.upgradeMultiplierArcology * V.HackingSkillMultiplier,
notes: [`increases the effectiveness of ${V.schoolroomName}`],
prereqs: [
- () => V.schoolroomRemodelBimbo > 0,
+ V.schoolroomRemodelBimbo > 0,
],
},
{
value: 1,
text: `${this.facility.nameCaps} 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.`,
prereqs: [
- () => V.schoolroomRemodelBimbo > 0,
+ V.schoolroomRemodelBimbo > 0,
],
},
{
@@ -191,14 +191,14 @@ App.Facilities.Schoolroom.schoolroom = class Schoolroom extends App.Facilities.F
handler: () => V.schoolroomRemodelBimbo = 0,
notes: [`increases the effectiveness of ${V.schoolroomName}`],
prereqs: [
- () => V.schoolroomRemodelBimbo === 0,
+ V.schoolroomRemodelBimbo === 0,
],
},
{
value: 1,
text: `${this.facility.nameCaps} 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.`,
prereqs: [
- () => V.schoolroomRemodelBimbo === 0,
+ V.schoolroomRemodelBimbo === 0,
],
},
],
diff --git a/src/facilities/servantsQuarters/servantsQuarters.js b/src/facilities/servantsQuarters/servantsQuarters.js
index 2179d22eb5075ccc85de405d26df16291a12a08b..7e0ffc0837ff1ff43d104e00a5bc4d5a7b1c5092 100644
--- a/src/facilities/servantsQuarters/servantsQuarters.js
+++ b/src/facilities/servantsQuarters/servantsQuarters.js
@@ -119,9 +119,9 @@ App.Facilities.ServantsQuarters.servantsQuarters = class ServantsQuarters extend
{
property: "stewardessImpregnates",
prereqs: [
- () => !!S.Stewardess,
- () => !!canAchieveErection(S.Stewardess) && S.Stewardess.pubertyXY === 1,
- () => !!V.seePreg,
+ !!S.Stewardess,
+ !!canAchieveErection(S.Stewardess) && S.Stewardess.pubertyXY === 1,
+ !!V.seePreg,
],
options: [
{
diff --git a/src/facilities/spa/spa.js b/src/facilities/spa/spa.js
index e44076a07eec71cb1edab06d85b18d05edbe5fa8..25f4d577abd6d405b08a315f84df17b5af1b7354 100644
--- a/src/facilities/spa/spa.js
+++ b/src/facilities/spa/spa.js
@@ -123,7 +123,7 @@ App.Facilities.Spa.spa = class Spa extends App.Facilities.Facility {
{
property: "spaFix",
prereqs: [
- () => !!S.Attendant,
+ !!S.Attendant,
],
options: [
{
diff --git a/src/js/upgrade.js b/src/js/upgrade.js
index 6c7300124909cc8fe83672bb5be740f09550d4e5..49ee68f797e1502d27ad914608b2bcf698909c28 100644
--- a/src/js/upgrade.js
+++ b/src/js/upgrade.js
@@ -33,7 +33,7 @@ App.Upgrade = class Upgrade {
const cost = Math.trunc(tier.cost) || 0;
- if ((!prereqs || prereqs.every(prereq => prereq())) &&
+ if ((!prereqs || prereqs.every(prereq => prereq === true)) &&
_.isEqual(value, this._object[this._property])) {
App.UI.DOM.appendNewElement("div", frag, text);