diff --git a/.eslintrc.json b/.eslintrc.json index dd366ede7294dd2087b28c611ac17b862a0822f5..ca6b1a67cabea891cdc6231376feb059900e2df5 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -34,7 +34,7 @@ "eqeqeq": "error", "no-fallthrough": "error", "space-before-function-paren": ["error", "never"], - "no-nested-ternary": "warn", + "no-trailing-spaces": "warn", "no-unneeded-ternary": "error", "camelcase": "warn", "padded-blocks": ["warn", "never"], diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js index 7f9ef193207ebf6f2a715d52d3647d5650e64f26..49026bfbea5a73d3aebb00c9244b6fedba5aad59 100644 --- a/src/endWeek/saServeThePublic.js +++ b/src/endWeek/saServeThePublic.js @@ -664,7 +664,7 @@ window.saServeThePublic = (function saServeThePublic() { r += ` The public fetishizes body mods and considers ${hers} interesting.`; } } else if (arcology.FSBodyPurist > 20 || arcology.FSPaternalist > 20) { - if (V.modScore > 7) { + if (V.modScore <= 7) { r += ` The public disapproves of body mods and is pleased that ${he}'s unspoiled in that regard.`; } else { r += ` The public disapproves of body mods and considers ${hers} unappealing.`; diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js index 57caf147ec2ec0fe0871fe0a7d4c8ecc172c4b92..d9729133642d8afe877d4aa5dba5f2cf6f9ddd41 100644 --- a/src/endWeek/saWhore.js +++ b/src/endWeek/saWhore.js @@ -820,15 +820,15 @@ window.saWhore = (function saWhore() { if (arcology.FSTransformationFetishist > 20 || arcology.FSDegradationist > 20) { if ((V.modScore > 15) || (V.piercingScore > 8 && V.tatScore > 5)) { - r += ` Many customers fetishizes body mods and considers ${hers} fascinating.`; + r += ` Many customers fetishize body mods and consider ${hers} fascinating.`; } else if (V.modScore > 7) { - r += ` Many customers fetishizes body mods and considers ${hers} interesting.`; + r += ` Many customers fetishize body mods and consider ${hers} interesting.`; } } else if (arcology.FSBodyPurist > 20 || arcology.FSPaternalist > 20) { - if (V.modScore > 7) { - r += ` Many customers disapproves of body mods and is pleased that ${he}'s unspoiled in that regard.`; + if (V.modScore <= 7) { + r += ` Many customers disapprove of body mods and are pleased that ${he}'s unspoiled in that regard.`; } else { - r += ` Many customers disapproves of body mods and considers ${hers} unappealing.`; + r += ` Many customers disapprove of body mods and consider ${hers} unappealing.`; } } else { if ((V.modScore > 15) || (V.piercingScore > 8 && V.tatScore > 5)) { @@ -1031,7 +1031,7 @@ window.saWhore = (function saWhore() { if (slave.bellyPreg >= 1500 || setup.fakeBellies.includes(slave.bellyAccessory) || slave.bellyImplant >= 1500) { if (arcology.FSRepopulationFocus !== "unset") { - r =+ ` In the new culture of ${arcology.name}, ${his} pregnancy makes ${him} a profitable whore`; + r += ` In the new culture of ${arcology.name}, ${his} pregnancy makes ${him} a profitable whore`; if (setup.fakeBellies.includes(slave.bellyAccessory) || slave.bellyImplant >= 1500) { r += `, even if it's not real`; } @@ -1076,7 +1076,7 @@ window.saWhore = (function saWhore() { } if (arcology.FSEdoRevivalist !== "unset") { if (slave.nationality === "Japanese" || slave.nationality === "Edo Revivalist") { - r =+ ` As a proper Japanese ${girl}, ${he} is considered extremely desirable.`; + r += ` As a proper Japanese ${girl}, ${he} is considered extremely desirable.`; } } else if (arcology.FSChineseRevivalist !== "unset") { if (slave.nationality === "Chinese" || slave.nationality === "Chinese Revivalist") { diff --git a/src/uncategorized/slaveStats.tw b/src/uncategorized/slaveStats.tw index 07e275ab91ef569889938e1278c0151c334a020f..ee2541e649f1977bd1bb5418db9b930e6db3e82b 100644 --- a/src/uncategorized/slaveStats.tw +++ b/src/uncategorized/slaveStats.tw @@ -225,7 +225,7 @@ slaveName: $activeSlave.slaveName /* TODO: figure out why this is being inden <br>skill.vaginal: $activeSlave.skill.vaginal <br>skill.oral: $activeSlave.skill.oral <br>skill.anal: $activeSlave.skill.anal -<br>akill.whore: $activeSlave.skill.whore +<br>skill.whore: $activeSlave.skill.whore <br>skill.entertainment: $activeSlave.skill.entertainment <br>skill.combat: $activeSlave.skill.combat <br>livingRules: $activeSlave.livingRules