diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index 60b45fdb06fbf24631e6b079f67ae6bd075b89d5..cbee9283d519e999f0ae98791c96f1878edff3d1 100644
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
@@ -137,51 +137,51 @@ window.SFBC = function() {
if (V.SFUC > 0) V.SF.UC.num = V.SFUC; delete V.SFUC;
if (V.SF.Active === -1) SFInit();
if (V.SF.MWU) delete V.SF.MWU;
- if (V.SpecOpsLock != undefined) V.SF.SpecOpsLock = V.SpecOpsLock; delete V.SpecOpsLock;
+ if (V.SpecOpsLock !== undefined) V.SF.SpecOpsLock = V.SpecOpsLock; delete V.SpecOpsLock;
if (V.SF.UC === undefined) {
- if (V.SF.SpecOps != undefined && V.SF.SpecOpsLock != undefined) {
+ if (V.SF.SpecOps !== undefined && V.SF.SpecOpsLock !== undefined) {
V.SF.UC = {Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock};
jsDel([V.SF.SpecOps,V.SF.SpecOpsLock]);
} else if (V.SF.UC === {}) {
V.SF.UC = {Assign:0, Lock:0};
}
}
- if (V.SF.U != undefined) V.SF.Upgrade = V.SF.U; delete V.SF.U;
- if (V.SF.WG != undefined) V.SF.Gift = V.SF.WG; delete V.SF.WG;
+ if (V.SF.U !== undefined) V.SF.Upgrade = V.SF.U; delete V.SF.U;
+ if (V.SF.WG !== undefined) V.SF.Gift = V.SF.WG; delete V.SF.WG;
if (V.SF.MercCon === undefined) MercCon();
- if (V.SF.MercCon.Helots != undefined) {
+ if (V.SF.MercCon.Helots !== undefined) {
V.SF.MercCon.Menials = V.SF.MercCon.Helots;
delete V.SF.MercCon.Helots;
} else { V.SF.MercCon.Menials = 0; }
- if (V.SF.MercCon.TotalHelots != undefined) {
+ if (V.SF.MercCon.TotalHelots !== undefined) {
V.SF.MercCon.TotalMenials = V.SF.MercCon.TotalHelots;
delete V.SF.MercCon.TotalHelots;
} else { V.SF.MercCon.TotalMenials = 0; }
- if (V.SF.Bonus != undefined) delete V.SF.Bonus;
+ if (V.SF.Bonus !== undefined) delete V.SF.Bonus;
if (V.SF.Depravity < 0) V.SF.Depravity = 0;
if (V.SF.Size === undefined) V.SF.Size = V.SF.Units; delete V.SF.Units;
- if (V.SFUnit != undefined) {
- if (V.SFUnit.AT != undefined) V.SFUnitTA = 0;
+ if (V.SFUnit !== undefined) {
+ if (V.SFUnit.AT !== undefined) V.SFUnitTA = 0;
V.SF.Squad.Satellite = V.SF.Squad.Sat;
jsDel([V.SF.Squad.Sat,V.SatLaunched,V.SFUnit.AT]);
V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat;
- if (V.SFTradeShow != undefined) V.SF.MercCon = V.SFTradeShow; delete V.SFTradeShow;
- if (V.SFColonel != undefined) V.SF.Colonel = V.SFColonel; delete V.SFColonel;
+ if (V.SFTradeShow !== undefined) V.SF.MercCon = V.SFTradeShow; delete V.SFTradeShow;
+ if (V.SFColonel !== undefined) V.SF.Colonel = V.SFColonel; delete V.SFColonel;
if (V.SF.BadOutcome === undefined) V.SF.BadOutcome = "";
- if (V.SF.Squad.Satellite != undefined && V.SatLaunched === undefined) {
+ if (V.SF.Squad.Satellite !== undefined && V.SatLaunched === undefined) {
V.SF.Squad.Sat = {lv:0, InOrbit:0};
V.SF.Squad.Satellite = V.SF.Squad.Sat;
jsDel([V.SF.Squad.Sat,V.SatLaunched,V.SFUnit]);
}
}
- if (V.SF.Squad != undefined && V.SF.Squad.Satellite.lv === undefined) {
+ if (V.SF.Squad !== undefined && V.SF.Squad.Satellite.lv === undefined) {
V.SF.Squad.Sat = {lv:V.SF.Squad.Satellite, InOrbit:0};
V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat;
}
}
- if (V.securityForceName != undefined) InitClean(); MainClean(); ColonelClean(); TradeShowClean(); UnitsClean();
+ if (V.securityForceName !== undefined) InitClean(); MainClean(); ColonelClean(); TradeShowClean(); UnitsClean();
if (V.SF.Facility === undefined) Facility();
};
@@ -310,7 +310,7 @@ window.SFReport = function() {
if (deaths > 0) S.Troops -= deaths;
}
if (V.SF.UC.Assign === 1 && V.SF.UC.Lock < 1) V.SF.UC.Assign = 0;
- if (V.SF.Upgrade != undefined) V.SF.Upgrade = 0; V.SF.Gift = 0;
+ if (V.SF.Upgrade !== undefined) V.SF.Upgrade = 0; V.SF.Gift = 0;
V.SF.Colonel.Talk = 0; V.SF.Colonel.Fun = 0;
r += `<br>__Week ${V.week} operational report for ${V.SF.Lower}__:`;
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 5db9fcb90724ee5d7641be999033bee5eec4ee1e..a6985cba59c0921d3aeaff603916fe9dc928a31e 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -1637,7 +1637,7 @@ window.DefaultRules = (function() {
// Diet Setting
if (rule.diet !== undefined && rule.diet !== "no default setting") {
/*
- if ((slave.boobs >= 1600) && (slave.muscles <= 5) && (slave.amp != 1) && ((rule.muscles == "no default setting") || (rule.muscles === 0))) {
+ if ((slave.boobs >= 1600) && (slave.muscles <= 5) && (slave.amp !== 1) && ((rule.muscles == "no default setting") || (rule.muscles === 0))) {
if ((slave.diet !== "muscle building")) {
slave.diet = "muscle building"
r += `<br>${slave.slaveName} has big tits and no back muscles, so ${he}'s been assigned to gain some.`
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index b2a7f7bf3d854ee4933dbc69c340542b8ad0bd85..e3b1c666adc8b49790f10c1ed4a19ecc07b784f8 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -373,7 +373,7 @@ window.SlavePronouns = /** @param {App.Entity.SlaveState} slave */ function Slav
window.WrittenMaster = /** @param {App.Entity.SlaveState} slave */ function WrittenMaster(slave) {
const V = State.variables;
- if (slave != undefined)
+ if (slave !== undefined)
Enunciate(slave);
else if (V.titleEnunciate === undefined)
Enunciate(V.activeSlave);
@@ -383,7 +383,7 @@ window.WrittenMaster = /** @param {App.Entity.SlaveState} slave */ function Writ
window.Enunciate = /** @param {App.Entity.SlaveState} slave */ function Enunciate(slave) {
const V = State.variables;
if (SlaveStatsChecker.checkForLisp(slave)) {
- if (V.PC.customTitleLisp != undefined)
+ if (V.PC.customTitleLisp !== undefined)
V.titleEnunciate = V.PC.customTitleLisp;
else if (V.PC.title !== 0)
V.titleEnunciate = "Mathter";
@@ -447,7 +447,7 @@ window.Enunciate = /** @param {App.Entity.SlaveState} slave */ function Enunciat
V.xEnunciate = "kth";
V.XEnunciate = "Th";
} else {
- if (V.PC.customTitle != undefined)
+ if (V.PC.customTitle !== undefined)
V.titleEnunciate = V.PC.customTitle;
else if (V.PC.title !== 0)
V.titleEnunciate = "Master";
@@ -487,15 +487,15 @@ window.Enunciate = /** @param {App.Entity.SlaveState} slave */ function Enunciat
}
}
}
- if (slave.customTitle != undefined && slave.customTitle !== "")
+ if (slave.customTitle !== undefined && slave.customTitle !== "")
V.titleEnunciate = slave.customTitle;
- if (V.PC.customTitle != undefined)
+ if (V.PC.customTitle !== undefined)
V.writtenTitle = V.PC.customTitle;
else if (V.PC.title !== 0)
V.writtenTitle = "Master";
else
V.writtenTitle = "Mistress";
- if (slave.customTitle != undefined && slave.customTitle !== "" && slave.rudeTitle === 0)
+ if (slave.customTitle !== undefined && slave.customTitle !== "" && slave.rudeTitle === 0)
V.writtenTitle = slave.customTitle;
V.sayEnunciate = "say";
V.sEnunciate = "s";
@@ -1927,7 +1927,7 @@ window.SlaveSort = /** @param {App.Entity.SlaveState[]} slaves */ function Slave
V.slaveIndices = slaves2indices();
} else {
V.slaveIndices = slaves2indices();
- filterInPlace(slaves, s => V.slaveIndices[s] != undefined);
+ filterInPlace(slaves, s => V.slaveIndices[s] !== undefined);
slaves.sort((a, b) => V.slaveIndices[a] - V.slaveIndices[b]);
}
};
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index ba236ac1154531c029ef83728e5090c1aa80cf72..47fbacfcd0173d11a1f0cb87639248be00bd6c58 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -21,7 +21,7 @@
Use slave.value = Math.min(+slave.value, a) || default; if you need slave.value <= a.
Use slave.value = Math.clamp(+slave.value, a, b) || default; if you need a <= slave.value <= b.
Use slave.value = +slave.value || default; if slave.value can be any number.
- The exception to this is if the default != 0. In this case, it's usually good enough to just check if slave.value !== 0 first. The strict equality is important!
+ The exception to this is if the default !== 0. In this case, it's usually good enough to just check if slave.value !== 0 first. The strict equality is important!
If you want slave.value to be a string, there's no easy tricks to make sure it's already an accepted value. The simplest way is the following
if (typeof slave.value !== "string") slave.value = default;
@@ -1262,13 +1262,13 @@ window.PCDatatypeCleanup = function PCDatatypeCleanup() {
PC.lactationDuration = Math.max(+PC.lactationDuration, 0) || 0;
generatePlayerPronouns(PC);
- if (PC.age != undefined) {
+ if (PC.age !== undefined) {
delete PC.age;
}
- if (PC.indenture != undefined) {
+ if (PC.indenture !== undefined) {
delete PC.indenture;
}
- if (PC.indentureRestrictions != undefined) {
+ if (PC.indentureRestrictions !== undefined) {
delete PC.indentureRestrictions;
}
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 9a109f00bcdb32cdd69b33c6849754b15cac54fe..08b4014739b3dcce6672b37c6615d48cf6c67e9d 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -268,23 +268,23 @@ window.getSecurityExpansionCost = function() {
else {
soldierMod = 2;
}
- if (State.variables.militiaUnits != null) {
+ if (State.variables.militiaUnits !== null) {
for (let i = 0; i < State.variables.militiaUnits.length; i++) {
- if (State.variables.militiaUnits[i] != null) {
+ if (State.variables.militiaUnits[i] !== null) {
secExpCost += State.variables.militiaUnits[i].troops * State.variables.soldierUpkeep * soldierMod;
}
}
}
- if (State.variables.slaveUnits != null) {
+ if (State.variables.slaveUnits !== null) {
for (let i = 0; i < State.variables.slaveUnits.length; i++) {
- if (State.variables.slaveUnits[i] != null) {
+ if (State.variables.slaveUnits[i] !== null) {
secExpCost += State.variables.slaveUnits[i].troops * State.variables.soldierUpkeep * 0.5 * soldierMod;
}
}
}
- if (State.variables.mercUnits != null) {
+ if (State.variables.mercUnits !== null) {
for (let i = 0; i < State.variables.mercUnits.length; i++) {
- if (State.variables.mercUnits[i] != null) {
+ if (State.variables.mercUnits[i] !== null) {
secExpCost += State.variables.mercUnits[i].troops * State.variables.soldierUpkeep * 1.5 * soldierMod;
}
}
@@ -521,7 +521,7 @@ window.getEnvironmentCosts = function(cost) {
window.getSFCosts = function() {
let costs = 0;
- if (State.variables.SF.Toggle && State.variables.SF.Active >= 1 && State.variables.SF.Subsidy != undefined) {
+ if (State.variables.SF.Toggle && State.variables.SF.Active >= 1 && State.variables.SF.Subsidy !== undefined) {
Count(); costs += Math.ceil(State.temporary.SFSubsidy);
}
return costs;
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index 029f4ce6405757bf618543e297d9cd72668622f8..4b303286f93920e300092d6008c20b7b51c33571 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -1838,7 +1838,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (canWalk(eventSlave)) {
State.variables.RESSevent.push("mindbroken morning");
}
- if (eventSlave.kindness != undefined && eventSlave.kindness >= 100) {
+ if (eventSlave.kindness !== undefined && eventSlave.kindness >= 100) {
if ((isSlaveAvailable(eventSlave) && canWalk(eventSlave)) || (["please you", "serve in the master suite", "be your Concubine"].includes(eventSlave.assignment))) {
if (eventSlave.relationship === -3) {
if (jsRandom(1, 200) < eventSlave.kindness) {
@@ -2949,7 +2949,7 @@ window.generateRandomEventPoolServant = function(eventSlave) {
if (canWalk(eventSlave)) {
State.variables.RESSevent.push("mindbroken morning");
}
- if (eventSlave.kindness != undefined && eventSlave.kindness >= 100) {
+ if (eventSlave.kindness !== undefined && eventSlave.kindness >= 100) {
if ((isSlaveAvailable(eventSlave) && canWalk(eventSlave)) || (["be your Concubine", "please you", "serve in the master suite"].includes(eventSlave.assignment))) {
if (eventSlave.relationship === -3) {
if (jsRandom(1, 200) < eventSlave.kindness) {
diff --git a/src/js/foreachMacroJS.js b/src/js/foreachMacroJS.js
index a0cd53060708adc9c20ab1ae15f4e60b6a11aa5a..ea5e0afcd3ffed39d03bb4a9ef4e833376ad54fb 100644
--- a/src/js/foreachMacroJS.js
+++ b/src/js/foreachMacroJS.js
@@ -12,7 +12,7 @@ Macro.add('foreach', {
if (statement.length !== 0) {
const parts = statement.match(/^(\S+?)\s+of\s+(\S.*?)\s*$/i);
- if(parts != null) {
+ if(parts !== null) {
variable = parts[1];
array = parts[2];
}
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index c112d64cc2e2c5699a8ed271339c9497d3f559fc..0f0afc00e58a7b7e0cb311bb093267a27327c1a4 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -790,13 +790,13 @@ window.generateChild = function (mother, ova, destination) {
} else if (genes.father > 0) {
child.slaveName = `${genes.motherName} and ${genes.fatherName}'s daughter`;
let currentMother = getSlave(genes.mother);
- if (currentMother != undefined) {
+ if (currentMother !== undefined) {
if (currentMother.slaveSurname !== 0 && currentMother.slaveSurname !== "") {
child.slaveSurname = currentMother.slaveSurname;
}
} else {
let currentFather = getSlave(genes.father);
- if (currentFather != undefined) {
+ if (currentFather !== undefined) {
if (currentFather.slaveSurname !== 0 && currentFather.slaveSurname !== "") {
child.slaveSurname = currentFather.slaveSurname;
}
@@ -805,7 +805,7 @@ window.generateChild = function (mother, ova, destination) {
} else {
child.slaveName = `${genes.motherName}'s bastard daughter`;
let currentMother = getSlave(genes.mother);
- if (currentMother != undefined) {
+ if (currentMother !== undefined) {
if (currentMother.slaveSurname !== 0 && currentMother.slaveSurname !== "") {
child.slaveSurname = currentMother.slaveSurname;
}
@@ -840,13 +840,13 @@ window.generateChild = function (mother, ova, destination) {
child.slaveSurname = V.PC.surname;
} else if (genes.father > 0) {
let currentMother = getSlave(genes.mother);
- if (currentMother != undefined) {
+ if (currentMother !== undefined) {
if (currentMother.slaveSurname !== 0 && currentMother.slaveSurname !== "") {
child.slaveSurname = currentMother.slaveSurname;
}
} else {
let currentFather = getSlave(genes.father);
- if (currentFather != undefined) {
+ if (currentFather !== undefined) {
if (currentFather.slaveSurname !== 0 && currentFather.slaveSurname !== "") {
child.slaveSurname = currentFather.slaveSurname;
}
@@ -854,7 +854,7 @@ window.generateChild = function (mother, ova, destination) {
}
} else {
let currentMother = getSlave(genes.mother);
- if (currentMother != undefined) {
+ if (currentMother !== undefined) {
if (currentMother.slaveSurname !== 0 && currentMother.slaveSurname !== "") {
child.slaveSurname = currentMother.slaveSurname;
}
@@ -880,13 +880,13 @@ window.generateChild = function (mother, ova, destination) {
} else if (genes.father > 0) {
child.slaveName = `${genes.motherName} and ${genes.fatherName}'s son`;
let currentMother = getSlave(genes.mother);
- if (currentMother != undefined) {
+ if (currentMother !== undefined) {
if (currentMother.slaveSurname !== 0 && currentMother.slaveSurname !== "") {
child.slaveSurname = currentMother.slaveSurname;
}
} else {
let currentFather = getSlave(genes.father);
- if (currentFather != undefined) {
+ if (currentFather !== undefined) {
if (currentFather.slaveSurname !== 0 && currentFather.slaveSurname !== "") {
child.slaveSurname = currentFather.slaveSurname;
}
@@ -895,7 +895,7 @@ window.generateChild = function (mother, ova, destination) {
} else {
child.slaveName = `${genes.motherName}'s bastard son`;
let currentMother = getSlave(genes.mother);
- if (currentMother != undefined) {
+ if (currentMother !== undefined) {
if (currentMother.slaveSurname !== 0 && currentMother.slaveSurname !== "") {
child.slaveSurname = currentMother.slaveSurname;
}
@@ -930,13 +930,13 @@ window.generateChild = function (mother, ova, destination) {
child.slaveSurname = V.PC.surname;
} else if (genes.father > 0) {
let currentMother = getSlave(genes.mother);
- if (currentMother != undefined) {
+ if (currentMother !== undefined) {
if (currentMother.slaveSurname !== 0 && currentMother.slaveSurname !== "") {
child.slaveSurname = currentMother.slaveSurname;
}
} else {
let currentFather = getSlave(genes.father);
- if (currentFather != undefined) {
+ if (currentFather !== undefined) {
if (currentFather.slaveSurname !== 0 && currentFather.slaveSurname !== "") {
child.slaveSurname = currentFather.slaveSurname;
}
@@ -944,7 +944,7 @@ window.generateChild = function (mother, ova, destination) {
}
} else {
let currentMother = getSlave(genes.mother);
- if (currentMother != undefined) {
+ if (currentMother !== undefined) {
if (currentMother.slaveSurname !== 0 && currentMother.slaveSurname !== "") {
child.slaveSurname = currentMother.slaveSurname;
}
@@ -1010,7 +1010,7 @@ window.generateChild = function (mother, ova, destination) {
child.eyebrowHColor = child.hColor;
}
child.birthWeek = 0;
- if (genes.faceShape != undefined) {
+ if (genes.faceShape !== undefined) {
child.faceShape = genes.faceShape;
}
if (mother.addict > 0) {
@@ -1058,13 +1058,13 @@ window.generateChild = function (mother, ova, destination) {
} else if (genes.father > 0) {
child.slaveName = `${genes.motherName} and ${genes.fatherName}'s daughter`;
let currentMother = getSlave(genes.mother);
- if (currentMother != undefined) {
+ if (currentMother !== undefined) {
if (currentMother.slaveSurname !== 0 && currentMother.slaveSurname !== "") {
child.slaveSurname = currentMother.slaveSurname;
}
} else {
let currentFather = getSlave(genes.father);
- if (currentFather != undefined) {
+ if (currentFather !== undefined) {
if (currentFather.slaveSurname !== 0 && currentFather.slaveSurname !== "") {
child.slaveSurname = currentFather.slaveSurname;
}
@@ -1073,7 +1073,7 @@ window.generateChild = function (mother, ova, destination) {
} else {
child.slaveName = `${genes.motherName}'s bastard daughter`;
let currentMother = getSlave(genes.mother);
- if (currentMother != undefined) {
+ if (currentMother !== undefined) {
if (currentMother.slaveSurname !== 0 && currentMother.slaveSurname !== "") {
child.slaveSurname = currentMother.slaveSurname;
}
@@ -1108,13 +1108,13 @@ window.generateChild = function (mother, ova, destination) {
child.slaveSurname = V.PC.surname;
} else if (genes.father > 0) {
let currentMother = getSlave(genes.mother);
- if (currentMother != undefined) {
+ if (currentMother !== undefined) {
if (currentMother.slaveSurname !== 0 && currentMother.slaveSurname !== "") {
child.slaveSurname = currentMother.slaveSurname;
}
} else {
let currentFather = getSlave(genes.father);
- if (currentFather != undefined) {
+ if (currentFather !== undefined) {
if (currentFather.slaveSurname !== 0 && currentFather.slaveSurname !== "") {
child.slaveSurname = currentFather.slaveSurname;
}
@@ -1122,7 +1122,7 @@ window.generateChild = function (mother, ova, destination) {
}
} else {
let currentMother = getSlave(genes.mother);
- if (currentMother != undefined) {
+ if (currentMother !== undefined) {
if (currentMother.slaveSurname !== 0 && currentMother.slaveSurname !== "") {
child.slaveSurname = currentMother.slaveSurname;
}
@@ -1148,13 +1148,13 @@ window.generateChild = function (mother, ova, destination) {
} else if (genes.father > 0) {
child.slaveName = `${genes.motherName} and ${genes.fatherName}'s son`;
let currentMother = getSlave(genes.mother);
- if (currentMother != undefined) {
+ if (currentMother !== undefined) {
if (currentMother.slaveSurname !== 0 && currentMother.slaveSurname !== "") {
child.slaveSurname = currentMother.slaveSurname;
}
} else {
let currentFather = getSlave(genes.father);
- if (currentFather != undefined) {
+ if (currentFather !== undefined) {
if (currentFather.slaveSurname !== 0 && currentFather.slaveSurname !== "") {
child.slaveSurname = currentFather.slaveSurname;
}
@@ -1163,7 +1163,7 @@ window.generateChild = function (mother, ova, destination) {
} else {
child.slaveName = `${genes.motherName}'s bastard son`;
let currentMother = getSlave(genes.mother);
- if (currentMother != undefined) {
+ if (currentMother !== undefined) {
if (currentMother.slaveSurname !== 0 && currentMother.slaveSurname !== "") {
child.slaveSurname = currentMother.slaveSurname;
}
@@ -1198,13 +1198,13 @@ window.generateChild = function (mother, ova, destination) {
child.slaveSurname = V.PC.surname;
} else if (genes.father > 0) {
let currentMother = getSlave(genes.mother);
- if (currentMother != undefined) {
+ if (currentMother !== undefined) {
if (currentMother.slaveSurname !== 0 && currentMother.slaveSurname !== "") {
child.slaveSurname = currentMother.slaveSurname;
}
} else {
let currentFather = getSlave(genes.father);
- if (currentFather != undefined) {
+ if (currentFather !== undefined) {
if (currentFather.slaveSurname !== 0 && currentFather.slaveSurname !== "") {
child.slaveSurname = currentFather.slaveSurname;
}
@@ -1212,7 +1212,7 @@ window.generateChild = function (mother, ova, destination) {
}
} else {
let currentMother = getSlave(genes.mother);
- if (currentMother != undefined) {
+ if (currentMother !== undefined) {
if (currentMother.slaveSurname !== 0 && currentMother.slaveSurname !== "") {
child.slaveSurname = currentMother.slaveSurname;
}
@@ -1222,7 +1222,7 @@ window.generateChild = function (mother, ova, destination) {
}
}
- if (genes.clone != undefined) {
+ if (genes.clone !== undefined) {
child.clone = genes.clone;
child.cloneID = genes.cloneID;
}
@@ -1266,7 +1266,7 @@ window.generateChild = function (mother, ova, destination) {
child.balls = 1;
child.scrotum = 1;
}
- if (genes.faceShape != undefined) {
+ if (genes.faceShape !== undefined) {
child.faceShape = genes.faceShape;
}
if (mother.addict > 0) {
diff --git a/src/js/rbuttonJS.js b/src/js/rbuttonJS.js
index 53e5de138c857504a2a1a3f2c380b69c48109862..06ff286cd4942cb79649c975b599252f20a91c30 100644
--- a/src/js/rbuttonJS.js
+++ b/src/js/rbuttonJS.js
@@ -74,7 +74,7 @@ Macro.add('rbutton', {
var replaceEl = document.getElementById(replaceID);
//alert (replaceEl);
- if (replaceEl != null) {
+ if (replaceEl !== null) {
replaceEl.innerHTML = replaceText;
}
@@ -87,7 +87,7 @@ Macro.add('rbutton', {
var replaceEl = document.getElementById(replaceID);
//alert (replaceEl);
- if (replaceEl != null) {
+ if (replaceEl !== null) {
replaceEl.innerHTML = replaceText;
}
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 2557800286e28b072bc05916e54e257776ebd54c..acce062418cf14843d6ef0114cffe3cc24115b5f 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -16,7 +16,7 @@ window.rulesAssistantOptions = (function() {
V.returnTo = "Main";
V.showEncyclopedia = 1;
V.encyclopedia = "Personal Assistant";
- if (V.currentRule != null) {
+ if (V.currentRule !== null) {
const idx = V.defaultRules.findIndex(rule => rule.ID === V.currentRule);
if (idx === -1)
current_rule = V.defaultRules[0];
@@ -230,7 +230,7 @@ window.rulesAssistantOptions = (function() {
class ListItem extends Element {
constructor(displayvalue, data) {
super(displayvalue);
- this.data = data != undefined ? data: displayvalue;
+ this.data = data !== undefined ? data: displayvalue;
this.selected = false;
}
@@ -370,7 +370,7 @@ window.rulesAssistantOptions = (function() {
render() {
let element = document.getElementById("importfield");
- if (element != null) { return element; }
+ if (element !== null) { return element; }
const container = document.createElement("div");
container.id = "importfield";
const textarea = document.createElement("textarea");
@@ -598,7 +598,7 @@ window.rulesAssistantOptions = (function() {
}
show_custom_editor(what, ...args) {
- if (this.custom_editor != null) this.hide_custom_editor();
+ if (this.custom_editor !== null) this.hide_custom_editor();
this.custom_editor = new what(...args);
this.appendChild(this.custom_editor);
}
@@ -616,7 +616,7 @@ window.rulesAssistantOptions = (function() {
}
fnchanged(value) {
- if (this.fneditor != null) {
+ if (this.fneditor !== null) {
this.fneditor.element.remove();
this.fneditor = null;
}
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index b2055eeb0cbcfac3c4ab8017b129d671b35e28a8..1339c626047b25e8985575bea6ee7ed7a814d72d 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -1414,7 +1414,7 @@ window.FResult = (function() {
/** @param {App.Entity.SlaveState} slave */
function calcWorksWithRelativesVanilla(slave) {
const fre = getSlave(slave.relationTarget);
- if (fre != undefined && sameAssignmentP(slave, fre)) {
+ if (fre !== undefined && sameAssignmentP(slave, fre)) {
result += 2;
if (incest_bonus) result += 2;
}
@@ -1431,7 +1431,7 @@ window.FResult = (function() {
/** @param {App.Entity.SlaveState} slave */
function calcWorksWithRival(slave) {
const en = getSlave(slave.rivalryTarget);
- if (en != undefined && sameAssignmentP(slave, en)) result -= 1;
+ if (en !== undefined && sameAssignmentP(slave, en)) result -= 1;
}
/** @param {App.Entity.SlaveState} slave */
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index dffcb731b9fbe1dced6297ec018d83fb38640e8b..edcf03c510c9c9257b073b4e77a44f6946b6d202 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -4713,7 +4713,7 @@ window.SlaveSummaryUncached = (function(){
function rules_assistant(slave) {
if (slave.useRulesAssistant === 0) {
r += `<span class="lightgreen">RA-Exempt</span> `;
- } else if (V.abbreviateRulesets === 2 && (slave.currentRules != undefined) && (slave.currentRules.length > 0)) {
+ } else if (V.abbreviateRulesets === 2 && (slave.currentRules !== undefined) && (slave.currentRules.length > 0)) {
r += `Rules: ${V.defaultRules.filter(x => ruleApplied(slave, x)).map(x => x.name).join(", ") }`;
}
}
@@ -4887,13 +4887,13 @@ App.UI.slaveSummaryList = function (passageName) {
const _filteredSlaveIdxs = slaves.map(function (slave, idx) {
return _passagePreFilter(slave) ? idx : null;
}).filter(function (idx) {
- return idx != null;
+ return idx !== null;
});
const _indexSlavesIdxs = slaves.map(function (slave, idx) {
return _passagePreFilter(slave) ? idx : null;
}).filter(function (idx) {
- return idx != null;
+ return idx !== null;
});
let res = [];
@@ -5643,7 +5643,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
}/* closes _numFacilities */
- if ((passageName !== 'Main') || (V.Flag != undefined) || (V.useSlaveSummaryTabs === 0) || (tabName === "all")) {
+ if ((passageName !== 'Main') || (V.Flag !== undefined) || (V.useSlaveSummaryTabs === 0) || (tabName === "all")) {
res.push(`<span id="slave-${slaves[_ssi].ID}"> </span>`);
}
res.push('<br/>');
diff --git a/src/js/walkPastJS.js b/src/js/walkPastJS.js
index 97cdc731d78a09f2362c7fbe1c2c860aaa94b9fb..ca56e19c2cee92cb7f1c22b3b2a073a088c65ffc 100644
--- a/src/js/walkPastJS.js
+++ b/src/js/walkPastJS.js
@@ -32,7 +32,7 @@ window.rivalSlave = function(activeSlave, seed) {
let t = "";
let _target = "";
- if (_partnerSlave != undefined) { /* potential problem point */
+ if (_partnerSlave !== undefined) { /* potential problem point */
// let race2 = (V.seeRace ? _partnerSlave.race : "");
t += " Meanwhile, ";
@@ -70,7 +70,7 @@ window.loverSlave = function(activeSlave) {
var _seed = jsRandom(1,100);
var _fuckSpot;
- if (_partnerSlave != undefined) {
+ if (_partnerSlave !== undefined) {
var pronouns2 = getPronouns(_partnerSlave);
var he2 = pronouns2.pronoun, him2 = pronouns2.object, his2 = pronouns2.possessive, hers2 = pronouns2.possessivePronoun, himself2 = pronouns2.objectReflexive, boy2 = pronouns2.noun;
@@ -1257,7 +1257,7 @@ window.relatedSlave = function(activeSlave) {
partnerSlave = getSlave(activeSlave.relationshipTarget);
}
- if (partnerSlave != undefined) { /* potential problem point */
+ if (partnerSlave !== undefined) { /* potential problem point */
t += ` ${His} `;
if (V.partner === "relation") {