diff --git a/js/003-data/policiesData.js b/js/003-data/policiesData.js index d3ea8334c2bb730369513211298f75fc6ab337e1..e5ad057b92a9668ef6d673aae539d1d86617b485 100644 --- a/js/003-data/policiesData.js +++ b/js/003-data/policiesData.js @@ -316,11 +316,10 @@ App.Data.Policies.Selection = { { title: "Age Of Sexual Appeal", get text() { - const el = new DocumentFragment; - if(V.idealAge === 18) { + const el = new DocumentFragment(); + if (V.idealAge === 18) { el.append(`many consider the most sexually appealing age to be the old world default of 18. You will use your influence to change the sexual ideal to `); - } - else { + } else { el.append(`many consider the most sexually appealing age to be ${V.idealAge}. You will use your influence to change the sexual ideal to `); } el.append( @@ -331,10 +330,10 @@ App.Data.Policies.Selection = { v => { let minAge = V.minimumSlaveAge; let maxAge = V.retirementAge - 1 > 60 ? 60 : V.retirementAge - 1;/* problems do occur if idealAge can be set to over 60 */ - if(V.arcologies[0].FSMaturityPreferentialist !== "unset") { + if (V.arcologies[0].FSMaturityPreferentialist !== "unset") { minAge = 30; } - if(V.arcologies[0].FSYouthPreferentialist !== "unset") { + if (V.arcologies[0].FSYouthPreferentialist !== "unset") { maxAge = 29; } V.targetIdealAge = Math.clamp(v, minAge, maxAge); @@ -350,21 +349,20 @@ App.Data.Policies.Selection = { get activatedText() { return `you are using your personal influence to make ${V.targetIdealAge} the most sexually appealing age. The current perceived ideal age is ${V.idealAge}.`; }, - onRepeal: function() { - if(V.arcologies[0].FSMaturityPreferentialist !== "unset") { - if(V.idealAge < 30) { + onRepeal: function() { + if (V.arcologies[0].FSMaturityPreferentialist !== "unset") { + if (V.idealAge < 30) { V.idealAge = 30; } V.targetIdealAge = 30; - } - else { - if(V.idealAge >= 30) { + } else { + if (V.idealAge >= 30) { V.idealAge = 29; } V.targetIdealAge = 18; } }, - get note() { return `Will cost ${cashFormat(1500)} weekly until the target age is reached; high reputation will accelerate adoption.`} + get note() { return `Will cost ${cashFormat(1500)} weekly until the target age is reached; high reputation will accelerate adoption.`; } } ], "arcologies[0].FSEgyptianRevivalistIncestPolicy": [ @@ -790,7 +788,7 @@ App.Data.Policies.Selection = { { title: "Redefined Mandatory Retirement Age", get text() { - const el = new DocumentFragment; + const el = new DocumentFragment(); el.append(`you will set your arcology's standard retirement age for sex slaves at age `); el.append( App.UI.DOM.makeElement( @@ -823,7 +821,7 @@ App.Data.Policies.Selection = { { title: "Physical Retirement Age", get text() { - const el = new DocumentFragment; + const el = new DocumentFragment(); el.append(`you will replace your arcology's standard age-based retirement policy for one retiring sex slaves once their bodies reach age `); el.append( App.UI.DOM.makeElement( @@ -834,7 +832,7 @@ App.Data.Policies.Selection = { const age = Math.clamp(v, 20, 120); V.customRetirementAge = age; V.retirementAge = age; - if(V.idealAge >= V.retirementAge) { + if (V.idealAge >= V.retirementAge) { V.idealAge = V.retirementAge - 1; } App.UI.reload(); @@ -895,7 +893,7 @@ App.Data.Policies.Selection = { title: "Sexual Milestone Retirement", get text() { return `slaves will be rewarded with their freedom once they have been fucked ${V.policies.retirement.sex === 0 ? "a set number of" : num(V.policies.retirement.sex)} times.`; }, get activatedText() { - const el = new DocumentFragment; + const el = new DocumentFragment(); let div = document.createElement("div"); el.append(`slaves are rewarded with their freedom once they have been fucked ${num(V.policies.retirement.sex)} times.`); div.append(`Set a new retirement requirement:`); @@ -925,7 +923,7 @@ App.Data.Policies.Selection = { title: "Productive Cow Retirement", get text() { return `slaves will be rewarded with their freedom once they have given ${V.policies.retirement.milk === 0 ? "a set number of" : num(V.policies.retirement.milk)} liters of milk.`; }, get activatedText() { - const el = new DocumentFragment; + const el = new DocumentFragment(); let div = document.createElement("div"); el.append(`slaves are rewarded with their freedom once they have given ${num(V.policies.retirement.milk)} liters of milk.`); div.append(`Set a new retirement requirement:`); @@ -955,7 +953,7 @@ App.Data.Policies.Selection = { title: "Productive Bull Retirement", get text() { return `slaves will be rewarded with their freedom once they have given ${V.policies.retirement.cum === 0 ? "a set number of" : num(V.policies.retirement.cum)} deciliters of cum.`; }, get activatedText() { - const el = new DocumentFragment; + const el = new DocumentFragment(); let div = document.createElement("div"); el.append(`slaves are rewarded with their freedom once they have given ${num(V.policies.retirement.cum)} deciliters of cum.`); div.append(`Set a new retirement requirement:`); @@ -985,7 +983,7 @@ App.Data.Policies.Selection = { title: "Fertile Breeder Retirement", get text() { return `slaves will be rewarded with their freedom once they add ${V.policies.retirement.births === 0 ? "a set number of" : num(V.policies.retirement.births)} new slaves to the population of ${V.arcologies[0].name}.`; }, get activatedText() { - const el = new DocumentFragment; + const el = new DocumentFragment(); let div = document.createElement("div"); el.append(`slaves are rewarded with their freedom once they add ${num(V.policies.retirement.births)} new slaves to the population of ${V.arcologies[0].name}. `); div.append(`Set a new retirement requirement:`); @@ -1015,7 +1013,7 @@ App.Data.Policies.Selection = { title: "Champion Gladiatrix Retirement", get text() { return `slaves will be rewarded with their freedom once they have killed ${V.policies.retirement.kills === 0 ? "a set number of" : num(V.policies.retirement.kills)} of their fellow slaves in the pit.`; }, get activatedText() { - const el = new DocumentFragment; + const el = new DocumentFragment(); let div = document.createElement("div"); el.append(`slaves are rewarded with their freedom once they have killed ${num(V.policies.retirement.kills)} of their fellow slaves in the pit.`); div.append(`Set a new retirement requirement:`); @@ -1045,7 +1043,7 @@ App.Data.Policies.Selection = { "policies.retirement.menial2Citizen": [ { get title() { - const el = new DocumentFragment; + const el = new DocumentFragment(); if (V.policies.retirement.menial2Citizen !== 1) { let div = document.createElement("div"); let span = document.createElement("span"); @@ -1063,7 +1061,7 @@ App.Data.Policies.Selection = { return el; }, get text() { - const el = new DocumentFragment; + const el = new DocumentFragment(); el.append(`you will set your arcology's retirement age for menial slaves at age`); el.append( App.UI.DOM.makeElement( diff --git a/src/art/webgl/art.js b/src/art/webgl/art.js index 9ff669b41873da2a1d185907330ccf6a0df5a525..f902cb5a7833e458fb9e28578e10b434b0a075b4 100644 --- a/src/art/webgl/art.js +++ b/src/art/webgl/art.js @@ -118,7 +118,7 @@ App.Art.applyFigures = function(slave, scene, p) { p.applyNipples = false; break; case "a bunny outfit": - figures.push("Bunny Suit", "Bunny Gloves", "Bunny Chocker", "Bunny Shoes", "Bunny Stocking", "Bunny Ears"); + figures.push("Bunny Suit", "Bunny Gloves", "Bunny Choker", "Bunny Shoes", "Bunny Stocking", "Bunny Ears"); p.applyPanty = false; p.hideDick = true; p.applyNipples = false; @@ -1838,16 +1838,14 @@ App.Art.getAnimState = function(slave, scene, p, morphs, isAnimTick) { if (Math.random() < (slave.trust + 100) / 200) { // trusting slave - happy animations faceAnimList.push("expressionsHappy", "expressionsHappyCheerful", "expressionsHappyDelighted", "expressionsHappyFriendly", "expressionsHappySweet"); - } - else { + } else { // fearful slave - fear/sad animations faceAnimList.push("expressionsFear", "expressionsFearAlarm", "expressionsFearAnticipation", "expressionsFearFrightened", "expressionsSadConfused", "expressionsSadOffended", "expressionsSadDejected", "expressionsSadIll"); } if (Math.random() < (slave.devotion + 100) / 200) { // devoted slave - seductive animations faceAnimList.push("expressionsSeductiveDesire", "expressionsSeductiveLoving"); - } - else { + } else { // hateful slave - angry animations faceAnimList.push("expressionsAngerFierce", "expressionsAngerGrumpy", "expressionsAngerSnarl"); } @@ -1870,8 +1868,7 @@ App.Art.getAnimState = function(slave, scene, p, morphs, isAnimTick) { if (App.Art.artSize === 1) { animLength[i] = (Math.random() * 0.5) + 0.5; animDelay[i] = (Math.floor(Math.random() * 4) + 1) * V.animFPS; - } - else { + } else { animLength[i] = (Math.random() * 4) + 2; animDelay[i] = (Math.floor(Math.random() * 25) + 5) * V.animFPS; } @@ -1900,7 +1897,7 @@ App.Art.getAnimState = function(slave, scene, p, morphs, isAnimTick) { animLength[4] = (Math.random() * 2) + 0.5; animDelay[4] = (Math.floor(Math.random() * 10) + 5) * V.animFPS; animPower[4] = Math.random(); - + currentAnim[5] = ((Math.random() < (slave.trust + 100) / 200) ? "down" : "up"); eyeMoveReciprocal = (Math.random() > (slave.trust + 100) / 200); animLength[5] = (Math.random() * 2) + 0.5; @@ -1930,7 +1927,7 @@ App.Art.getAnimState = function(slave, scene, p, morphs, isAnimTick) { if (slave.devotion <= 50) { slaveArmsDown += Math.max(Math.min(-slave.weight/300/3.5, -slave.scrotum/200), -0.5); } - + if (p.applyExtremeHeels || p.applyExtremeHeels2) { slaveLegsClosed += Math.max(Math.min(-slave.weight/300/3.5 - 0.5, -slave.scrotum/20), -1.5); } else { @@ -1940,7 +1937,7 @@ App.Art.getAnimState = function(slave, scene, p, morphs, isAnimTick) { if (slave.devotion <= 50) { slaveArmsDown += Math.max(-slave.weight/300/3.5, -0.5); } - + if (p.applyExtremeHeels || p.applyExtremeHeels2 && !scene.inspect) { slaveLegsClosed += Math.max(-slave.weight/300/3.5 - 0.5, -1.5); } else { @@ -2044,16 +2041,13 @@ App.Art.getAnimState = function(slave, scene, p, morphs, isAnimTick) { if (currentAnim[i] === "headBendLeft" || currentAnim[i] === "headTwistLeft") { if (eyeMoveReciprocal) { morphs.push(["eyesLookRight", getAnimState(animPower[i] * 0.75)]); - } - else { + } else { morphs.push(["eyesLookLeft", getAnimState(animPower[i] * 0.75)]); } - } - else { + } else { if (eyeMoveReciprocal) { morphs.push(["eyesLookLeft", getAnimState(animPower[i] * 0.75)]); - } - else { + } else { morphs.push(["eyesLookRight", getAnimState(animPower[i] * 0.75)]); } } @@ -2064,8 +2058,7 @@ App.Art.getAnimState = function(slave, scene, p, morphs, isAnimTick) { morphs.push(["headBendBackwards", getAnimState(animPower[i] * 0.15)]); if (eyeMoveReciprocal) { morphs.push(["eyesLookDown", getAnimState(animPower[i] * 0.5)]); - } - else { + } else { morphs.push(["eyesLookUp", getAnimState(animPower[i] * 0.5)]); } break; @@ -2073,8 +2066,7 @@ App.Art.getAnimState = function(slave, scene, p, morphs, isAnimTick) { morphs.push(["headBendForward", getAnimState(animPower[i] * 0.25)]); if (eyeMoveReciprocal) { morphs.push(["eyesLookUp", getAnimState(animPower[i] * 0.5)]); - } - else { + } else { morphs.push(["eyesLookDown", getAnimState(animPower[i] * 0.5)]); } break; @@ -2091,8 +2083,7 @@ App.Art.getAnimState = function(slave, scene, p, morphs, isAnimTick) { case 0: // pose if (App.Art.artSize === 1) { animDelay[i] = (Math.floor(Math.random() * 4) + 1) * V.animFPS; - } - else { + } else { animDelay[i] = (Math.floor(Math.random() * 10) + 10) * V.animFPS; } break; @@ -2112,11 +2103,9 @@ App.Art.getAnimState = function(slave, scene, p, morphs, isAnimTick) { } animFrame[i]++; } - } - else if (animState[i] === -1.0 && animFrame[i] > 0) { // end of anim track + } else if (animState[i] === -1.0 && animFrame[i] > 0) { // end of anim track currentAnim[i] = ""; - } - else { + } else { animFrame[i]++; } } @@ -2169,7 +2158,7 @@ App.Art.applyMorphs = function(slave, scene, p, isAnimating) { if (slave.devotion <= 50) { morphs.push(["posesArmsDown", Math.max(Math.min(-slave.weight/300/3.5, -slave.scrotum/200), -0.5)]); } - + if (p.applyExtremeHeels || p.applyExtremeHeels2) { morphs.push(["posesLegsClosed", Math.max(Math.min(-slave.weight/300/3.5 - 0.5, -slave.scrotum/20), -1.5)]); } else { @@ -2179,7 +2168,7 @@ App.Art.applyMorphs = function(slave, scene, p, isAnimating) { if (slave.devotion <= 50) { morphs.push(["posesArmsDown", Math.max(-slave.weight/300/3.5, -0.5)]); } - + if (p.applyExtremeHeels || p.applyExtremeHeels2) { morphs.push(["posesLegsClosed", Math.max(-slave.weight/300/3.5 - 0.5, -1.5)]); } else { @@ -2188,7 +2177,7 @@ App.Art.applyMorphs = function(slave, scene, p, isAnimating) { } } } - + if (slave.trust < 0) { morphs.push(["expressionsFear", Math.abs(slave.trust)/100]); } else { diff --git a/src/events/scheduled/seFctvWatch.js b/src/events/scheduled/seFctvWatch.js index 4ac7c13910194d7df7706f388c7ed1d29defc6cc..f2e9fe824f237b69c388ae8167172125af1c5148 100644 --- a/src/events/scheduled/seFctvWatch.js +++ b/src/events/scheduled/seFctvWatch.js @@ -247,9 +247,9 @@ App.Events.SEfctvWatch = class SEfctvWatch extends App.Events.BaseEvent { * @returns {Node} */ function channelFailed(text) { - const frag = new DocumentFragment; + const frag = new DocumentFragment(); frag.append(`A notification is shown: `); - App.UI.DOM.appendNewElement("span", frag, text, "note"); + App.UI.DOM.appendNewElement("span", frag, text, ["note"]); frag.append(`, changing program.`); return frag; } diff --git a/src/interaction/policies/policies.js b/src/interaction/policies/policies.js index c07cdea812037630ca95664cbdf6de8dfec84bda..6075feea5b6015ddd959bc2d60acbb221c287df2 100644 --- a/src/interaction/policies/policies.js +++ b/src/interaction/policies/policies.js @@ -91,7 +91,7 @@ globalThis.policy = function(category) { * @returns {Node} Link to repeal. */ function repeal(p) { - const frag = new DocumentFragment; + const frag = new DocumentFragment(); let check = canAfford(); let link; if (!(p.hasOwnProperty("hide") && p.hide.button === 1)) { @@ -129,7 +129,7 @@ globalThis.policy = function(category) { */ function implement(p, enable) { let check = canAfford(); - const frag = new DocumentFragment; + const frag = new DocumentFragment(); const linkArray = []; let link; if (check === true) { diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js index 6f5d9ae3ed73463b0d6677aba98a49c71d3dd4ef..110c43fc817daa606b53b256552e9a5d87160258 100644 --- a/src/js/DefaultRules.js +++ b/src/js/DefaultRules.js @@ -583,9 +583,9 @@ globalThis.DefaultRules = function(slave) { if ((rule.vaginalAccessory !== undefined) && (rule.vaginalAccessory !== null)) { if (slave.vaginalAccessory !== rule.vaginalAccessory) { slave.vaginalAccessory = rule.vaginalAccessory; + const m = `${slave.slaveName} has been given a`; switch (slave.vaginalAccessory) { case "huge dildo": - const m = `${slave.slaveName} has been given a`; if (slave.vagina >= 2) { message(`${m} massive dildo to permanently gape ${his} cunt.`, sourceRecord.vaginalAccessory); } else { diff --git a/src/js/utilsPC.js b/src/js/utilsPC.js index 206a3cbd8c4299a224aa7d7e0ab37e30ea170a74..3d439804db2d578aefb09092e82bd9257f60508f 100644 --- a/src/js/utilsPC.js +++ b/src/js/utilsPC.js @@ -709,7 +709,7 @@ globalThis.PCCareerTier = function(career = V.PC.career) { } console.log(`"${career}" not found in App.Data.player.career`); return "master"; -} +}; /** Identifies which category the PC's career is in * @param {string} [career] @@ -723,4 +723,4 @@ globalThis.PCCareerCategory = function(career = V.PC.career) { } console.log(`"${career}" not found in App.Data.player.career`); return career; -} +}; diff --git a/src/js/utilsSlave.js b/src/js/utilsSlave.js index 496a6e87d2aa6e05660dd8bd9e360fe619e5a865..dbc1635ae0bf275955651e1df40be989e5f10959 100644 --- a/src/js/utilsSlave.js +++ b/src/js/utilsSlave.js @@ -3201,4 +3201,4 @@ globalThis.ChattelReligionistClothingPass = function(outfit) { } else { return fsLovesClothes; } -} +}; diff --git a/src/markets/theMarket/tradeMenials.js b/src/markets/theMarket/tradeMenials.js index aebf1ed099390c54ef86808578df64fee3413c43..276e2ea29aee3ae8eb18bc475a4b5890c6881d08 100644 --- a/src/markets/theMarket/tradeMenials.js +++ b/src/markets/theMarket/tradeMenials.js @@ -64,8 +64,8 @@ App.UI.tradeMenials = function(menialWorkersOnly) { } if (V.cheatMode && V.cheatModeM) { const menDemand = function() { - const el = new DocumentFragment; - App.UI.DOM.appendNewElement("span", el, `Slave Demand`, `yellowgreen`); + const el = new DocumentFragment(); + App.UI.DOM.appendNewElement("span", el, `Slave Demand`, ["yellowgreen"]); el.append(`| ${V.menialDemandFactor}`); return el; }; @@ -122,7 +122,7 @@ App.UI.tradeMenials = function(menialWorkersOnly) { if (V.cheatMode && V.cheatModeM) { const menSupply = function() { - const el = new DocumentFragment; + const el = new DocumentFragment(); App.UI.DOM.appendNewElement("span", el, `Slave Supply`, `yellowgreen`); el.append(`| ${V.menialSupplyFactor}`); return el; diff --git a/src/pregmod/blackMarket.js b/src/pregmod/blackMarket.js index a956270f4fef585566c4d0e48c0899f205e35c27..ae6867adfb282bca7c9120e59863ebcf96442492 100644 --- a/src/pregmod/blackMarket.js +++ b/src/pregmod/blackMarket.js @@ -321,11 +321,11 @@ App.UI.blackMarket = function() { r.push(r.pop() + `"`); App.Events.addNode(node, r, "div"); r = []; + const NCSCash = 135000; if (V.thisWeeksIllegalWares !== 0 && V.thisWeeksIllegalWares.length > 0) { for (const ware of V.thisWeeksIllegalWares) { // TODO: why do we loop at all, instead of just checking if it's in array. switch (ware) { case "childhoodFertilityInducedNCS": - const NCSCash = 135000; if (V.minimumSlaveAge <= 15) { r.push(App.UI.DOM.makeElement("div", `Childhood Fertility Induced NCS (Induced Neotenic Complex Syndrome or Syndrome X modified for fertility).`, ["cyan"])); if (V.minimumSlaveAge > 8) {