diff --git a/devTools/types/FC/facilities.d.ts b/devTools/types/FC/facilities.d.ts
index dd2773799e4d13197bd191d1f9d9b41b8998929e..16db5832ff9cc11f6d01a087f40095e604f03a7b 100644
--- a/devTools/types/FC/facilities.d.ts
+++ b/devTools/types/FC/facilities.d.ts
@@ -13,13 +13,13 @@ declare namespace FC {
/** The value to set `property` to upon purchase. */
value: any;
/** The text displayed before the upgrade has been purchased. */
- base: string;
+ base?: string;
/** The text displayed after the upgrade has been purchased. */
- upgraded: string;
+ upgraded?: string;
/** The link text. */
link: string;
/** How much the upgrade costs. */
- cost: number;
+ cost?: number;
/** Any handler to run upon purchase. */
handler?: () => void;
/** Any additional information to display upon hover on the link. */
diff --git a/src/facilities/Facility.js b/src/facilities/Facility.js
index aed1ab702b8a7ff54be4907894f399deb1dd4525..7f92b3facfda7e2b170aa5e3001cf8811b939956 100644
--- a/src/facilities/Facility.js
+++ b/src/facilities/Facility.js
@@ -172,6 +172,8 @@ App.Facilities.Facility = class {
this._upgrades.forEach(upgrade => {
if (upgrade.prereqs.every(prereq => prereq())) {
+ upgrade.cost = upgrade.cost || 0;
+
if (V[upgrade.property] === upgrade.value) {
App.UI.DOM.appendNewElement("div", div, upgrade.upgraded);
} else {
@@ -185,7 +187,9 @@ App.Facilities.Facility = class {
}
this.refresh();
- }, [], '', `Costs ${cashFormat(upgrade.cost)}${upgrade.note ? ` and ${upgrade.note}` : ``}.`), ['indent']);
+ }, [], '',
+ `${upgrade.cost > 0 ? `This costs ${cashFormat(upgrade.cost)}` : `This is free`}${upgrade.note ? `${upgrade.note}` : ``}.`),
+ ['indent']);
}
if (upgrade.nodes) {
diff --git a/src/facilities/arcade/arcade.js b/src/facilities/arcade/arcade.js
index c8eb4b67249a73a4c14339a30bc649451116cb6d..b50213f54ae4f74e21d3fd6d59353799a91aecbc 100644
--- a/src/facilities/arcade/arcade.js
+++ b/src/facilities/arcade/arcade.js
@@ -92,15 +92,63 @@ App.Facilities.Arcade.arcade = class extends App.Facilities.Facility {
get upgrades() {
return [
{
- property: ``,
+ property: "arcadeUpgradeInjectors",
+ prereqs: [
+ () => V.arcadeUpgradeCollectors < 1,
+ () => V.arcadeUpgradeInjectors < 1,
+ ],
+ value: 1,
+ base: `It is a standard arcade. It can be upgraded to either maximize the pleasure of those that visit it at the expense of the health of the inmates, or to keep them healthy (if not happy) and milk them of useful fluids.`,
+ upgraded: `It has been upgraded with electroshock applicators. Whether they're enjoying themselves or not is irrelevant, they are shocked to tighten their holes regardless. You may also apply aphrodisiacs to further enhance performance.`,
+ link: `Upgrade the arcade with invasive performance-enhancing systems`,
+ cost: 10000 * V.upgradeMultiplierArcology,
+ handler: () => V.PC.skill.engineering += .1,
+ note: `, increases upkeep costs, and is mutually exclusive with the collectors`,
+ },
+ {
+ property: "arcadeUpgradeInjectors",
+ prereqs: [
+ () => V.arcadeUpgradeCollectors < 1,
+ () => V.arcadeUpgradeInjectors > 0,
+ ],
+ value: 2,
+ upgraded: `It has been upgraded with aphrodisiac injection systems and electroshock applicators. If the aphrodisiacs fail to force an orgasm from an inmate, they are shocked to tighten their holes regardless.`,
+ link: `Apply aphrodisiacs`,
+ handler: () => V.PC.skill.engineering += .1,
+ },
+ {
+ property: "arcadeUpgradeCollectors",
+ prereqs: [
+ () => V.arcadeUpgradeInjectors < 1,
+ ],
+ value: 1,
+ upgraded: `It has been retrofitted to milk lactating slaves${V.seeDicks !== 0 ? ` and cockmilk slaves capable of ejaculating` : ``}, though less efficiently than a dedicated facility.`,
+ link: `Retrofit the arcade to collect useful fluids`,
+ cost: 10000 * V.upgradeMultiplierArcology,
+ handler: () => V.PC.skill.engineering += .1,
+ note: `, increases upkeep costs, and is mutually exclusive with the injectors.`,
+ },
+ {
+ property: "arcadeUpgradeHealth",
prereqs: [],
- value: ``,
- base: ``,
- upgraded: ``,
- link: ``,
+ value: 1,
+ base: `The arcade can be upgraded to include curative injectors in order to keep inmates from succumbing under the harsh treatment. You are assured the inmates won't like their time in the arcade any better, it is purely intended to keep them functional and ready for use around the clock. It comes equipped with two settings.`,
+ upgraded: `It has been upgraded with curative injectors. Inmates will be kept alive and productive, so they may be held locked in place for as long as necessary and available for use.`,
+ link: `Install curative injectors`,
cost: 10000 * V.upgradeMultiplierArcology,
handler: () => V.PC.skill.engineering += .1,
- note: ``,
+ note: ` and will increase upkeep costs`,
+ },
+ {
+ property: "arcadeUpgradeFuckdolls",
+ prereqs: [],
+ value: 1,
+ base: `${capFirstChar(V.arcadeName)} is not equipped to convert inmates into standard Fuckdolls.`,
+ upgraded: `${capFirstChar(V.arcadeName)} is equipped to convert inmates into standard Fuckdolls. The converter can be put to work on your order.`,
+ link: `Upgrade the arcade to create Fuckdolls`,
+ cost: 5000 * V.upgradeMultiplierArcology,
+ handler: () => V.PC.skill.engineering += .1,
+ note: ` and will increase upkeep costs`,
},
];
}
@@ -151,82 +199,28 @@ function arcade() {
const frag = new DocumentFragment();
const upgradesDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
- const statsDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
- const slavesDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
- const renameDiv = App.UI.DOM.makeElement("div", null, ['margin-bottom']);
let arcadeNameCaps = capFirstChar(V.arcadeName);
frag.append(
upgrades(),
- stats(),
- slaves(),
- rename(),
);
return frag;
function upgrades() {
- const injectorsDiv = document.createElement("div");
- const collectorsDiv = document.createElement("div");
const healthDiv = document.createElement("div");
const fuckdollsDiv = document.createElement("div");
const cost = Math.trunc(10000 * V.upgradeMultiplierArcology);
upgradesDiv.append(
- injectors(),
- collectors(),
health(),
fuckdolls(),
);
return upgradesDiv;
- function injectors() {
- if (V.arcadeUpgradeInjectors === 1) {
- injectorsDiv.append(`It has been upgraded with electroshock applicators. Whether they're enjoying themselves or not is irrelevant, they are shocked to tighten their holes regardless. You may also apply aphrodisiacs to further enhance performance.`);
-
- App.UI.DOM.appendNewElement("div", injectorsDiv, App.UI.DOM.link(`Apply aphrodisiacs`, () => {
- V.arcadeUpgradeInjectors = 2;
-
- refresh();
- }), ['indent']);
- } else if (V.arcadeUpgradeInjectors === 2) {
- injectorsDiv.append(`It has been upgraded with aphrodisiac injection systems and electroshock applicators. If the aphrodisiacs fail to force an orgasm from an inmate, they are shocked to tighten their holes regardless.`);
- } else if (V.arcadeUpgradeCollectors !== 1) {
- injectorsDiv.append(`It is a standard arcade. It can be upgraded to either maximize the pleasure of those that visit it at the expense of the health of the inmates, or to keep them healthy (if not happy) and milk them of useful fluids.`);
-
- App.UI.DOM.appendNewElement("div", injectorsDiv, App.UI.DOM.link(`Upgrade the arcade with invasive performance-enhancing systems`, () => {
- cashX(forceNeg(cost), "capEx");
- V.arcadeUpgradeInjectors = 1;
- V.PC.skill.engineering += .1;
-
- refresh();
- },
- [], '', `Costs ${cashFormat(cost)}, increases upkeep costs, and is mutually exclusive with the collectors.`), ['indent']);
- }
-
- return injectorsDiv;
- }
-
- function collectors() {
- if (V.arcadeUpgradeCollectors === 1) {
- collectorsDiv.append(`It has been retrofitted to milk lactating slaves${V.seeDicks !== 0 ? ` and cockmilk slaves capable of ejaculating` : ``}, though less efficiently than a dedicated facility.`);
- } else if (V.arcadeUpgradeInjectors < 1) {
- App.UI.DOM.appendNewElement("div", collectorsDiv, App.UI.DOM.link(`Retrofit the arcade to collect useful fluids`, () => {
- cashX(forceNeg(cost), "capEx");
- V.arcadeUpgradeCollectors = 1;
- V.PC.skill.engineering += .1;
-
- refresh();
- },
- [], '', `Costs ${cashFormat(cost)}, increases upkeep costs, and is mutually exclusive with the injectors.`), ['indent']);
- }
-
- return collectorsDiv;
- }
-
function health() {
const options = new App.UI.OptionsGroup();
const option = options.addOption(null, 'arcadeUpgradeHealth');
@@ -236,7 +230,7 @@ function arcade() {
option.addValue(`Decrease power`, 1);
} else if (V.arcadeUpgradeHealth === 1) {
- healthDiv.append(`It has been upgraded with curative injectors. Inmates will be kept alive and productive, so they may be held locked in place for as long as necessary and available for use.`);
+ healthDiv.append(``);
option.addValue(`Increase power`, 2)
.addValue(`Turn off`, 0);
@@ -245,16 +239,16 @@ function arcade() {
option.addValue(`Turn on`, 1);
} else {
- healthDiv.append(`The arcade can be upgraded to include curative injectors in order to keep inmates from succumbing under the harsh treatment. You are assured the inmates won't like their time in the arcade any better, it is purely intended to keep them functional and ready for use around the clock. It comes equipped with two settings.`);
+ healthDiv.append(``);
- App.UI.DOM.appendNewElement("div", healthDiv, App.UI.DOM.link(`Install curative injectors`, () => {
+ App.UI.DOM.appendNewElement("div", healthDiv, App.UI.DOM.link(``, () => {
cashX(forceNeg(cost), "capEx");
V.arcadeUpgradeHealth = 1;
V.PC.skill.engineering += .1;
refresh();
},
- [], '', `Costs ${cashFormat(cost)} and will increase upkeep costs.`), ['indent']);
+ [], '', `Costs ${cashFormat(cost)}.`), ['indent']);
}
App.UI.DOM.appendNewElement("div", healthDiv, options.render(), ['indent']);
@@ -267,7 +261,7 @@ function arcade() {
const option = options.addOption(null, 'arcadeUpgradeFuckdolls');
if (V.arcadeUpgradeFuckdolls === 1) {
- fuckdollsDiv.append(`${arcadeNameCaps} is equipped to convert inmates into standard Fuckdolls. The converter can be put to work on your order.`);
+ fuckdollsDiv.append(``);
option.addValue(`Turn on conversion`, 2)
.addValue(`Turn on bulk conversion`, 3);
@@ -284,16 +278,16 @@ function arcade() {
} else {
const cost = Math.trunc(5000 * V.upgradeMultiplierArcology);
- fuckdollsDiv.append(`${arcadeNameCaps} is not equipped to convert inmates into standard Fuckdolls.`);
+ fuckdollsDiv.append(``);
- App.UI.DOM.appendNewElement("div", fuckdollsDiv, App.UI.DOM.link(`Upgrade the arcade to create Fuckdolls`, () => {
+ App.UI.DOM.appendNewElement("div", fuckdollsDiv, App.UI.DOM.link(``, () => {
cashX(forceNeg(cost), "capEx");
V.arcadeUpgradeFuckdolls = 1;
V.PC.skill.engineering += .1;
refresh();
},
- [], '', `Costs ${cashFormat(cost)} and will increase upkeep costs.`), ['indent']);
+ [], '', `Costs ${cashFormat(cost)}.`), ['indent']);
}
App.UI.DOM.appendNewElement("div", fuckdollsDiv, options.render(), ['indent']);
@@ -302,32 +296,7 @@ function arcade() {
}
}
- function stats() {
- statsDiv.append(App.Facilities.Arcade.Stats(true));
-
- return statsDiv;
- }
-
- function slaves() {
- slavesDiv.append(App.UI.SlaveList.listSJFacilitySlaves(App.Entity.facilities.arcade));
-
- return slavesDiv;
- }
-
- function rename() {
- renameDiv.append(App.Facilities.rename(App.Entity.facilities.arcade, () => {
- arcadeNameCaps = capFirstChar(V.arcadeName);
-
- refresh();
- }));
-
- return renameDiv;
- }
-
function refresh() {
App.UI.DOM.replace(upgradesDiv, upgrades);
- App.UI.DOM.replace(statsDiv, stats);
- App.UI.DOM.replace(slavesDiv, slaves);
- App.UI.DOM.replace(renameDiv, rename);
}
}