diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js index 42cc4585ad59425129ac4e224898221880a044a6..377e444007fa07d6ee571abcb8a10821691aefd3 100644 --- a/src/endWeek/saServeThePublic.js +++ b/src/endWeek/saServeThePublic.js @@ -33,7 +33,7 @@ window.saServeThePublic = (function saServeThePublic() { he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, girl = pronouns.noun; He = capFirstChar(he), His = capFirstChar(his); girl === "girl" ? loli = "loli" : loli = "shota"; - + gatherStatistics(slave); if (slave.assignment === "serve in the club") { // By being at the end, every slave after the first will get a bonus. By moving it up, the first can enjoy it too. updateNonSlaveVariables() checks Edo Rivalist, so here we are. @@ -71,14 +71,14 @@ window.saServeThePublic = (function saServeThePublic() { const facility = slave.assignment === Job.CLUB ? V.facility.club : undefined; T.incomeStats = getSlaveStatisticData(slave, facility); } - + // I suspect this one will mostly be cut out in the overhauling /** @param {App.Entity.SlaveState} slave */ function updateNonSlaveVariables(slave) { if (slave.assignment === "serve in the club" || slave.assignment === "serve the public") { V.publicServants += 1; } - + // FResult setting FuckResult = FResult(slave); //slave needs release @@ -102,7 +102,7 @@ window.saServeThePublic = (function saServeThePublic() { if (canDoAnal(slave) && slave.anus === 0) { FuckResult += 10; } - + // Beauty setting beauty = Beauty(slave); if (V.ACitizens > (V.ASlaves * 4)) { @@ -127,7 +127,7 @@ window.saServeThePublic = (function saServeThePublic() { if (slave.minorInjury !== 0) { beauty -= 1; } - + // Beauty multipliers if (arcology.FSEdoRevivalist === "unset") { beautyMultiplier = 1; @@ -318,7 +318,7 @@ window.saServeThePublic = (function saServeThePublic() { r += ` ${His} inability to move to the rhythm of the music is very off putting to those looking to party.`; } if (V.DJ !== 0) { - let DJpronouns = getPronouns(V.DJ); + const DJpronouns = getPronouns(V.DJ); if (V.DJRepBonus > 0) { if (slave.assignment === "serve the public") { r += ` Working`; @@ -444,7 +444,7 @@ window.saServeThePublic = (function saServeThePublic() { if (slave.curatives > 0 || slave.inflationType === "curative") { r += ` The drugs `; if (slave.inflationType === "curative") { - r += `${he} holds within ${his} gut`; + r += `${he} holds within ${his} gut`; } else { r += `${he}'s on`; } @@ -642,7 +642,7 @@ window.saServeThePublic = (function saServeThePublic() { } r += ` pussy,`; } else if (beauty > 70 && jsRandom(1, 3) === 1) { - r += `getting gangbanged,` + r += `getting gangbanged,`; } else if (jsRandom(1, 2) === 1) { r += `giving away one of ${his} `; if (slave.prestige > 1 || slave.pornPrestige > 2) { @@ -681,7 +681,7 @@ window.saServeThePublic = (function saServeThePublic() { if (slave.amp !== 1) { if (slave.entertainSkill < 100) { r += ` ${He} gains experience as a public slut.`; - skillIncrease = (10 + Math.floor((slave.intelligence + slave.intelligenceImplant) / 32)) + skillIncrease = (10 + Math.floor((slave.intelligence + slave.intelligenceImplant) / 32)); r += `${SkillIncrease.Entertain(slave, skillIncrease)}`; } } @@ -695,14 +695,14 @@ window.saServeThePublic = (function saServeThePublic() { if (slave.releaseRules === "restrictive" && slave.standardReward !== "orgasm") { r += ` ${He}'s a better slut because public service is ${his} main sexual outlet.`; } - + //Someone double check this block if (V.familyTesting === 1) { if (totalRelatives(slave) > 0) { let children = []; children = V.slaves.filter( - function(s) { - return ((slave.ID == s.father || slave.ID == s.mother || s.ID == slave.father || s.ID == slave.mother || areSisters(slave, s) > 0) && (s.assignment === slave.assignment)); + function(s) { + return ((slave.ID === s.father || slave.ID === s.mother || s.ID === slave.father || s.ID === slave.mother || areSisters(slave, s) > 0) && (s.assignment === slave.assignment)); } ); if (children.length > 2) { @@ -828,7 +828,7 @@ window.saServeThePublic = (function saServeThePublic() { if (slave.butt > 4 && slave.boobs > 800) { if (arcology.FSAssetExpansionist !== "unset") { r += ` ${His} huge, fashionable assets are immensely popular.`; - if (canTalk(slave)){ + if (canTalk(slave)) { if (slave.voice > 2) { r += ` ${His} high voice contributes to ${his} bimbo image, so ${he} does even better.`; } @@ -916,7 +916,7 @@ window.saServeThePublic = (function saServeThePublic() { } } } else if (arcology.FSHedonisticDecadence !== "unset" && slave.weight <= 30) { // reduced weight malus for fat loving societies - if (arcology.FSHedonisticDecadenceStrongFat === 1) { // no muscle malus for muscle loving societies + if (arcology.FSHedonisticDecadenceStrongFat === 1) { // no muscle malus for muscle loving societies if (arcology.FSSlimnessEnthusiast > 20) { r += ` The public enjoys ${his} fashionably sleek little body.`; } else { @@ -1360,7 +1360,7 @@ window.saServeThePublic = (function saServeThePublic() { } T.incomeStats.income += Math.trunc((beauty * FuckResult) * (1 + (0.003 * slave.entertainSkill)) * 0.15); } - + function applyFSDecoration() { /* FACILITY DECORATION IMPACTS */ const fsBeauty = (0.0005 * V.FSSingleSlaveRep * beauty); @@ -1442,9 +1442,8 @@ window.saServeThePublic = (function saServeThePublic() { /** @param {App.Entity.SlaveState} slave */ function sexCounts(slave) { - /* SEX ACT COUNTS AND SEXUAL SATISFACTION */ - + oralUse = (V.oralUseWeight + (slave.oralSkill / 30) + (slave.lips / 20)); analUse = 0; if (canDoAnal(slave)) { @@ -1553,7 +1552,7 @@ window.saServeThePublic = (function saServeThePublic() { break; case "boobs": if (mammaryUse > 0) { - r += ` ${He} enjoys ` + r += ` ${He} enjoys `; if (slave.nipples === "fuckable") { r += `having ${his} tits fucked,`; } else { @@ -1685,4 +1684,4 @@ window.saServeThePublic = (function saServeThePublic() { } } } -})(); \ No newline at end of file +})();