diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js index 7889818b32d2be19fd5ce391403829b43b3b5b90..5d83ed514c3a7f1d7e7e79b449c2de2d2e6458ab 100644 --- a/src/data/backwardsCompatibility/backwardsCompatibility.js +++ b/src/data/backwardsCompatibility/backwardsCompatibility.js @@ -1,3 +1,4 @@ +/* eslint-disable no-lone-blocks */ App.Update.autoshred = function(node) { const set = new Set( Object.getOwnPropertyNames(App.Data.defaultGameStateVariables).concat( @@ -993,7 +994,7 @@ App.Update.globalVariables = function(node) { // move from "V.corpDivArcade" format to "V.corp.DivArcade" (put corp into one object) for (let variable in State.variables) { if (variable.startsWith('corp') && variable !== "corp") { - console.log ("Corp: moving V." + variable, V[variable], "to V.corp." + variable.slice(4)); + console.log("Corp: moving V." + variable, V[variable], "to V.corp." + variable.slice(4)); if (Array.isArray(V[variable])){ V.corp[variable.slice(4)] = Array.from(V[variable]); } else if (typeof V[variable] === "object" && typeof V[variable] !== undefined) { diff --git a/src/js/assignJS.js b/src/js/assignJS.js index 007db25b71f159e7be671a5c9a1004db4405f871..d04f9b90c0ffe33e6ccbdc986e2f34fc6e6659b9 100644 --- a/src/js/assignJS.js +++ b/src/js/assignJS.js @@ -674,7 +674,7 @@ globalThis.removeJob = function(slave, assignment, saveRecord = false) { globalThis.assignmentVisible = function(slave) { switch (slave.assignment) { /* normal out-of-penthouse jobs */ - case Job.ARCADE : + case Job.ARCADE: case Job.BROTHEL: case Job.CELLBLOCK: case Job.CLINIC: diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js index 40fee5bae588e51fa0c97ec12f1279af599e89ed..19ca5bfffd15fcd32a0fe3e6b85e08ed8f99f244 100644 --- a/src/js/descriptionWidgets.js +++ b/src/js/descriptionWidgets.js @@ -164,7 +164,7 @@ App.Desc.eyes = function(slave) { if (slave.intelligence + slave.intelligenceImplant > 15) { r += `but ${his} facial expressions reveal ${his} cleverness; with ${his} education, ${he} can be considered of <span class="deepskyblue">above average intelligence.</span> `; } else if (slave.intelligence + slave.intelligenceImplant < -15) { - r += `but ${his} facial expressions reveal ${his} alertness; with ${his} miseducation, however, ${he} exibits <span class="orangered">below average intelligence.</span> `; + r += `but ${his} facial expressions reveal ${his} alertness; with ${his} miseducation, however, ${he} exhibits <span class="orangered">below average intelligence.</span> `; } else if (slave.intelligenceImplant >= 15) { r += `but ${his} facial expressions reveal ${his} alertness; ${he} is of average intelligence due to being `; if (slave.intelligenceImplant >= 30) { @@ -292,7 +292,7 @@ App.Desc.eyes = function(slave) { if (slave.intelligence + slave.intelligenceImplant > 15) { r += `clever; with ${his} education, ${he} can be considered of <span class="deepskyblue">above average intelligence.</span> `; } else if (slave.intelligence + slave.intelligenceImplant < -15) { - r += `alert; with ${his} miseducation, however, ${he} exibits <span class="orangered">below average intelligence.</span> `; + r += `alert; with ${his} miseducation, however, ${he} exhibits <span class="orangered">below average intelligence.</span> `; } else if (slave.intelligenceImplant >= 15) { r += `alert; ${he} is of average intelligence due to being `; if (slave.intelligenceImplant >= 30) { @@ -415,7 +415,7 @@ App.Desc.ageAndHealth = function(slave) { } else if (H.shortDamage >= 70) { array.push(`is <span class="red">gravely injured</span> with assured lasting effects`); } else if (H.shortDamage >= 40) { - array.push(`is <span class="red">seriouly injured</span> with some lasting effects`); + array.push(`is <span class="red">seriously injured</span> with some lasting effects`); } else if (H.shortDamage >= 20) { array.push(`is <span class="orange">injured</span>`); } else if (H.shortDamage > 0) { @@ -741,7 +741,7 @@ App.Desc.ageAndHealth = function(slave) { } else if (H.shortDamage >= 70) { r += ` <span class="red">gravely damaged</span>`; } else if (H.shortDamage >= 40) { - r += ` <span class="red">seriouly damaged</span>`; + r += ` <span class="red">seriously damaged</span>`; } else if (H.shortDamage >= 20) { r += ` <span class="red">damaged</span>`; } else if (H.shortDamage > 0) { @@ -1705,13 +1705,13 @@ App.Desc.sexualHistory = function(slave) { } r += `within the walls of ${V.arcologies[0].name}. `; } - + if (slave.counter.abortions > 0) { - r += `${He} has had a total of ${numberWithPluralOne(slave.counter.abortions, "abortion")}. `; + r += `${He} has had a total of ${numberWithPluralOne(slave.counter.abortions, "abortion")}. `; } - + if (slave.counter.miscarriages > 0) { - r += `${He} has had a total of ${numberWithPluralOne(slave.counter.miscarriages, "miscarriage")}. `; + r += `${He} has had a total of ${numberWithPluralOne(slave.counter.miscarriages, "miscarriage")}. `; } if (slave.counter.slavesKnockedUp > 0) { @@ -1736,7 +1736,7 @@ App.Desc.sexualHistory = function(slave) { return r; }; -App.Desc.faceAccessory = function(slave) { +App.Desc.faceAccessory = function(slave) { const {He, his} = getPronouns(slave); switch (slave.faceAccessory) { case "porcelain mask": @@ -1746,7 +1746,7 @@ App.Desc.faceAccessory = function(slave) { } }; -App.Desc.mouthAccessory = function(slave) { +App.Desc.mouthAccessory = function(slave) { const {He, His, him, he, his, himself, girl} = getPronouns(slave); let r = ``; switch (slave.mouthAccessory ) { @@ -1763,7 +1763,7 @@ App.Desc.mouthAccessory = function(slave) { r += `${He} is wearing a jaw spreading, bar-shaped gag that prevents ${him} from speaking while keeping $him uncomfortably aware of ${his} status.`; break; case "dildo gag": - r += `${He} is wearing a sturdy leather collar that continues up to restrict ${his} jaw as well. It holds a ring gag in ${his} mouth, into which slots a formidable inward-facing dildo that reaches down ${his} throat. It can be removed to facefuck ${him}.`; + r += `${He} is wearing a sturdy leather collar that continues up to restrict ${his} jaw as well. It holds a ring gag in ${his} mouth, into which slots a formidable inward-facing dildo that reaches down ${his} throat. It can be removed to facefuck ${him}.`; break; case "massive dildo gag": r += `${He} is wearing a sturdy leather collar that continues up to restrict ${his} jaw as well. It acts as an anchor for an enormous inward-facing dildo that reaches deep down ${his} throat. The sheer size of the phallus forces ${his} mouth as wide as it will go and considerably bulges ${his} throat. Fortunately for ${him}, it is designed to allow ${him} to be able to breathe through ${his} nose; though when removed, the poor ${girl} finds ${himself} incapable of closing ${his} mouth for some time.`; diff --git a/src/js/economyJS.js b/src/js/economyJS.js index 388048944d013aa03906e100e5bf699ca5b463c7..316e19d54520109881e8ea10431ef68844003dd2 100644 --- a/src/js/economyJS.js +++ b/src/js/economyJS.js @@ -17,30 +17,30 @@ globalThis.CategoryAssociatedGroup = Object.freeze({ 'slaveAssignmentGloryhole', 'slaveAssignmentConfinement', 'slaveAssignmentChoice' - ], + ], HEADGIRLSUITE: [ 'slaveAssignmentHeadgirl', 'slaveAssignmentHeadgirlsuite' - ], + ], RECRUITER: [ 'slaveAssignmentRecruiter' - ], + ], DOJO: [ 'slaveAssignmentBodyguard' - ], + ], MASTERSUITE: [ 'masterSuite', 'slaveAssignmentConcubine', 'slaveAssignmentMastersuite' - ], + ], AGENT: [ 'slaveAssignmentAgent', 'slaveAssignmentAgentPartner' - ], + ], ARCADE: [ 'arcade', 'slaveAssignmentArcade' - ], + ], BROTHEL: [ 'brothel', 'slaveAssignmentMadam', @@ -48,12 +48,12 @@ globalThis.CategoryAssociatedGroup = Object.freeze({ 'slaveAssignmentBrothel', 'slaveAssignmentBrothelVign', 'brothelAds' - ], + ], CELLBLOCK: [ 'cellblock', 'slaveAssignmentWarden', 'slaveAssignmentCellblock' - ], + ], CLUB: [ 'club', 'slaveAssignmentDj', @@ -61,70 +61,70 @@ globalThis.CategoryAssociatedGroup = Object.freeze({ 'slaveAssignmentClub', 'slaveAssignmentClubVign', 'clubAds' - ], + ], CLINIC: [ 'clinic', 'slaveAssignmentNurse', 'slaveAssignmentClinic' - ], + ], DAIRY: [ 'dairy', 'slaveAssignmentMilkmaid', 'slaveAssignmentDairy', 'slaveAssignmentDairyVign' - ], + ], FARMYARD: [ 'farmyard', 'slaveAssignmentFarmer', 'slaveAssignmentFarmyard', 'slaveAssignmentFarmyardVign', - ], + ], INCUBATOR: [ 'incubator', 'incubatorSlaves' - ], + ], NURSERY: [ 'nursery', 'slaveAssignmentMatron', 'slaveAssignmentNursery', 'slaveAssignmentNurseryVign' - ], + ], PIT: [ 'pit' - ], + ], PROSTHETICLAB: [ 'lab', 'labResearch', 'labScientists', 'labMenials' - ], + ], SCHOOLROOM: [ 'school', 'slaveAssignmentTeacher', 'slaveAssignmentSchool' - ], + ], SERVANTSQUARTERS: [ 'servantsQuarters', 'slaveAssignmentSteward', 'slaveAssignmentQuarter', 'slaveAssignmentQuarterVign' - ], + ], SPA: [ 'spa', 'slaveAssignmentAttendant', 'slaveAssignmentSpa' - ], + ], SLAVES: [ 'porn', 'slaveMod', 'slaveSurgery', 'birth' - ], + ], LABOR: [ 'menialTrades', 'fuckdolls', 'menialBioreactors' - ], + ], FLIPPING: [ 'slaveTransfer', 'menialTransfer', @@ -136,7 +136,7 @@ globalThis.CategoryAssociatedGroup = Object.freeze({ 'menialRetirement', 'labScientistsTransfer', 'babyTransfer' - ], + ], FINANCIALS: [ 'weather', 'rents', @@ -147,14 +147,14 @@ globalThis.CategoryAssociatedGroup = Object.freeze({ 'schoolBacking', 'war', 'cheating' - ], + ], POLICIES: [ 'policies', 'subsidiesAndBarriers' - ], + ], EDICTS: [ 'edicts' - ], + ], PERSONALFINANCE: [ 'personalBusiness', 'personalLivingExpenses', @@ -165,13 +165,13 @@ globalThis.CategoryAssociatedGroup = Object.freeze({ 'privateOrphanage', 'stocks', 'stocksTraded' - ], + ], SECURITY: [ 'mercenaries', 'securityExpansion', 'specialForces', 'peacekeepers' - ] + ] }); globalThis.calculateCosts = (function() { @@ -1526,76 +1526,76 @@ globalThis.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDeman } if (V.Madam !== 0) { const madamIntel = V.Madam.intelligence + V.Madam.intelligenceImplant; - V.MadamCashBonus = 0; + V.madamCashBonus = 0; if (V.Madam.relationship === -3 && V.Madam.devotion > 50) { // As your loving $wife, $he does $his best to attract attention to your brothel. - V.MadamCashBonus += 0.25; + V.madamCashBonus += 0.25; } if (V.Madam.skill.whoring > 10 && V.Madam.skill.whoring <= 30) { // V.Madam.slaveName's basic skills marginally yellowgreen;improve business at $brothelName. - V.MadamCashBonus += 0.05; + V.madamCashBonus += 0.05; } else if (V.Madam.skill.whoring <= 60) { // V.Madam.slaveName's skills yellowgreen;improve business at $brothelName. - V.MadamCashBonus += 0.1; + V.madamCashBonus += 0.1; } else if (V.Madam.skill.whoring < 100) { // V.Madam.slaveName's skills greatly yellowgreen;improve business at $brothelName. - V.MadamCashBonus += 0.15; + V.madamCashBonus += 0.15; } else { // V.Madam.slaveName's mastery immensely yellowgreen;improves business at $brothelName. - V.MadamCashBonus += 0.20; + V.madamCashBonus += 0.20; } if (V.Madam.actualAge > 35) { // $His age and experience also contribute. - V.MadamCashBonus += 0.05; + V.madamCashBonus += 0.05; } else if (V.AgePenalty === 0) { - V.MadamCashBonus += 0.05; + V.madamCashBonus += 0.05; } if (setup.madamCareers.includes(V.Madam.career)) { // $He has experience from $his life before $he was a slave that helps $him in the seedy business of selling other people's bodies for sex. - V.MadamCashBonus += 0.05; + V.madamCashBonus += 0.05; } else if (V.Madam.skill.madam >= V.masteredXP) { // $He has experience from working for you that helps $him in the seedy business of selling other people's bodies for sex. - V.MadamCashBonus += 0.05; + V.madamCashBonus += 0.05; } else { V.Madam.skill.madam += jsRandom(1, Math.ceil((madamIntel) / 15) + 8); } if (madamIntel > 15) { // $He is a clever manager. - V.MadamCashBonus += 0.05 * Math.floor((-0.00008 * madamIntel * madamIntel) + (0.0337 * madamIntel) + 0.5); + V.madamCashBonus += 0.05 * Math.floor((-0.00008 * madamIntel * madamIntel) + (0.0337 * madamIntel) + 0.5); } if (V.Madam.dick > 2 && canPenetrate(V.Madam)) { // $His turgid dick helps $him manage the bitches. - V.MadamCashBonus += 0.05; + V.madamCashBonus += 0.05; } for (const slave of App.Entity.facilities.brothel.employees()) { if (V.Madam.relationshipTarget === slave.ID) { - V.MadamCashBonus -= 0.05; + V.madamCashBonus -= 0.05; } else if (areRelated(V.Madam, slave)) { - V.MadamCashBonus += 0.05; + V.madamCashBonus += 0.05; } if (slave.prestigeDesc === "$He is a famed Free Cities whore, and commands top prices.") { - V.MadamCashBonus += 0.15; + V.madamCashBonus += 0.15; } else if (slave.prestigeDesc === "$He is a famed Free Cities slut, and can please anyone.") { - V.MadamCashBonus += 0.15; + V.madamCashBonus += 0.15; } else if (slave.prestigeDesc === "$He is remembered for winning best in show as a dairy cow.") { if (V.arcologies[0].FSPhysicalIdealist !== "unset") { if (slave.muscles > 60 && slave.weight < 30 && slave.lactation > 0 && slave.boobs - slave.boobsImplant > 6000) { - V.MadamCashBonus += 0.15; + V.madamCashBonus += 0.15; } } else if (V.slaves[i].lactation > 0 && slave.boobs - slave.boobsImplant > 6000) { - V.MadamCashBonus += 0.10; + V.madamCashBonus += 0.10; } } else if (slave.prestigeDesc === "$He is remembered for winning best in show as a cockmilker.") { if (V.arcologies[0].FSGenderFundamentalist !== "unset") { if (slave.balls === 0 && slave.dick === 0 && slave.vagina > -1) { /* this needs review - doesn't fit right. An XY slave would be expected to be masculine. */ - V.MadamCashBonus += 0.20; + V.madamCashBonus += 0.20; } } else if ((slave.balls > 5 && slave.dick !== 0) || (slave.balls > 4 && slave.dick !== 0 && slave.prostate > 1)) { - V.MadamCashBonus += 0.15; + V.madamCashBonus += 0.15; } } else if (slave.prestigeDesc === "$He is remembered for winning best in show as a breeder.") { if (canGetPregnant(slave)) { - V.MadamCashBonus += 0.15; + V.madamCashBonus += 0.15; } else if (isPreg(slave) && slave.bellyPreg >= 5000) { V.madamCashBonus += 0.1; } @@ -2512,10 +2512,10 @@ globalThis.supplyPoliciesReport = function(NPCclass) { r += ` ${dissatisfaction}`; } } else if (V.sexDemandResult[varName] < 750) { - r += `<b>Your ${className} have no issue finding the sexual relief they need inside your arcology.`; - if (V.classSatisfied[varName] === 1) { - r += ` They are <span class='green'>delighted</span> with how quickly you've provided for them.`; - } + r += `<b>Your ${className} have no issue finding the sexual relief they need inside your arcology.`; + if (V.classSatisfied[varName] === 1) { + r += ` They are <span class='green'>delighted</span> with how quickly you've provided for them.`; + } } else { r += `Your ${className} are <span class='green'>${V.sexDemandResult[varName] < 950 ? `happy with the availability` : `delighted with the abundance`} of sexual services</span> inside your arcology.`; } diff --git a/src/js/statsChecker/statsChecker.js b/src/js/statsChecker/statsChecker.js index a2b2e372267c7956492cb36749fafc8d22295f0c..cda6ac74b90bb3cb4fa9dc05c2479e1eb88b9a8e 100644 --- a/src/js/statsChecker/statsChecker.js +++ b/src/js/statsChecker/statsChecker.js @@ -766,15 +766,15 @@ globalThis.canTalk = function(slave, checkLanguage = true) { return false; } else if (slave.lips > 95) { return false; - } else if (slave.mouthAccessory === "dildo gag") { + } else if (slave.mouthAccessory === "dildo gag") { return false; - } else if (slave.mouthAccessory === "massive dildo gag") { + } else if (slave.mouthAccessory === "massive dildo gag") { return false; - } else if (slave.mouthAccessory === "ball gag") { + } else if (slave.mouthAccessory === "ball gag") { return false; - } else if (slave.mouthAccessory === "bit gag") { + } else if (slave.mouthAccessory === "bit gag") { return false; - } else if (slave.mouthAccessory === "ring gag") { + } else if (slave.mouthAccessory === "ring gag") { return false; } return true;