From a1e937d45c7459cf2cdf4dad8bcb3eaaf853b95a Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Mon, 18 Mar 2019 19:04:54 -0400
Subject: [PATCH] More fixes
---
src/SpecialForce/SpecialForce.js | 30 +--
src/art/artJS.js | 4 +-
src/art/vector/VectorArtJS.js | 10 +-
.../vector_revamp/vectorRevampedArtControl.js | 8 +-
src/facilities/nursery/childSummary.tw | 4 +-
src/js/DefaultRules.js | 184 +++++++++---------
src/js/assayJS.js | 14 +-
src/js/datatypeCleanupJS.js | 6 +-
src/js/economyJS.js | 14 +-
src/js/eventSelectionJS.js | 4 +-
src/js/foreachMacroJS.js | 2 +-
src/js/generateGenetics.js | 54 ++---
src/js/rbuttonJS.js | 4 +-
src/js/rulesAssistantOptions.js | 10 +-
src/js/slaveCostJS.js | 4 +-
src/js/slaveSummaryWidgets.js | 8 +-
src/js/walkPastJS.js | 6 +-
17 files changed, 183 insertions(+), 183 deletions(-)
diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index 00e7bd9bbff..1cdb182d654 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/art/artJS.js b/src/art/artJS.js
index 830f4cb7811..58ec6513689 100644
--- a/src/art/artJS.js
+++ b/src/art/artJS.js
@@ -13,7 +13,7 @@ UIDisplay (optional, only used by legacy art): icon UI Display for vector art, 1
*/
window.SlaveArt = function(artSlave, artSize, UIDisplay) {
const imageChoice = State.variables.imageChoice;
- if (artSlave.customImage !== "" && artSlave.customImage !== undefined)
+ if (artSlave.customImage !== "" && artSlave.customImage != undefined)
return CustomArt(artSlave, artSize);
else if (imageChoice === 1) /* VECTOR ART BY NOX/DEEPMURK */
return VectorArt(artSlave, artSize);
@@ -171,7 +171,7 @@ window.extractColor = function (color, eyes) {
color = color.toLowerCase(); /* normalization: lowercase color name */
var colorCode = FCnames.get(color); /* look up in FreeCities color names */
if (!colorCode) { /* not a FreeCities color name*/
- if (HTMLstandardColors.includes(color) || color.match(/^#([0-9a-f]{3}){1,2}$/) !== null) {
+ if (HTMLstandardColors.includes(color) || color.match(/^#([0-9a-f]{3}){1,2}$/) != null) {
colorCode = color; /* is a HTML color name or value, use it directly */
} else {
/*
diff --git a/src/art/vector/VectorArtJS.js b/src/art/vector/VectorArtJS.js
index 710eb3c56bd..0b407224266 100644
--- a/src/art/vector/VectorArtJS.js
+++ b/src/art/vector/VectorArtJS.js
@@ -1411,7 +1411,7 @@ window.VectorArt = (function () {
if (slave.clothes === "a Fuckdoll suit" || slave.clothes === "restrictive latex") {
T.shoeColour = T.skinColour;
T.shoeShadowColour = T.shoeColour+";opacity: 0.5"; /* TODO: do not abuse "color" variable for style definitions. do not rely on dark background for shadow effect either. */
- } else if (slave.shoeColor !== undefined) {
+ } else if (slave.shoeColor != undefined) {
T.shoeColour = slave.shoeColor+";opacity: 0.4"; /* shoe color selected by user */
T.shoeShadowColour = T.shoeColour+";opacity: 0.5"; /* TODO: do not abuse "color" variable for style definitions. do not rely on dark background for shadow effect either. */
} else {
@@ -1507,7 +1507,7 @@ window.VectorArt = (function () {
r += jsInclude("Art_Vector_Feet_ProstheticSwiss");
}
}
- if (stockings !== undefined && slave.amp !== 1) {
+ if (stockings != undefined && slave.amp !== 1) {
if (slave.shoes === "heels") {
r += jsInclude(`Art_Vector_Shoes_Heel_${stockings}_${legSize}`);
} else if (slave.shoes === "pumps") {
@@ -1573,7 +1573,7 @@ window.VectorArt = (function () {
default:
outfit = clothing2artSuffix(slave.clothes);
}
- if (outfit !== undefined) {
+ if (outfit != undefined) {
if (slave.amp !== 1) {
if (slave.clothes !== "a slutty qipao" && slave.clothes !== "harem gauze" && slave.clothes !== "slutty jewelry" && slave.clothes !== "Western clothing") /* these clothes have a stump/leg outfit, but no butt outfit */
r += jsInclude(`Art_Vector_Butt_Outfit_${outfit}_${buttSize}`);
@@ -1587,7 +1587,7 @@ window.VectorArt = (function () {
}
function ArtVectorHairBack() {
- if (hairLength !== undefined) { /* Don't draw hair if it isn't there */
+ if (hairLength != undefined) { /* Don't draw hair if it isn't there */
if (slave.fuckdoll !== 0 || (slave.bald !== 0 && slave.hStyle === "bald")) {
r += jsInclude("Art_Vector_Hair_Back_NoHair");
} else {
@@ -1661,7 +1661,7 @@ window.VectorArt = (function () {
}
function ArtVectorHairFore() {
- if (hairLength !== undefined) { /* Don't draw hair if it isn't there */
+ if (hairLength != undefined) { /* Don't draw hair if it isn't there */
if (slave.fuckdoll !== 0 || (slave.bald !== 0 && slave.hStyle === "bald")) {
r += jsInclude("Art_Vector_Hair_Fore_NoHair");
} else {
diff --git a/src/art/vector_revamp/vectorRevampedArtControl.js b/src/art/vector_revamp/vectorRevampedArtControl.js
index 98b4149c7af..47a9c531ed6 100644
--- a/src/art/vector_revamp/vectorRevampedArtControl.js
+++ b/src/art/vector_revamp/vectorRevampedArtControl.js
@@ -40,7 +40,7 @@ class ArtStyleEntry {
{
var keys = Object.keys(this);
var styleArray = [];
- if (keys !== null && keys !== undefined)
+ if (keys != null && keys != undefined)
{
var styleObj = this;
keys.forEach(function(key) {
@@ -641,11 +641,11 @@ class RevampedArtControl {
this.pubicTattooText = "";
var clothing = this.getClothing();
- if (clothing !== null)
+ if (clothing != null)
{
- if (clothing.bodySettings !== null)
+ if (clothing.bodySettings != null)
this.applyClothingSettings(clothing.bodySettings);
- if (clothing.styleSettings !== null)
+ if (clothing.styleSettings != null)
this.applyClothingStyleSettings(clothing.styleSettings);
}
diff --git a/src/facilities/nursery/childSummary.tw b/src/facilities/nursery/childSummary.tw
index 3fc4168fc5a..cb3b48b4025 100644
--- a/src/facilities/nursery/childSummary.tw
+++ b/src/facilities/nursery/childSummary.tw
@@ -13,8 +13,8 @@
}>>
<<set _Pass = passage(), _CL = $cribs.length, $assignTo = _Pass, _indexed = 0,
_passagePreFilter = (c => c.assignment != "be your agent" && c.assignment != "live with your agent" && (!setup.passagePreFilters.hasOwnProperty(_Pass) || setup.passagePreFilters[_Pass](c))),
- _filteredSlaveIdxs = $cribs.map(function(slave, idx) { return _passagePreFilter(slave) ? idx : null; }).filter(function(idx) { return idx !== null; }),
- _indexSlavesIdxs = $cribs.map(function(slave, idx) { return _passagePreFilter(slave) ? idx : null; }).filter(function(idx) { return idx !== null; })>>
+ _filteredSlaveIdxs = $cribs.map(function(slave, idx) { return _passagePreFilter(slave) ? idx : null; }).filter(function(idx) { return idx != null; }),
+ _indexSlavesIdxs = $cribs.map(function(slave, idx) { return _passagePreFilter(slave) ? idx : null; }).filter(function(idx) { return idx != null; })>>
<<for !_.isUndefined(_csi = _filteredSlaveIdxs.shift())>>
<<set _Child = $cribs[_csi]>>
<<set _childName = SlaveFullName(_Child);>>
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index cb2eca1e4d2..959d1e17270 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -306,7 +306,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function AssignJobToSlave(slave, rule) {
// place slave on assignment defined by the rule
- if ((rule.setAssignment !== undefined && rule.setAssignment !== "no default setting")) {
+ if ((rule.setAssignment != undefined && rule.setAssignment !== "no default setting")) {
if (((rule.setAssignment === "choose her own job" && !slave.choosesOwnAssignment) || rule.setAssignment !== slave.assignment)) {
switch (rule.setAssignment) {
case "live with your Head Girl":
@@ -363,7 +363,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessClothing(slave, rule) {
// apply clothes to slave
- if ((rule.clothes !== undefined) && (rule.clothes !== "no default setting")) {
+ if ((rule.clothes != undefined) && (rule.clothes !== "no default setting")) {
if ((rule.clothes === "choosing her own clothes")) {
if ((slave.choosesOwnClothes === 0)) {
slave.clothes = "choosing her own clothes";
@@ -381,7 +381,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessCollar(slave, rule) {
// apply collar to slave
- if ((rule.collar !== undefined) && (rule.collar !== "no default setting")) {
+ if ((rule.collar != undefined) && (rule.collar !== "no default setting")) {
if ((slave.collar !== rule.collar)) {
r += "<br>";
if (rule.collar === "preg biometrics" && slave.preg <= -1 && slave.ovaries === 0 && slave.mpreg === 0) {
@@ -409,7 +409,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessEyewear(slave, rule) {
// apply glasses, contacts to slave
- if ((rule.eyewear !== undefined) && (rule.eyewear !== "no default setting")) {
+ if ((rule.eyewear != undefined) && (rule.eyewear !== "no default setting")) {
switch (rule.eyewear) {
case "correct with glasses":
if (slave.eyes === -1) {
@@ -500,7 +500,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessEarwear(slave, rule) {
// apply earplugs to slave
- if ((rule.earwear !== undefined) && (rule.earwear !== "no default setting")) {
+ if ((rule.earwear != undefined) && (rule.earwear !== "no default setting")) {
switch (rule.earwear) {
case "correct with hearing aids":
if (slave.hears === -1) {
@@ -573,7 +573,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessVVirginDildos(slave, rule) {
// apply vaginal dildos to vaginal virgins
- if ((rule.virginAccessory !== undefined) && (rule.virginAccessory !== "no default setting")) {
+ if ((rule.virginAccessory != undefined) && (rule.virginAccessory !== "no default setting")) {
if (slave.vaginalAccessory !== rule.virginAccessory) {
slave.vaginalAccessory = rule.virginAccessory;
switch (slave.vaginalAccessory) {
@@ -631,7 +631,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessAVirginDildos(slave, rule) {
// apply vaginal dildos to anal virgins
- if ((rule.aVirginAccessory !== undefined) && (rule.aVirginAccessory !== "no default setting")) {
+ if ((rule.aVirginAccessory != undefined) && (rule.aVirginAccessory !== "no default setting")) {
if (slave.vaginalAccessory !== rule.aVirginAccessory) {
slave.vaginalAccessory = rule.aVirginAccessory;
switch (slave.vaginalAccessory) {
@@ -689,7 +689,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessNonVirginDildos(slave, rule) {
// apply vaginal dildos to non-virgins
- if ((rule.vaginalAccessory !== undefined) && (rule.vaginalAccessory !== "no default setting")) {
+ if ((rule.vaginalAccessory != undefined) && (rule.vaginalAccessory !== "no default setting")) {
if (slave.vaginalAccessory !== rule.vaginalAccessory) {
slave.vaginalAccessory = rule.vaginalAccessory;
switch (slave.vaginalAccessory) {
@@ -748,7 +748,7 @@ window.DefaultRules = (function() {
// apply vaginal accessories to slaves
if (slave.vaginalAccessory === "none" && slave.vaginalAttachment === "vibrator") {
slave.vaginalAttachment = "none"; // clears dildo attachment when dildos are removed above
- } else if ((rule.vaginalAttachment !== undefined) && (rule.vaginalAttachment !== "no default setting")) {
+ } else if ((rule.vaginalAttachment != undefined) && (rule.vaginalAttachment !== "no default setting")) {
if ((slave.vaginalAttachment !== rule.vaginalAttachment)) {
slave.vaginalAttachment = rule.vaginalAttachment;
if (slave.vaginalAccessory !== "none") {
@@ -785,7 +785,7 @@ window.DefaultRules = (function() {
// apply dick accessories to slave
if ((slave.dick > 0)) {
if (slave.anus === 0) {
- if ((rule.aVirginDickAccessory !== undefined) && (rule.aVirginDickAccessory !== "no default setting")) {
+ if ((rule.aVirginDickAccessory != undefined) && (rule.aVirginDickAccessory !== "no default setting")) {
if ((slave.dickAccessory !== rule.aVirginDickAccessory)) {
slave.dickAccessory = rule.aVirginDickAccessory;
if (slave.dickAccessory === "none") {
@@ -796,7 +796,7 @@ window.DefaultRules = (function() {
}
}
} else {
- if ((rule.dickAccessory !== undefined) && (rule.dickAccessory !== "no default setting")) {
+ if ((rule.dickAccessory != undefined) && (rule.dickAccessory !== "no default setting")) {
if ((slave.dickAccessory !== rule.dickAccessory)) {
slave.dickAccessory = rule.dickAccessory;
if (slave.dickAccessory === "none") {
@@ -813,7 +813,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessChastity(slave, rule) {
// apply chastity to slave
- if ((rule.chastityVagina !== undefined) && (rule.chastityVagina !== "no default setting")) {
+ if ((rule.chastityVagina != undefined) && (rule.chastityVagina !== "no default setting")) {
if (slave.vagina > -1) {
if ((slave.chastityVagina !== rule.chastityVagina)) {
slave.chastityVagina = rule.chastityVagina;
@@ -825,7 +825,7 @@ window.DefaultRules = (function() {
}
}
}
- if ((rule.chastityPenis !== undefined) && (rule.chastityPenis !== "no default setting")) {
+ if ((rule.chastityPenis != undefined) && (rule.chastityPenis !== "no default setting")) {
if (slave.dick > 0) {
if ((slave.chastityPenis !== rule.chastityPenis)) {
slave.chastityPenis = rule.chastityPenis;
@@ -837,7 +837,7 @@ window.DefaultRules = (function() {
}
}
}
- if ((rule.chastityAnus !== undefined) && (rule.chastityAnus !== "no default setting")) {
+ if ((rule.chastityAnus != undefined) && (rule.chastityAnus !== "no default setting")) {
if ((slave.chastityAnus !== rule.chastityAnus)) {
slave.chastityAnus = rule.chastityAnus;
if (rule.chastityAnus === 1) {
@@ -852,7 +852,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessShoes(slave, rule) {
// apply shoes to slave
- if ((rule.shoes !== undefined) && (rule.shoes !== "no default setting")) {
+ if ((rule.shoes != undefined) && (rule.shoes !== "no default setting")) {
if ((slave.shoes !== rule.shoes)) {
if ((slave.amp !== 1)) {
slave.shoes = rule.shoes;
@@ -865,7 +865,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessBellyAccessories(slave, rule) {
// apply belly accessories to slave
- if ((rule.bellyAccessory !== undefined) && (rule.bellyAccessory !== "no default setting")) {
+ if ((rule.bellyAccessory != undefined) && (rule.bellyAccessory !== "no default setting")) {
if ((slave.bellyAccessory !== rule.bellyAccessory)) {
if ((slave.belly >= 1500 || slave.weight >= 130) && setup.fakeBellies.includes(rule.bellyAccessory)) {
r += `<br>${slave.slaveName}'s natural belly is too big to properly wear an empathy belly.`;
@@ -884,7 +884,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessLegAccessory(slave, rule) {
- if (rule.legAccessory !== undefined && rule.legAccessory !== "no default setting" && slave.amp !== 1 && slave.legAccessory !== rule.legAccessory) {
+ if (rule.legAccessory != undefined && rule.legAccessory !== "no default setting" && slave.amp !== 1 && slave.legAccessory !== rule.legAccessory) {
slave.legAccessory = rule.legAccessory;
r += `<br>${slave.slaveName}'s leg accessory was set to ${rule.legAccessory}.`;
}
@@ -906,7 +906,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessAnalVirginButtplugs(slave, rule) {
// apply buttplugs to virgins
- if ((rule.aVirginButtplug !== undefined) && (rule.aVirginButtplug !== "no default setting")) {
+ if ((rule.aVirginButtplug != undefined) && (rule.aVirginButtplug !== "no default setting")) {
if ((slave.buttplug !== rule.aVirginButtplug)) {
slave.buttplug = rule.aVirginButtplug;
switch (slave.buttplug) {
@@ -964,7 +964,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessNonVirginButtplugs(slave, rule) {
// apply buttplugs to non-virgins
- if ((rule.buttplug !== undefined) && (rule.buttplug !== "no default setting")) {
+ if ((rule.buttplug != undefined) && (rule.buttplug !== "no default setting")) {
if ((slave.buttplug !== rule.buttplug)) {
slave.buttplug = rule.buttplug;
switch (slave.buttplug) {
@@ -1024,7 +1024,7 @@ window.DefaultRules = (function() {
// apply buttplug accessories to slaves
if (slave.buttplug === "none" && slave.buttplugAttachment !== "none") {
slave.buttplugAttachment = "none"; // clears buttplug attachments when buttplugs are removed above
- } else if ((rule.buttplugAttachment !== undefined) && (rule.buttplugAttachment !== "no default setting")) {
+ } else if ((rule.buttplugAttachment != undefined) && (rule.buttplugAttachment !== "no default setting")) {
if ((slave.buttplugAttachment !== rule.buttplugAttachment)) {
slave.buttplugAttachment = rule.buttplugAttachment;
switch (slave.buttplugAttachment) {
@@ -1044,7 +1044,7 @@ window.DefaultRules = (function() {
function ProcessBellyImplant(slave, rule) {
// Here is belly implant size control, it's used in Surgery Degradation passage to setup devotion and trust changes.
// silent calls to surgery degradation have been replaced with a js function, which is less hacky
- if ((rule.bellyImplantVol !== undefined) && slave.bellyImplant >= 0 && rule.bellyImplantVol >= 0) {
+ if ((rule.bellyImplantVol != undefined) && slave.bellyImplant >= 0 && rule.bellyImplantVol >= 0) {
r += "<br>";
if (slave.health > -10 ) {
const diff = rule.bellyImplantVol - slave.bellyImplant;
@@ -1118,7 +1118,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessContraceptives(slave, rule) {
- if ((rule.preg !== undefined) && (rule.preg !== "no default setting")) {
+ if ((rule.preg != undefined) && (rule.preg !== "no default setting")) {
if (rule.preg === true && slave.preg === 0) {
r += `<br>${slave.slaveName} is being given contraceptives.`;
slave.preg = -1;
@@ -1131,7 +1131,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessAbortions(slave, rule) {
- if ((rule.abortion !== undefined) && (rule.abortion !== "no default setting")) {
+ if ((rule.abortion != undefined) && (rule.abortion !== "no default setting")) {
if (rule.abortion === "all") {
if (slave.preg < 4 || (slave.fetish === "mindbroken" || slave.fuckdoll !== 0)) {
r += `<br>${slave.slaveName}'s pregnancy has been terminated.`;
@@ -1610,7 +1610,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessEnema(slave, rule) {
- if ((rule.inflationType !== undefined) && (rule.inflationType !== "no default setting")) {
+ if ((rule.inflationType != undefined) && (rule.inflationType !== "no default setting")) {
if (slave.inflationType !== rule.inflationType) {
if ((slave.inflationType === "curative" && slave.health > 90) || (slave.inflationType === "tightener" && slave.anus <= 1 && slave.vagina <= 1)) {
r += `<br>${slave.slaveName} cannot benefit from ${his} assigned enema and has been defaulted to none.`;
@@ -1652,7 +1652,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessDiet(slave, rule) {
// Diet Setting
- if (rule.diet !== undefined && rule.diet !== "no default 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.diet !== "muscle building")) {
@@ -1684,7 +1684,7 @@ window.DefaultRules = (function() {
slave.diet = "fattening";
r += `<br>${slave.slaveName} is too skinny so ${his} diet has been set to fattening.`;
}
- } else if ((rule.muscles !== undefined) && (rule.muscles !== "no default setting") && (slave.amp !== 1)) {
+ } else if ((rule.muscles != undefined) && (rule.muscles !== "no default setting") && (slave.amp !== 1)) {
if ((slave.muscles >= rule.muscles+8)) {
if ((slave.diet !== "slimming")) {
slave.diet = "slimming";
@@ -1718,7 +1718,7 @@ window.DefaultRules = (function() {
slave.diet = "fattening";
r += `<br>${slave.slaveName} is too skinny so ${his} diet has been set to fattening.`;
}
- } else if ((rule.muscles !== undefined) && (rule.muscles !== "no default setting") && (slave.amp !== 1)) {
+ } else if ((rule.muscles != undefined) && (rule.muscles !== "no default setting") && (slave.amp !== 1)) {
if ((slave.muscles >= rule.muscles+8)) {
if ((slave.diet !== "slimming")) {
slave.diet = "slimming";
@@ -1799,7 +1799,7 @@ window.DefaultRules = (function() {
}
}
}
- } else if ((rule.muscles !== undefined) && (rule.muscles !== "no default setting") && (slave.amp !== 1)) { // no diet rule, muscles only
+ } else if ((rule.muscles != undefined) && (rule.muscles !== "no default setting") && (slave.amp !== 1)) { // no diet rule, muscles only
if ((slave.muscles >= rule.muscles+8)) {
if ((slave.diet !== "slimming")) {
slave.diet = "slimming";
@@ -1829,7 +1829,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessCuratives(slave, rule) {
- if ((rule.curatives !== undefined) && (rule.curatives !== "no default setting")) {
+ if ((rule.curatives != undefined) && (rule.curatives !== "no default setting")) {
if (slave.curatives !== rule.curatives) {
if (rule.curatives === 2) {
if (slave.health > 100) {
@@ -1851,7 +1851,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessAphrodisiacs(slave, rule) {
- if ((rule.aphrodisiacs !== undefined) && (rule.aphrodisiacs !== "no default setting")) {
+ if ((rule.aphrodisiacs != undefined) && (rule.aphrodisiacs !== "no default setting")) {
if (slave.aphrodisiacs !== rule.aphrodisiacs) {
r += `<br>${slave.slaveName} has been ${rule.aphrodisiacs > 0 ? "put on the proper" : "taken off"} aphrodisiacs.`;
slave.aphrodisiacs = rule.aphrodisiacs;
@@ -1863,7 +1863,7 @@ window.DefaultRules = (function() {
function ProcessPenisHormones(slave, rule) {
if ((slave.dick > 0)) {
if ((slave.balls === 0)) {
- if ((rule.gelding !== undefined) && (rule.gelding !== "no default setting")) {
+ if ((rule.gelding != undefined) && (rule.gelding !== "no default setting")) {
if ((slave.hormones !== rule.gelding)) {
const _oldHormones = slave.hormones;
slave.hormones = rule.gelding;
@@ -1876,7 +1876,7 @@ window.DefaultRules = (function() {
}
}
} else if ((slave.balls > 0)) {
- if ((rule.XY !== undefined) && (rule.XY !== "no default setting")) {
+ if ((rule.XY != undefined) && (rule.XY !== "no default setting")) {
if ((slave.hormones !== rule.XY)) {
if ((slave.assignment !== "recruit girls")) {
if ((slave.assignment !== "be the Wardeness")) {
@@ -1900,7 +1900,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessFemaleHormones(slave, rule) {
- if ((slave.vagina > -1) && (slave.dick === 0) && (rule.XX !== undefined) && (rule.XX !== "no default setting")) {
+ if ((slave.vagina > -1) && (slave.dick === 0) && (rule.XX != undefined) && (rule.XX !== "no default setting")) {
if ((slave.hormones !== rule.XX)) {
const _oldHormones = slave.hormones;
slave.hormones = rule.XX;
@@ -1943,7 +1943,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessLivingStandard(slave, rule) {
- if ((rule.livingRules !== undefined) && (rule.livingRules !== "no default setting")) {
+ if ((rule.livingRules != undefined) && (rule.livingRules !== "no default setting")) {
if (setup.facilityCareers.includes(slave.assignment)) {
r += ""; // `<br>${slave.slaveName}'s living standards are controlled by ${his} assignment.`;
} else if (((slave.assignment === "be your Head Girl") && (V.HGSuite === 1)) || ((slave.assignment === "guard you") && (V.dojo > 1))) {
@@ -1977,7 +1977,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessSpeech(slave, rule) {
- if ((rule.speechRules !== undefined) && (rule.speechRules !== "no default setting") && (slave.speechRules !== rule.speechRules)) {
+ if ((rule.speechRules != undefined) && (rule.speechRules !== "no default setting") && (slave.speechRules !== rule.speechRules)) {
if (slave.fetish === "mindbroken") {
if ((slave.speechRules !== "restrictive")) {
slave.speechRules = "restrictive";
@@ -2009,7 +2009,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessRelationship(slave, rule) {
if ((slave.fetish !== "mindbroken")) {
- if ((rule.relationshipRules !== undefined) && (rule.relationshipRules !== "no default setting")) {
+ if ((rule.relationshipRules != undefined) && (rule.relationshipRules !== "no default setting")) {
if ((slave.relationshipRules !== rule.relationshipRules )) {
slave.relationshipRules = rule.relationshipRules;
r += `<br>${slave.slaveName}'s relationship rules have been set to ${rule.relationshipRules}.`;
@@ -2020,7 +2020,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessRelease(slave, rule) {
- if ((rule.releaseRules !== undefined) && (rule.releaseRules !== "no default setting")) {
+ if ((rule.releaseRules != undefined) && (rule.releaseRules !== "no default setting")) {
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))) {
@@ -2043,7 +2043,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessPunishment(slave, rule) {
- if ((rule.standardPunishment !== undefined) && (rule.standardPunishment !== "no default setting")) {
+ if ((rule.standardPunishment != undefined) && (rule.standardPunishment !== "no default setting")) {
if ((slave.standardPunishment !== rule.standardPunishment)) {
slave.standardPunishment = rule.standardPunishment;
r += `<br>${slave.slaveName}'s typical punishment has been updated to ${rule.standardPunishment}.`;
@@ -2053,7 +2053,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessReward(slave, rule) {
- if ((rule.standardReward !== undefined) && (rule.standardReward !== "no default setting")) {
+ if ((rule.standardReward != undefined) && (rule.standardReward !== "no default setting")) {
if ((slave.standardReward !== rule.standardReward)) {
slave.standardReward = rule.standardReward;
r += `<br>${slave.slaveName}'s typical reward has been updated to ${rule.standardReward}.`;
@@ -2063,7 +2063,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessToyHole(slave, rule) {
- if ((rule.toyHole !== undefined) && (rule.toyHole !== "no default setting")) {
+ if ((rule.toyHole != undefined) && (rule.toyHole !== "no default setting")) {
if (rule.toyHole === "pussy") {
if (slave.vagina > 0 && canDoVaginal(slave)) {
slave.toyHole = rule.toyHole;
@@ -2097,7 +2097,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessDietCum(slave, rule) {
- if ((rule.dietCum !== undefined) && (rule.dietCum !== "no default setting")) {
+ if ((rule.dietCum != undefined) && (rule.dietCum !== "no default setting")) {
if (slave.dietCum !== rule.dietCum) {
slave.dietCum = rule.dietCum;
if (slave.dietCum === 2) {
@@ -2115,7 +2115,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessDietMilk(slave, rule) {
- if ((rule.dietMilk !== undefined) && (rule.dietMilk !== "no default setting")) {
+ if ((rule.dietMilk != undefined) && (rule.dietMilk !== "no default setting")) {
if (slave.dietMilk !== rule.dietMilk) {
slave.dietMilk = rule.dietMilk;
if (slave.dietMilk === 2) {
@@ -2133,7 +2133,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessSolidFood(slave, rule) {
- if ((rule.onDiet !== undefined) && (rule.onDiet !== "no default setting")) {
+ if ((rule.onDiet != undefined) && (rule.onDiet !== "no default setting")) {
if ((slave.onDiet !== rule.onDiet)) {
slave.onDiet = rule.onDiet;
if (slave.onDiet === 1) {
@@ -2147,7 +2147,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessTeeth(slave, rule) {
- if ((rule.teeth !== undefined) && (rule.teeth !== "no default setting")) {
+ if ((rule.teeth != undefined) && (rule.teeth !== "no default setting")) {
if ((rule.teeth === "universal")) {
if ((slave.teeth === "crooked")) {
slave.teeth = "straightening braces";
@@ -2189,7 +2189,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessStyle(slave, rule) {
- if (rule.eyeColor !== undefined && (rule.eyeColor !== "no default setting")) {
+ if (rule.eyeColor != undefined && (rule.eyeColor !== "no default setting")) {
if ((slave.eyeColor !== rule.eyeColor)) {
slave.eyeColor = rule.eyeColor;
cashX(forceNeg(V.modCost), "slaveMod", slave);
@@ -2197,7 +2197,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.makeup !== undefined && (rule.makeup !== "no default setting")) {
+ if (rule.makeup != undefined && (rule.makeup !== "no default setting")) {
if ((slave.makeup !== rule.makeup)) {
slave.makeup = rule.makeup;
cashX(forceNeg(V.modCost), "slaveMod", slave);
@@ -2206,7 +2206,7 @@ window.DefaultRules = (function() {
}
if ((slave.amp !== 1)) {
- if (rule.nails !== undefined && (rule.nails !== "no default setting")) {
+ if (rule.nails != undefined && (rule.nails !== "no default setting")) {
if ((slave.nails !== rule.nails)) {
slave.nails = rule.nails;
cashX(forceNeg(V.modCost), "slaveMod", slave);
@@ -2215,7 +2215,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.hColor !== undefined && (rule.hColor !== "no default setting")) {
+ if (rule.hColor != undefined && (rule.hColor !== "no default setting")) {
if (slave.bald !== 1) {
if ((slave.hColor !== rule.hColor)) {
slave.hColor = rule.hColor;
@@ -2225,7 +2225,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.hStyle !== undefined && (rule.hStyle !== "no default setting")) {
+ if (rule.hStyle != undefined && (rule.hStyle !== "no default setting")) {
if (slave.bald !== 1) {
if ((slave.hStyle !== rule.hStyle)) {
slave.hStyle = rule.hStyle;
@@ -2240,7 +2240,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.hLength !== undefined && (rule.hLength !== "no default setting")) {
+ if (rule.hLength != undefined && (rule.hLength !== "no default setting")) {
if (slave.bald !== 1) {
if ((slave.hLength !== rule.hLength)) {
if ((slave.hLength > rule.hLength)) {
@@ -2256,7 +2256,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.haircuts !== undefined && (rule.haircuts !== "no default setting")) {
+ if (rule.haircuts != undefined && (rule.haircuts !== "no default setting")) {
if (slave.bald !== 1) {
if (rule.haircuts === 1 && slave.haircuts !== 1) {
r += `<br>${slave.slaveName}'s hair will now be maintained at ${lengthToEitherUnit(slave.hLength)} long.`;
@@ -2268,7 +2268,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.eyebrowHColor !== undefined && (rule.eyebrowHColor !== "no default setting")) {
+ if (rule.eyebrowHColor != undefined && (rule.eyebrowHColor !== "no default setting")) {
if (slave.eyebrowHStyle !== "bald" && slave.eyebrowHStyle !== "hairless") {
if ((slave.eyebrowHColor !== rule.eyebrowHColor)) {
slave.eyebrowHColor = rule.eyebrowHColor;
@@ -2278,7 +2278,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.eyebrowHStyle !== undefined && (rule.eyebrowHStyle !== "no default setting")) {
+ if (rule.eyebrowHStyle != undefined && (rule.eyebrowHStyle !== "no default setting")) {
if (slave.eyebrowHStyle !== "bald" && slave.eyebrowHStyle !== "hairless") {
if ((slave.eyebrowHStyle !== rule.eyebrowHStyle)) {
slave.eyebrowHStyle = rule.eyebrowHStyle;
@@ -2288,7 +2288,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.eyebrowFullness !== undefined && (rule.eyebrowFullness !== "no default setting")) {
+ if (rule.eyebrowFullness != undefined && (rule.eyebrowFullness !== "no default setting")) {
if (slave.eyebrowHStyle !== "bald" && slave.eyebrowHStyle !== "hairless") {
if ((slave.eyebrowFullness !== rule.eyebrowFullness)) {
slave.eyebrowFullness = rule.eyebrowFullness;
@@ -2298,7 +2298,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.pubicHColor !== undefined && (rule.pubicHColor !== "no default setting")) {
+ if (rule.pubicHColor != undefined && (rule.pubicHColor !== "no default setting")) {
if (slave.pubicHStyle !== "bald" && slave.pubicHStyle !== "hairless") {
if ((slave.pubicHColor !== rule.pubicHColor)) {
slave.pubicHColor = rule.pubicHColor;
@@ -2308,7 +2308,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.pubicHStyle !== undefined && (rule.pubicHStyle !== "no default setting")) {
+ if (rule.pubicHStyle != undefined && (rule.pubicHStyle !== "no default setting")) {
if (slave.pubicHStyle !== "bald" && slave.pubicHStyle !== "hairless") {
if ((slave.pubicHStyle !== rule.pubicHStyle)) {
slave.pubicHStyle = rule.pubicHStyle;
@@ -2318,7 +2318,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.underArmHColor !== undefined && (rule.underArmHColor !== "no default setting")) {
+ if (rule.underArmHColor != undefined && (rule.underArmHColor !== "no default setting")) {
if (slave.underArmHStyle !== "bald" && slave.underArmHStyle !== "hairless") {
if ((slave.underArmHColor !== rule.underArmHColor)) {
slave.underArmHColor = rule.underArmHColor;
@@ -2328,7 +2328,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.underArmHStyle !== undefined && (rule.underArmHStyle !== "no default setting")) {
+ if (rule.underArmHStyle != undefined && (rule.underArmHStyle !== "no default setting")) {
if (slave.underArmHStyle !== "bald" && slave.underArmHStyle !== "hairless") {
if ((slave.underArmHStyle !== rule.underArmHStyle)) {
slave.underArmHStyle = rule.underArmHStyle;
@@ -2338,7 +2338,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.eyebrowHColor !== undefined && (rule.eyebrowHColor !== "no default setting")) {
+ if (rule.eyebrowHColor != undefined && (rule.eyebrowHColor !== "no default setting")) {
if (slave.eyebrowHStyle !== "bald") {
if ((slave.eyebrowHColor !== rule.eyebrowHColor)) {
slave.eyebrowHColor = rule.eyebrowHColor;
@@ -2348,7 +2348,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.eyebrowHStyle !== undefined && (rule.eyebrowHStyle !== "no default setting")) {
+ if (rule.eyebrowHStyle != undefined && (rule.eyebrowHStyle !== "no default setting")) {
if (slave.eyebrowHStyle !== "bald") {
if ((slave.eyebrowHStyle !== rule.eyebrowHStyle)) {
slave.eyebrowHStyle = rule.eyebrowHStyle;
@@ -2358,7 +2358,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.eyebrowFullness !== undefined && (rule.eyebrowFullness !== "no default setting")) {
+ if (rule.eyebrowFullness != undefined && (rule.eyebrowFullness !== "no default setting")) {
if (slave.eyebrowHStyle !== "bald") {
if ((slave.eyebrowFullness !== rule.eyebrowFullness)) {
slave.eyebrowFullness = rule.eyebrowFullness;
@@ -2368,7 +2368,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.markings !== undefined && (rule.markings !== "no default setting")) {
+ if (rule.markings != undefined && (rule.markings !== "no default setting")) {
if (slave.markings === "beauty mark" && (rule.markings === "remove beauty marks" || rule.markings === "remove both")) {
r += `<br>${slave.slaveName}'s beauty mark has been removed.`;
}
@@ -2379,7 +2379,7 @@ window.DefaultRules = (function() {
cashX(forceNeg(V.modCost), "slaveMod", slave);
}
- if (rule.skinColor !== undefined && rule.skinColor !== "no default setting" && rule.skinColor !== slave.skin) {
+ if (rule.skinColor != undefined && rule.skinColor !== "no default setting" && rule.skinColor !== slave.skin) {
if (rule.skinColor === "natural") {
slave.skin = slave.origSkin;
r += `<br>${slave.slaveName}'s skin color has been returned to ${slave.origSkin}.`;
@@ -2391,7 +2391,7 @@ window.DefaultRules = (function() {
}
function ProcessPiercings(slave, rule) {
- if (rule.nipplesPiercing !== undefined && (rule.nipplesPiercing !== "no default setting")) {
+ if (rule.nipplesPiercing != undefined && (rule.nipplesPiercing !== "no default setting")) {
if ((slave.nipplesPiercing !== rule.nipplesPiercing)) {
if ((rule.nipplesPiercing === 0)) {
slave.nipplesPiercing = 0;
@@ -2406,7 +2406,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.areolaePiercing !== undefined && (rule.areolaePiercing !== "no default setting")) {
+ if (rule.areolaePiercing != undefined && (rule.areolaePiercing !== "no default setting")) {
if ((slave.areolaePiercing !== rule.areolaePiercing)) {
if ((rule.areolaePiercing === 0)) {
slave.areolaePiercing = 0;
@@ -2419,7 +2419,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.clitPiercing !== undefined && (rule.clitPiercing !== "no default setting")) {
+ if (rule.clitPiercing != undefined && (rule.clitPiercing !== "no default setting")) {
if ((slave.clitPiercing !== rule.clitPiercing)) {
if ((rule.clitPiercing === 0)) {
slave.clitPiercing = 0;
@@ -2446,7 +2446,7 @@ window.DefaultRules = (function() {
}
if ((slave.vagina !== -1)) {
- if (rule.vaginaPiercing !== undefined && (rule.vaginaPiercing !== "no default setting")) {
+ if (rule.vaginaPiercing != undefined && (rule.vaginaPiercing !== "no default setting")) {
if ((slave.vaginaPiercing !== rule.vaginaPiercing)) {
if ((rule.vaginaPiercing === 0)) {
slave.vaginaPiercing = 0;
@@ -2461,7 +2461,7 @@ window.DefaultRules = (function() {
}
if ((slave.dick > 0)) {
- if (rule.dickPiercing !== undefined && (rule.dickPiercing !== "no default setting")) {
+ if (rule.dickPiercing != undefined && (rule.dickPiercing !== "no default setting")) {
if ((slave.dickPiercing !== rule.dickPiercing)) {
if ((rule.dickPiercing === 0)) {
slave.dickPiercing = 0;
@@ -2475,7 +2475,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.anusPiercing !== undefined && (rule.anusPiercing !== "no default setting")) {
+ if (rule.anusPiercing != undefined && (rule.anusPiercing !== "no default setting")) {
if ((slave.anusPiercing !== rule.anusPiercing)) {
if ((rule.anusPiercing === 0)) {
slave.anusPiercing = 0;
@@ -2488,7 +2488,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.lipsPiercing !== undefined && (rule.lipsPiercing !== "no default setting")) {
+ if (rule.lipsPiercing != undefined && (rule.lipsPiercing !== "no default setting")) {
if ((slave.lipsPiercing !== rule.lipsPiercing)) {
if ((rule.lipsPiercing === 0)) {
slave.lipsPiercing = 0;
@@ -2501,7 +2501,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.tonguePiercing !== undefined && (rule.tonguePiercing !== "no default setting")) {
+ if (rule.tonguePiercing != undefined && (rule.tonguePiercing !== "no default setting")) {
if ((slave.tonguePiercing !== rule.tonguePiercing)) {
if ((rule.tonguePiercing === 0)) {
slave.tonguePiercing = 0;
@@ -2514,7 +2514,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.earPiercing !== undefined && (rule.earPiercing !== "no default setting")) {
+ if (rule.earPiercing != undefined && (rule.earPiercing !== "no default setting")) {
if ((slave.earPiercing !== rule.earPiercing)) {
if ((rule.earPiercing === 0)) {
slave.earPiercing = 0;
@@ -2527,7 +2527,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.nosePiercing !== undefined && (rule.nosePiercing !== "no default setting")) {
+ if (rule.nosePiercing != undefined && (rule.nosePiercing !== "no default setting")) {
if ((slave.nosePiercing !== rule.nosePiercing)) {
if ((rule.nosePiercing === 0)) {
slave.nosePiercing = 0;
@@ -2540,7 +2540,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.eyebrowPiercing !== undefined && (rule.eyebrowPiercing !== "no default setting")) {
+ if (rule.eyebrowPiercing != undefined && (rule.eyebrowPiercing !== "no default setting")) {
if ((slave.eyebrowPiercing !== rule.eyebrowPiercing)) {
if ((rule.eyebrowPiercing === 0)) {
slave.eyebrowPiercing = 0;
@@ -2553,7 +2553,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.navelPiercing !== undefined && (rule.navelPiercing !== "no default setting")) {
+ if (rule.navelPiercing != undefined && (rule.navelPiercing !== "no default setting")) {
if ((slave.navelPiercing !== rule.navelPiercing)) {
if ((rule.navelPiercing === 0)) {
slave.navelPiercing = 0;
@@ -2566,7 +2566,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.corsetPiercing !== undefined && (rule.corsetPiercing !== "no default setting")) {
+ if (rule.corsetPiercing != undefined && (rule.corsetPiercing !== "no default setting")) {
if ((slave.corsetPiercing !== rule.corsetPiercing)) {
if ((rule.corsetPiercing === 0)) {
slave.corsetPiercing = 0;
@@ -2584,7 +2584,7 @@ window.DefaultRules = (function() {
function ProcessSmartPiercings(slave, rule) {
if ((slave.clitPiercing === 3)) {
let _used = 0;
- if (rule.clitSetting !== undefined && (rule.clitSetting !== "no default setting")) {
+ if (rule.clitSetting != undefined && (rule.clitSetting !== "no default setting")) {
if (slave.clitSetting !== rule.clitSetting) {
slave.clitSetting = rule.clitSetting;
_used = 1;
@@ -2594,7 +2594,7 @@ window.DefaultRules = (function() {
}
}
if (_used === 0) {
- if (rule.clitSettingEnergy !== undefined && (rule.clitSettingEnergy !== "no default setting")) {
+ if (rule.clitSettingEnergy != undefined && (rule.clitSettingEnergy !== "no default setting")) {
if (slave.energy < rule.clitSettingEnergy) {
if (slave.clitSetting !== "all") {
r += `<br>${slave.slaveName}'s smart piercing has been set to enhance libido.`;
@@ -2611,7 +2611,7 @@ window.DefaultRules = (function() {
}
}
if (_used === 0) {
- if (rule.clitSettingXY !== undefined && (rule.clitSettingXY !== "no default setting")) {
+ if (rule.clitSettingXY != undefined && (rule.clitSettingXY !== "no default setting")) {
if (slave.attrXY < rule.clitSettingXY) {
if (slave.clitSetting !== "men") {
r += `<br>${slave.slaveName}'s smart piercing has been set to encourage attraction to men.`;
@@ -2628,7 +2628,7 @@ window.DefaultRules = (function() {
}
}
if (_used === 0) {
- if (rule.clitSettingXX !== undefined && (rule.clitSettingXX !== "no default setting")) {
+ if (rule.clitSettingXX != undefined && (rule.clitSettingXX !== "no default setting")) {
if (slave.attrXX < rule.clitSettingXX) {
if (slave.clitSetting !== "women") {
r += `<br>${slave.slaveName}'s smart piercing has been set to encourage attraction to women.`;
@@ -2649,7 +2649,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessTattoos(slave, rule) {
- if (rule.boobsTat !== undefined && (rule.boobsTat !== "no default setting")) {
+ if (rule.boobsTat != undefined && (rule.boobsTat !== "no default setting")) {
if ((slave.boobsTat !== rule.boobsTat)) {
slave.boobsTat = rule.boobsTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
@@ -2657,7 +2657,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.buttTat !== undefined && (rule.buttTat !== "no default setting")) {
+ if (rule.buttTat != undefined && (rule.buttTat !== "no default setting")) {
if ((slave.buttTat !== rule.buttTat)) {
slave.buttTat = rule.buttTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
@@ -2665,7 +2665,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.vaginaTat !== undefined && (rule.vaginaTat !== "no default setting")) {
+ if (rule.vaginaTat != undefined && (rule.vaginaTat !== "no default setting")) {
if ((slave.vaginaTat !== rule.vaginaTat)) {
slave.vaginaTat = rule.vaginaTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
@@ -2674,7 +2674,7 @@ window.DefaultRules = (function() {
}
if ((slave.dick > 0)) {
- if (rule.dickTat !== undefined && (rule.dickTat !== "no default setting")) {
+ if (rule.dickTat != undefined && (rule.dickTat !== "no default setting")) {
if ((slave.dickTat !== rule.dickTat)) {
slave.dickTat = rule.dickTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
@@ -2683,7 +2683,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.lipsTat !== undefined && (rule.lipsTat !== "no default setting")) {
+ if (rule.lipsTat != undefined && (rule.lipsTat !== "no default setting")) {
if ((slave.lipsTat !== rule.lipsTat)) {
slave.lipsTat = rule.lipsTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
@@ -2691,7 +2691,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.anusTat !== undefined && (rule.anusTat !== "no default setting")) {
+ if (rule.anusTat != undefined && (rule.anusTat !== "no default setting")) {
if ((slave.anusTat !== rule.anusTat)) {
slave.anusTat = rule.anusTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
@@ -2699,7 +2699,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.backTat !== undefined && (rule.backTat !== "no default setting")) {
+ if (rule.backTat != undefined && (rule.backTat !== "no default setting")) {
if ((slave.backTat !== rule.backTat)) {
slave.backTat = rule.backTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
@@ -2707,7 +2707,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.shouldersTat !== undefined && (rule.shouldersTat !== "no default setting")) {
+ if (rule.shouldersTat != undefined && (rule.shouldersTat !== "no default setting")) {
if ((slave.shouldersTat !== rule.shouldersTat)) {
slave.shouldersTat = rule.shouldersTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
@@ -2715,7 +2715,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.armsTat !== undefined && (rule.armsTat !== "no default setting")) {
+ if (rule.armsTat != undefined && (rule.armsTat !== "no default setting")) {
if ((slave.armsTat !== rule.armsTat)) {
slave.armsTat = rule.armsTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
@@ -2723,7 +2723,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.legsTat !== undefined && (rule.legsTat !== "no default setting")) {
+ if (rule.legsTat != undefined && (rule.legsTat !== "no default setting")) {
if ((slave.legsTat !== rule.legsTat)) {
slave.legsTat = rule.legsTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
@@ -2731,7 +2731,7 @@ window.DefaultRules = (function() {
}
}
- if (rule.stampTat !== undefined && (rule.stampTat !== "no default setting")) {
+ if (rule.stampTat != undefined && (rule.stampTat !== "no default setting")) {
if ((slave.stampTat !== rule.stampTat)) {
slave.stampTat = rule.stampTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
@@ -2771,7 +2771,7 @@ window.DefaultRules = (function() {
}
function ProcessPorn(slave, rule) {
- if ((rule.pornFameSpending !== undefined) && (rule.pornFameSpending !== "no default setting")) {
+ if ((rule.pornFameSpending != undefined) && (rule.pornFameSpending !== "no default setting")) {
if ((slave.pornPrestige < 3)) {
if ((slave.pornFameSpending !== rule.pornFameSpending)) {
slave.pornFameSpending = rule.pornFameSpending;
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index e324a56cd2c..c1d7a621027 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 47fbacfcd01..340521cf499 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -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 08b4014739b..9a109f00bcd 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 4b303286f93..029f4ce6405 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 ea5e0afcd3f..a0cd5306070 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 bf9ee9159a0..28261af165c 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 06ff286cd49..53e5de138c8 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 383693a7d5d..97b306b977b 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 a30ed1d1b64..3b64ba24a83 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 d25fd5418f0..4119a7c6495 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 ca56e19c2ce..97cdc731d78 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") {
--
GitLab