diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 3bf1d60b17b6792b54650df99f92814be09708ed..2a2fdb9dd552088ca5b863e5d587f4ed7268547f 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -1225,20 +1225,30 @@ window.DefaultRules = (function() {
r += `<br>${slave.slaveName}'s pregnancy has been terminated; `;
if (slave.sexualFlaw === "breeder") {
r += `it broke ${his} mind.`;
- slave.fetish = "mindbroken", slave.behavioralQuirk = "none", slave.behavioralFlaw = "none", slave.sexualQuirk = "none", slave.sexualFlaw = "none", slave.devotion = 0, slave.trust = 0;
+ slave.fetish = "mindbroken";
+ slave.behavioralQuirk = "none";
+ slave.behavioralFlaw = "none";
+ slave.sexualQuirk = "none";
+ slave.sexualFlaw = "none";
+ slave.devotion = 0;
+ slave.trust = 0;
} else if (slave.devotion < -50) {
r += `${he} did not handle it well.`;
- slave.trust -= 10, slave.devotion -= 25;
+ slave.trust -= 10;
+ slave.devotion -= 25;
} else if (slave.devotion < -20) {
r += `${he} did not handle it well.`;
- slave.trust -= 10, slave.devotion -= 10;
+ slave.trust -= 10;
+ 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);
+ let fetishModifier = slave.fetishStrength / 2;
+ slave.devotion -= fetishModifier;
+ slave.trust -= fetishModifier;
} else if (slave.devotion <= 20) {
r += `${he} did not handle it well.`;
- slave.trust -= 10, slave.devotion -= 5;
+ slave.trust -= 10;
+ slave.devotion -= 5;
} else if (slave.devotion <= 50) {
r += `${he} did not handle it well.`;
slave.trust -= 10;
@@ -1253,11 +1263,15 @@ window.DefaultRules = (function() {
slave.preg = 0;
}
if (slave.abortionTat > -1) {
- slave.abortionTat++, cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+ slave.abortionTat++;
+ cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
}
V.reservedChildren = FetusGlobalReserveCount("incubator");
V.reservedChildrenNursery = FetusGlobalReserveCount("nursery");
- slave.pregType = 0, slave.pregSource = 0, slave.pregKnown = 0, slave.pregWeek = -2;
+ slave.pregType = 0;
+ slave.pregSource = 0;
+ slave.pregKnown = 0;
+ slave.pregWeek = -2;
WombFlush(slave);
} else if (rule.abortion === "male") {
if (slave.preg < 4) {
@@ -1270,7 +1284,10 @@ window.DefaultRules = (function() {
}
}
if (WL === 0) {
- slave.pregType = 0, slave.pregSource = 0, slave.pregKnown = 0, slave.pregWeek = -2;
+ slave.pregType = 0;
+ slave.pregSource = 0;
+ slave.pregKnown = 0;
+ slave.pregWeek = -2;
WombFlush(slave);
}
r += `<br>${slave.slaveName}'s male fetuses have been terminated.`;
@@ -1286,7 +1303,10 @@ window.DefaultRules = (function() {
}
}
if (WL === 0) {
- slave.pregType = 0, slave.pregSource = 0, slave.pregKnown = 0, slave.pregWeek = -2;
+ slave.pregType = 0;
+ slave.pregSource = 0;
+ slave.pregKnown = 0;
+ slave.pregWeek = -2;
WombFlush(slave);
}
r += `<br>${slave.slaveName}'s female fetuses have been terminated.`;
@@ -1485,31 +1505,31 @@ window.DefaultRules = (function() {
break;
case "breast injections":
- if (!(slave.boobs < 48000)) {
+ if (slave.boobs >= 48000) {
flag = false;
}
break;
case "hyper breast injections":
- if (!(slave.boobs < 48000)) {
+ if (slave.boobs >= 48000) {
flag = false;
}
break;
case "breast redistributors":
- if (!(slave.boobs - slave.boobsImplant > 100)) {
+ if (slave.boobs - slave.boobsImplant <= 100) {
flag = false;
}
break;
case "butt injections":
- if (!(slave.butt < 9)) {
+ if (slave.butt >= 9) {
flag = false;
}
break;
case "hyper butt injections":
- if (!(slave.butt < 20)) {
+ if (slave.butt >= 20) {
flag = false;
}
break;
@@ -1521,7 +1541,7 @@ window.DefaultRules = (function() {
break;
case "butt redistributors":
- if (!(slave.buttImplant > 0)) {
+ if (slave.buttImplant <= 0) {
flag = false;
}
break;
@@ -1533,7 +1553,7 @@ window.DefaultRules = (function() {
break;
case "lip atrophiers":
- if (!(slave.lips - slave.lipsImplant > 0)) {
+ if (slave.lips - slave.lipsImplant <= 0) {
flag = false;
}
break;
@@ -1557,43 +1577,43 @@ window.DefaultRules = (function() {
break;
case "penis atrophiers":
- if (!(slave.dick > 1)) {
+ if (slave.dick <= 1) {
flag = false;
}
break;
case "testicle enhancement":
- if (!(slave.balls > 0)) {
+ if (slave.balls <= 0) {
flag = false;
}
break;
case "hyper testicle enhancement":
- if (!(slave.balls > 0)) {
+ if (slave.balls <= 0) {
flag = false;
}
break;
case "testicle atrophiers":
- if (!(slave.balls > 1)) {
+ if (slave.balls <= 1) {
flag = false;
}
break;
case "clitoris atrophiers":
- if (!(slave.clit > 0)) {
+ if (slave.clit <= 0) {
flag = false;
}
break;
case "labia atrophiers":
- if (!(slave.labia > 0)) {
+ if (slave.labia <= 0) {
flag = false;
}
break;
case "appetite suppressors":
- if (!(slave.weight <= -95)) {
+ if (slave.weight > -95) {
flag = false;
}
break;
@@ -2061,12 +2081,10 @@ window.DefaultRules = (function() {
*/
function ProcessRelease(slave, rule) {
if ((rule.releaseRules !== undefined) && (rule.releaseRules !== null)) {
- let _release = 0;
+ let release = 0;
if (rule.releaseRules === "restrictive" &&
!(["be a subordinate slave", "be confined in the arcade", "be your Head Girl", "get milked", "please you", "serve in the club", "serve in the master suite", "serve the public", "whore", "work a glory hole", "work as a farmhand", "work in the brothel", "work in the dairy"].contains(slave.assignment))) {
- _release = 1;
- } else {
- _release = 1;
+ release = 1;
}
if (slave.fetish === "mindbroken") {
if (slave.releaseRules !== "permissive") {
@@ -2078,7 +2096,7 @@ window.DefaultRules = (function() {
slave.releaseRules = "restrictive";
r += `<br>Since ${slave.slaveName} is unable to masturbate, ${his} masturbation rules have been set to restrictive.`;
}
- } else if ((_release !== 0) && (slave.releaseRules !== rule.releaseRules)) {
+ } else if ((release !== 0) && (slave.releaseRules !== rule.releaseRules)) {
slave.releaseRules = rule.releaseRules;
r += `<br>${slave.slaveName}'s masturbation rules have been set to ${rule.releaseRules}.`;
}
@@ -2837,7 +2855,7 @@ window.DefaultRules = (function() {
} else if (rule.brandTarget === "shoulders") {
left = "left shoulder";
right = "right shoulder";
- }else if (rule.brandTarget === "upper arms") {
+ } else if (rule.brandTarget === "upper arms") {
left = "left upper arm";
right = "right upper arm";
} else if (rule.brandTarget === "wrists") {
diff --git a/src/js/random.js b/src/js/random.js
index 1f7f6c4812f4c9c3119d8d9ea885320bc64f2189..c98890793ea53e37c1e18b6fbbf308cf66d0d8b0 100644
--- a/src/js/random.js
+++ b/src/js/random.js
@@ -18,7 +18,7 @@ window.normalRandInt = function(mean = 0, deviation = 1, min = mean - 3 * deviat
val = gaussianPair(mean, deviation)[0];
}
return Math.round(val);
-}
+};
/**
* Returns a random integer between min and max (both inclusive).
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 2e389fbde2c15fb8d6ab391db21681fd02d9c6d6..fbec34ce4e411c0371cae6cf0a9b0bf66c9e159d 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -459,7 +459,7 @@ window.rulesAssistantOptions = (function() {
let inp = document.createElement("input");
inp.type = "radio";
inp.name = this.name_;
- inp.id = prefix + '_' + v[0];
+ inp.id = `${prefix}_${v[0]}`;
inp.value = v[0];
let lbl = document.createElement("label");
@@ -637,7 +637,7 @@ window.rulesAssistantOptions = (function() {
* @param {boolean} [spinBox=false]
*/
constructor(prefix, data = [], allowNullValue = true, min = 0, max = 100, spinBox = false) {
- super(prefix, data, allowNullValue, spinBox, true, min, max);
+ super(prefix, data, allowNullValue, spinBox, true, min, max);
}
createEditor(min, max) {
@@ -707,8 +707,7 @@ window.rulesAssistantOptions = (function() {
}
render() {
- const elem = document.createElement("div");
- return elem;
+ return document.createElement("div");
}
appendChild(child) {
@@ -847,7 +846,7 @@ window.rulesAssistantOptions = (function() {
const text = this.textarea.value;
try {
const rule = JSON.parse(text);
- if (rule instanceof Array) {
+ if (Array.isArray(rule)) {
rule.forEach(r => {
V.defaultRules.push(App.Entity.Utils.RARuleDatatypeCleanup(r));
});
@@ -1073,8 +1072,7 @@ window.rulesAssistantOptions = (function() {
}
render() {
- const elem = document.createElement("div");
- return elem;
+ return document.createElement("div");
}
fnchanged(value) {
@@ -1430,8 +1428,9 @@ window.rulesAssistantOptions = (function() {
class RegimenTab extends Tab {
constructor(tabButtons) {
super("regiment", "Physical Regiment", tabButtons);
- if (V.arcologies[0].FSAssetExpansionistResearch === 1)
+ if (V.arcologies[0].FSAssetExpansionistResearch === 1) {
this.appendChild(new HyperGrowthSwitch());
+ }
this.appendChild(new IntensiveGrowthSwitch());
this.appendChild(new GrowthList());
this.appendChild(new CurrativesList());
@@ -1788,7 +1787,7 @@ window.rulesAssistantOptions = (function() {
bellies.push([`${acc.name} (FS)`, acc.value]);
} else if (acc.rs === "boughtBelly" && V.clothesBoughtBelly === 1) {
bellies.push([`${acc.name} (Purchased)`, acc.value]);
-}
+ }
});
super("Corsetage", bellies);
this.setValue(current_rule.set.bellyAccessory);
@@ -1946,7 +1945,7 @@ window.rulesAssistantOptions = (function() {
accs.push([acc.name, acc.value]);
} else if (acc.rs === "buyBigPlugs" && V.toysBoughtButtPlugs === 1) {
accs.push([`${acc.name} (Purchased)`, acc.value]);
-}
+ }
});
super("Buttplugs for anal virgins", accs);
this.setValue(current_rule.set.aVirginButtplug);
@@ -1962,7 +1961,7 @@ window.rulesAssistantOptions = (function() {
accs.push([acc.name, acc.value]);
} else if (acc.rs === "buyBigPlugs" && V.toysBoughtButtPlugs === 1) {
accs.push([`${acc.name} (Purchased)`, acc.value]);
-}
+ }
});
super("Buttplugs for other slaves", accs);
this.setValue(current_rule.set.buttplug);
@@ -1978,7 +1977,7 @@ window.rulesAssistantOptions = (function() {
accs.push([acc.name, acc.value]);
} else if (acc.rs === "buyTails" && V.toysBoughtButtPlugTails === 1) {
accs.push([`${acc.name} (Purchased)`, acc.value]);
-}
+ }
});
super("Buttplug attachments for slaves with buttplugs", accs);
this.setValue(current_rule.set.buttplugAttachment);
@@ -2074,8 +2073,8 @@ window.rulesAssistantOptions = (function() {
this.breasts.setValue(App.RA.makeTarget('<=', 350));
this.butts.setValue(App.RA.makeTarget('<=', 2));
this.lips.setValue(App.RA.makeTarget('<=', 25));
- if (this.dicks) this.dicks.setValue(App.RA.makeTarget('==', 0));
- if (this.balls) this.balls.setValue(App.RA.makeTarget('==', 0));
+ if (this.dicks) { this.dicks.setValue(App.RA.makeTarget('==', 0)); }
+ if (this.balls) { this.balls.setValue(App.RA.makeTarget('==', 0)); }
this.sublists.forEach(i => i.propagateChange());
}
@@ -2083,8 +2082,8 @@ window.rulesAssistantOptions = (function() {
this.breasts.setValue(App.RA.makeTarget('>=', 1000));
this.butts.setValue(App.RA.makeTarget('>=', 5));
this.lips.setValue(App.RA.makeTarget('>=', 25));
- if (this.dicks) this.dicks.setValue(App.RA.makeTarget('>=', 4));
- if (this.balls) this.balls.setValue(App.RA.makeTarget('>=', 4));
+ if (this.dicks) { this.dicks.setValue(App.RA.makeTarget('>=', 4)); }
+ if (this.balls) { this.balls.setValue(App.RA.makeTarget('>=', 4)); }
this.sublists.forEach(i => i.propagateChange());
}
@@ -2092,8 +2091,8 @@ window.rulesAssistantOptions = (function() {
this.breasts.setValue(App.RA.makeTarget('>=', 9000));
this.butts.setValue(App.RA.makeTarget('>=', 10));
this.lips.setValue(App.RA.makeTarget('>=', 45));
- if (this.dicks) this.dicks.setValue(App.RA.makeTarget('>=', 6));
- if (this.balls) this.balls.setValue(App.RA.makeTarget('>=', 6));
+ if (this.dicks) { this.dicks.setValue(App.RA.makeTarget('>=', 6)); }
+ if (this.balls) { this.balls.setValue(App.RA.makeTarget('>=', 6)); }
this.sublists.forEach(i => i.propagateChange());
}
@@ -2101,8 +2100,8 @@ window.rulesAssistantOptions = (function() {
this.breasts.setValue(App.RA.makeTarget('>=', 48000));
this.butts.setValue(App.RA.makeTarget('>=', 20));
this.lips.setValue(App.RA.makeTarget('>=', 100));
- if (this.dicks) this.dicks.setValue(App.RA.makeTarget('>=', 30));
- if (this.balls) this.balls.setValue(App.RA.makeTarget('>=', 125));
+ if (this.dicks) { this.dicks.setValue(App.RA.makeTarget('>=', 30)); }
+ if (this.balls) { this.balls.setValue(App.RA.makeTarget('>=', 125)); }
this.sublists.forEach(i => i.propagateChange());
}
@@ -2713,12 +2712,9 @@ window.rulesAssistantOptions = (function() {
combine() {
const lst = [];
- if (this.colorlist.getData() !== null)
- lst.push(this.colorlist.getData());
- if (this.shapelist.getData() !== null)
- lst.push(this.shapelist.getData());
- if (lst.length === 0) return null;
- else return lst.join(" ");
+ if (this.colorlist.getData() !== null) { lst.push(this.colorlist.getData()); }
+ if (this.shapelist.getData() !== null) { lst.push(this.shapelist.getData()); }
+ return (lst.length === 0) ? null : lst.join(" ");
}
setValue(val) {
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index 04a3c5e82ba5ddac781dfe197cb9e3d879b9ef8c..2d4d1700d844f3431852a25774284e43a1a754a1 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -302,7 +302,7 @@ window.rulesAutosurgery = (function() {
if (slave.health > 20 && surgeries.length < 3) {
if (slave.faceImplant <= 15 && slave.face <= 95 && thisSurgery.cosmetic > 0) {
commitProcedure("a nicer face", slave => {
- if (slave.faceShape === "masculine") slave.faceShape = "androgynous";
+ if (slave.faceShape === "masculine") { slave.faceShape = "androgynous"; }
slave.faceImplant += 25 - 5 * Math.trunc(V.PC.medicine / 50) - 5 * V.surgeryUpgrade;
slave.face = Math.clamp(slave.face + 20, -100, 100);
});
@@ -310,16 +310,20 @@ window.rulesAutosurgery = (function() {
commitProcedure("an age lift", slave => {
slave.ageImplant = 1;
slave.faceImplant += 25 - 5 * Math.trunc(V.PC.medicine / 50) - 5 * V.surgeryUpgrade;
- if (slave.visualAge > 80) slave.visualAge -= 40;
- else if (slave.visualAge >= 70) slave.visualAge -= 30;
- else if (slave.visualAge > 50) slave.visualAge -= 20;
- else if (slave.visualAge > 36) slave.visualAge -= 10;
- else slave.visualAge -= 5;
+ if (slave.visualAge > 80) {
+ slave.visualAge -= 40;
+ } else if (slave.visualAge >= 70) {
+ slave.visualAge -= 30;
+ } else if (slave.visualAge > 50) {
+ slave.visualAge -= 20;
+ } else if (slave.visualAge > 36) {
+ slave.visualAge -= 10;
+ } else { slave.visualAge -= 5; }
});
} else if (((slave.underArmHStyle !== "bald" && slave.underArmHStyle !== "hairless") || (slave.pubicHStyle !== "bald" && slave.pubicHStyle !== "hairless")) && thisSurgery.bodyhair === 2) {
commitProcedure("body hair removal", slave => {
- if (slave.underArmHStyle !== "hairless") slave.underArmHStyle = "bald";
- if (slave.pubicHStyle !== "hairless") slave.pubicHStyle = "bald";
+ if (slave.underArmHStyle !== "hairless") { slave.underArmHStyle = "bald"; }
+ if (slave.pubicHStyle !== "hairless") { slave.pubicHStyle = "bald"; }
}, 0);
} else if ((slave.bald === 0 || slave.hStyle !== "bald" || slave.eyebrowHStyle !== "bald") && thisSurgery.hair === 2) {
commitProcedure("hair removal", slave => {
@@ -359,7 +363,7 @@ window.rulesAutosurgery = (function() {
commitProcedure("surgery to remove a c-section scar", s => { s.cSec = 0; });
} else if (slave.faceImplant <= 45 && slave.face <= 95 && thisSurgery.cosmetic === 2) {
commitProcedure("a nicer face", slave => {
- if (slave.faceShape === "masculine") slave.faceShape = "androgynous";
+ if (slave.faceShape === "masculine") { slave.faceShape = "androgynous"; }
slave.faceImplant += 25 - 5 * Math.trunc(V.PC.medicine / 50) - 5 * V.surgeryUpgrade;
slave.face = Math.clamp(slave.face + 20, -100, 100);
});
diff --git a/src/js/wombJS.js b/src/js/wombJS.js
index fd59729b215bda0e4a584db88876b45dfd7322d5..7631d07380d272a9c303286ddad6c718b238cf16 100644
--- a/src/js/wombJS.js
+++ b/src/js/wombJS.js
@@ -382,7 +382,7 @@ window.FetusGetPrediction = function(actor, age) {
} else if (actor.pregData.sizeType === 1) {
vol = getVolByWeight(actor, age);
} else if (actor.pregData.sizeType === 2) {
- vol = getVolByRaw(actor, age);
+ vol = getVolByRaw(actor, age);
}
if (vol === 0) {