From 007bbae3e528ef79aa422c3b8a3fab951634f2c0 Mon Sep 17 00:00:00 2001
From: DCoded <dsoloha@live.com>
Date: Tue, 21 May 2019 00:15:38 -0400
Subject: [PATCH] Fixes
---
src/SpecialForce/SpecialForce.js | 24 ++--
src/art/artJS.js | 22 ++--
.../vector_revamp/vectorRevampedArtControl.js | 8 +-
src/debugging/debugJS.js | 6 +-
src/endWeek/saChoosesOwnClothes.js | 4 +-
src/endWeek/saPorn.js | 2 +-
src/endWeek/saServeThePublic.js | 2 +-
src/endWeek/saWhore.js | 2 +-
src/interaction/main/toychest.js | 2 +-
src/interaction/main/useGuard.js | 2 +-
src/js/PenthouseNaming.js | 18 +--
src/js/accordianJS.js | 8 +-
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 | 36 +++---
src/js/food.js | 4 +-
src/js/futureSocietyJS.js | 2 +-
src/js/generateGenetics.js | 12 +-
src/js/generateNewSlaveJS.js | 2 +-
src/js/heroCreator.js | 2 +-
src/js/itemAvailability.js | 2 +-
src/js/nurseryWidgets.js | 2 +-
src/js/pregJS.js | 18 +--
src/js/rbuttonJS.js | 4 +-
src/js/relationshipChecks.js | 6 +-
src/js/rulesAssistant.js | 14 +--
src/js/rulesAssistantOptions.js | 4 +-
src/js/rulesAutosurgery.js | 2 +-
src/js/slaveCostJS.js | 6 +-
src/js/slaveListing.js | 10 +-
src/js/slaveSummaryWidgets.js | 38 +++---
src/js/textbox2.js | 12 +-
src/js/textboxJS.js | 6 +-
src/js/utilJS.js | 114 +++++++++---------
src/js/walkPastJS.js | 18 +--
src/js/wombJS.js | 92 +++++++-------
src/neighbor/arcologyOpinion.js | 2 +-
42 files changed, 340 insertions(+), 340 deletions(-)
diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index a91c9aff346..ad90a862560 100644
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
@@ -1,5 +1,5 @@
// V=SugarCube.State.variables, T=SugarCube.State.temporary;
-App.SF.Init = function () {
+App.SF.Init = function() {
const V = State.variables;
V.SF.Toggle = V.SF.Toggle || 0;
if (passage() === "init" || passage() === "New Game Plus") {
@@ -74,7 +74,7 @@ App.SF.Init = function () {
};
/* no-usedOnce */
-App.SF.BC = function () {
+App.SF.BC = function() {
const V = State.variables;
function InitClean() {
@@ -350,7 +350,7 @@ App.SF.BC = function () {
};
/* usedOnce */
-App.SF.fsIntegration = function (input = 'Menu', textDisplay = 100, text = `\n`) {
+App.SF.fsIntegration = function(input = 'Menu', textDisplay = 100, text = `\n`) {
const Revivalisms = ['Arabian_Revivalism', 'Aztec_Revivalism', 'Chinese_Revivalism', 'Edo_Revivalism', 'Egyptian_Revivalism', 'Multiculturalism', 'Roman_Revivalism'],
V = State.variables;
let FS_OPTIONS = ['Asset_Expansionism', 'Body_Purism', 'Chattel_Religionism', 'Degradationism', 'Eugenics', 'Gender_radicalism', 'Gender_traditionalism', 'Hedonistic_Decadence', 'Maturity_Preferentialism', 'Paternalism', 'Physical_Idealism', 'Repopulation', 'Slave_Pastoralism', 'Slimness_Enthusiasm', 'Transformation_Fetishism', 'Youth_Preferentialism'];
@@ -2240,7 +2240,7 @@ App.SF.fsIntegration = function (input = 'Menu', textDisplay = 100, text = `\n`)
}
};
-App.SF.AAR = function (endWeekCall = 1) {
+App.SF.AAR = function(endWeekCall = 1) {
const V = State.variables,
T = State.temporary,
S = V.SF.Squad,
@@ -2646,7 +2646,7 @@ App.SF.AAR = function (endWeekCall = 1) {
return r;
};
-App.SF.Count = function () {
+App.SF.Count = function() {
const V = State.variables,
T = State.temporary,
C = Math.clamp, // sure that's correct?
@@ -2794,14 +2794,14 @@ App.SF.Count = function () {
}
};
-App.SF.NameCapsCheck = function () {
+App.SF.NameCapsCheck = function() {
const V = State.variables;
if (V.SF.Lower !== "the special force") {
V.SF.Caps = V.SF.Lower.replace("the ", "The ");
}
};
-App.SF.UpgradeCost = function (cost, unit) {
+App.SF.UpgradeCost = function(cost, unit) {
"use strict";
const V = State.variables,
T = State.temporary,
@@ -2814,7 +2814,7 @@ App.SF.UpgradeCost = function (cost, unit) {
return Math.ceil(value);
};
-App.SF.progress = function (x, max) {
+App.SF.progress = function(x, max) {
"use strict";
let out = `â`,
z, i;
@@ -2854,7 +2854,7 @@ App.SF.progress = function (x, max) {
return `${out}`;
};
-App.SF.SFC = function () {
+App.SF.SFC = function() {
const V = State.variables;
if (V.SF.MercCon.CanAttend === -1) {
return `The Colonel`;
@@ -2866,7 +2866,7 @@ App.SF.SFC = function () {
}
};
-App.SF.ColonelStatus = function () {
+App.SF.ColonelStatus = function() {
const V = State.variables,
C = V.SF.Colonel;
if (C.Status <= 19) {
@@ -2878,7 +2878,7 @@ App.SF.ColonelStatus = function () {
}
};
-App.SF.Interactions = function () {
+App.SF.Interactions = function() {
"use strict";
let choice = ``,
time = ``;
@@ -2914,7 +2914,7 @@ App.SF.Interactions = function () {
return `${time} <br>${choice}`;
};
-App.SF.UnitText = function (input) {
+App.SF.UnitText = function(input) {
"use strict";
const V = State.variables,
S = V.SF.Squad;
diff --git a/src/art/artJS.js b/src/art/artJS.js
index 0f0e3c64883..4f23c968541 100644
--- a/src/art/artJS.js
+++ b/src/art/artJS.js
@@ -17,7 +17,7 @@ UIDisplay (optional, only used by legacy art): icon UI Display for vector art, 1
* @param {number} UIDisplay
* @returns {object} // TODO: I think
*/
-window.SlaveArt = function (artSlave, artSize, UIDisplay) {
+window.SlaveArt = function(artSlave, artSize, UIDisplay) {
const imageChoice = State.variables.imageChoice;
if (artSlave.custom.image !== null && artSlave.custom.image.filename !== "") {
return CustomArt(artSlave, artSize);
@@ -107,7 +107,7 @@ window.ArtControlRendered = function ArtControlRendered(slave, sizePlacement) {
* @param {number} imageSize
* @returns {string}
*/
-window.CustomArt = function (slave, imageSize) {
+window.CustomArt = function(slave, imageSize) {
const fileType = slave.custom.image.format || "png";
const fileName = `'resources/${slave.custom.image.filename}.${fileType}'`;
const displayTypeStart = (fileType === "webm" ? "video loop autoplay" : "img");
@@ -131,7 +131,7 @@ eyes can be nearly anything, it only indicates that the function is being used f
This code's working is described to the user in the Encyclopedia, chapter "Lore", section "Dyes".
*/
-window.extractColor = function (color, eyes) {
+window.extractColor = function(color, eyes) {
/*
these are color names known and used in FreeCities
attributed color names are at the front of the array
@@ -193,20 +193,20 @@ window.extractColor = function (color, eyes) {
let colorNoSpaces = color.replace(/\s+/g, ''); /* remove all spaces from description */
let FCkeys = Array.from(FCnames.keys());
let colorCodes = [
- FCnames.get(FCkeys.find(function (e) {
+ FCnames.get(FCkeys.find(function(e) {
return color.startsWith(e);
})),
- HTMLstandardColors.find(function (e) {
+ HTMLstandardColors.find(function(e) {
return colorNoSpaces.startsWith(e);
}),
- FCnames.get(FCkeys.find(function (e) {
+ FCnames.get(FCkeys.find(function(e) {
return color.includes(e);
})),
- HTMLstandardColors.find(function (e) {
+ HTMLstandardColors.find(function(e) {
return colorNoSpaces.includes(e);
})
];
- colorCode = colorCodes.find(function (e) {
+ colorCode = colorCodes.find(function(e) {
return e;
}); /* picks the first successful guess */
}
@@ -222,7 +222,7 @@ window.extractColor = function (color, eyes) {
return colorCode;
};
-window.clothing2artSuffix = function (v) {
+window.clothing2artSuffix = function(v) {
if (v === "restrictive latex") {
v = "latex";
} /* universal "special case": latex art is actually "restrictive latex" TODO: align name in vector source */
@@ -230,7 +230,7 @@ window.clothing2artSuffix = function (v) {
.replace(/ ?(outfit|clothing) ?/, "") /* remove "outfit" and "clothing" (redundant) */
.replace("-", "") /* remove minus character */
.replace(/\w\S*/g,
- function (txt) {
+ function(txt) {
return txt.charAt(0).toUpperCase() +
txt.substr(1).toLowerCase();
}
@@ -238,7 +238,7 @@ window.clothing2artSuffix = function (v) {
.replace(/\W/g, ""); /* remove remaining whitespace */
};
-window.skinColorCatcher = function (artSlave) {
+window.skinColorCatcher = function(artSlave) {
let colorSlave = {
skinColor: "#e8b693",
areolaColor: "#d76b93",
diff --git a/src/art/vector_revamp/vectorRevampedArtControl.js b/src/art/vector_revamp/vectorRevampedArtControl.js
index 2e4a6aa5f58..6c4c727da02 100644
--- a/src/art/vector_revamp/vectorRevampedArtControl.js
+++ b/src/art/vector_revamp/vectorRevampedArtControl.js
@@ -22,12 +22,12 @@ window.RevampedVectorArt = function(slave) {
T.boob_outfit_art_transform = T.revampedVectorArtControl.boobOutfitArtTransform;
T.art_pussy_tattoo_text = T.revampedVectorArtControl.pubicTattooText;
- T.revampedArtLayers.forEach(function (s) { r += jsInclude(s); });
+ T.revampedArtLayers.forEach(function(s) { r += jsInclude(s); });
return r;
};
-window.getVectorArtRevampedControl = function (artDisplayClass, artSlave, globalShowHighlights, globalShowBodyMods) {
+window.getVectorArtRevampedControl = function(artDisplayClass, artSlave, globalShowHighlights, globalShowBodyMods) {
return new RevampedArtControl(artDisplayClass, artSlave, globalShowHighlights, globalShowBodyMods);
};
@@ -41,7 +41,7 @@ class ArtStyleEntry {
let styleArray = [];
if (keys !== null && keys !== undefined) {
let styleObj = this;
- keys.forEach(function (key) {
+ keys.forEach(function(key) {
if (key !== "name") {
let value = styleObj[key];
styleArray.push(`${key}:${value}`);
@@ -372,7 +372,7 @@ class ArtStyleControl {
let artDisplayClass = this.artDisplayClass;
stylesValues.push(`.${artDisplayClass} ${mainStyle.toString()}`);
- this.styles.forEach(function (style) {
+ this.styles.forEach(function(style) {
stylesValues.push(`.${artDisplayClass} ${style.toString()}`);
});
diff --git a/src/debugging/debugJS.js b/src/debugging/debugJS.js
index d58029a473e..6b8110b7a06 100644
--- a/src/debugging/debugJS.js
+++ b/src/debugging/debugJS.js
@@ -5,7 +5,7 @@ Given an object, this will return an array where for each property of the origin
{variable: property, oldVal: _oldDiff.property, newVal: _newDiff.property}
*/
window.generateDiffArray = function generateDiffArray(obj) {
- let diffArray = Object.keys(obj).map(function (key) {
+ let diffArray = Object.keys(obj).map(function(key) {
return {variable: key, oldVal: State.temporary.oldDiff[key], newVal: State.temporary.newDiff[key]};
});
return diffArray;
@@ -91,7 +91,7 @@ window.findNaN = function findNan() {
/**
* Dumps game save as a readable JSON to the browser for saving in a file
*/
-App.Debug.dumpGameState = function () {
+App.Debug.dumpGameState = function() {
// helper to download a blob
// borrowed from stackexchange
function downloadToFile(content, fileName, contentType) {
@@ -107,7 +107,7 @@ App.Debug.dumpGameState = function () {
// we will replace SugarCube onSave handler
let oldHandler = SugarCube.Config.saves.onSave;
try {
- SugarCube.Config.saves.onSave = function (save) {
+ SugarCube.Config.saves.onSave = function(save) {
if (oldHandler) {
oldHandler(save);
}
diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js
index 90c6006478f..3c43be115f4 100644
--- a/src/endWeek/saChoosesOwnClothes.js
+++ b/src/endWeek/saChoosesOwnClothes.js
@@ -1,4 +1,4 @@
-window.saChoosesOwnClothes = (function () {
+window.saChoosesOwnClothes = (function() {
"use strict";
let V;
let player;
@@ -671,7 +671,7 @@ window.saChoosesOwnClothes = (function () {
}
}
}
-
+
if (V.arcologies[0].FSSubjugationist > 0) {
if (V.arcologies[0].FSSubjugationistRace === "black") {
if (isItemAccessible("a klan robe")) {
diff --git a/src/endWeek/saPorn.js b/src/endWeek/saPorn.js
index 4829c896b36..93ab5aa36c5 100644
--- a/src/endWeek/saPorn.js
+++ b/src/endWeek/saPorn.js
@@ -4,7 +4,7 @@
* @param {App.Entity.SlaveState} slave
* @returns {object}
*/
-window.getHighestPorn = function (slave) {
+window.getHighestPorn = function(slave) {
let max = {value: 0, type: "none"};
if (slave.porn.fame.general > max.value) {
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 73fe75b36e6..2c54aa55d6c 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -574,7 +574,7 @@ window.saServeThePublic = (function saServeThePublic() {
if (totalRelatives(slave) > 0) {
let children = [];
children = V.slaves.filter(
- function (s) {
+ function(s) {
return ((slave.ID === s.father || slave.ID === s.mother || s.ID === slave.father || s.ID === slave.mother || areSisters(slave, s) > 0) && (s.assignment === slave.assignment));
}
);
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index b546d877e42..2cc8bfc1ab9 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -737,7 +737,7 @@ window.saWhore = (function saWhore() {
if (totalRelatives(slave) > 0) {
let children = [];
children = V.slaves.filter(
- function (s) {
+ function(s) {
return ((slave.ID === s.father || slave.ID === s.mother || s.ID === slave.father || s.ID === slave.mother || areSisters(slave, s) > 0) && (s.assignment === slave.assignment));
}
);
diff --git a/src/interaction/main/toychest.js b/src/interaction/main/toychest.js
index f3d3b715ad0..1e82154d406 100644
--- a/src/interaction/main/toychest.js
+++ b/src/interaction/main/toychest.js
@@ -1,5 +1,5 @@
/* OPEN TOYCHEST */
-App.Interact.ToyChest = function (slave) {
+App.Interact.ToyChest = function(slave) {
"use strict";
const V = State.variables;
let r = ``;
diff --git a/src/interaction/main/useGuard.js b/src/interaction/main/useGuard.js
index 5ab5a860bca..1ad32f94395 100644
--- a/src/interaction/main/useGuard.js
+++ b/src/interaction/main/useGuard.js
@@ -1,6 +1,6 @@
/* OPEN USEGUARD */
-App.Interact.UseGuard = function (slave) {
+App.Interact.UseGuard = function(slave) {
"use strict";
let r = ``;
/* eslint-disable */
diff --git a/src/js/PenthouseNaming.js b/src/js/PenthouseNaming.js
index be28f776426..6e85f6ab59a 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 36f89889148..9c6ae8a420e 100644
--- a/src/js/accordianJS.js
+++ b/src/js/accordianJS.js
@@ -14,20 +14,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/colorModeJS.js b/src/js/colorModeJS.js
index bc6d8d7630a..3c495cdb522 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 9c51bb29e29..b97711b59ca 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 e95809e7181..d93384d17d4 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 8596e4991c0..547281a5961 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 85925d8502a..61e8197b727 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,
@@ -547,7 +547,7 @@ window.calculateCosts = (function () {
}
})();
-window.getSlaveCost = function (s) {
+window.getSlaveCost = function(s) {
if (!s) {
return 0;
}
@@ -870,7 +870,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;
}
@@ -881,7 +881,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};
@@ -899,7 +899,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;
@@ -1226,7 +1226,7 @@ window.slaveJobValues = function () {
// Corporation Value
-window.corpValue = function () {
+window.corpValue = function() {
const V = State.variables;
if (V.corpIncorporated === 0) {
return 0;
@@ -1277,7 +1277,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;
@@ -1289,7 +1289,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;
@@ -1297,7 +1297,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;
@@ -1305,7 +1305,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;
@@ -1313,7 +1313,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;
@@ -1321,7 +1321,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;
@@ -1329,7 +1329,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;
@@ -1337,7 +1337,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;
@@ -1347,7 +1347,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);
@@ -1359,7 +1359,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 {
@@ -1398,7 +1398,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;
@@ -1434,7 +1434,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)) {
@@ -1482,7 +1482,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)) {
@@ -1542,10 +1542,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 cc6db609677..bb9d91a2f3f 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 ee51652283a..a040b9f2f9e 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 c4a9f68219b..303fd0e09ae 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;
@@ -84,11 +84,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))
@@ -103,7 +103,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') {
@@ -125,10 +125,10 @@ window.renderFamilyTree = function (slaves, filterID) {
.on('end', dragended));
node.append('circle')
- .attr('r', function (d) {
+ .attr('r', function(d) {
return d.r;
})
- .attr('stroke', function (d) {
+ .attr('stroke', function(d) {
if (d.ID === filterID) {
return '#ffff20';
} else {
@@ -139,7 +139,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) {
@@ -161,11 +161,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) {
@@ -182,15 +182,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)
@@ -218,7 +218,7 @@ window.renderFamilyTree = function (slaves, filterID) {
}
};
-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 = {
@@ -533,7 +533,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;
@@ -695,7 +695,7 @@ window.updateFamilyTree = function (activeSlave = lastActiveSlave, slaves = last
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 1cac0324215..d92bffb1bb4 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 69b6d51983d..2351c02c0bc 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 41930df40e1..f953280591d 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?
@@ -1089,7 +1089,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 365b96df1c0..66dd60d6f0e 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/heroCreator.js b/src/js/heroCreator.js
index 1338cb7826f..1200dc10bd3 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 a94668cbd41..a01fbbe2422 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 322252ede7a..235a44b457e 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 660ebc3bc2c..f9417498ebf 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.
@@ -410,7 +410,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;
@@ -498,21 +498,21 @@ 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;
});
}
@@ -521,7 +521,7 @@ 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;
@@ -558,6 +558,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 bceb15c6a9a..2f2df1d7ca5 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 d1f94be6636..79e936e38a4 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 428d951d86a..034984c6069 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);
};
@@ -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);
};
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index dc6328a227d..9e1f6926e6c 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -5,7 +5,7 @@
// wrapped in a closure so as not to pollute the global namespace
// the widgets are generic enough to be reusable; if similar user interfaces are ported to JS, we could move the classes to the global scope
-window.rulesAssistantOptions = (function () {
+window.rulesAssistantOptions = (function() {
"use strict";
let V, current_rule;
@@ -507,7 +507,7 @@ window.rulesAssistantOptions = (function () {
constructor(root) {
super("Current rule", V.defaultRules.map(i => [i.name, i]));
this.setValue(current_rule.name);
- this.onchange = function (rule) {
+ this.onchange = function(rule) {
V.currentRule = rule.ID;
reload(root);
};
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index 613d51b520a..6be658d7a68 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -1,5 +1,5 @@
/* eslint-disable camelcase */
-window.rulesAutosurgery = (function () {
+window.rulesAutosurgery = (function() {
"use strict";
let V;
let r;
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 2ade7da5be5..811a4a3f0b8 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
@@ -1846,7 +1846,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 9f5d50fc340..b08753a9926 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 5e3f282e337..d09a60f2585 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 e5b8a222e73..cebb01edecd 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 4302fdafec6..573fac9a376 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/utilJS.js b/src/js/utilJS.js
index 0a3953a0a93..98c4b95c9f1 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -68,7 +68,7 @@ window.Height = (function() {
* @param {any} [conf]
* @returns {object}
*/
- const _config = function (conf) {
+ const _config = function(conf) {
if (_.isUndefined(conf)) {
return {
limitMult: [minMult, maxMult],
@@ -550,7 +550,7 @@ window.Height = (function() {
* @param {undefined} [def]
* @returns {string} //I think
*/
- const nationalityMeanHeight = function (table, nationality, race, def) {
+ const nationalityMeanHeight = function(table, nationality, race, def) {
return table[`${nationality}.${race}`] || table[nationality] || table[`.${race}`] || table[""] || def;
};
@@ -561,7 +561,7 @@ window.Height = (function() {
* @param {number} s
* @returns {number}
*/
- const skewedGaussian = function (s) {
+ const skewedGaussian = function(s) {
let randoms = gaussianPair();
if (s === 0) {
// Don't bother, return an unskewed normal distribution
@@ -589,7 +589,7 @@ window.Height = (function() {
* @param {number} mean
* @returns {number}
*/
- const heightGenerator = function (mean) {
+ const heightGenerator = function(mean) {
let result = mean * (1 + multGenerator() * spread);
while (result < minHeight || result > maxHeight) {
result = mean * (1 + multGenerator() * spread);
@@ -604,7 +604,7 @@ window.Height = (function() {
* @param {string} genes
* @returns {number}
*/
- const applyAge = function (height, age, genes) {
+ const applyAge = function(height, age, genes) {
if (!_.isFinite(age) || age < 2 || age >= 20) {
return height;
}
@@ -653,7 +653,7 @@ window.Height = (function() {
* @param {number} age
* @returns {number}
*/
- const _meanHeight = function (nationality, race, genes, age) {
+ const _meanHeight = function(nationality, race, genes, age) {
if (_.isObject(nationality)) {
// We got called with a single slave as the argument
return _meanHeight(nationality.nationality, nationality.race, nationality.genes, nationality.physicalAge + nationality.birthWeek / 52.0);
@@ -703,7 +703,7 @@ window.Height = (function() {
* @param {number} age
* @returns {Function} // I think
*/
- const _randomHeight = function (nationality, race, genes, age) {
+ const _randomHeight = function(nationality, race, genes, age) {
const mean = _meanHeight(nationality, race, genes, age);
// If we got called with a slave object and options, temporarily modify
// our configuration.
@@ -723,7 +723,7 @@ window.Height = (function() {
* @param {string} genes
* @returns {number}
*/
- const _forAge = function (height, age, genes) {
+ const _forAge = function(height, age, genes) {
if (_.isObject(age)) {
// We got called with a slave as a second argument
return applyAge(height, age.physicalAge + age.birthWeek / 52.0, age.genes);
@@ -790,7 +790,7 @@ window.Intelligence = (function() {
* @param {object} [conf]
* @returns {object}
*/
- const _config = function (conf) {
+ const _config = function(conf) {
if (_.isUndefined(conf)) {
return {
mean: mean,
@@ -833,7 +833,7 @@ window.Intelligence = (function() {
* @param {number} s
* @returns {number}
*/
- const skewedGaussian = function (s) {
+ const skewedGaussian = function(s) {
let randoms = gaussianPair();
if (s === 0) {
// Don't bother, return an unskewed normal distribution
@@ -845,7 +845,7 @@ window.Intelligence = (function() {
};
// Intelligence multiplier generator; skewed gaussian according to global parameters
- const multGenerator = function () {
+ const multGenerator = function() {
let result = skewedGaussian(skew);
while (result < minMult || result > maxMult) {
result = skewedGaussian(skew);
@@ -854,7 +854,7 @@ window.Intelligence = (function() {
};
// Helper method: Transform the values from multGenerator to have the appropriate mean and standard deviation.
- const intelligenceGenerator = function () {
+ const intelligenceGenerator = function() {
let result = multGenerator() * spread + mean;
while (result < minIntelligence || result > maxIntelligence) {
result = multGenerator() * spread + mean;
@@ -867,7 +867,7 @@ window.Intelligence = (function() {
* @param {{ mean: number; limitMult: number[]; limitIntelligence: number[]; skew: number; spread: number; } | { limitMult: number[]; limitIntelligence: number[]; skew: number; spread: number; mean?: undefined; }} settings
* @returns {number}
*/
- const _randomIntelligence = function (settings) {
+ const _randomIntelligence = function(settings) {
if (settings) {
const currentConfig = _config();
_config(settings);
@@ -927,23 +927,23 @@ As a categorizer
<<print $cats.muscleCat.cat(_Slave.muscles)>>
*/
-window.Categorizer = function () {
+window.Categorizer = function() {
this.cats = Array.prototype.slice.call(arguments)
- .filter(function (e, i, a) {
+ .filter(function(e, i, a) {
return e instanceof Array && e.length === 2 && typeof e[0] === "number" && !isNaN(e[0]) &&
- a.findIndex(function (val) {
+ a.findIndex(function(val) {
return e[0] === val[0];
}) === i; /* uniqueness test */
})
- .sort(function (a, b) {
+ .sort(function(a, b) {
return b[0] - a[0]; /* reverse sort */
});
};
-window.Categorizer.prototype.cat = function (val, def) {
+window.Categorizer.prototype.cat = function(val, def) {
let result = def;
if (typeof val === "number" && !isNaN(val)) {
- let foundCat = this.cats.find(function (e) {
+ let foundCat = this.cats.find(function(e) {
return val >= e[0];
});
if (foundCat) {
@@ -963,7 +963,7 @@ window.Categorizer.prototype.cat = function (val, def) {
* @param {number} x
* @returns {string}
*/
-window.num = function (x) {
+window.num = function(x) {
const V = State.variables;
const max = V.showNumbersMax;
@@ -1107,7 +1107,7 @@ window.num = function (x) {
* @param {number} s
* @returns {string}
*/
-window.cashFormat = function (s) {
+window.cashFormat = function(s) {
if (!s) {
s = 0;
} else {
@@ -1124,7 +1124,7 @@ window.cashFormat = function (s) {
* @param {number} s
* @returns {string}
*/
-window.repFormat = function (s) {
+window.repFormat = function(s) {
const V = State.variables;
/* if (!s) {
s = 0;
@@ -1171,7 +1171,7 @@ window.repFormat = function (s) {
* @param {number} s
* @returns {string}
*/
-window.massFormat = function (s) {
+window.massFormat = function(s) {
if (!s) {
s = 0;
}
@@ -1192,7 +1192,7 @@ window.massFormat = function (s) {
* @param {string} title
* @returns {string}
*/
-window.budgetLine = function (category, title) {
+window.budgetLine = function(category, title) {
let income;
let expenses;
let profits;
@@ -1247,7 +1247,7 @@ window.budgetLine = function (category, title) {
* @param {number} n
* @returns {boolean}
*/
-window.isFloat = function (n) {
+window.isFloat = function(n) {
return Number.isFinite(n) && Math.floor(n) !== n;
};
@@ -1257,7 +1257,7 @@ window.isFloat = function (n) {
* @param {number} max
* @returns {number}
*/
-window.jsRandom = function (min, max) {
+window.jsRandom = function(min, max) {
return Math.floor(Math.random() * (max - min + 1) + min);
};
@@ -1266,7 +1266,7 @@ window.jsRandom = function (min, max) {
* @param {number} count
* @returns {number[]}
*/
-window.jsRandomMany = function (arr, count) {
+window.jsRandomMany = function(arr, count) {
let result = [];
let _tmp = arr.slice();
for (let i = 0; i < count; i++) {
@@ -1282,7 +1282,7 @@ window.jsRandomMany = function (arr, count) {
* @param {...(number|string|number[]|string[])} otherChoices
* @returns {number|string|number[]|string[]|undefined}
*/
-window.jsEither = function (choices, ...otherChoices) {
+window.jsEither = function(choices, ...otherChoices) {
if (otherChoices.length === 0 && Array.isArray(choices)) {
return choices[Math.floor(Math.random() * choices.length)];
}
@@ -1386,7 +1386,7 @@ window.between = function between(a, low, high) {
// generate a random, almost unique ID that is compliant (possibly) with RFC 4122
window.generateNewID = function generateNewID() {
let date = Date.now(); // high-precision timer
- let uuid = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
+ let uuid = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
let r = (date + Math.random() * 16) % 16 | 0;
date = Math.floor(date / 16);
return (c === "x" ? r : (r & 0x3 | 0x8)).toString(16);
@@ -1421,7 +1421,7 @@ window.html5passage = function html5passage(passageFunction) {
* @param {string} passageTitle
* @returns {string}
*/
-window.jsInclude = function (passageTitle) {
+window.jsInclude = function(passageTitle) {
if (Story.has(passageTitle)) {
return Story.get(passageTitle).processText();
} else {
@@ -1441,7 +1441,7 @@ window.capFirstChar = function capFirstChar(string) {
* @param {string} word
* @returns {string}
*/
-window.addA = function (word) {
+window.addA = function(word) {
let vocal = ['a', 'e', 'i', 'o', 'u', 'A', 'E', 'I', 'O', 'U'];
if (vocal.includes(word.charAt(0))) {
return `an ${word}`;
@@ -1545,7 +1545,7 @@ window.cmToInchString = function(s) {
* @param {number} s
* @returns {string}
*/
-window.cmToFootInchString = function (s) {
+window.cmToFootInchString = function(s) {
if (Math.round(s / 2.54) < 12) {
return cmToInchString(s);
}
@@ -1557,7 +1557,7 @@ window.cmToFootInchString = function (s) {
* @param {number} s
* @returns {string}
*/
-window.dickToInchString = function (s) {
+window.dickToInchString = function(s) {
return cmToInchString(dickToCM(s));
};
@@ -1566,7 +1566,7 @@ window.dickToInchString = function (s) {
* @param {number} s
* @returns {number}
*/
-window.dickToCM = function (s) {
+window.dickToCM = function(s) {
if (s < 9) {
return s * 5;
} else if (s === 9) {
@@ -1576,12 +1576,12 @@ window.dickToCM = function (s) {
};
// takes a ball value e.g. $activeSlave.balls, returns a string in the format 3 inches
-window.ballsToInchString = function (s) {
+window.ballsToInchString = function(s) {
return cmToInchString(ballsToCM(s));
};
// takes a ball value e.g. $activeSlave.balls, returns an int of the ball size in cm
-window.ballsToCM = function (s) {
+window.ballsToCM = function(s) {
if (s < 2) {
return 0;
}
@@ -1589,7 +1589,7 @@ window.ballsToCM = function (s) {
};
// takes a dick value e.g. $activeSlave.dick, returns a string in the format of either `20cm (8 inches)`, `8 inches`, or `20cm`
-window.dickToEitherUnit = function (s) {
+window.dickToEitherUnit = function(s) {
if (State.variables.showInches === 1) {
return `${dickToCM(s)}cm (${dickToInchString(s)})`;
}
@@ -1600,7 +1600,7 @@ window.dickToEitherUnit = function (s) {
};
// takes a ball value e.g. $activeSlave.balls, returns a string in the format of either `20cm (8 inches)`, `8 inches`, or `20cm`
-window.ballsToEitherUnit = function (s) {
+window.ballsToEitherUnit = function(s) {
if (State.variables.showInches === 1) {
return `${ballsToCM(s)}cm (${ballsToInchString(s)})`;
}
@@ -1611,7 +1611,7 @@ window.ballsToEitherUnit = function (s) {
};
// takes an int in centimeters e.g. $activeSlave.height, returns a string in the format of either `200cm (6'7")`, `6'7"`, or `200cm`
-window.heightToEitherUnit = function (s) {
+window.heightToEitherUnit = function(s) {
if (State.variables.showInches === 1) {
return `${s}cm (${cmToFootInchString(s)})`;
}
@@ -1622,7 +1622,7 @@ window.heightToEitherUnit = function (s) {
};
// takes an int in centimeters e.g. $activeSlave.hLength, returns a string in the format of either `30cm (12 inches)`, `12 inches`, or `30cm`
-window.lengthToEitherUnit = function (s) {
+window.lengthToEitherUnit = function(s) {
if (State.variables.showInches === 1) {
return `${s}cm (${cmToInchString(s)})`;
}
@@ -1674,7 +1674,7 @@ window.induceLactation = function induceLactation(slave) {
return r;
};
-window.ResearchLabStockPile = function () {
+window.ResearchLabStockPile = function() {
const V = State.variables;
return `__Prosthetics__
Prosthetics interfaces: ${num(V.prosthetics.interfaceP1.amount + V.prosthetics.interfaceP2.amount)}
@@ -1779,7 +1779,7 @@ window.originPronounReplace = function(slave) {
}
};
-window.HackingSkillMultiplier = function () {
+window.HackingSkillMultiplier = function() {
const V = State.variables;
if (V.PC.hacking <= -100) {
return 1.5;
@@ -1808,7 +1808,7 @@ window.HackingSkillMultiplier = function () {
}
};
-App.UI.tabbar = function () {
+App.UI.tabbar = function() {
return {
openTab: openTab,
tabButton: tabButton,
@@ -1873,7 +1873,7 @@ App.UI.tabbar = function () {
* @param {string} text
* @returns {string}
*/
-App.Utils.escapeHtml = function (text) {
+App.Utils.escapeHtml = function(text) {
const map = {
'&': '&',
'<': '<',
@@ -1953,7 +1953,7 @@ App.UI.htag = function(text, attributes, tag = 'div') {
return `<${tag} ${attributes}>${payload}</${tag}>`;
};
-window.SkillIncrease = (function () {
+window.SkillIncrease = (function() {
return {
Oral: OralSkillIncrease,
Vaginal: VaginalSkillIncrease,
@@ -2121,7 +2121,7 @@ window.SkillIncrease = (function () {
}
})();
-window.upgradeMultiplierArcology = function () {
+window.upgradeMultiplierArcology = function() {
const V = State.variables;
if (V.PC.career === "engineer" || (V.arcologies[0].FSRestartDecoration >= 100 && V.eugenicsFullControl === 0)) {
return 0.6;
@@ -2152,7 +2152,7 @@ window.upgradeMultiplierArcology = function () {
}
};
-window.upgradeMultiplierMedicine = function () {
+window.upgradeMultiplierMedicine = function() {
const V = State.variables;
if (V.PC.career === "medicine" || (V.arcologies[0].FSRestartDecoration >= 100 && V.eugenicsFullControl === 0)) {
return 0.6;
@@ -2183,7 +2183,7 @@ window.upgradeMultiplierMedicine = function () {
}
};
-window.upgradeMultiplierTrade = function () {
+window.upgradeMultiplierTrade = function() {
const V = State.variables;
if (V.PC.trading <= -100) {
return 1.5;
@@ -2212,7 +2212,7 @@ window.upgradeMultiplierTrade = function () {
}
};
-window.jsNdef = function (input) {
+window.jsNdef = function(input) {
if (typeof input === "undefined") {
return true;
} else {
@@ -2220,7 +2220,7 @@ window.jsNdef = function (input) {
}
};
-window.jsDef = function (input) {
+window.jsDef = function(input) {
if (typeof input !== "undefined") {
return true;
} else {
@@ -2249,7 +2249,7 @@ window.randomCareer = function(slave) {
/**
* @param {App.Entity.SlaveState} slave
*/
-window.resyncSlaveToAge = function (slave) {
+window.resyncSlaveToAge = function(slave) {
slave.height = Height.random(slave);
slave.pubertyXX = slave.actualAge < slave.pubertyAgeXX ? 0 : 1;
slave.pubertyXY = slave.actualAge < slave.pubertyAgeXY ? 0 : 1;
@@ -2295,7 +2295,7 @@ window.resyncSlaveToAge = function (slave) {
* @param {number} [increase=1]
* @returns {string}
*/
-window.IncreasePCSkills = function (input, increase = 1) {
+window.IncreasePCSkills = function(input, increase = 1) {
const player = State.variables.PC;
const oldSkill = player[input];
player[input] += increase;
@@ -2322,7 +2322,7 @@ window.IncreasePCSkills = function (input, increase = 1) {
* @param {string} raceName
* @returns {string}
*/
-window.randomRaceSkin = function (raceName) {
+window.randomRaceSkin = function(raceName) {
let skin;
switch (raceName) {
case "asian":
@@ -2359,7 +2359,7 @@ window.randomRaceSkin = function (raceName) {
* @param {string} raceName
* @returns {string}
*/
-window.randomRaceEye = function (raceName) {
+window.randomRaceEye = function(raceName) {
let eye;
switch (raceName) {
case "asian":
@@ -2392,7 +2392,7 @@ window.randomRaceEye = function (raceName) {
* @param {string} raceName
* @returns {string}
*/
-window.randomRaceHair = function (raceName) {
+window.randomRaceHair = function(raceName) {
let hair;
switch (raceName) {
case "asian":
@@ -2423,7 +2423,7 @@ window.randomRaceHair = function (raceName) {
* @param {string} skinTone
* @returns {number}
*/
-window.skinToneLevel = function (skinTone) {
+window.skinToneLevel = function(skinTone) {
if (!setup.naturalSkins.includes(skinTone)) {
return undefined;
}
@@ -2464,7 +2464,7 @@ window.skinToneLevel = function (skinTone) {
* @returns {string}
*/
-window.changeSkinTone = function (skin, value) {
+window.changeSkinTone = function(skin, value) {
if (!setup.naturalSkins.includes(skin)) {
return skin;
}
diff --git a/src/js/walkPastJS.js b/src/js/walkPastJS.js
index 87aeca46b3e..3a0d06b51e2 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;
diff --git a/src/js/wombJS.js b/src/js/wombJS.js
index 0fc8e245981..ea8ae151fcb 100644
--- a/src/js/wombJS.js
+++ b/src/js/wombJS.js
@@ -24,7 +24,7 @@ $slave.bellyPreg = WombGetWolume($slave) - return double, with current womb volu
*/
// Init womb system.
-window.WombInit = function (actor) {
+window.WombInit = function(actor) {
let i;
if (!Array.isArray(actor.womb)) {
@@ -52,7 +52,7 @@ window.WombInit = function (actor) {
// backward compatibility setup. Fully accurate for normal pregnancy only.
if (actor.womb.length > 0 && actor.womb[0].genetics === undefined && actor.eggType === "human") {
i = 0;
- actor.womb.forEach(function (ft) {
+ actor.womb.forEach(function(ft) {
ft.genetics = generateGenetics(actor, actor.pregSource, i);
i++;
});
@@ -79,7 +79,7 @@ window.WombInit = function (actor) {
}
};
-window.WombImpregnate = function (actor, fCount, fatherID, age, surrogate) {
+window.WombImpregnate = function(actor, fCount, fatherID, age, surrogate) {
let i;
let tf;
for (i = 0; i < fCount; i++) {
@@ -119,11 +119,11 @@ window.WombImpregnate = function (actor, fCount, fatherID, age, surrogate) {
MissingParentIDCorrection(actor);
};
-window.WombSurrogate = function (actor, fCount, mother, fatherID, age) {
+window.WombSurrogate = function(actor, fCount, mother, fatherID, age) {
WombImpregnate(actor, fCount, fatherID, age, mother);
};
-window.WombImpregnateClone = function (actor, fCount, mother, motherOriginal, age) {
+window.WombImpregnateClone = function(actor, fCount, mother, motherOriginal, age) {
let i;
let tf;
for (i = 0; i < fCount; i++) {
@@ -187,7 +187,7 @@ window.WombImpregnateClone = function (actor, fCount, mother, motherOriginal, ag
};
// Should be used to set biological age for fetus (ageToAdd), AND chronological (realAgeToAdd). Speed up or slow down gestation drugs should affect ONLY biological.
-window.WombProgress = function (actor, ageToAdd, realAgeToAdd = ageToAdd) {
+window.WombProgress = function(actor, ageToAdd, realAgeToAdd = ageToAdd) {
ageToAdd = Math.ceil(ageToAdd * 10) / 10;
realAgeToAdd = Math.ceil(realAgeToAdd * 10) / 10;
try {
@@ -201,7 +201,7 @@ window.WombProgress = function (actor, ageToAdd, realAgeToAdd = ageToAdd) {
}
};
-window.WombBirth = function (actor, readyAge) {
+window.WombBirth = function(actor, readyAge) {
try {
WombSort(actor); // For normal processing fetuses that more old should be first. Now - they are.
} catch (err) {
@@ -220,11 +220,11 @@ window.WombBirth = function (actor, readyAge) {
return birthed;
};
-window.WombFlush = function (actor) {
+window.WombFlush = function(actor) {
actor.womb = [];
};
-window.WombBirthReady = function (actor, readyAge) {
+window.WombBirthReady = function(actor, readyAge) {
let readyCnt = 0;
try {
readyCnt += actor.womb.filter(ft => ft.age >= readyAge).length;
@@ -373,7 +373,7 @@ window.WombGetVolume = function(actor) { // most legacy code from pregJS.tw with
}
};
-window.WombUpdatePregVars = function (actor) {
+window.WombUpdatePregVars = function(actor) {
WombSort(actor);
if (actor.womb.length > 0) {
if (actor.preg > 0 && actor.womb[0].age > 0) {
@@ -384,7 +384,7 @@ window.WombUpdatePregVars = function (actor) {
}
};
-window.WombMinPreg = function (actor) {
+window.WombMinPreg = function(actor) {
WombSort(actor);
if (actor.womb.length > 0) {
return actor.womb[actor.womb.length - 1].age;
@@ -393,7 +393,7 @@ window.WombMinPreg = function (actor) {
}
};
-window.WombMaxPreg = function (actor) {
+window.WombMaxPreg = function(actor) {
WombSort(actor);
if (actor.womb.length > 0) {
return actor.womb[0].age;
@@ -402,7 +402,7 @@ window.WombMaxPreg = function (actor) {
}
};
-window.WombNormalizePreg = function (actor) {
+window.WombNormalizePreg = function(actor) {
// console.log("New actor: " + actor.slaveName + " ===============" + actor.name);
WombInit(actor);
@@ -470,7 +470,7 @@ window.WombNormalizePreg = function (actor) {
actor.bellyPreg = WombGetVolume(actor);
};
-window.WombZeroID = function (actor, id) {
+window.WombZeroID = function(actor, id) {
WombInit(actor);
actor.womb
.filter(ft => ft.fatherID === id)
@@ -478,7 +478,7 @@ window.WombZeroID = function (actor, id) {
WombNormalizePreg(actor);
};
-window.WombChangeID = function (actor, fromID, toID) {
+window.WombChangeID = function(actor, fromID, toID) {
WombInit(actor);
actor.womb
.filter(ft => ft.fatherID === fromID)
@@ -486,7 +486,7 @@ window.WombChangeID = function (actor, fromID, toID) {
WombNormalizePreg(actor);
};
-window.WombChangeGeneID = function (actor, fromID, toID) {
+window.WombChangeGeneID = function(actor, fromID, toID) {
WombInit(actor);
actor.womb
.filter(ft => ft.genetics.father === fromID)
@@ -498,17 +498,17 @@ window.WombChangeGeneID = function (actor, fromID, toID) {
};
/* Sorts the womb object by age with oldest and thus soonest to be born, first. This will be needed in the future once individual fertilization is a possibility.*/
-window.WombSort = function (actor) {
+window.WombSort = function(actor) {
actor.womb.sort((a, b) => {
return b.age - a.age;
});
};
// now function work with chance. Literary we give it "one from X" as chance.
-window.fetalSplit = function (actor, chance) {
+window.fetalSplit = function(actor, chance) {
let nft;
- actor.womb.forEach(function (s) {
+ actor.womb.forEach(function(s) {
if ((jsRandom(1, chance) >= chance) && s.splitted !== 1) {
nft = {};
nft.age = s.age;
@@ -535,13 +535,13 @@ window.fetalSplit = function (actor, chance) {
};
// safe alternative to .womb.length.
-window.WombFetusCount = function (actor) {
+window.WombFetusCount = function(actor) {
WombInit(actor);
return actor.womb.length;
};
// give reference to fetus object, but not remove fetus, use for manipulation in the womb.
-window.WombGetFetus = function (actor, fetusNum) {
+window.WombGetFetus = function(actor, fetusNum) {
WombInit(actor);
if (actor.womb.length >= fetusNum) {
return actor.womb[fetusNum];
@@ -551,7 +551,7 @@ window.WombGetFetus = function (actor, fetusNum) {
};
// give reference to fetus object, and remove it form the womb.
-window.WombRemoveFetus = function (actor, fetusNum) {
+window.WombRemoveFetus = function(actor, fetusNum) {
WombInit(actor);
if (actor.womb.length >= fetusNum) {
let ft = actor.womb[fetusNum];
@@ -565,26 +565,26 @@ window.WombRemoveFetus = function (actor, fetusNum) {
};
/* to add fetus object in the womb. Be warned - you can add one single fetus to many wombs, or even add it many times to one womb. It will not show error, but behavior becomes strange, as fetus object will be the same - it's reference, not full copies. If this is not desired - use clone() on fetus before adding.*/
-window.WombAddFetus = function (actor, fetus) {
+window.WombAddFetus = function(actor, fetus) {
WombInit(actor);
actor.womb.push(fetus);
WombSort(actor);
};
// change property for all fetuses. Like fetus.age = X.
-window.WombChangeFetus = function (actor, propName, newValue) {
+window.WombChangeFetus = function(actor, propName, newValue) {
WombInit(actor);
actor.womb.forEach(ft => ft[propName] = newValue);
};
// change genetic property of all fetuses. Like fetus.genetic.intelligence = X
-window.WombChangeGene = function (actor, geneName, newValue) {
+window.WombChangeGene = function(actor, geneName, newValue) {
WombInit(actor);
actor.womb.forEach(ft => ft.genetics[geneName] = newValue);
};
// change genetic property of all fetuses based on race
-window.WombFatherRace = function (actor, raceName) {
+window.WombFatherRace = function(actor, raceName) {
let skinColor = randomRaceSkin(raceName);
let eyeColor = randomRaceEye(raceName);
let hairColor = randomRaceHair(raceName);
@@ -595,7 +595,7 @@ window.WombFatherRace = function (actor, raceName) {
};
// replaces untraceable fatherIDs with missingParentID. Required for concurrent pregnancy to differentiate between siblings.
-window.MissingParentIDCorrection = function (actor) {
+window.MissingParentIDCorrection = function(actor) {
WombInit(actor);
actor.womb
.filter(ft => (ft.genetics.father === 0 || (ft.genetics.father < -1 && ft.genetics.father >= -20 && ft.genetics.father !== -3)))
@@ -603,7 +603,7 @@ window.MissingParentIDCorrection = function (actor) {
State.variables.missingParentID--;
};
-window.WombCleanYYFetuses = function (actor) {
+window.WombCleanYYFetuses = function(actor) {
let reserved = [];
let i = actor.womb.length - 1;
@@ -624,7 +624,7 @@ window.WombCleanYYFetuses = function (actor) {
return reserved;
};
-window.FetusGlobalReserveCount = function (reserveType) {
+window.FetusGlobalReserveCount = function(reserveType) {
let cnt = 0;
let SV = State.variables;
@@ -649,9 +649,9 @@ window.FetusGlobalReserveCount = function (reserveType) {
return cnt;
};
-window.WombSetGenericReserve = function (actor, type, count) {
+window.WombSetGenericReserve = function(actor, type, count) {
// console.log ("actor: " + actor + " type: " + type + " typeof: " + typeof type + " count: " + count);
- actor.womb.forEach(function (ft) {
+ actor.womb.forEach(function(ft) {
// console.log (" type: " + ft.reserve + " typeof: " + typeof ft.reserve);
if ((ft.reserve === "" || ft.reserve === type) && count > 0) {
// console.log ("!trigger");
@@ -661,14 +661,14 @@ window.WombSetGenericReserve = function (actor, type, count) {
});
};
-window.WombAddToGenericReserve = function (actor, type, count) {
+window.WombAddToGenericReserve = function(actor, type, count) {
WombSetGenericReserve(actor, type, (WombReserveCount(actor, type) + count));
};
-window.WombChangeReserveType = function (actor, oldType, newType) {
+window.WombChangeReserveType = function(actor, oldType, newType) {
let count = 0;
- actor.womb.forEach(function (ft) {
+ actor.womb.forEach(function(ft) {
if (ft.reserve === oldType) {
ft.reserve = newType;
count++;
@@ -678,8 +678,8 @@ window.WombChangeReserveType = function (actor, oldType, newType) {
return count;
};
-window.WombCleanGenericReserve = function (actor, type, count) {
- actor.womb.forEach(function (ft) {
+window.WombCleanGenericReserve = function(actor, type, count) {
+ actor.womb.forEach(function(ft) {
if (ft.reserve === type && count > 0) {
ft.reserve = "";
count--;
@@ -687,10 +687,10 @@ window.WombCleanGenericReserve = function (actor, type, count) {
});
};
-window.WombReserveCount = function (actor, type) {
+window.WombReserveCount = function(actor, type) {
let cnt = 0;
- actor.womb.forEach(function (ft) {
+ actor.womb.forEach(function(ft) {
if (ft.reserve === type) /* the lazy equality will catch "" case */ {
cnt++;
}
@@ -699,10 +699,10 @@ window.WombReserveCount = function (actor, type) {
return cnt;
};
-window.WombGetReservedFetuses = function (actor, type) {
+window.WombGetReservedFetuses = function(actor, type) {
let reserved = [];
- actor.womb.forEach(function (ft) {
+ actor.womb.forEach(function(ft) {
if (ft.reserve === type) {
reserved.push(ft);
}
@@ -711,7 +711,7 @@ window.WombGetReservedFetuses = function (actor, type) {
return reserved;
};
-window.WombRemoveReservedFetuses = function (actor, type) {
+window.WombRemoveReservedFetuses = function(actor, type) {
let reserved = [];
let i = actor.womb.length - 1;
@@ -731,8 +731,8 @@ window.WombRemoveReservedFetuses = function (actor, type) {
return reserved;
};
-window.WombCleanAllReserve = function (actor) {
- actor.womb.forEach(function (ft) {
+window.WombCleanAllReserve = function(actor) {
+ actor.womb.forEach(function(ft) {
ft.reserve = "";
});
};
@@ -753,7 +753,7 @@ She is _wd.litters[0] weeks pregnant with her first set of _wd.countLitter[0] ch
In summary she carry _wd.litters.length separate sets of children. Her most progressed fetus of second pregnancy is already reached _wd.litterData[1][0].age biological week of gestation.
---
*/
-window.WombGetLittersData = function (actor) {
+window.WombGetLittersData = function(actor) {
let data = {};
let unicLiters = []; // array with realAges of separate litters.
let countLitter = [];
@@ -768,7 +768,7 @@ window.WombGetLittersData = function (actor) {
});
// now we should find and store separate litters data (count of fetuses):
- unicLiters.forEach(function (litter) {
+ unicLiters.forEach(function(litter) {
tmp = actor.womb.filter(ft => Math.ceil(ft.realAge) === litter);
countLitter.push(tmp.length);
litterData.push(tmp);
@@ -781,7 +781,7 @@ window.WombGetLittersData = function (actor) {
return data;
};
-window.BCReserveInit = function () {
+window.BCReserveInit = function() {
let SV = State.variables;
SV.slaves.forEach(function(slave) {
diff --git a/src/neighbor/arcologyOpinion.js b/src/neighbor/arcologyOpinion.js
index 5ff8bd9d38e..b5cbc5905bf 100644
--- a/src/neighbor/arcologyOpinion.js
+++ b/src/neighbor/arcologyOpinion.js
@@ -1,4 +1,4 @@
-window.arcologyOpinion = function () {
+window.arcologyOpinion = function() {
const V = State.variables;
if (typeof V.activeArcology.FSNull === "undefined") { V.activeArcology.FSNull = "unset"; }
--
GitLab