diff --git a/src/endWeek/events/retire.js b/src/endWeek/events/retire.js index 56dffde15148b8d8ccaa13c7bfebf34b3cec8dbf..ef4f3623b306231b5562ba3360f1634a1aff4355 100644 --- a/src/endWeek/events/retire.js +++ b/src/endWeek/events/retire.js @@ -52,10 +52,10 @@ globalThis.retireScene = function(originalSlave) { he, his, him, himself, wife, woman, girl } = getPronouns(slave); const {title: Master} = getEnunciation(slave); - let his2, he2, him2, wife2, girl2; + let his2, he2, him2, girl2; if (getSlave(slave.relationshipTarget)) { ({ - his2, he2, him2, wife2, girl2 + his2, he2, him2, girl2 } = getPronouns(getSlave(slave.relationshipTarget)).appendSuffix("2")); } diff --git a/src/events/RE/reArcologyInspection.js b/src/events/RE/reArcologyInspection.js index 1209b58b99b07a33fd2960b6c7cc2056aae92ba6..bbf3d2850c2b33c7335c0abc24850fe15f6421fa 100644 --- a/src/events/RE/reArcologyInspection.js +++ b/src/events/RE/reArcologyInspection.js @@ -451,7 +451,7 @@ App.Events.REArcologyInspection = class REArcologyInspection extends App.Events. virgins.push(agentLover.slaveName); } if (virgins.length > 0) { - return `This option may take ${toSentence(virgins)}'s virginity.` + return `This option may take ${toSentence(virgins)}'s virginity.`; } return null; } diff --git a/src/facilities/incubator/incubatorUtils.js b/src/facilities/incubator/incubatorUtils.js index cb47b07c38763f5c85979117644483570cdcd6dd..9d1ee89caa476cdc92dd0ee53af734ab7e61ca75 100644 --- a/src/facilities/incubator/incubatorUtils.js +++ b/src/facilities/incubator/incubatorUtils.js @@ -23,7 +23,7 @@ App.Facilities.Incubator.init = function(state) { if (state === 'base') { return V.incubator = {capacity: 0, tanks: []}; } - + V.incubator = { capacity: 1, tanks: [], @@ -50,4 +50,4 @@ App.Facilities.Incubator.init = function(state) { pregAdaptationPower: 0, }, }; -}; \ No newline at end of file +}; diff --git a/src/interaction/siPhysicalRegimen.js b/src/interaction/siPhysicalRegimen.js index 40b92cd5555fe607a0f9b318023d964b66e3cb21..80b469e4071528f5f78197b91686eca1dd25b7fd 100644 --- a/src/interaction/siPhysicalRegimen.js +++ b/src/interaction/siPhysicalRegimen.js @@ -565,7 +565,7 @@ App.UI.SlaveInteract.physicalRegimen = function(slave) { } else { title.textContent = `All ${_reservedIncubator} of ${his} children `; } - title.textContent += ` will be placed in ${V.incubator.name}. `; + title.textContent += ` will be placed in ${V.incubator.name}. `; if ((_reservedIncubator + _reservedNursery < _WL) && (reservedChildren < freeTanks)) { linkArray.push( App.UI.DOM.link(`Keep another child`, () => wombUpdateIncubator(1, true)) diff --git a/src/js/economyJS.js b/src/js/economyJS.js index 435f4796b5be45228ae6da38ac36ae2d477645f7..9018814f9757ac8ce486113d628e418b1d703786 100644 --- a/src/js/economyJS.js +++ b/src/js/economyJS.js @@ -266,7 +266,7 @@ globalThis.calculateCosts = (function() { getPCCosts() + predictTotalSlaveCosts() ); - + if (V.incubator.capacity > 0) { totalCosts += getIncubatorCosts(); } @@ -317,7 +317,7 @@ globalThis.calculateCosts = (function() { cashX(forceNeg(getPCTrainingCosts()), "PCtraining"); cashX(forceNeg(getPCCosts()), "PCmedical"); getTotalSlaveCosts(); - + if (V.incubator.capacity > 0) { cashX(forceNeg(getIncubatorCosts()), "incubator"); cashX(forceNeg(getIncubatorSlavesCosts()), "incubatorSlaves"); @@ -582,16 +582,16 @@ globalThis.calculateCosts = (function() { 0.2 * V.incubator.upgrade.weight * facIncMultiplier + 0.2 * V.incubator.upgrade.muscles * facIncMultiplier + 0.2 * V.incubator.upgrade.reproduction * facIncMultiplier + - 0.2 * V.incubator.upgrade.growthStims * facIncMultiplier + + 0.2 * V.incubator.upgrade.growthStims * facIncMultiplier + 0.2 * V.incubator.upgrade.organs * facIncMultiplier + 0.5 * V.incubator.upgrade.reproduction * facIncMultiplier + 0.5 * V.incubator.upgrade.speed * facIncMultiplier; } function getIncubatorSlavesCosts() { - return ((V.incubator.upgrade.weight + V.incubator.upgrade.muscles + V.incubator.upgrade.reproduction + - V.incubator.upgrade.growthStims + V.incubator.upgrade.organs + V.incubator.setting.pregAdaptationPower) - * 500 * V.incubator.tanks.length); + return ((V.incubator.upgrade.weight + V.incubator.upgrade.muscles + V.incubator.upgrade.reproduction + + V.incubator.upgrade.growthStims + V.incubator.upgrade.organs + V.incubator.setting.pregAdaptationPower) + * 500 * V.incubator.tanks.length); } function getServantsQuartersCosts() { @@ -1000,16 +1000,21 @@ globalThis.getSlaveCostArray = function(s) { if (V.geneticMappingUpgrade >= 1) { retval.push({ text: "Additional dietary supplements due to genetic hyper-fertility", - value: Math.trunc(foodCost * 0.5)}); + value: Math.trunc(foodCost * 0.5) + }); } else { - retval.push({text: "Adjustment for unusual dietary deficiencies", value: Math.trunc(foodCost * 0.5)}); + retval.push({ + text: "Adjustment for unusual dietary deficiencies", + value: Math.trunc(foodCost * 0.5) + }); } } if (s.geneticQuirks.rearLipedema === 2) { if (V.geneticMappingUpgrade >= 1) { retval.push({ text: "Additional dietary supplements due to lipedema", - value: Math.trunc(foodCost * 0.2)}); + value: Math.trunc(foodCost * 0.2) + }); } else { retval.push({text: "Adjustment for unusual dietary deficiencies", value: Math.trunc(foodCost * 0.2)}); } @@ -1018,7 +1023,8 @@ globalThis.getSlaveCostArray = function(s) { if (V.geneticMappingUpgrade >= 1) { retval.push({ text: "Additional dietary supplements due to macromastia", - value: Math.trunc(foodCost * 0.2)}); + value: Math.trunc(foodCost * 0.2) + }); } else { retval.push({text: "Adjustment for unusual dietary deficiencies", value: Math.trunc(foodCost * 0.2)}); } @@ -1027,7 +1033,8 @@ globalThis.getSlaveCostArray = function(s) { if (V.geneticMappingUpgrade >= 1) { retval.push({ text: "Additional dietary supplements due to gigantomastia", - value: Math.trunc(foodCost * 0.2)}); + value: Math.trunc(foodCost * 0.2) + }); } else { retval.push({text: "Adjustment for unusual dietary deficiencies", value: Math.trunc(foodCost * 0.2)}); } diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js index f918d49506395228368cfce72b9195b48c5427bb..bfdb5062d2b85af1190b03404957b911f5df3813 100644 --- a/src/js/rulesAssistantOptions.js +++ b/src/js/rulesAssistantOptions.js @@ -13,7 +13,8 @@ App.RA.options = (function() { const noDefaultSetting = {value: "!NDS!", text: "no default setting"}; /** @type {FC.RA.Rule} */ - let current_rule, root; + let current_rule; + let root; function rulesAssistantOptions(div) { V.nextButton = "Back to Main"; @@ -974,7 +975,7 @@ App.RA.options = (function() { getTextData() { const n = this.numEditor.value !== "" ? Number(this.numEditor.value) : Number.NaN; // Attempt to convert numEditor.value to number, const v = isNaN(n) ? this.numEditor.value : Math.floor(n); // return numEditor.value as number if !NaN (should result in realValue being of number) - return v === null || v === "" ? null : { cond: this.opSelector.value, val: v }; + return v === null || v === "" ? null : {cond: this.opSelector.value, val: v}; } dataEqual(left, right) { diff --git a/src/js/utilsSlave.js b/src/js/utilsSlave.js index 96081a52fe4c003fd93fcfdf24981b1847cdcefb..007708d9ff4ed3bddbdc16a8ffe024470b840f4a 100644 --- a/src/js/utilsSlave.js +++ b/src/js/utilsSlave.js @@ -2090,9 +2090,9 @@ globalThis.newSlave = function(slave) { * @returns {number} */ globalThis.fetishChangeChance = function(slave) { - let chance = 0, - fetish = (slave.fetishStrength / 4), - sex = 0; + let chance = 0; + let fetish = (slave.fetishStrength / 4); + let sex = 0; if (slave.clitSetting !== slave.fetish && !('fetishChanged' in slave && slave.fetishChanged === 1)) { // fetish should be more uncertain leading towards puberty and then steadily become more set in stone afterwards @@ -2135,7 +2135,7 @@ globalThis.SlaveFullBirthName = function(slave) { */ globalThis.PoliteRudeTitle = function(slave) { const PC = V.PC; - const { s, ss, title } = getEnunciation(slave); + const {s, ss, title} = getEnunciation(slave); let r = ""; if (slave.nationality === "Japanese") { @@ -3269,7 +3269,7 @@ globalThis.ageSlave = function(slave, forceDevelopment = false) { * @returns {string} */ globalThis.induceLactation = function(slave, induce = 0) { - const { His } = getPronouns(slave); + const {His} = getPronouns(slave); let r = ""; let lactationStartChance = jsRandom(10, 100); slave.induceLactation += induce; @@ -3316,7 +3316,8 @@ globalThis.induceLactation = function(slave, induce = 0) { * @returns {string} */ globalThis.slaveSkillIncrease = function(targetSkill, slave, skillIncrease = 1) { - let r = "", skillDec; + let r = ""; + let skillDec; const {He, he, his, him} = getPronouns(slave); const isleadershipRole = ['headGirl', 'recruiter', 'bodyguard', 'madam', 'DJ', 'nurse', 'teacher', 'attendant', 'matron', 'stewardess', 'milkmaid', 'farmer', 'wardeness'].includes(targetSkill); if (isleadershipRole) { diff --git a/src/npc/children/longChildDescription.js b/src/npc/children/longChildDescription.js index a49b2573472cd5de74ac237e4595ae330ba1d841..60638365e9d3e21f2fb27003d0d5a8d415245f05 100644 --- a/src/npc/children/longChildDescription.js +++ b/src/npc/children/longChildDescription.js @@ -4408,7 +4408,6 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event } return r; - } function tats() { @@ -8002,7 +8001,7 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event break; case "intensive penis enhancement": case "hyper penis enhancement": - `${He} ${hasAnyArms(child) ? `massages ${his} ${child.dick > 0 ? `dick` : `clit`} uncomfortably` : `squirms under the unfamiliar weight in ${his} ${child.dick > 0 ? `dick` : `clit`}`}. The ${child.drugs === "hyper penis enhancement" ? `HA-HGH` : `A-HGH`} must be having an effect, painfully lengthening and thickening ${his} ${child.dick > 0 ? `dick` : `clit`}. `; + r += `${He} ${hasAnyArms(child) ? `massages ${his} ${child.dick > 0 ? `dick` : `clit`} uncomfortably` : `squirms under the unfamiliar weight in ${his} ${child.dick > 0 ? `dick` : `clit`}`}. The ${child.drugs === "hyper penis enhancement" ? `HA-HGH` : `A-HGH`} must be having an effect, painfully lengthening and thickening ${his} ${child.dick > 0 ? `dick` : `clit`}. `; break; case "intensive testicle enhancement": case "hyper testicle enhancement":