From 31e878b5dd108238b453a201dd33194379f812f3 Mon Sep 17 00:00:00 2001
From: DCoded <dsoloha@live.com>
Date: Fri, 17 May 2019 18:41:56 -0400
Subject: [PATCH] Linting
---
src/js/PenthouseNaming.js | 18 +++---
src/js/accordianJS.js | 8 +--
src/js/assignJS.js | 103 +++++++--------------------------
src/js/colorModeJS.js | 6 +-
src/js/colorinput.js | 4 +-
src/js/datatypeCleanupJS.js | 28 ++++-----
src/js/descriptionWidgets.js | 12 ++--
src/js/economyJS.js | 42 +++++++-------
src/js/eventSelectionJS.js | 10 ++--
src/js/extendedFamilyModeJS.js | 70 +++++++++++-----------
src/js/familyTreeJS.js | 66 ++++++++++-----------
src/js/food.js | 4 +-
src/js/futureSocietyJS.js | 2 +-
src/js/generateGenetics.js | 12 ++--
src/js/generateNewSlaveJS.js | 2 +-
src/js/hTagMacroJS.js | 5 +-
src/js/heroCreator.js | 2 +-
src/js/itemAvailability.js | 2 +-
src/js/nurseryWidgets.js | 2 +-
src/js/pregJS.js | 25 ++++----
src/js/rbuttonJS.js | 4 +-
src/js/relationshipChecks.js | 6 +-
src/js/rulesAssistant.js | 20 +++----
src/js/sexActsJS.js | 3 +-
src/js/slaveCostJS.js | 57 ++++++++----------
src/js/slaveListing.js | 10 ++--
src/js/slaveSummaryWidgets.js | 38 ++++++------
src/js/textbox2.js | 12 ++--
src/js/textboxJS.js | 6 +-
src/js/walkPastJS.js | 18 +++---
30 files changed, 259 insertions(+), 338 deletions(-)
diff --git a/src/js/PenthouseNaming.js b/src/js/PenthouseNaming.js
index 6e85f6ab59a..be28f776426 100644
--- a/src/js/PenthouseNaming.js
+++ b/src/js/PenthouseNaming.js
@@ -1,7 +1,7 @@
/**
* @return {string}
*/
-window.MasterSuiteUIName = function() {
+window.MasterSuiteUIName = function () {
const V = State.variables;
const name = (V.masterSuiteNameCaps === "The Master Suite") ? "Master Suite" : V.masterSuiteNameCaps;
return `<<link "${name}""Master Suite">><</link>> `;
@@ -10,7 +10,7 @@ window.MasterSuiteUIName = function() {
/**
* @return {string}
*/
-window.HeadGirlSuiteUIName = function() {
+window.HeadGirlSuiteUIName = function () {
const V = State.variables;
const name = (V.HGSuiteNameCaps === "The Head Girl Suite") ? "Head Girl Suite" : V.HGSuiteNameCaps;
return `<<link "${name}""Head Girl Suite">><</link>> `;
@@ -19,7 +19,7 @@ window.HeadGirlSuiteUIName = function() {
/**
* @return {string}
*/
-window.ServantQuartersUIName = function() {
+window.ServantQuartersUIName = function () {
const V = State.variables;
const name = (V.servantsQuartersNameCaps === "The Servants' Quarters") ? "Servants' Quarters" : V.servantsQuartersNameCaps;
return `<<link "${name}""Servants' Quarters">><</link>> `;
@@ -28,7 +28,7 @@ window.ServantQuartersUIName = function() {
/**
* @return {string}
*/
-window.SpaUIName = function() {
+window.SpaUIName = function () {
const V = State.variables;
const name = (V.spaNameCaps === "The Spa") ? "Spa" : V.spaNameCaps;
return `<<link "${name}""Spa">><</link>> `;
@@ -37,7 +37,7 @@ window.SpaUIName = function() {
/**
* @return {string}
*/
-window.NurseryUIName = function() {
+window.NurseryUIName = function () {
const V = State.variables;
const name = (V.nurseryNameCaps === "The Nursery") ? "Nursery" : V.nurseryNameCaps;
return `<<link "${name}""Nursery">><</link>> `;
@@ -46,7 +46,7 @@ window.NurseryUIName = function() {
/**
* @return {string}
*/
-window.ClinicUIName = function() {
+window.ClinicUIName = function () {
const V = State.variables;
const name = (V.clinicNameCaps === "The Clinic") ? "Clinic" : V.clinicNameCaps;
return `<<link "${name}""Clinic">><</link>> `;
@@ -55,7 +55,7 @@ window.ClinicUIName = function() {
/**
* @return {string}
*/
-window.SchoolRoomUIName = function() {
+window.SchoolRoomUIName = function () {
const V = State.variables;
const name = (V.schoolroomNameCaps === "The Schoolroom") ? "Schoolroom" : V.schoolroomNameCaps;
return `<<link "${name}""Schoolroom">><</link>> `;
@@ -64,7 +64,7 @@ window.SchoolRoomUIName = function() {
/**
* @return {string}
*/
-window.CellblockUIName = function() {
+window.CellblockUIName = function () {
const V = State.variables;
const name = (V.cellblockNameCaps === "The Cellblock") ? "Cellblock" : V.cellblockNameCaps;
return `<<link "${name}""Cellblock">><</link>> `;
@@ -73,7 +73,7 @@ window.CellblockUIName = function() {
/**
* @return {string}
*/
-window.IncubatorUIName = function() {
+window.IncubatorUIName = function () {
const V = State.variables;
const name = (V.incubatorNameCaps === "The Incubator") ? "Incubator" : V.incubatorNameCaps;
return `<<link "${name}""Incubator">><</link>> `;
diff --git a/src/js/accordianJS.js b/src/js/accordianJS.js
index f65b7d736a4..6966eb5334a 100644
--- a/src/js/accordianJS.js
+++ b/src/js/accordianJS.js
@@ -13,20 +13,20 @@
* 000-250-006 03092017
*/
-postdisplay.doAccordionSet = function() {
+postdisplay.doAccordionSet = function () {
if (variables().useAccordion === 1) {
Array.prototype.slice.call(document.querySelectorAll(".macro-include"))
- .forEach(function(element) {
+ .forEach(function (element) {
element.classList.add("accHidden");
});
}
};
-postdisplay.doAccordion = function() {
+postdisplay.doAccordion = function () {
const acc = document.getElementsByClassName("accordion");
for (let i = 0; i < acc.length; i += 1) {
- acc[i].onclick = function() {
+ acc[i].onclick = function () {
this.classList.toggle("active");
let panel = this.nextElementSibling;
if (panel === null || panel === undefined) {
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 90124832f88..7be204049b7 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -4,8 +4,7 @@ window.assignJob = function assignJob(slave, job) {
const V = State.variables;
let r = "";
- if (job === "Pit" || job === "Coursing Association")
- return r;
+ if (job === "Pit" || job === "Coursing Association") { return r; }
removeJob(slave, slave.assignment);
const idx = V.slaveIndices[slave.ID];
@@ -170,10 +169,7 @@ window.assignJob = function assignJob(slave, job) {
slave.assignmentVisible = 0;
V.masterSuiteSlaves++;
V.MastSiIDs.push(slave.ID);
- if (V.masterSuiteUpgradeLuxury > 0)
- slave.livingRules = "luxurious";
- else
- slave.livingRules = "spare";
+ if (V.masterSuiteUpgradeLuxury > 0) { slave.livingRules = "luxurious"; } else { slave.livingRules = "spare"; }
break;
case "learn in the schoolroom":
@@ -258,10 +254,7 @@ window.assignJob = function assignJob(slave, job) {
case "be your concubine":
slave.assignment = job;
slave.assignmentVisible = 0; /* non-visible leadership roles */
- if (V.masterSuiteUpgradeLuxury > 0)
- slave.livingRules = "luxurious";
- else
- slave.livingRules = "normal";
+ if (V.masterSuiteUpgradeLuxury > 0) { slave.livingRules = "luxurious"; } else { slave.livingRules = "normal"; }
break;
case "be your head girl":
@@ -276,8 +269,7 @@ window.assignJob = function assignJob(slave, job) {
if (V.dojo > 1) {
slave.livingRules = "luxurious";
}
- if (V.pitBG === 1 && V.fighterIDs.includes(slave.ID))
- V.fighterIDs.delete(slave.ID);
+ if (V.pitBG === 1 && V.fighterIDs.includes(slave.ID)) { V.fighterIDs.delete(slave.ID); }
break;
case "be your agent":
@@ -303,24 +295,17 @@ window.assignJob = function assignJob(slave, job) {
}
if (slave.assignmentVisible === 0 && Array.isArray(V.personalAttention)) {
- const awi = V.personalAttention.findIndex(function(s) {return s.ID === slave.ID;});
+ const awi = V.personalAttention.findIndex(function (s) { return s.ID === slave.ID; });
if (awi !== -1) {
V.personalAttention.deleteAt(awi);
if (V.personalAttention.length === 0) {
- if (V.PC.career === "escort")
- V.personalAttention = "whoring";
- else if (V.PC.career === "servant")
- V.personalAttention = "upkeep";
- else
- V.personalAttention = "business";
+ if (V.PC.career === "escort") { V.personalAttention = "whoring"; } else if (V.PC.career === "servant") { V.personalAttention = "upkeep"; } else { V.personalAttention = "business"; }
r += `${slave.slaveName} no longer has your personal attention; you plan to focus on ${V.personalAttention}.`;
- } else
- r += `${slave.slaveName} no longer has your personal attention.`;
+ } else { r += `${slave.slaveName} no longer has your personal attention.`; }
}
}
V.JobIDArray = resetJobIDArray();
- if (idx >= 0)
- V.slaves[idx] = slave;
+ if (idx >= 0) { V.slaves[idx] = slave; }
return r;
};
@@ -332,43 +317,8 @@ window.removeJob = function removeJob(slave, assignment) {
const idx = V.slaveIndices[slave.ID];
- if (assignment === "Pit")
- V.fighterIDs.delete(slave.ID);
-
- else if (assignment === "Coursing Association")
- V.Lurcher = 0;
-
- else {
- if (V.HeadGirl !== 0 && slave.ID === V.HeadGirl.ID)
- V.HeadGirl = 0;
- else if (V.Recruiter !== 0 && slave.ID === V.Recruiter.ID)
- V.Recruiter = 0;
- else if (V.Bodyguard !== 0 && slave.ID === V.Bodyguard.ID)
- V.Bodyguard = 0;
- else if (V.Madam !== 0 && slave.ID === V.Madam.ID)
- V.Madam = 0;
- else if (V.DJ !== 0 && slave.ID === V.DJ.ID)
- V.DJ = 0;
- else if (V.Milkmaid !== 0 && slave.ID === V.Milkmaid.ID)
- V.Milkmaid = 0;
- else if (V.Farmer !== 0 && slave.ID === V.Farmer.ID)
- V.Farmer = 0;
- else if (V.Schoolteacher !== 0 && slave.ID === V.Schoolteacher.ID)
- V.Schoolteacher = 0;
- else if (V.Attendant !== 0 && slave.ID === V.Attendant.ID)
- V.Attendant = 0;
- else if (V.Matron !== 0 && slave.ID === V.Matron.ID)
- V.Matron = 0;
- else if (V.Nurse !== 0 && slave.ID === V.Nurse.ID)
- V.Nurse = 0;
- else if (V.Stewardess !== 0 && slave.ID === V.Stewardess.ID)
- V.Stewardess = 0;
- else if (V.Wardeness !== 0 && slave.ID === V.Wardeness.ID)
- V.Wardeness = 0;
- else if (V.Concubine !== 0 && slave.ID === V.Concubine.ID)
- V.Concubine = 0;
- else if (V.Collectrix !== 0 && slave.ID === V.Collectrix.ID)
- V.Collectrix = 0;
+ if (assignment === "Pit") { V.fighterIDs.delete(slave.ID); } else if (assignment === "Coursing Association") { V.Lurcher = 0; } else {
+ if (V.HeadGirl !== 0 && slave.ID === V.HeadGirl.ID) { V.HeadGirl = 0; } else if (V.Recruiter !== 0 && slave.ID === V.Recruiter.ID) { V.Recruiter = 0; } else if (V.Bodyguard !== 0 && slave.ID === V.Bodyguard.ID) { V.Bodyguard = 0; } else if (V.Madam !== 0 && slave.ID === V.Madam.ID) { V.Madam = 0; } else if (V.DJ !== 0 && slave.ID === V.DJ.ID) { V.DJ = 0; } else if (V.Milkmaid !== 0 && slave.ID === V.Milkmaid.ID) { V.Milkmaid = 0; } else if (V.Farmer !== 0 && slave.ID === V.Farmer.ID) { V.Farmer = 0; } else if (V.Schoolteacher !== 0 && slave.ID === V.Schoolteacher.ID) { V.Schoolteacher = 0; } else if (V.Attendant !== 0 && slave.ID === V.Attendant.ID) { V.Attendant = 0; } else if (V.Matron !== 0 && slave.ID === V.Matron.ID) { V.Matron = 0; } else if (V.Nurse !== 0 && slave.ID === V.Nurse.ID) { V.Nurse = 0; } else if (V.Stewardess !== 0 && slave.ID === V.Stewardess.ID) { V.Stewardess = 0; } else if (V.Wardeness !== 0 && slave.ID === V.Wardeness.ID) { V.Wardeness = 0; } else if (V.Concubine !== 0 && slave.ID === V.Concubine.ID) { V.Concubine = 0; } else if (V.Collectrix !== 0 && slave.ID === V.Collectrix.ID) { V.Collectrix = 0; }
/* use .toLowerCase() to get rid of a few dupe conditions. */
switch (assignment.toLowerCase()) {
@@ -475,12 +425,7 @@ window.removeJob = function removeJob(slave, assignment) {
case "be your head girl":
slave.assignment = "rest";
if (V.HGSuiteEquality === 0 && V.personalAttention === "HG") {
- if (V.PC.career === "escort")
- V.personalAttention = "whoring";
- else if (V.PC.career === "servant")
- V.personalAttention = "upkeep";
- else
- V.personalAttention = "business";
+ if (V.PC.career === "escort") { V.personalAttention = "whoring"; } else if (V.PC.career === "servant") { V.personalAttention = "upkeep"; } else { V.personalAttention = "business"; }
r += `You no longer have a slave assigned to be your Head Girl, so you turn your personal attention to focus on ${V.personalAttention}.`;
}
@@ -489,15 +434,14 @@ window.removeJob = function removeJob(slave, assignment) {
case "be your agent":
case "live with your agent":
slave.assignment = "rest";
- const _leaderIndex = V.leaders.findIndex(function(x) {
+ const _leaderIndex = V.leaders.findIndex(function (x) {
return x.ID === slave.ID;
});
- if (_leaderIndex !== -1)
- V.leaders.deleteAt(_leaderIndex);
+ if (_leaderIndex !== -1) { V.leaders.deleteAt(_leaderIndex); }
if (slave.relationshipTarget > 0) {
/* following code assumes there can be at most one companion */
- const _lover = V.slaves.findIndex(function(s) {return haveRelationshipP(s, slave) && s.assignment === "live with your agent";});
+ const _lover = V.slaves.findIndex(function (s) { return haveRelationshipP(s, slave) && s.assignment === "live with your agent"; });
if (_lover !== -1) {
V.slaves[_lover].assignment = "rest";
V.slaves[_lover].assignmentVisible = 1;
@@ -510,16 +454,14 @@ window.removeJob = function removeJob(slave, assignment) {
break;
}
- if (slave.livingRules === "luxurious" && slave.assignmentVisible !== 1)
- slave.livingRules = "normal";
+ if (slave.livingRules === "luxurious" && slave.assignmentVisible !== 1) { slave.livingRules = "normal"; }
slave.assignmentVisible = 1;
slave.choosesOwnAssignment = 0;
slave.sentence = 0;
}
V.JobIDArray = resetJobIDArray();
- if (idx >= 0)
- V.slaves[idx] = slave;
+ if (idx >= 0) { V.slaves[idx] = slave; }
return r;
};
@@ -540,9 +482,8 @@ window.resetJobIDArray = function resetJobIDArray() {
"be a subordinate slave": []
};
- slaves.forEach(function(slave) {
- if (JobIDArray.hasOwnProperty(slave.assignment))
- JobIDArray[slave.assignment].push(slave.ID);
+ slaves.forEach(function (slave) {
+ if (JobIDArray.hasOwnProperty(slave.assignment)) { JobIDArray[slave.assignment].push(slave.ID); }
});
return JobIDArray;
@@ -551,7 +492,7 @@ window.resetJobIDArray = function resetJobIDArray() {
/**
* Generates string with links for changing slave assignment
*/
-App.UI.jobLinks = function() {
+App.UI.jobLinks = function () {
"use strict";
const facilitiesOrder = [
/* sorted by improvement before work, within improvement in order of progress, within work alphabetical for facilities*/
@@ -602,7 +543,7 @@ App.UI.jobLinks = function() {
const slave = App.Utils.slaveByIndex(index);
for (const f of facilitiesOrder) {
- if (!f.established) continue;
+ if (!f.established) { continue; }
const rejects = f.canHostSlave(slave);
if (rejects.length === 0) {
transfers.push(f.transferLink(index, undefined, passage()));
@@ -616,7 +557,7 @@ App.UI.jobLinks = function() {
}();
App.UI.SlaveInteract = {
- fucktoyPref: function() {
+ fucktoyPref: function () {
let res = "";
/** @type {App.Entity.SlaveState} */
const slave = State.variables.activeSlave;
@@ -647,7 +588,7 @@ App.UI.SlaveInteract = {
App.UI.replace('#fucktoypref', res);
},
- assignmentBlock: function(blockId) {
+ assignmentBlock: function (blockId) {
let res = App.UI.jobLinks.assignments(-1, undefined, () => {
return `<<replace "#assign">>$activeSlave.assignment<</replace>><<replace "#${blockId}">><<= App.UI.SlaveInteract.assignmentBlock("${blockId}")>><<= App.UI.SlaveInteract.fucktoyPref()>><</replace>>`;
});
diff --git a/src/js/colorModeJS.js b/src/js/colorModeJS.js
index 3c495cdb522..bc6d8d7630a 100644
--- a/src/js/colorModeJS.js
+++ b/src/js/colorModeJS.js
@@ -1,4 +1,4 @@
-window.flipColors = function(lightColorMap) {
+window.flipColors = function (lightColorMap) {
if (!window.savedColorMap) {
window.savedColorMap = setColors(lightColorMap);
} else {
@@ -7,7 +7,7 @@ window.flipColors = function(lightColorMap) {
}
};
-window.setColors = function(colorMap) {
+window.setColors = function (colorMap) {
let originalState = [];
let props = ["color", "backgroundColor", "backgroundImage"];
let styleSheetArray = Array.from(document.styleSheets);
@@ -38,7 +38,7 @@ window.setColors = function(colorMap) {
return originalState;
};
-window.restoreColors = function(styleMap) {
+window.restoreColors = function (styleMap) {
styleMap.forEach(
item => {
item.element.style[item.propName] = item.value;
diff --git a/src/js/colorinput.js b/src/js/colorinput.js
index b97711b59ca..9c51bb29e29 100644
--- a/src/js/colorinput.js
+++ b/src/js/colorinput.js
@@ -1,5 +1,5 @@
Macro.add("colorinput", {
- handler: function() {
+ handler: function () {
if (this.args.length < 2) {
let e = [];
return this.args.length < 1 && e.push("variable name"), this.args.length < 2 && e.push("default value"), this.error("no " + e.join(" or ") + " specified");
@@ -48,7 +48,7 @@ Macro.add("colorinput", {
value: value,
tabindex: 0
}).addClass("macro-" + this.name)
- .on("change", function() {
+ .on("change", function () {
State.setVar(varName, this.value);
// eslint-disable-next-line eqeqeq
if (this.value != value) { // If the value has actually changed, reload the page. Note != and not !== because types might be different
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 0fcc266f1b9..bff8c9e6d81 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -5,7 +5,7 @@
* and in general pays no attention to the property values unless they need to be changed due
* to the schema change.
*/
-App.Entity.Utils.SlaveDataSchemeCleanup = (function() {
+App.Entity.Utils.SlaveDataSchemeCleanup = (function () {
"use strict";
return SlaveDataSchemeCleanup;
@@ -1641,7 +1641,7 @@ window.ArcologyDatatypeCleanup = function ArcologyDatatypeCleanup() {
V.NUL.schoolProsperity = Math.clamp(+V.NUL.schoolProsperity, -10, 10) || 0;
};
-window.FacilityDatatypeCleanup = (function() {
+window.FacilityDatatypeCleanup = (function () {
"use strict";
let V;
return FacilityDatatypeCleanup;
@@ -1737,7 +1737,7 @@ window.FacilityDatatypeCleanup = (function() {
V.brothel = Math.max(+V.brothel, 0) || 0;
V.brothelUpgradeDrugs = Math.clamp(+V.brothelUpgradeDrugs, 0, 2) || 0;
/* madam */
- V.Madam = V.slaves.find(function(s) {
+ V.Madam = V.slaves.find(function (s) {
return s.assignment === "be the Madam";
}) || 0;
V.MadamIgnoresFlaws = Math.clamp(+V.MadamIgnoresFlaws, 0, 1) || 0;
@@ -1769,7 +1769,7 @@ window.FacilityDatatypeCleanup = (function() {
V.bioreactorsXY = Math.max(+V.bioreactorsXY, 0) || 0;
V.bioreactorsBarren = Math.max(+V.bioreactorsBarren, 0) || 0;
/* milkmaid */
- V.Milkmaid = V.slaves.find(function(s) {
+ V.Milkmaid = V.slaves.find(function (s) {
return s.assignment === "be the Milkmaid";
}) || 0;
V.milkmaidImpregnates = Math.clamp(+V.milkmaidImpregnates, 0, 1) || 0;
@@ -1780,7 +1780,7 @@ window.FacilityDatatypeCleanup = (function() {
V.farmyardBreeding = Math.clamp(+V.farmyardBreeding, 0, 1) || 0;
V.farmyardShows = Math.clamp(+V.farmyardShows, 0, 1) || 0;
/* farmer */
- V.Farmer = V.slaves.find(function(s) {
+ V.Farmer = V.slaves.find(function (s) {
return s.assignment === "be the Farmer";
}) || 0;
}
@@ -1798,7 +1798,7 @@ window.FacilityDatatypeCleanup = (function() {
V.club = Math.max(+V.club, 0) || 0;
V.clubUpgradePDAs = Math.clamp(+V.clubUpgradePDAs, 0, 1) || 0;
/* madam */
- V.DJ = V.slaves.find(function(s) {
+ V.DJ = V.slaves.find(function (s) {
return s.assignment === "be the DJ";
}) || 0;
V.DJignoresFlaws = Math.clamp(+V.DJignoresFlaws, 0, 1) || 0;
@@ -1809,7 +1809,7 @@ window.FacilityDatatypeCleanup = (function() {
V.servantsQuarters = Math.max(+V.servantsQuarters, 0) || 0;
V.servantsQuartersUpgradeMonitoring = Math.clamp(+V.servantsQuartersUpgradeMonitoring, 0, 1) || 0;
/* stewardess */
- V.Stewardess = V.slaves.find(function(s) {
+ V.Stewardess = V.slaves.find(function (s) {
return s.assignment === "be the Stewardess";
}) || 0;
V.stewardessImpregnates = Math.clamp(+V.stewardessImpregnates, 0, 1) || 0;
@@ -1822,7 +1822,7 @@ window.FacilityDatatypeCleanup = (function() {
V.schoolroomUpgradeLanguage = Math.clamp(+V.schoolroomUpgradeLanguage, 0, 1) || 0;
V.schoolroomUpgradeRemedial = Math.clamp(+V.schoolroomUpgradeRemedial, 0, 1) || 0;
/* schoolteacher */
- V.Schoolteacher = V.slaves.find(function(s) {
+ V.Schoolteacher = V.slaves.find(function (s) {
return s.assignment === "be the Schoolteacher";
}) || 0;
}
@@ -1832,7 +1832,7 @@ window.FacilityDatatypeCleanup = (function() {
V.spa = Math.max(+V.spa, 0) || 0;
V.spaUpgrade = Math.clamp(+V.spaUpgrade, 0, 1) || 0;
/* attendant */
- V.Attendant = V.slaves.find(function(s) {
+ V.Attendant = V.slaves.find(function (s) {
return s.assignment === "be the Attendant";
}) || 0;
V.spaFix = Math.clamp(+V.spaFix, 0, 2) || 0;
@@ -1847,7 +1847,7 @@ window.FacilityDatatypeCleanup = (function() {
V.clinicInflateBelly = Math.clamp(+V.clinicInflateBelly, 0, 1) || 0;
V.clinicSpeedGestation = Math.clamp(+V.clinicSpeedGestation, 0, 1) || 0;
/* nurse */
- V.Nurse = V.slaves.find(function(s) {
+ V.Nurse = V.slaves.find(function (s) {
return s.assignment === "be the Nurse";
}) || 0;
}
@@ -1866,7 +1866,7 @@ window.FacilityDatatypeCleanup = (function() {
V.cellblock = Math.max(+V.cellblock, 0) || 0;
V.cellblockUpgrade = Math.clamp(+V.cellblockUpgrade, 0, 1) || 0;
/* wardeness */
- V.Wardeness = V.slaves.find(function(s) {
+ V.Wardeness = V.slaves.find(function (s) {
return s.assignment === "be the Wardeness";
}) || 0;
V.cellblockWardenCumsInside = Math.clamp(+V.cellblockWardenCumsInside, 0, 1) || 0;
@@ -1882,14 +1882,14 @@ window.FacilityDatatypeCleanup = (function() {
V.masterSuitePregnancyFertilityDrugs = Math.clamp(+V.masterSuitePregnancyFertilityDrugs, 0, 1) || 0;
V.masterSuiteHyperPregnancy = Math.clamp(+V.masterSuiteHyperPregnancy, 0, 1) || 0;
/* concubine */
- V.Concubine = V.slaves.find(function(s) {
+ V.Concubine = V.slaves.find(function (s) {
return s.assignment === "be your Concubine";
}) || 0;
}
function HeadGirlSuiteDatatypeCleanup() {
/* headgirl */
- V.HeadGirl = V.slaves.find(function(s) {
+ V.HeadGirl = V.slaves.find(function (s) {
return s.assignment === "be your Head Girl";
}) || 0;
V.HGSuiteEquality = Math.clamp(+V.HGSuiteEquality, 0, 1) || 0;
@@ -1912,7 +1912,7 @@ window.FacilityDatatypeCleanup = (function() {
* It removes all the unneeded properties for the gene pool attributes.
* @todo remove after refactoring the slave state class
*/
-App.Entity.Utils.GenePoolRecordCleanup = (function() {
+App.Entity.Utils.GenePoolRecordCleanup = (function () {
"use strict";
return GenePoolRecordCleanup;
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index 547281a5961..8596e4991c0 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -2,7 +2,7 @@
* @param {App.Entity.SlaveState} slave
* @return {string} Slave's eyes
*/
-App.Desc.eyes = function(slave) {
+App.Desc.eyes = function (slave) {
"use strict";
const V = State.variables;
let r = ``;
@@ -247,7 +247,7 @@ App.Desc.eyes = function(slave) {
* @param {App.Entity.SlaveState} slave
* @returns {string} Slave's eye color
*/
-App.Desc.eyeColor = function(slave) {
+App.Desc.eyeColor = function (slave) {
"use strict";
let r;
@@ -265,7 +265,7 @@ App.Desc.eyeColor = function(slave) {
* @param {App.Entity.SlaveState} slave
* @returns {string} Slave's age and health
*/
-App.Desc.ageAndHealth = function(slave) {
+App.Desc.ageAndHealth = function (slave) {
"use strict";
const V = State.variables;
let r = ``;
@@ -572,7 +572,7 @@ App.Desc.ageAndHealth = function(slave) {
* @param {App.Entity.SlaveState} slave
* @returns {string} Slave's brand
*/
-App.Desc.brand = function(slave) {
+App.Desc.brand = function (slave) {
"use strict";
let r = ``;
let bellyAccessory;
@@ -603,7 +603,7 @@ App.Desc.brand = function(slave) {
* @param {App.Entity.SlaveState} slave
* @returns {string} Description of slave's amputation, if present
*/
-App.Desc.amputee = function(slave) {
+App.Desc.amputee = function (slave) {
"use strict";
let r = ``;
/* eslint-disable */
@@ -642,7 +642,7 @@ App.Desc.amputee = function(slave) {
* @param {App.Entity.SlaveState} slave
* @returns {string} Description of slave's waist
*/
-App.Desc.waist = function(slave) {
+App.Desc.waist = function (slave) {
"use strict";
const V = State.variables;
let r = ``;
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 56df0d3ff68..fadcbea2760 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -38,7 +38,7 @@ window.PersonalAttention = Object.freeze({
HACKING: 'hacking'
});
-window.calculateCosts = (function() {
+window.calculateCosts = (function () {
return {
predict: predictCost,
bill: getCost,
@@ -548,7 +548,7 @@ window.calculateCosts = (function() {
}
})();
-window.getSlaveCost = function(s) {
+window.getSlaveCost = function (s) {
if (!s) {
return 0;
}
@@ -871,7 +871,7 @@ window.getSlaveCost = function(s) {
// Supply and Demand for slaves (linear, simple)
// PC buying slaves reduces supply, selling slaves reduces demand.
-window.menialSlaveCost = function(q) {
+window.menialSlaveCost = function (q) {
if (!q) {
q = 0;
}
@@ -882,7 +882,7 @@ window.menialSlaveCost = function(q) {
return (Math.trunc(baseCost + demand / 400 - supply / 400 + q / 400) + random);
};
-window.NPCSexSupply = function(LC) {
+window.NPCSexSupply = function (LC) {
const V = State.variables;
const NPCSexSupply = {lowerClass: V.NPCSexSupply.lowerClass};
@@ -900,7 +900,7 @@ window.NPCSexSupply = function(LC) {
};
// The function for calculating and storing a slave's sexual interaction with citizens/'the outside'
-window.slaveJobValues = function() {
+window.slaveJobValues = function () {
const V = State.variables;
const slaveJobValues = {arcade: 0, club: 0, clubSP: 0}; let clubSpots = 0; const toTheClubTotal = 0; let DJRepBonus = 0;
V.slavesGettingHelp = 0;
@@ -1227,7 +1227,7 @@ window.slaveJobValues = function() {
// Corporation Value
-window.corpValue = function() {
+window.corpValue = function () {
const V = State.variables;
if (V.corpIncorporated === 0) {
return 0;
@@ -1278,7 +1278,7 @@ window.corpValue = function() {
// Corporation Share Price
// A positive q means adding shares to the market, negative means removing them
-window.corpSharePrice = function(q = 0) {
+window.corpSharePrice = function (q = 0) {
const V = State.variables;
if (V.corpIncorporated === 0) {
return 0;
@@ -1290,7 +1290,7 @@ window.corpSharePrice = function(q = 0) {
// The amount of additional slaves you can fit in a division
// Can we condense this?
-window.corpDivBreakSlavesRoom = function() {
+window.corpDivBreakSlavesRoom = function () {
const V = State.variables;
if (V.corpDivBreak === 1 && V.corpDivBreakDev > V.corpDivBreakSlaves) {
return V.corpDivBreakDev - V.corpDivBreakSlaves;
@@ -1298,7 +1298,7 @@ window.corpDivBreakSlavesRoom = function() {
return 0;
};
-window.corpDivSurgerySlavesRoom = function() {
+window.corpDivSurgerySlavesRoom = function () {
const V = State.variables;
if (V.corpDivSurgery === 1 && V.corpDivSurgeryDev > V.corpDivSurgerySlaves) {
return V.corpDivSurgeryDev - V.corpDivSurgerySlaves;
@@ -1306,7 +1306,7 @@ window.corpDivSurgerySlavesRoom = function() {
return 0;
};
-window.corpDivTrainSlavesRoom = function() {
+window.corpDivTrainSlavesRoom = function () {
const V = State.variables;
if (V.corpDivTrain === 1 && V.corpDivTrainDev > V.corpDivTrainSlaves) {
return V.corpDivTrainDev - V.corpDivTrainSlaves;
@@ -1314,7 +1314,7 @@ window.corpDivTrainSlavesRoom = function() {
return 0;
};
-window.corpDivArcadeSlavesRoom = function() {
+window.corpDivArcadeSlavesRoom = function () {
const V = State.variables;
if (V.corpDivArcade === 1 && V.corpDivArcadeDev > V.corpDivArcadeSlaves) {
return V.corpDivArcadeDev - V.corpDivArcadeSlaves;
@@ -1322,7 +1322,7 @@ window.corpDivArcadeSlavesRoom = function() {
return 0;
};
-window.corpDivMenialSlavesRoom = function() {
+window.corpDivMenialSlavesRoom = function () {
const V = State.variables;
if (V.corpDivMenial === 1 && V.corpDivMenialDev > V.corpDivMenialSlaves) {
return V.corpDivMenialDev - V.corpDivMenialSlaves;
@@ -1330,7 +1330,7 @@ window.corpDivMenialSlavesRoom = function() {
return 0;
};
-window.corpDivDairySlavesRoom = function() {
+window.corpDivDairySlavesRoom = function () {
const V = State.variables;
if (V.corpDivDairy === 1 && V.corpDivDairyDev > V.corpDivDairySlaves) {
return V.corpDivDairyDev - V.corpDivDairySlaves;
@@ -1338,7 +1338,7 @@ window.corpDivDairySlavesRoom = function() {
return 0;
};
-window.corpDivWhoreSlavesRoom = function() {
+window.corpDivWhoreSlavesRoom = function () {
const V = State.variables;
if (V.corpDivWhore === 1 && V.corpDivWhoreDev > V.corpDivWhoreSlaves) {
return V.corpDivWhoreDev - V.corpDivWhoreSlaves;
@@ -1348,7 +1348,7 @@ window.corpDivWhoreSlavesRoom = function() {
// Corporation race blacklisting/whitelisting
// race is the lowercase string representing the race, 'blacklist' is either 1 or 0. 1 means we are blacklisting and 0 means we are whitelisting said race
-window.corpBlacklistRace = function(race, blacklist) {
+window.corpBlacklistRace = function (race, blacklist) {
let raceArray = State.variables.corpSpecRaces;
if (raceArray.length > 0 && blacklist === 1) {
raceArray.delete(race);
@@ -1360,7 +1360,7 @@ window.corpBlacklistRace = function(race, blacklist) {
return raceArray;
};
-window.getSlaveStatisticData = function(s, facility) {
+window.getSlaveStatisticData = function (s, facility) {
if (!s || !facility) {
// Base data, even without facility
return {
@@ -1399,7 +1399,7 @@ window.getSlaveStatisticData = function(s, facility) {
return data;
};
-window.initFacilityStatistics = function(facility = {}) {
+window.initFacilityStatistics = function (facility = {}) {
facility.adsIncome = 0;
facility.maintenance = 0;
facility.totalIncome = 0;
@@ -1435,7 +1435,7 @@ A full list of categories (slaveMod, slaveTransfer, event) are in the widget "se
The third category, the "slave slot" is completely optional. Sometimes you just want to spend money by yourself.
*/
-window.cashX = function(cost, what, who) {
+window.cashX = function (cost, what, who) {
const V = State.variables;
if (!Number.isFinite(cost)) {
@@ -1483,7 +1483,7 @@ window.cashX = function(cost, what, who) {
return cost;
};
-window.repX = function(rep, what, who) {
+window.repX = function (rep, what, who) {
const V = State.variables;
if (!Number.isFinite(rep)) {
@@ -1543,10 +1543,10 @@ window.repX = function(rep, what, who) {
return rep;
};
-window.forceNeg = function(x) {
+window.forceNeg = function (x) {
return -Math.abs(x);
};
-Number.prototype.toFixedHTML = function() {
+Number.prototype.toFixedHTML = function () {
return num(Number.prototype.toFixed.apply(this, arguments)).replace(/\.0+$/, '<span style="opacity: 0.3">$&</span>');
};
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index bb9d91a2f3f..cc6db609677 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -1,4 +1,4 @@
-window.generateRandomEventPoolStandard = function(eventSlave) {
+window.generateRandomEventPoolStandard = function (eventSlave) {
/* STANDARD EVENTS */
if (eventSlave.fetish !== "mindbroken") {
@@ -225,7 +225,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
}
if (eventSlave.relationship > 3) {
- let relationshipSlave = State.variables.slaves.find(function(s) {
+ let relationshipSlave = State.variables.slaves.find(function (s) {
return s.ID === eventSlave.relationshipTarget;
});
if (relationshipSlave.devotion > 20) {
@@ -1865,7 +1865,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
};
/* servants spend a lot of time in the penthouse, so should be eligible for a number (but not all) random events */
-window.generateRandomEventPoolServant = function(eventSlave) {
+window.generateRandomEventPoolServant = function (eventSlave) {
/* STANDARD EVENTS */
if (eventSlave.fetish !== "mindbroken") {
@@ -1956,7 +1956,7 @@ window.generateRandomEventPoolServant = function(eventSlave) {
}
if (eventSlave.relationship > 3) {
- let relationshipSlave = State.variables.slaves.find(function(s) {
+ let relationshipSlave = State.variables.slaves.find(function (s) {
return s.ID === eventSlave.relationshipTarget;
});
if (relationshipSlave.devotion > 20) {
@@ -2970,7 +2970,7 @@ window.generateRandomEventPoolServant = function(eventSlave) {
}
};
-window.populateEventArray = function(RESS = State.variables.RESSevent.length, RESSTR = State.variables.RESSTRevent.length, RETS = State.variables.RETSevent.length, RECI = State.variables.RECIevent.length) {
+window.populateEventArray = function (RESS = State.variables.RESSevent.length, RESSTR = State.variables.RESSTRevent.length, RETS = State.variables.RETSevent.length, RECI = State.variables.RECIevent.length) {
/* EVENT RANDOMIZATION */
let events = State.variables.events;
let i = 0;
diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js
index a040b9f2f9e..ee51652283a 100644
--- a/src/js/extendedFamilyModeJS.js
+++ b/src/js/extendedFamilyModeJS.js
@@ -12,14 +12,14 @@ window.isParentP = function isParentP(daughter, parent) {
return isMotherP(daughter, parent) || isFatherP(daughter, parent);
};
-window.sameDad = function(slave1, slave2) {
+window.sameDad = function (slave1, slave2) {
if ((slave1.father === slave2.father) && (slave1.father !== 0 && slave1.father !== -2)) {
return true;
}
return false;
};
-window.sameMom = function(slave1, slave2) {
+window.sameMom = function (slave1, slave2) {
if ((slave1.mother === slave2.mother) && (slave1.mother !== 0 && slave1.mother !== -2)) {
return true;
}
@@ -31,7 +31,7 @@ window.sameMom = function(slave1, slave2) {
* @param {App.Entity.SlaveState} aunt
* @returns {boolean}
*/
-window.isAunt = function(niece, aunt) {
+window.isAunt = function (niece, aunt) {
if (!State.variables.showDistantRelatives) {
return false;
}
@@ -53,7 +53,7 @@ window.isAunt = function(niece, aunt) {
};
// testtest catches the case if a mother is a father or a father a mother - thank you familyAnon, for this code
-window.sameTParent = function(slave1, slave2) {
+window.sameTParent = function (slave1, slave2) {
if (slave1.mother === -1 && slave1.father === -1 && slave2.mother === -1 && slave2.father === -1) {
return 1;
} else if (slave1.mother === slave2.father && slave1.father === slave2.mother && slave1.mother !== 0 && slave1.mother !== -2 && slave1.father !== 0 && slave1.father !== -2 && slave1.mother !== slave1.father) {
@@ -74,7 +74,7 @@ window.sameTParent = function(slave1, slave2) {
};
*/
-window.areTwins = function(slave1, slave2) {
+window.areTwins = function (slave1, slave2) {
if (!sameDad(slave1, slave2)) {
return false;
} else if (!sameMom(slave1, slave2)) {
@@ -85,7 +85,7 @@ window.areTwins = function(slave1, slave2) {
return false;
};
-window.areSisters = function(slave1, slave2) {
+window.areSisters = function (slave1, slave2) {
if (slave1.ID === slave2.ID) {
return 0; // you are not your own sister
} else if (((slave1.father === 0) || (slave1.father === -2)) && ((slave1.mother === 0) || (slave1.mother === -2))) {
@@ -139,7 +139,7 @@ window.areSisters = function(c1, c2) {
* @param {App.Entity.SlaveState} slave2
* @returns {boolean}
*/
-window.areCousins = function(slave1, slave2) {
+window.areCousins = function (slave1, slave2) {
if (!State.variables.showDistantRelatives) {
return false;
}
@@ -172,7 +172,7 @@ window.areCousins = function(slave1, slave2) {
* @returns {boolean}
*/
window.areRelated =
- function(slave1, slave2) {
+ function (slave1, slave2) {
return (slave1.father === slave2.ID || slave1.mother === slave2.ID || slave2.father === slave1.ID || slave2.mother === slave1.ID || areSisters(slave1, slave2) > 0);
};
@@ -180,7 +180,7 @@ window.areRelated =
* @param {App.Entity.SlaveState} slave
* @returns {number}
*/
-window.totalRelatives = function(slave) {
+window.totalRelatives = function (slave) {
let relatives = 0;
if (slave.mother > 0) {
relatives += 1;
@@ -203,8 +203,8 @@ window.totalRelatives = function(slave) {
* @param {App.Entity.SlaveState[]} slaves
* @returns {Array} // I think
*/
-window.mutualChildren = function(slave1, slave2, slaves) {
- return slaves.filter(function(s) {
+window.mutualChildren = function (slave1, slave2, slaves) {
+ return slaves.filter(function (s) {
return s.ID !== slave1.ID && s.ID !== slave2.ID && s.mother > 0 && s.father > 0 && ((s.mother === slave1.ID && s.father === slave2.ID) || (s.mother === slave2.ID && s.father === slave1.ID));
}).length;
};
@@ -213,7 +213,7 @@ window.mutualChildren = function(slave1, slave2, slaves) {
* @param {App.Entity.SlaveState} slave
* @returns {boolean}
*/
-window.isSlaveAvailable = function(slave) {
+window.isSlaveAvailable = function (slave) {
if (!slave) {
return null;
} else if (slave.assignment === "be your agent") {
@@ -241,18 +241,18 @@ window.randomRelatedSlave = function(slave, filterFunction) {
* @param {function} filterFunction // I think
* @returns {object} // I think
*/
-window.randomRelatedSlave = function(slave, filterFunction) {
+window.randomRelatedSlave = function (slave, filterFunction) {
if (!slave || !SugarCube) {
return undefined;
}
if (typeof filterFunction !== 'function') {
- filterFunction = function( /* s, index, array*/ ) {
+ filterFunction = function ( /* s, index, array*/ ) {
return true;
};
}
const arr = State.variables.slaves.filter(filterFunction);
arr.shuffle();
- return arr.find(function(s) {
+ return arr.find(function (s) {
return areSisters(slave, s) ||
slave.ID === s.mother ||
slave.ID === s.father ||
@@ -265,8 +265,8 @@ window.randomRelatedSlave = function(slave, filterFunction) {
* @param {App.Entity.SlaveState} slave
* @returns {object}
*/
-window.randomRelatedAvailableSlave = function(slave) {
- return randomRelatedSlave(slave, function(s) {
+window.randomRelatedAvailableSlave = function (slave) {
+ return randomRelatedSlave(slave, function (s) {
return isSlaveAvailable(s);
});
};
@@ -275,8 +275,8 @@ window.randomRelatedAvailableSlave = function(slave) {
* @param {App.Entity.SlaveState} slave
* @returns {object}
*/
-window.randomSister = function(slave) {
- return randomRelatedSlave(slave, function(s) {
+window.randomSister = function (slave) {
+ return randomRelatedSlave(slave, function (s) {
return areSisters(slave, s);
});
};
@@ -285,8 +285,8 @@ window.randomSister = function(slave) {
* @param {App.Entity.SlaveState} slave
* @returns {object}
*/
-window.randomTwinSister = function(slave) {
- return randomRelatedSlave(slave, function(s) {
+window.randomTwinSister = function (slave) {
+ return randomRelatedSlave(slave, function (s) {
return areSisters(slave, s);
});
};
@@ -295,8 +295,8 @@ window.randomTwinSister = function(slave) {
* @param {App.Entity.SlaveState} slave
* @returns {object}
*/
-window.randomAvailableSister = function(slave) {
- return randomRelatedSlave(slave, function(s) {
+window.randomAvailableSister = function (slave) {
+ return randomRelatedSlave(slave, function (s) {
return isSlaveAvailable(s) && areSisters(slave, s);
});
};
@@ -305,8 +305,8 @@ window.randomAvailableSister = function(slave) {
* @param {App.Entity.SlaveState} slave
* @returns {object}
*/
-window.randomAvailableTwinSister = function(slave) {
- return randomRelatedSlave(slave, function(s) {
+window.randomAvailableTwinSister = function (slave) {
+ return randomRelatedSlave(slave, function (s) {
return isSlaveAvailable(s) && areSisters(slave, s);
});
};
@@ -315,8 +315,8 @@ window.randomAvailableTwinSister = function(slave) {
* @param {App.Entity.SlaveState} slave
* @returns {object}
*/
-window.randomDaughter = function(slave) {
- return randomRelatedSlave(slave, function(s) {
+window.randomDaughter = function (slave) {
+ return randomRelatedSlave(slave, function (s) {
return s.mother === slave.ID || s.father === slave.ID;
});
};
@@ -325,8 +325,8 @@ window.randomDaughter = function(slave) {
* @param {App.Entity.SlaveState} slave
* @returns {object}
*/
-window.randomAvailableDaughter = function(slave) {
- return randomRelatedSlave(slave, function(s) {
+window.randomAvailableDaughter = function (slave) {
+ return randomRelatedSlave(slave, function (s) {
return isSlaveAvailable(s) && (s.mother === slave.ID || s.father === slave.ID);
});
};
@@ -335,8 +335,8 @@ window.randomAvailableDaughter = function(slave) {
* @param {App.Entity.SlaveState} slave
* @returns {object}
*/
-window.randomParent = function(slave) {
- return randomRelatedSlave(slave, function(s) {
+window.randomParent = function (slave) {
+ return randomRelatedSlave(slave, function (s) {
return s.ID === slave.mother || s.ID === slave.father;
});
};
@@ -345,13 +345,13 @@ window.randomParent = function(slave) {
* @param {App.Entity.SlaveState} slave
* @returns {object}
*/
-window.randomAvailableParent = function(slave) {
- return randomRelatedSlave(slave, function(s) {
+window.randomAvailableParent = function (slave) {
+ return randomRelatedSlave(slave, function (s) {
return isSlaveAvailable(s) && (s.ID === slave.mother || s.ID === slave.father);
});
};
-window.totalPlayerRelatives = function(pc) {
+window.totalPlayerRelatives = function (pc) {
let relatives = 0;
if (pc.mother > 0) {
relatives += 1;
@@ -374,7 +374,7 @@ window.totalPlayerRelatives = function(pc) {
* @returns {string}
*/
window.relativeTerm =
- function(slave1, slave2) {
+ function (slave1, slave2) {
if (slave2.mother === slave1.ID || slave2.father === slave1.ID) {
if (slave2.genes === "XY" && State.variables.diversePronouns) {
return "son";
diff --git a/src/js/familyTreeJS.js b/src/js/familyTreeJS.js
index e6cc775d6bb..9242fda8057 100644
--- a/src/js/familyTreeJS.js
+++ b/src/js/familyTreeJS.js
@@ -16,7 +16,7 @@ let lastActiveSlave, lastSlaves, lastPC;
*/
-window.renderFamilyTree = function(slaves, filterID) {
+window.renderFamilyTree = function (slaves, filterID) {
'use strict';
let ftreeWidth, ftreeHeight;
@@ -81,11 +81,11 @@ window.renderFamilyTree = function(slaves, filterID) {
function runFtreeSim(data) {
let simulation = d3.forceSimulation()
- .force('link', d3.forceLink().id(function(d) {
+ .force('link', d3.forceLink().id(function (d) {
return d.index;
}))
// eslint-disable-next-line no-unused-vars
- .force('collide', d3.forceCollide(function(d) {
+ .force('collide', d3.forceCollide(function (d) {
return 60;
}).iterations(4))
.force('charge', d3.forceManyBody().strength(-200).distanceMin(100).distanceMax(1000))
@@ -100,7 +100,7 @@ window.renderFamilyTree = function(slaves, filterID) {
.enter()
.append('line')
.attr('marker-end', 'url(#arrowhead)')
- .attr('stroke', function(d) {
+ .attr('stroke', function (d) {
if (d.type === 'homologous') {
return '#862d59';
} else if (d.type === 'paternal') {
@@ -122,8 +122,8 @@ window.renderFamilyTree = function(slaves, filterID) {
.on('end', dragended));
node.append('circle')
- .attr('r', function(d) { return d.r; })
- .attr('stroke', function(d) {
+ .attr('r', function (d) { return d.r; })
+ .attr('stroke', function (d) {
if (d.ID === filterID) {
return '#ffff20';
} else {
@@ -134,7 +134,7 @@ window.renderFamilyTree = function(slaves, filterID) {
.attr('r', 20);
node.append('text')
- .text(function(d) {
+ .text(function (d) {
let ssym;
if (d.ID === -1) {
if (d.dick === 1 && d.vagina === 1) {
@@ -156,11 +156,11 @@ window.renderFamilyTree = function(slaves, filterID) {
return `${d.name}(${ssym})`;
})
.attr('dy', 4)
- .attr('dx', function(d) {
+ .attr('dx', function (d) {
return -(8 * d.name.length) / 2;
})
.attr('class', 'node-text')
- .style('fill', function(d) {
+ .style('fill', function (d) {
if (d.is_mother && d.is_father) {
return '#b84dff';
} else if (d.is_father) {
@@ -177,15 +177,15 @@ window.renderFamilyTree = function(slaves, filterID) {
svg.selectAll('.node-circle');
svg.selectAll('.node-text');
- let ticked = function() {
+ let ticked = function () {
link
- .attr('x1', function(d) { return d.source.x; })
- .attr('y1', function(d) { return d.source.y; })
- .attr('x2', function(d) { return d.target.x; })
- .attr('y2', function(d) { return d.target.y; });
+ .attr('x1', function (d) { return d.source.x; })
+ .attr('y1', function (d) { return d.source.y; })
+ .attr('x2', function (d) { return d.target.x; })
+ .attr('y2', function (d) { return d.target.y; });
node
- .attr("transform", function(d) { return `translate(${d.x}, ${d.y})`; });
+ .attr("transform", function (d) { return `translate(${d.x}, ${d.y})`; });
};
simulation.nodes(data.nodes)
@@ -195,7 +195,7 @@ window.renderFamilyTree = function(slaves, filterID) {
.links(data.links);
function dragstarted(d) {
- if (!d3.event.active) simulation.alphaTarget(0.3).restart();
+ if (!d3.event.active) { simulation.alphaTarget(0.3).restart(); }
d.fx = d.x;
d.fy = d.y;
}
@@ -206,14 +206,14 @@ window.renderFamilyTree = function(slaves, filterID) {
}
function dragended(d) {
- if (!d3.event.active) simulation.alphaTarget(0);
+ if (!d3.event.active) { simulation.alphaTarget(0); }
d.fx = null;
d.fy = null;
}
}
};
-window.buildFamilyTree = function(slaves = State.variables.slaves, filterID) {
+window.buildFamilyTree = function (slaves = State.variables.slaves, filterID) {
let family_graph = {nodes: [], links: []};
let node_lookup = {};
let preset_lookup = {
@@ -528,7 +528,7 @@ If there's no active slave, you can do:
<<run updateFamilyTree(null, $slaves, $PC)>>
*/
-window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastSlaves, PC = lastPC) {
+window.updateFamilyTree = function (activeSlave = lastActiveSlave, slaves = lastSlaves, PC = lastPC) {
lastActiveSlave = activeSlave;
lastSlaves = slaves;
lastPC = PC;
@@ -536,8 +536,7 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS
let numTreeNodes = 0;
let graphElement = document.getElementById("graph");
- if (!graphElement)
- return;
+ if (!graphElement) { return; }
graphElement.innerHTML = "";
/* The way this code works is that we start with the activeSlave then we call
@@ -563,8 +562,7 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS
return activeSlave;
}
for (let i = 0; i < slaves.length; ++i) {
- if (slaves[i].ID === id)
- return slaves[i];
+ if (slaves[i].ID === id) { return slaves[i]; }
}
return {
"slaveName": "-",
@@ -582,8 +580,7 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS
}
recursionProtectSlaveId[slave.ID] = true;
- if (typeof slave.father === "undefined" || typeof slave.mother === "undefined")
- return slaveInfo_(slave, activeSlaveId);
+ if (typeof slave.father === "undefined" || typeof slave.mother === "undefined") { return slaveInfo_(slave, activeSlaveId); }
if (slave.father === -1 || slave.mother === -1) {
return slaveInfo(getSlave(-1), activeSlaveId, recursionProtectSlaveId);
@@ -616,8 +613,7 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS
let spouseToChild = {};
function maybeAddSpouseToChild(child) {
- if (child.ID === slave.ID)
- return;
+ if (child.ID === slave.ID) { return; }
if (child.father === slave.ID) {
if (!spouseToChild[child.mother]) {
spouseToChild[child.mother] = [];
@@ -631,14 +627,12 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS
}
}
- if (activeSlave.ID !== PC.ID)
- maybeAddSpouseToChild(activeSlave);
+ if (activeSlave.ID !== PC.ID) { maybeAddSpouseToChild(activeSlave); }
maybeAddSpouseToChild(getSlave(-1));
for (let i = 0; i < slaves.length; ++i) {
let child = slaves[i];
- if (child.ID !== activeSlave.ID)
- maybeAddSpouseToChild(child);
+ if (child.ID !== activeSlave.ID) { maybeAddSpouseToChild(child); }
}
for (let key in spouseToChild) {
@@ -653,7 +647,7 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS
}
let marriage = {
"spouse": {"name": spouseName, "class": spouse.genes},
- "children": children.map(function(x) { return slaveInfo_(x, activeSlaveId, slavesAdded, depth + 1); }),
+ "children": children.map(function (x) { return slaveInfo_(x, activeSlaveId, slavesAdded, depth + 1); }),
};
data.marriages.push(marriage);
}
@@ -661,16 +655,14 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS
return data;
}
- if (activeSlave === PC || activeSlave === null)
- activeSlave = getSlave(-1);
+ if (activeSlave === PC || activeSlave === null) { activeSlave = getSlave(-1); }
const treeData = [slaveInfo(activeSlave, activeSlave.ID)];
console.log("Family tree is", treeData, 'and has:', numTreeNodes);
let parentWidth = document.getElementById('editFamily').offsetWidth;
console.log(parentWidth, document.getElementById('passages').offsetWidth);
- if (!parentWidth)
- parentWidth = document.body.offsetWidth - 483;
+ if (!parentWidth) { parentWidth = document.body.offsetWidth - 483; }
console.log(parentWidth, Math.min(200 + 40 * numTreeNodes, parentWidth - 200) + 200);
@@ -682,7 +674,7 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS
width: Math.min(200 + 40 * numTreeNodes,
parentWidth - 200) + 200,
callbacks: {
- nodeClick: function( /* name, extra*/ ) {}
+ nodeClick: function ( /* name, extra*/ ) {}
}
});
};
diff --git a/src/js/food.js b/src/js/food.js
index d92bffb1bb4..1cac0324215 100644
--- a/src/js/food.js
+++ b/src/js/food.js
@@ -2,7 +2,7 @@
* @param {App.Entity.SlaveState} slave
* @returns {number}
*/
-window.foodAmount = function(slave) {
+window.foodAmount = function (slave) {
const V = State.variables;
let food = 400; // kg / food produced by base slave / week
if (!slave) {
@@ -61,7 +61,7 @@ window.foodAmount = function(slave) {
* @param {App.Entity.SlaveState} slave
* @returns {number}
*/
-window.farmShowsIncome = function(slave) {
+window.farmShowsIncome = function (slave) {
// TODO: incorporate farmyardRestraints
const V = State.variables;
let arcology = V.arcologies[0];
diff --git a/src/js/futureSocietyJS.js b/src/js/futureSocietyJS.js
index 03dc2cdece4..be256308b2a 100644
--- a/src/js/futureSocietyJS.js
+++ b/src/js/futureSocietyJS.js
@@ -1,4 +1,4 @@
-window.FutureSocieties = (function() {
+window.FutureSocieties = (function () {
"use strict";
const FSString2Property = { // blame Hedonism and Eugenics for this
Supremacist: "FSSupremacist",
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 9af3ce923a7..82a5099fec0 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -1,6 +1,6 @@
// Generates a child's genetics based off mother and father and returns it as an object to be attached to an ovum
-window.generateGenetics = (function() {
+window.generateGenetics = (function () {
"use strict";
let genes;
let mother;
@@ -37,7 +37,7 @@ window.generateGenetics = (function() {
geneticQuirks: 0
};
if (actor1.ID > 0) {
- mother = V.genePool.find(function(s) {
+ mother = V.genePool.find(function (s) {
return s.ID === actor1.ID;
});
if (mother === undefined) {
@@ -52,7 +52,7 @@ window.generateGenetics = (function() {
mother = V.PC;
}
if (actor2 > 0) {
- father = V.genePool.find(function(s) {
+ father = V.genePool.find(function (s) {
return s.ID === actor2;
});
activeFather = V.slaves[V.slaveIndices[actor2]];
@@ -62,7 +62,7 @@ window.generateGenetics = (function() {
}
if (father === undefined) {
if (V.incubator > 0) {
- father = V.tanks.find(function(s) {
+ father = V.tanks.find(function (s) {
return s.ID === actor2;
});
activeFather = 0; // activeFather = father?
@@ -70,7 +70,7 @@ window.generateGenetics = (function() {
}
if (father === undefined) {
if (V.nursery > 0) {
- father = V.cribs.find(function(s) {
+ father = V.cribs.find(function (s) {
return s.ID === actor2;
});
activeFather = 0; // activeFather = father?
@@ -1087,7 +1087,7 @@ window.generateGenetics = (function() {
return generateGenetics;
})();
-window.generateChild = function(mother, ova, destination) {
+window.generateChild = function (mother, ova, destination) {
let V = State.variables;
let genes = ova.genetics; // maybe just argument this? We'll see.
let pregUpgrade = V.pregnancyMonitoringUpgrade;
diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js
index e09b3b93bc8..ae3a48c7107 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -1,5 +1,5 @@
/* eslint-disable camelcase */
-window.GenerateNewSlave = (function() {
+window.GenerateNewSlave = (function () {
"use strict";
let V;
let chance;
diff --git a/src/js/hTagMacroJS.js b/src/js/hTagMacroJS.js
index 6918db8d627..3226d538fa3 100644
--- a/src/js/hTagMacroJS.js
+++ b/src/js/hTagMacroJS.js
@@ -31,11 +31,10 @@ Macro.add('htag', {
} else {
attributes = `id="${String(this.args[0]).trim()}"`;
}
- if (Config.debug)
- {
+ if (Config.debug) {
this.debugView.modes({
block: true
- });
+ });
}
jQuery(`<${htag} ${attributes} />`)
diff --git a/src/js/heroCreator.js b/src/js/heroCreator.js
index 1200dc10bd3..1338cb7826f 100644
--- a/src/js/heroCreator.js
+++ b/src/js/heroCreator.js
@@ -3,7 +3,7 @@
* @param {App.Entity.SlaveState} baseHeroSlave
* @return {App.Entity.SlaveState}
*/
-App.Utils.getHeroSlave = function(heroSlave, baseHeroSlave) {
+App.Utils.getHeroSlave = function (heroSlave, baseHeroSlave) {
function isObject(o) {
return (o !== undefined && typeof o === 'object' && !Array.isArray(o));
}
diff --git a/src/js/itemAvailability.js b/src/js/itemAvailability.js
index a01fbbe2422..a94668cbd41 100644
--- a/src/js/itemAvailability.js
+++ b/src/js/itemAvailability.js
@@ -5,7 +5,7 @@
* @param {string} string Name of the item
* @returns {boolean}
*/
-window.isItemAccessible = function(string) {
+window.isItemAccessible = function (string) {
const V = State.variables;
if (V.cheatMode === 1) {
diff --git a/src/js/nurseryWidgets.js b/src/js/nurseryWidgets.js
index 235a44b457e..322252ede7a 100644
--- a/src/js/nurseryWidgets.js
+++ b/src/js/nurseryWidgets.js
@@ -1,4 +1,4 @@
-App.Facilities.Nursery.ChildSummary = function(child) {
+App.Facilities.Nursery.ChildSummary = function (child) {
const V = State.variables;
let r = ``;
r += `${child} will stay in ${V.nurseryName} for another ${child.weeksLeft} weeks. `;
diff --git a/src/js/pregJS.js b/src/js/pregJS.js
index 853e4d66669..343ec2e9446 100644
--- a/src/js/pregJS.js
+++ b/src/js/pregJS.js
@@ -1,5 +1,5 @@
/* Major props to the anons who worked together to forge the Super Pregnancy Project. Let your legacy go unforgotten.*/
-window.getPregBellySize = function(s) {
+window.getPregBellySize = function (s) {
let targetLen;
let gestastionWeek = s.preg;
let fetuses = s.pregType;
@@ -21,7 +21,7 @@ window.getPregBellySize = function(s) {
* @param {App.Entity.SlaveState} slave
* @returns {string}
*/
-window.bellyAdjective = function(slave) {
+window.bellyAdjective = function (slave) {
if (slave.belly >= 1500) {
if (slave.belly >= 1000000) {
if (slave.preg > slave.pregData.normalBirth/4) {
@@ -62,7 +62,7 @@ window.bellyAdjective = function(slave) {
};
/* calculates and returns expected ovum count during conception*/
-window.setPregType = function(actor) {
+window.setPregType = function (actor) {
/* IMHO rework is possible. Can be more interesting to play, if this code will take in account more body conditions - age, fat, food, hormone levels, etc. */
let ovum = jsRandom(actor.pregData.normalOvaMin, actor.pregData.normalOvaMax); // for default human profile it's always 1.
@@ -394,7 +394,7 @@ window.setPregType = function(actor) {
fatherID is the ID of her sire or 0 if undefined.
displayOverride is an override if defined - fatherID must be defined in this case.
*/
-window.knockMeUp = function(target, chance, hole, fatherID, displayOverride) {
+window.knockMeUp = function (target, chance, hole, fatherID, displayOverride) {
const V = State.variables;
let pronouns;
let He;
@@ -474,29 +474,29 @@ window.knockMeUp = function(target, chance, hole, fatherID, displayOverride) {
return r;
};
-window.getIncubatorReserved = function(/* slaves */) {
+window.getIncubatorReserved = function (/* slaves */) {
return FetusGlobalReserveCount("incubator");
};
-window.getNurseryReserved = function(/* slaves */) {
+window.getNurseryReserved = function (/* slaves */) {
return FetusGlobalReserveCount("nursery");
};
-window.findFather = function(fatherID) {
+window.findFather = function (fatherID) {
let father;
let V = State.variables;
father = V.slaves[V.slaveIndices[fatherID]];
if (father === undefined) {
if (V.incubator > 0) {
- father = V.tanks.find(function(s) {
+ father = V.tanks.find(function (s) {
return s.ID === fatherID;
});
}
}
if (father === undefined) {
if (V.nursery > 0) {
- father = V.cribs.find(function(s) {
+ father = V.cribs.find(function (s) {
return s.ID === fatherID;
});
}
@@ -505,10 +505,9 @@ window.findFather = function(fatherID) {
return father;
};
-window.adjustFatherProperty = function(actor, property, newValue) {
+window.adjustFatherProperty = function (actor, property, newValue) {
let father = findFather(actor.ID);
- if (father)
- father[property] = newValue;
+ if (father) { father[property] = newValue; }
};
/* OLD
@@ -541,6 +540,6 @@ window.adjustFatherProperty = function(actor, property, newValue) {
* @param {App.Entity.SlaveState} slave
* @returns {number}
*/
-window.getBaseBoobs = function(slave) {
+window.getBaseBoobs = function (slave) {
return slave.boobs - slave.boobsImplant - slave.boobsMilk - slave.boobsWombVolume;
};
diff --git a/src/js/rbuttonJS.js b/src/js/rbuttonJS.js
index 2f2df1d7ca5..bceb15c6a9a 100644
--- a/src/js/rbuttonJS.js
+++ b/src/js/rbuttonJS.js
@@ -65,7 +65,7 @@ Macro.add('rbutton', {
tabindex: 0 // for accessibility
})
.addClass(`macro-${this.name}`)
- .on('change', function() {
+ .on('change', function () {
if (this.checked) {
Wikifier.setValue(varName, checkValue);
@@ -78,7 +78,7 @@ Macro.add('rbutton', {
}
}
})
- .ready(function() {
+ .ready(function () {
// alert ("DOM finished");
if (el.checked && replaceID.length > 0 && replaceText.length > 0) {
let replaceEl = document.getElementById(replaceID);
diff --git a/src/js/relationshipChecks.js b/src/js/relationshipChecks.js
index 79e936e38a4..d1f94be6636 100644
--- a/src/js/relationshipChecks.js
+++ b/src/js/relationshipChecks.js
@@ -2,7 +2,7 @@
* @param {{ rivalry: number; }} id
* @returns {string}
*/
-window.rivalryTerm = function(id) {
+window.rivalryTerm = function (id) {
if (id.rivalry === 1) {
return "growing rival";
} else if (id.rivalry === 2) {
@@ -16,7 +16,7 @@ window.rivalryTerm = function(id) {
* @param {{ relationship: number; }} id
* @returns {string}
*/
-window.relationshipTerm = function(id) {
+window.relationshipTerm = function (id) {
if (id.relationship === 1) {
return "friend";
} else if (id.relationship === 2) {
@@ -34,7 +34,7 @@ window.relationshipTerm = function(id) {
* @param {{ relationship: number; }} id
* @returns {string}
*/
-window.relationshipTermShort = function(id) {
+window.relationshipTermShort = function (id) {
if (id.relationship === 1) {
return "friend";
} else if (id.relationship === 2) {
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index 399d95b4a9f..6b754d63534 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -3,7 +3,7 @@
* @param {Object[]} rules
* @returns {boolean}
*/
-window.hasSurgeryRule = function(slave, rules) {
+window.hasSurgeryRule = function (slave, rules) {
return rules.some(
rule => ruleApplied(slave, rule) && rule.set.autoSurgery > 0);
};
@@ -14,7 +14,7 @@ window.hasSurgeryRule = function(slave, rules) {
* @param {string} what
* @returns {boolean}
*/
-window.hasRuleFor = function(slave, rules, what) {
+window.hasRuleFor = function (slave, rules, what) {
return rules.some(
rule => ruleApplied(slave, rule) && rule[what] !== "no default setting");
};
@@ -24,7 +24,7 @@ window.hasRuleFor = function(slave, rules, what) {
* @param {Object[]} rules
* @returns {boolean}
*/
-window.hasHColorRule = function(slave, rules) {
+window.hasHColorRule = function (slave, rules) {
return hasRuleFor(slave, rules, "hColor");
};
@@ -33,7 +33,7 @@ window.hasHColorRule = function(slave, rules) {
* @param {Object[]} rules
* @returns {boolean}
* */
-window.hasHStyleRule = function(slave, rules) {
+window.hasHStyleRule = function (slave, rules) {
return hasRuleFor(slave, rules, "hStyle");
};
@@ -42,7 +42,7 @@ window.hasHStyleRule = function(slave, rules) {
* @param {Object[]} rules
* @returns {boolean}
* */
-window.hasEyeColorRule = function(slave, rules) {
+window.hasEyeColorRule = function (slave, rules) {
return hasRuleFor(slave, rules, "eyeColor");
};
@@ -52,7 +52,7 @@ window.hasEyeColorRule = function(slave, rules) {
* @param {Object[]} rules
* @returns {boolean}
*/
-window.lastPregRule = function(slave, rules) {
+window.lastPregRule = function (slave, rules) {
return rules.some(rule =>
ruleApplied(slave, rule) && rule.set.preg === -1);
};
@@ -72,7 +72,7 @@ window.mergeRules = function mergeRules(rules) {
const applies = (combinedRule[key] === undefined ||
(key === "autoBrand" && rule[key]) ||
(key !== "autoBrand" && rule[key] !== "no default setting"));
- if (!applies) return;
+ if (!applies) { return; }
combinedRule[key] = rule[key];
});
});
@@ -85,7 +85,7 @@ window.mergeRules = function mergeRules(rules) {
* @param {Object} rule
* @returns {boolean}
*/
-window.ruleApplied = function(slave, rule) {
+window.ruleApplied = function (slave, rule) {
return slave.currentRules.includes(rule.ID);
};
@@ -97,7 +97,7 @@ window.ruleApplied = function(slave, rule) {
window.RAFacilityRemove = function RAFacilityRemove(slave, rule) {
const V = State.variables;
let r = "";
- if (!rule.facilityRemove) return r;
+ if (!rule.facilityRemove) { return r; }
switch (rule.setAssignment) {
case "be confined in the arcade":
if (slave.assignment === rule.setAssignment) {
@@ -223,7 +223,7 @@ window.ruleAppliesP = function ruleAppliesP(cond, slave) {
}
// assignment / facility / special slaves / specific slaves check
let assignment = slave.assignment;
- if (assignment === "be your Concubine") assignment = "serve in the master suite";
+ if (assignment === "be your Concubine") { assignment = "serve in the master suite"; }
if (cond.specialSlaves !== -1) { // not "Include", which means "doesn't matter"
flag = flag && (cond.specialSlaves == isLeaderP(slave)); // eslint-disable-line eqeqeq
diff --git a/src/js/sexActsJS.js b/src/js/sexActsJS.js
index f9ec0a9bf52..9ab9ceb09db 100644
--- a/src/js/sexActsJS.js
+++ b/src/js/sexActsJS.js
@@ -16,7 +16,7 @@ window.VCheck = (function () {
Simple: SimpleVCheck,
Partner: PartnerVCheck
};
-
+
function setScopedPronouns(slave) {
const pronouns = getPronouns(slave);
he = pronouns.pronoun;
@@ -315,7 +315,6 @@ window.VCheck = (function () {
}
return r;
}
-
})();
/**
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index a4a571ffe93..a44b9280433 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -1,4 +1,4 @@
-window.Beauty = (function() {
+window.Beauty = (function () {
"use strict";
let V;
let arcology;
@@ -1411,7 +1411,7 @@ window.Beauty = (function() {
// it has been wrapped in a closure so as not to pollute the global namespace
// and so that nested functions are only evaluated once
-window.FResult = (function() {
+window.FResult = (function () {
"use strict";
// we can't initialize our global variables on load, because SugarCube.State isn't initialized
// instead, declare them and initialize on run time
@@ -1488,7 +1488,7 @@ window.FResult = (function() {
}
const uses = V.oralUseWeight + V.vaginalUseWeight + V.analUseWeight;
- if (uses <= 0) return;
+ if (uses <= 0) { return; }
result += (6 + slave.tonguePiercing) * (V.oralUseWeight / uses) * (slave.skill.oral / 30);
if (slave.sexualFlaw === "cum addict") {
@@ -1527,11 +1527,11 @@ window.FResult = (function() {
V.slaves.forEach(islave => {
if (isParentP(slave, islave) && sameAssignmentP(slave, islave)) {
result += 1;
- if (incestBonus) result += 1;
+ if (incestBonus) { result += 1; }
}
if (areSisters(slave, islave) > 0 && sameAssignmentP(slave, islave)) {
result += 1;
- if (incestBonus) result += 1;
+ if (incestBonus) { result += 1; }
}
});
}
@@ -1543,7 +1543,7 @@ window.FResult = (function() {
const fre = getSlave(slave.relationTarget);
if (fre !== undefined && sameAssignmentP(slave, fre)) {
result += 2;
- if (incestBonus) result += 2;
+ if (incestBonus) { result += 2; }
}
}
@@ -1554,7 +1554,7 @@ window.FResult = (function() {
const fre = V.slaves.findIndex(s => {
return haveRelationshipP(slave, s) && sameAssignmentP(slave, s);
});
- if (fre !== -1) result += 1;
+ if (fre !== -1) { result += 1; }
}
/**
@@ -1562,7 +1562,7 @@ window.FResult = (function() {
*/
function calcWorksWithRival(slave) {
const en = getSlave(slave.rivalryTarget);
- if (en !== undefined && sameAssignmentP(slave, en)) result -= 1;
+ if (en !== undefined && sameAssignmentP(slave, en)) { result -= 1; }
}
/**
@@ -1588,8 +1588,7 @@ window.FResult = (function() {
*/
function calcPreg(slave) {
if (V.arcologies[0].FSRepopulationFocus > 20) {
- if (slave.belly >= 1500) result += 2;
- else result -= 2;
+ if (slave.belly >= 1500) { result += 2; } else { result -= 2; }
} else if (V.arcologies[0].FSRepopulationFocusPregPolicy === 1) {
if (slave.bellyPreg >= 1500) {
result += 1;
@@ -1624,8 +1623,8 @@ window.FResult = (function() {
* @param {App.Entity.SlaveState} slave
*/
function calcSexAttributes(slave) {
- if (slave.clitPiercing > 2) result += 1;
- if (slave.tail === "sex") result += 1;
+ if (slave.clitPiercing > 2) { result += 1; }
+ if (slave.tail === "sex") { result += 1; }
if (slave.fetishKnown === 1 && slave.fetishStrength > 60 && slave.fetish !== "none") {
result += slave.fetishStrength / 5;
}
@@ -1633,16 +1632,12 @@ window.FResult = (function() {
if (slave.attrKnown === 1) {
result += Math.trunc(slave.attrXX / 20);
result += Math.trunc(slave.attrXY / 20);
- if (slave.energy > 95) result += 3;
- else if (slave.energy > 80) result += 2;
- else if (slave.energy > 60) result += 1;
- else if (slave.energy <= 20) result -= 2;
- else if (slave.energy <= 40) result -= 1;
+ if (slave.energy > 95) { result += 3; } else if (slave.energy > 80) { result += 2; } else if (slave.energy > 60) { result += 1; } else if (slave.energy <= 20) { result -= 2; } else if (slave.energy <= 40) { result -= 1; }
}
- if (slave.sexualFlaw !== "none") result -= 2;
- if (slave.sexualQuirk !== "none") result += 2;
- if (slave.behavioralFlaw !== "none") result -= 2;
- if (slave.behavioralQuirk !== "none") result += 2;
+ if (slave.sexualFlaw !== "none") { result -= 2; }
+ if (slave.sexualQuirk !== "none") { result += 2; }
+ if (slave.behavioralFlaw !== "none") { result -= 2; }
+ if (slave.behavioralQuirk !== "none") { result += 2; }
}
/**
@@ -1660,8 +1655,7 @@ window.FResult = (function() {
* @param {App.Entity.SlaveState} slave
*/
function calcSight(slave) {
- if (!canSee(slave)) result -= 3;
- else if (slave.eyes <= -1) {
+ if (!canSee(slave)) { result -= 3; } else if (slave.eyes <= -1) {
if (slave.eyewear !== "corrective glasses" && slave.eyewear !== "corrective contacts") {
result -= 1;
}
@@ -1676,8 +1670,7 @@ window.FResult = (function() {
* @param {App.Entity.SlaveState} slave
*/
function calcHearing(slave) {
- if (!canHear(slave)) result -= 2;
- else if (slave.hears <= -1) {
+ if (!canHear(slave)) { result -= 2; } else if (slave.hears <= -1) {
if (slave.earwear !== "hearing aids") {
result -= 1;
}
@@ -1690,7 +1683,7 @@ window.FResult = (function() {
* @param {App.Entity.SlaveState} slave
*/
function calcEgyptianBonus(slave) {
- if (V.racialVarieties === undefined) V.racialVarieties = [];
+ if (V.racialVarieties === undefined) { V.racialVarieties = []; }
if (!V.racialVarieties.includes(slave.race)) {
V.racialVarieties.push(slave.race);
}
@@ -1728,8 +1721,8 @@ window.FResult = (function() {
} else if (!V.familyTesting && slave.relation !== 0) {
calcWorksWithRelativesVanilla(slave);
}
- if (slave.relationship > 0) calcWorksWithRelationship(slave);
- if (slave.rivalry !== 0) calcWorksWithRival(slave);
+ if (slave.relationship > 0) { calcWorksWithRelationship(slave); }
+ if (slave.rivalry !== 0) { calcWorksWithRival(slave); }
calcHInjectionsDiet(slave);
calcPreg(slave);
calcRace(slave);
@@ -1753,12 +1746,10 @@ window.FResult = (function() {
function calcAge(slave) {
if ((V.arcologies[0].FSRepopulationFocus !== "unset" || V.arcologies[0].FSGenderFundamentalist !== "unset") && slave.physicalAge === V.minimumSlaveAge && slave.physicalAge === V.fertilityAge && canGetPregnant(slave)) {
result += 1;
- if (slave.birthWeek === 0) result += result;
- else if (slave.birthWeek < 4) result += 0.2 * result;
+ if (slave.birthWeek === 0) { result += result; } else if (slave.birthWeek < 4) { result += 0.2 * result; }
} else if (slave.physicalAge === V.minimumSlaveAge) {
result += 1;
- if (slave.birthWeek === 0) result += 0.5 * result;
- else if (slave.birthWeek < 4) result += 0.1 * result;
+ if (slave.birthWeek === 0) { result += 0.5 * result; } else if (slave.birthWeek < 4) { result += 0.1 * result; }
} else if (slave.physicalAge === V.fertilityAge && canGetPregnant(slave) && (V.arcologies[0].FSRepopulationFocus !== "unset" || V.arcologies[0].FSGenderFundamentalist !== "unset")) {
result += 1;
if (slave.birthWeek === 0) {
@@ -1799,7 +1790,7 @@ window.FResult = (function() {
return FResult;
})();
-window.slaveCost = (function() {
+window.slaveCost = (function () {
"use strict";
let V;
let arcology;
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 2b1f75997c8..c698411eb10 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -13,7 +13,7 @@ App.UI.SlaveList = {};
* @param {number} index
* @return {string}
*/
-App.UI.SlaveList.render = function() {
+App.UI.SlaveList.render = function () {
'use strict';
let V;
/** @type {string} */
@@ -75,8 +75,8 @@ App.UI.SlaveList.render = function() {
res.push(`<div id="slave_${slave.ID}" style="clear:both">${rejectString}</div>`);
}
- $(document).one(':passagedisplay', function() {
- $('[data-quick-index]').unbind().click(function() {
+ $(document).one(':passagedisplay', function () {
+ $('[data-quick-index]').unbind().click(function () {
let which = this.attributes["data-quick-index"].value;
let quick = $("div#list_index" + which);
quick.toggleClass("hidden");
@@ -326,7 +326,7 @@ App.UI.SlaveList.SlaveInteract.retrieve = (slave, index) =>
* Adds/removes a slave with the given id to/from the personal attention array
* @param {number} id slave id
*/
-App.UI.selectSlaveForPersonalAttention = function(id) {
+App.UI.selectSlaveForPersonalAttention = function (id) {
const V = State.variables;
if (!Array.isArray(V.personalAttention)) {
@@ -336,7 +336,7 @@ App.UI.selectSlaveForPersonalAttention = function(id) {
trainingRegimen: "undecided"
}];
} else {
- const _pai = V.personalAttention.findIndex(function(s) {
+ const _pai = V.personalAttention.findIndex(function (s) {
return s.ID === id;
});
if (_pai === -1) {
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index d09a60f2585..5e3f282e337 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -28,7 +28,7 @@ window.SlaveSummary = function SlaveSummary(slave) {
return SlaveSummaryUncached(slave);
};
-window.SlaveSummaryUncached = (function() {
+window.SlaveSummaryUncached = (function () {
"use strict";
let V;
let r;
@@ -4004,7 +4004,7 @@ window.SlaveSummaryUncached = (function() {
function short_extended_family(slave) {
let handled = 0;
if (slave.mother > 0) {
- const _ssj = V.slaves.findIndex(function(s) {
+ const _ssj = V.slaves.findIndex(function (s) {
return s.ID === slave.mother;
});
if (_ssj !== -1) {
@@ -4030,7 +4030,7 @@ window.SlaveSummaryUncached = (function() {
r += `${V.missingTable[slave.mother].fullName}'s daughter `;
}
if (slave.father > 0 && slave.father !== slave.mother) {
- const _ssj = V.slaves.findIndex(function(s) {
+ const _ssj = V.slaves.findIndex(function (s) {
return s.ID === slave.father;
});
if (_ssj !== -1) {
@@ -4056,7 +4056,7 @@ window.SlaveSummaryUncached = (function() {
r += `${V.missingTable[slave.father].fullName}'s daughter`;
}
if (slave.daughters === 1) {
- let _ssj = V.slaves.findIndex(function(s) {
+ let _ssj = V.slaves.findIndex(function (s) {
return s.mother === slave.ID;
});
if (_ssj !== -1) {
@@ -4068,7 +4068,7 @@ window.SlaveSummaryUncached = (function() {
}
}
r += " ";
- _ssj = V.slaves.findIndex(function(s) {
+ _ssj = V.slaves.findIndex(function (s) {
return s.father === slave.ID;
});
if (_ssj !== -1) {
@@ -4084,7 +4084,7 @@ window.SlaveSummaryUncached = (function() {
r += `multiple daughters `;
}
if (slave.sisters === 1) {
- const _ssj = V.slaves.findIndex(function(s) {
+ const _ssj = V.slaves.findIndex(function (s) {
return areSisters(s, slave) > 0;
});
if (_ssj !== -1) {
@@ -4100,7 +4100,7 @@ window.SlaveSummaryUncached = (function() {
r += `multiple sisters `;
}
if (slave.relationship > 0 && handled !== 1) {
- const _ssj = V.slaves.findIndex(function(s) {
+ const _ssj = V.slaves.findIndex(function (s) {
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
@@ -4123,7 +4123,7 @@ window.SlaveSummaryUncached = (function() {
*/
function short_legacy_family(slave) {
if (slave.relation !== 0) {
- const _ssj = V.slaves.findIndex(function(s) {
+ const _ssj = V.slaves.findIndex(function (s) {
return s.ID === slave.relationTarget;
});
if (_ssj !== -1) {
@@ -4131,7 +4131,7 @@ window.SlaveSummaryUncached = (function() {
}
}
if (slave.relationship > 0) {
- const _ssj = V.slaves.findIndex(function(s) {
+ const _ssj = V.slaves.findIndex(function (s) {
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
@@ -4167,7 +4167,7 @@ window.SlaveSummaryUncached = (function() {
function short_rival(slave) {
if (slave.rivalry !== 0) {
r += ` `;
- const _ssj = V.slaves.findIndex(function(s) {
+ const _ssj = V.slaves.findIndex(function (s) {
return s.ID === slave.rivalryTarget;
});
if (_ssj !== -1) {
@@ -4190,7 +4190,7 @@ window.SlaveSummaryUncached = (function() {
function long_extended_family(slave) {
let handled = 0;
if (slave.mother > 0) {
- const _ssj = V.slaves.findIndex(function(s) {
+ const _ssj = V.slaves.findIndex(function (s) {
return s.ID === slave.mother;
});
if (_ssj !== -1) {
@@ -4217,7 +4217,7 @@ window.SlaveSummaryUncached = (function() {
r += `${V.missingTable[slave.mother].fullName}'s <span class="lightgreen">daughter.</span> `;
}
if (slave.father > 0 && slave.father !== slave.mother) {
- const _ssj = V.slaves.findIndex(function(s) {
+ const _ssj = V.slaves.findIndex(function (s) {
return s.ID === slave.father;
});
if (_ssj !== -1) {
@@ -4244,7 +4244,7 @@ window.SlaveSummaryUncached = (function() {
r += `${V.missingTable[slave.father].fullName}'s <span class="lightgreen">daughter.</span> `;
}
if (slave.daughters === 1) {
- let _ssj = V.slaves.findIndex(function(s) {
+ let _ssj = V.slaves.findIndex(function (s) {
return s.mother === slave.ID;
});
if (_ssj !== -1) {
@@ -4256,7 +4256,7 @@ window.SlaveSummaryUncached = (function() {
}
r += `.</span> `;
}
- _ssj = V.slaves.findIndex(function(s) {
+ _ssj = V.slaves.findIndex(function (s) {
return s.father === slave.ID;
});
if (_ssj !== -1) {
@@ -4278,7 +4278,7 @@ window.SlaveSummaryUncached = (function() {
}
}
if (slave.sisters === 1) {
- const _ssj = V.slaves.findIndex(function(s) {
+ const _ssj = V.slaves.findIndex(function (s) {
return areSisters(s, slave) > 0;
});
if (_ssj !== -1) {
@@ -4300,7 +4300,7 @@ window.SlaveSummaryUncached = (function() {
}
}
if (slave.relationship > 0 && handled !== 1) {
- const _ssj = V.slaves.findIndex(function(s) {
+ const _ssj = V.slaves.findIndex(function (s) {
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
@@ -4322,7 +4322,7 @@ window.SlaveSummaryUncached = (function() {
*/
function long_legacy_family(slave) {
if (slave.relation !== 0) {
- const _ssj = V.slaves.findIndex(function(s) {
+ const _ssj = V.slaves.findIndex(function (s) {
return s.ID === slave.relationTarget;
});
if (_ssj !== -1) {
@@ -4338,7 +4338,7 @@ window.SlaveSummaryUncached = (function() {
}
}
if (slave.relationship > 0) {
- const _ssj = V.slaves.findIndex(function(s) {
+ const _ssj = V.slaves.findIndex(function (s) {
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
@@ -4374,7 +4374,7 @@ window.SlaveSummaryUncached = (function() {
function long_rival(slave) {
if (slave.rivalry !== 0) {
r += ` `;
- const _ssj = V.slaves.findIndex(function(s) {
+ const _ssj = V.slaves.findIndex(function (s) {
return s.ID === slave.rivalryTarget;
});
if (_ssj !== -1) {
diff --git a/src/js/textbox2.js b/src/js/textbox2.js
index cebb01edecd..e5b8a222e73 100644
--- a/src/js/textbox2.js
+++ b/src/js/textbox2.js
@@ -1,5 +1,5 @@
Macro.add("textbox2", {
- handler: function() {
+ handler: function () {
if (this.args.length < 2) {
const e = [];
return this.args.length < 1 && e.push("variable name"), this.args.length < 2 && e.push("default value"), this.error(`no ${e.join(" or ")} specified`);
@@ -68,19 +68,19 @@ Macro.add("textbox2", {
// type: isNumber ? "number" : "text", /* TODO - hide spinner if we do this */
tabindex: 0
}).addClass(`macro-${this.name}`)
- .on("change", function() {
+ .on("change", function () {
State.setVar(t, valueToNumberIfSame(this.value));
- }).on("blur", function() {
+ }).on("blur", function () {
State.setVar(t, valueToNumberIfSame(this.value));
// eslint-disable-next-line eqeqeq
if (this.value != a) { // If the value has actually changed, reload the page. Note != and not !== because types might be different
gotoPassage();
}
})
- .on("keypress", function(e) {
+ .on("keypress", function (e) {
13 === e.which && (e.preventDefault(), State.setVar(t, valueToNumberIfSame(this.value)), gotoPassage());
- }).appendTo(this.output), State.setVar(t, a), inputElement.value = a, autofocus && (inputElement.setAttribute("autofocus", "autofocus"), postdisplay[`#autofocus:${inputElement.id}`] = function(e) {
- delete postdisplay[e], setTimeout(function() {
+ }).appendTo(this.output), State.setVar(t, a), inputElement.value = a, autofocus && (inputElement.setAttribute("autofocus", "autofocus"), postdisplay[`#autofocus:${inputElement.id}`] = function (e) {
+ delete postdisplay[e], setTimeout(function () {
return inputElement.focus();
}, Engine.minDomActionDelay);
});
diff --git a/src/js/textboxJS.js b/src/js/textboxJS.js
index 573fac9a376..4302fdafec6 100644
--- a/src/js/textboxJS.js
+++ b/src/js/textboxJS.js
@@ -1,5 +1,5 @@
/* Nicked off greyelf, works for replace textboxes */
-window.setReplaceTextboxMaxLength = function(storyVarName, maxLength) {
+window.setReplaceTextboxMaxLength = function (storyVarName, maxLength) {
const textboxId = `#textbox-${Util.slugify(storyVarName)}`;
$(textboxId)
.attr("maxlength", maxLength)
@@ -11,9 +11,9 @@ window.setReplaceTextboxMaxLength = function(storyVarName, maxLength) {
};
/* Nicked off TheMadExile, works for non-replace textboxes */
-window.setTextboxMaxLength = function(storyVarName, maxLength) {
+window.setTextboxMaxLength = function (storyVarName, maxLength) {
const textboxId = `#textbox-${Util.slugify(storyVarName)}`;
- postdisplay[`${textboxId}-maxlength`] = function(taskName) {
+ postdisplay[`${textboxId}-maxlength`] = function (taskName) {
delete postdisplay[taskName];
$(textboxId)
.attr("maxlength", maxLength)
diff --git a/src/js/walkPastJS.js b/src/js/walkPastJS.js
index ebcd24531c5..48fd6e6822d 100644
--- a/src/js/walkPastJS.js
+++ b/src/js/walkPastJS.js
@@ -1,7 +1,7 @@
/* eslint-disable no-unused-vars */
/* temporary container until the entire thing is complete. No point in not deploying the working functions, you know? */
-window.primeSlave = function(activeSlave, seed) {
+window.primeSlave = function (activeSlave, seed) {
/* will be moved up once this becomes a single, contained function. */
const V = State.variables;
const pronouns = getPronouns(activeSlave);
@@ -21,7 +21,7 @@ window.primeSlave = function(activeSlave, seed) {
return t;
};
-window.rivalSlave = function(activeSlave, seed) {
+window.rivalSlave = function (activeSlave, seed) {
const V = State.variables;
const pronouns = getPronouns(activeSlave);
const he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, boy = pronouns.noun;
@@ -50,7 +50,7 @@ window.rivalSlave = function(activeSlave, seed) {
return t;
};
-window.loverSlave = function(activeSlave) {
+window.loverSlave = function (activeSlave) {
/* will be moved up once this becomes a single, contained function. */
let _target = "";
let t = "";
@@ -1231,7 +1231,7 @@ window.loverSlave = function(activeSlave) {
return t;
};
-window.relatedSlave = function(activeSlave) {
+window.relatedSlave = function (activeSlave) {
const V = State.variables;
const pronouns = getPronouns(activeSlave);
const he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, boy = pronouns.noun;
@@ -1274,7 +1274,7 @@ window.relatedSlave = function(activeSlave) {
return t;
};
-window.walkPasts = function(slave, _seed) {
+window.walkPasts = function (slave, _seed) {
/* will be moved up once this becomes a single, contained function. */
const V = State.variables;
const pronouns = getPronouns(slave);
@@ -1857,7 +1857,7 @@ window.walkPasts = function(slave, _seed) {
return t;
};
-window.boobWatch = function(slave) {
+window.boobWatch = function (slave) {
/* will be moved up once this becomes a single, contained function. */
let t = "";
let V = State.variables;
@@ -2275,7 +2275,7 @@ window.boobWatch = function(slave) {
return t;
};
-window.buttWatch = function(slave) {
+window.buttWatch = function (slave) {
/* will be moved up once this becomes a single, contained function. */
let t = "";
let V = State.variables;
@@ -2611,7 +2611,7 @@ window.buttWatch = function(slave) {
return t;
};
-window.anusWatch = function(slave) {
+window.anusWatch = function (slave) {
/* will be moved up once this becomes a single, contained function. */
let t = "";
let V = State.variables;
@@ -2920,7 +2920,7 @@ window.anusWatch = function(slave) {
};
-window.lipWatch = function(slave) {
+window.lipWatch = function (slave) {
/* will be moved up once this becomes a single, contained function. */
let t = "";
let V = State.variables;
--
GitLab