diff --git a/src/art/vector_revamp/vectorRevampedArtControl.js b/src/art/vector_revamp/vectorRevampedArtControl.js
index e0e30c1234a78994856c5edba298082a2e0bb8ca..762a4b22599b2306f4dad2e1425c487e47620346 100644
--- a/src/art/vector_revamp/vectorRevampedArtControl.js
+++ b/src/art/vector_revamp/vectorRevampedArtControl.js
@@ -159,7 +159,7 @@ class ArtStyleControl {
/*currently unused, keeping for color reference - */
parseSkinColorFromName(colorName) {
- if (colorName === null)
+ if (colorName == null)
return "#000000";
var skinPalette = [
diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js
index 5b8dab55b30a191d1ad1e246c7b002a67094b338..a1dbca384f12e997e9f1ae611062b7fd84892079 100644
--- a/src/endWeek/saServant.js
+++ b/src/endWeek/saServant.js
@@ -1,8 +1,9 @@
+/* eslint-disable no-unused-vars */
/* eslint-disable no-undef */
window.saServant = /** @param {App.Entity.SlaveState} slave */ function saServant(slave) {
var pronouns = getPronouns(slave);
- var he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive;//, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, boy = pronouns.noun; /** FIXME: 'hers', 'himself', 'boy' is declared but its value is never read.ts(6133) */
+ var he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, boy = pronouns.noun; /** FIXME: 'hers', 'himself', 'boy' is declared but its value is never read.ts(6133) */
var He = capFirstChar(he), His = capFirstChar(his);
var V = State.variables;
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index ef2091f5319677aebb9de168326e4cc9121a1e2b..d134d5349a46b26239146a519a7010a90aae5f3a 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -565,8 +565,8 @@ window.DefaultRules = (function() {
ProcessAVirginDildos(slave, rule);
} else if (slave.vagina > 0) {
ProcessNonVirginDildos(slave, rule);
- ProcessVaginalAttachments(slave, rule);
}
+ ProcessVaginalAttachments(slave, rule);
}
/** @param {App.Entity.SlaveState} slave */
@@ -752,7 +752,6 @@ window.DefaultRules = (function() {
slave.vaginalAttachment = rule.vaginalAttachment;
if (slave.vaginalAccessory !== "none") {
switch (slave.vaginalAttachment) {
-
case "none":
r += `<br>${slave.slaveName} has been instructed not to use an attachment for ${his} dildo.`;
break;
@@ -767,7 +766,6 @@ window.DefaultRules = (function() {
}
} else {
switch (slave.vaginalAttachment) {
-
case "none":
r += `<br>${slave.slaveName} has been instructed not to use any vaginal accessories.`;
break;
@@ -1048,7 +1046,7 @@ window.DefaultRules = (function() {
if ((rule.bellyImplantVol !== undefined) && slave.bellyImplant >= 0 && rule.bellyImplantVol >= 0) {
r += "<br>";
if (slave.health > -10 ) {
- let diff = rule.bellyImplantVol - slave.bellyImplant;
+ const diff = rule.bellyImplantVol - slave.bellyImplant;
if (diff >= 5000 && slave.bellyPain === 0 && slave.health > 50) {
r += `${slave.slaveName}'s belly is way too small, so ${he} has been directed to have intensive belly implant filling procedures throughout this week.`;
slave.bellyImplant += 1000;
@@ -1157,9 +1155,8 @@ window.DefaultRules = (function() {
slave.devotion -= 10;
} else if (slave.fetish === "pregnancy") {
r += `${he} did not handle it well.`;
- let fetishModifier = (slave.fetishStrength / 2);
- slave.devotion -= (1 * fetishModifier);
- (slave.trust -= 1 * fetishModifier);
+ const fetishModifier = (slave.fetishStrength / 2);
+ slave.devotion -= (1 * fetishModifier), (slave.trust -= 1 * fetishModifier);
} else if (slave.devotion <= 20) {
r += `${he} did not handle it well.`;
slave.trust -= 10;
@@ -1845,7 +1842,7 @@ window.DefaultRules = (function() {
slave.curatives = rule.curatives;
}
} else {
- r += `<br>${slave.slaveName} has been ${rule.curatives > 0 ? "put on preventatives" : "taken off health drugs"}`;
+ r += `<br>${slave.slaveName} has been ${rule.curatives > 0 ? "put on preventatives" : "taken off health drugs"}.`;
slave.curatives = rule.curatives;
}
}
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 2e159d033bf9dbde7a59c2ef1e7b344b702405fa..47fbacfcd0173d11a1f0cb87639248be00bd6c58 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -1527,7 +1527,7 @@ window.FacilityDatatypeCleanup = (function() {
V.dairyPrepUpgrade = Math.clamp(+V.dairyPrepUpgrade, 0, 1) || 0;
V.dairyHyperPregRemodel = Math.clamp(+V.dairyHyperPregRemodel, 0, 1) || 0;
V.dairyImplantsSetting = Math.clamp(+V.dairyImplantsSetting, 0, 3) || 0;
- V.dairyWeightSetting = Math.clamp(+V.dairyWeightSetting, 0, 4) || 0;
+ V.dairyWeightSetting = Math.clamp(+V.dairyWeightSetting, -1, 4) || 0;
/* bioreactors */
V.bioreactorsAnnounced = Math.clamp(+V.bioreactorsAnnounced, 0, 1) || 0;
V.createBioreactors = Math.clamp(+V.createBioreactors, 0, 1) || 0;
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 8dee501453f46ecfe62c6c14ea62bb0f6704ef3d..0f0afc00e58a7b7e0cb311bb093267a27327c1a4 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -165,9 +165,6 @@ window.generateGenetics = (function() {
case -7:
fatherName = "Lab designed";
break;
- case -8:
- fatherName = "One of your animals";
- break;
case -9:
fatherName = "A Futanari Sister";
break;
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 1838c5c63dad22930c4891841d1db527a278656b..acce062418cf14843d6ef0114cffe3cc24115b5f 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -1289,7 +1289,7 @@ window.rulesAssistantOptions = (function() {
class LeggingsList extends List {
constructor() {
const items = [
- ["No default setting"],
+ ["No default setting", "no default setting"],
["None", "none"],
["Short stockings", "short stockings"],
["Long stockings", "long stockings"],
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index ede3a1c286726e90577b74264be21f31574a3cd5..c4ee812092660e639c6b6b9dac5de5fd25840f03 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -415,7 +415,7 @@ window.gaussianPair = function() {
if (!Array.prototype.findIndex) {
Array.prototype.findIndex = function(predicate) {
- if (this === null) {
+ if (this == null) {
throw new TypeError('Array.prototype.find called on null or undefined');
}
if (typeof predicate !== 'function') {
@@ -503,7 +503,7 @@ window.Categorizer.prototype.cat = function(val, def) {
window.num = function(x) {
const V = State.variables;
let max = V.showNumbersMax;
-
+
var ONE_TO_NINETEEN = [
'one', 'two', 'three', 'four', 'five',
'six', 'seven', 'eight', 'nine', 'ten',