diff --git a/src/endWeek/saNanny.js b/src/endWeek/saNanny.js
index 6f7227f046fb5f09859dbf29f1f01c3ef548dea5..247c482d7f7a73d29b74fef0f0d629bdcf5eb271 100644
--- a/src/endWeek/saNanny.js
+++ b/src/endWeek/saNanny.js
@@ -5,7 +5,7 @@
window.saNanny = function saNanny(slave) {
"use strict";
const V = State.variables;
- /* eslint-disable */
+ /* eslint-disable no-unused*/
const pronouns = getPronouns(slave);
const he = pronouns.pronoun;
const him = pronouns.object;
diff --git a/src/endWeek/saRest.js b/src/endWeek/saRest.js
index 009befc9e6b397d3426d5f13dc73ae0136b75b50..61fab787504819fb54af457c30829038c277e640 100644
--- a/src/endWeek/saRest.js
+++ b/src/endWeek/saRest.js
@@ -4,7 +4,7 @@
*/
window.saRest = function saRest(slave) {
const V = State.variables;
- /* eslint-disable */
+ /* eslint-disable no-unused*/
const pronouns = getPronouns(slave);
const he = pronouns.pronoun;
const him = pronouns.object;
diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js
index 7125a95b18c2258d193979513773d0a1421410e8..c40010c37fe4ba97e3ddd1d6a04b98db27cba6dc 100644
--- a/src/endWeek/saServant.js
+++ b/src/endWeek/saServant.js
@@ -4,7 +4,7 @@
*/
window.saServant = function saServant(slave) {
const V = State.variables;
- /* eslint-disable */
+ /* eslint-disable no-unused*/
const pronouns = getPronouns(slave);
const he = pronouns.pronoun;
const him = pronouns.object;
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 2c54aa55d6c0a8f9718dcac2eabec0e9da5dadfb..26d7436a7420d0b897e8c97ef14a20d454f21b84 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -29,7 +29,8 @@ window.saServeThePublic = (function saServeThePublic() {
r = ` `;
pronouns = getPronouns(slave);
he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, girl = pronouns.noun;
- He = capFirstChar(he), His = capFirstChar(his);
+ He = capFirstChar(he);
+ His = capFirstChar(his);
girl === "girl" ? loli = "loli" : loli = "shota";
gatherStatistics(slave);
@@ -769,16 +770,7 @@ window.saServeThePublic = (function saServeThePublic() {
r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
}
} else if (arcology.FSPhysicalIdealist !== "unset") { // no muscle malus for muscle loving societies
- if (arcology.FSPhysicalIdealistStrongFat === 1 && slave.weight <= 30) { // reduced weight malus for fat loving societies
- if (arcology.FSSlimnessEnthusiast > 20) {
- r += ` The public enjoys ${his} fashionably sleek little body.`;
- } else {
- r += ` The public enjoys ${his} sleek, girlish figure.`;
- }
- if (canTalk(slave) && slave.voice > 2) {
- r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
- }
- } else if (slave.weight <= 10) {
+ if ((arcology.FSPhysicalIdealistStrongFat === 1 && slave.weight <= 30) || slave.weight <= 10) { // reduced weight malus for fat loving societies
if (arcology.FSSlimnessEnthusiast > 20) {
r += ` The public enjoys ${his} fashionably sleek little body.`;
} else {
@@ -789,16 +781,7 @@ window.saServeThePublic = (function saServeThePublic() {
}
}
} else if (arcology.FSHedonisticDecadence !== "unset" && slave.weight <= 30) { // reduced weight malus for fat loving societies
- if (arcology.FSHedonisticDecadenceStrongFat === 1) { // no muscle malus for muscle loving societies
- if (arcology.FSSlimnessEnthusiast > 20) {
- r += ` The public enjoys ${his} fashionably sleek little body.`;
- } else {
- r += ` The public enjoys ${his} sleek, girlish figure.`;
- }
- if (canTalk(slave) && slave.voice > 2) {
- r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
- }
- } else if (slave.muscles <= 30) {
+ if (arcology.FSHedonisticDecadenceStrongFat === 1 || slave.muscles <= 30) { // no muscle malus for muscle loving societies
if (arcology.FSSlimnessEnthusiast > 20) {
r += ` The public enjoys ${his} fashionably sleek little body.`;
} else {
diff --git a/src/endWeek/saStayConfined.js b/src/endWeek/saStayConfined.js
index a76ddbb0f2c5de970f1ead3e6a46600697fc1cbb..d1daa0a7b4600a326b83ab7587f49f658ec5c72e 100644
--- a/src/endWeek/saStayConfined.js
+++ b/src/endWeek/saStayConfined.js
@@ -4,7 +4,7 @@
*/
window.saStayConfined = function saStayConfined(slave) {
const V = State.variables;
- /* eslint-disable */
+ /* eslint-disable no-unused*/
const pronouns = getPronouns(slave);
const he = pronouns.pronoun;
const him = pronouns.object;
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index 6155ba33760998d27af48e91715a6f62e5b68dcf..05e5a3fb5892d1db676d80a67fcc9fbaf9f425b9 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -43,7 +43,7 @@ window.saWhore = (function saWhore() {
updateNonSlaveVariables(slave); // must be run before applyFSDecoration() or you will face NaNs
if (slave.assignment === "work in the brothel" || slave.assignment === "be the Madam") {
// By being at the end, every slave after the first will get a bonus. By moving it up, the first can enjoy it too. slaveJobValues() checks Edo Revivalist, so here we are.
- applyFSDecoration(slave);
+ applyFSDecoration();
}
addCash(slave);
sexCounts(slave);
@@ -934,7 +934,7 @@ window.saWhore = (function saWhore() {
r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
}
} else if (arcology.FSPhysicalIdealist !== "unset") { // no muscle malus for muscle loving societies
- if (arcology.FSPhysicalIdealistStrongFat === 1 && slave.weight <= 30) { // reduced weight malus for fat loving societies
+ if ((arcology.FSPhysicalIdealistStrongFat === 1 && slave.weight <= 30) || slave.weight <= 10) { // reduced weight malus for fat loving societies
if (arcology.FSSlimnessEnthusiast > 20) {
r += ` ${He} makes extra ¤ due to ${his} fashionably sleek little body.`;
} else {
@@ -942,28 +942,10 @@ window.saWhore = (function saWhore() {
}
if (canTalk(slave) && slave.voice > 2) {
r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
- }
- } else if (slave.weight <= 10) {
- if (arcology.FSSlimnessEnthusiast > 20) {
- r += ` ${He} makes extra ¤ due to ${his} fashionably sleek little body.`;
- } else {
- r += ` ${He} receives extra ¤ for having a sleek, girlish figure.`;
- }
- if (canTalk(slave) && slave.voice > 2) {
- r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
- }
+ }r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
}
} else if (arcology.FSHedonisticDecadence !== "unset" && slave.weight <= 30) { // reduced weight malus for fat loving societies
- if (arcology.FSHedonisticDecadenceStrongFat === 1) { // no muscle malus for muscle loving societies
- if (arcology.FSSlimnessEnthusiast > 20) {
- r += ` ${He} makes extra ¤ due to ${his} fashionably sleek little body.`;
- } else {
- r += ` ${He} receives extra ¤ for having a sleek, girlish figure.`;
- }
- if (canTalk(slave) && slave.voice > 2) {
- r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
- }
- } else if (slave.muscles <= 30) {
+ if (arcology.FSHedonisticDecadenceStrongFat === 1 || slave.muscles <= 30) { // no muscle malus for muscle loving societies
if (arcology.FSSlimnessEnthusiast > 20) {
r += ` ${He} makes extra ¤ due to ${his} fashionably sleek little body.`;
} else {
diff --git a/src/endWeek/saWorkAGloryHole.js b/src/endWeek/saWorkAGloryHole.js
index ca4aefb3ab2e745e239084b79d74e85ea6d517d6..b441cbd552690389029f8887393d674ceae6cdbb 100644
--- a/src/endWeek/saWorkAGloryHole.js
+++ b/src/endWeek/saWorkAGloryHole.js
@@ -5,7 +5,7 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
let r;
let beauty;
let FResult;
- /* eslint-disable */
+ /* eslint-disable no-unused*/
let pronouns;
let he;
let him;
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index f62056a106b5599dd9cef7b21a0a9429038344ad..e3c766dbdb688793ce768afde506c6c56bc4fa33 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -6,7 +6,7 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
"use strict";
const V = State.variables;
const arcology = V.arcologies[0];
- /* eslint-disable */
+ /* eslint-disable no-unused*/
const pronouns = getPronouns(slave);
const he = pronouns.pronoun;
const him = pronouns.object;
diff --git a/src/interaction/main/toychest.js b/src/interaction/main/toychest.js
index 1e82154d406c0125db4b8dc8c453ffe1c964aa63..69a1a3f6f05541a3b0330a3a98ba439d64de2f7c 100644
--- a/src/interaction/main/toychest.js
+++ b/src/interaction/main/toychest.js
@@ -3,7 +3,7 @@ App.Interact.ToyChest = function(slave) {
"use strict";
const V = State.variables;
let r = ``;
- /* eslint-disable */
+ /* eslint-disable no-unused*/
let pronouns = getPronouns(slave);
let he = pronouns.pronoun;
let him = pronouns.object;
diff --git a/src/interaction/main/useGuard.js b/src/interaction/main/useGuard.js
index 1ad32f94395565074edb16a2446dee1905f77e7b..973cb5d41e8f4e34135e01e9584ad884bc90c983 100644
--- a/src/interaction/main/useGuard.js
+++ b/src/interaction/main/useGuard.js
@@ -3,7 +3,7 @@
App.Interact.UseGuard = function(slave) {
"use strict";
let r = ``;
- /* eslint-disable */
+ /* eslint-disable no-unused*/
let pronouns = getPronouns(slave);
let he = pronouns.pronoun;
let him = pronouns.object;
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 417fba5c65b07161853d0f8c57ec351ab8787f8c..f7fd4fc764c29b88a9a4361b4a8361dab0b153d4 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -1349,7 +1349,7 @@ window.SlaveTitle = function SlaveTitle(slave) {
if (slave.butt >= 12) {
r = `colossal assed ${r}`;
- } else if (slave.butt >= 12) {
+ } else if (slave.butt >= 10) {
r = `massive assed ${r}`;
} else if (slave.butt >= 8) {
r = `fat assed ${r}`;
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 317a0d21efd80461b34c19fdd1644866484d8892..95fa17b6df06019dd954cfb6cc4827dbda55032f 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -617,7 +617,7 @@ App.UI.SlaveInteract = {
/** @type {App.Entity.SlaveState} */
const slave = State.variables.activeSlave;
if ((slave.assignment === "please you") || (slave.assignment === "serve in the master suite") || (slave.assignment === "be your Concubine")) {
- res += '__Fucktoy use preference__: <strong><span id = "hole">' + slave.toyHole + '</span></strong>.';
+ res += `__Fucktoy use preference__: <strong><span id = "hole">${slave.toyHole}</span></strong>.`;
/** @type {string[]} */
let links = [];
links.push('<<link "Mouth">><<set $activeSlave.toyHole = "mouth">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>');
diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js
index a040b9f2f9ebfeac1828758cdc634ac7f2c572eb..ddf4573c3be77eb338916fa2f474a81d2fcdf103 100644
--- a/src/js/extendedFamilyModeJS.js
+++ b/src/js/extendedFamilyModeJS.js
@@ -85,6 +85,11 @@ window.areTwins = function(slave1, slave2) {
return false;
};
+/**
+ * @param {App.Entity.SlaveState} slave1
+ * @param {App.Entity.SlaveState} slave2
+ * @returns {number}
+ */
window.areSisters = function(slave1, slave2) {
if (slave1.ID === slave2.ID) {
return 0; // you are not your own sister
@@ -239,7 +244,7 @@ window.randomRelatedSlave = function(slave, filterFunction) {
/**
* @param {App.Entity.SlaveState} slave
* @param {function} filterFunction // I think
- * @returns {object} // I think
+ * @returns {App.Entity.SlaveState}
*/
window.randomRelatedSlave = function(slave, filterFunction) {
if (!slave || !SugarCube) {
@@ -263,7 +268,7 @@ window.randomRelatedSlave = function(slave, filterFunction) {
/**
* @param {App.Entity.SlaveState} slave
- * @returns {object}
+ * @returns {App.Entity.SlaveState}
*/
window.randomRelatedAvailableSlave = function(slave) {
return randomRelatedSlave(slave, function(s) {
@@ -273,7 +278,7 @@ window.randomRelatedAvailableSlave = function(slave) {
/**
* @param {App.Entity.SlaveState} slave
- * @returns {object}
+ * @returns {App.Entity.SlaveState}
*/
window.randomSister = function(slave) {
return randomRelatedSlave(slave, function(s) {
@@ -283,7 +288,7 @@ window.randomSister = function(slave) {
/**
* @param {App.Entity.SlaveState} slave
- * @returns {object}
+ * @returns {App.Entity.SlaveState}
*/
window.randomTwinSister = function(slave) {
return randomRelatedSlave(slave, function(s) {
@@ -293,7 +298,7 @@ window.randomTwinSister = function(slave) {
/**
* @param {App.Entity.SlaveState} slave
- * @returns {object}
+ * @returns {App.Entity.SlaveState}
*/
window.randomAvailableSister = function(slave) {
return randomRelatedSlave(slave, function(s) {
@@ -303,7 +308,7 @@ window.randomAvailableSister = function(slave) {
/**
* @param {App.Entity.SlaveState} slave
- * @returns {object}
+ * @returns {App.Entity.SlaveState}
*/
window.randomAvailableTwinSister = function(slave) {
return randomRelatedSlave(slave, function(s) {
@@ -313,7 +318,7 @@ window.randomAvailableTwinSister = function(slave) {
/**
* @param {App.Entity.SlaveState} slave
- * @returns {object}
+ * @returns {App.Entity.SlaveState}
*/
window.randomDaughter = function(slave) {
return randomRelatedSlave(slave, function(s) {
@@ -323,7 +328,7 @@ window.randomDaughter = function(slave) {
/**
* @param {App.Entity.SlaveState} slave
- * @returns {object}
+ * @returns {App.Entity.SlaveState}
*/
window.randomAvailableDaughter = function(slave) {
return randomRelatedSlave(slave, function(s) {
@@ -333,7 +338,7 @@ window.randomAvailableDaughter = function(slave) {
/**
* @param {App.Entity.SlaveState} slave
- * @returns {object}
+ * @returns {App.Entity.SlaveState}
*/
window.randomParent = function(slave) {
return randomRelatedSlave(slave, function(s) {
@@ -343,7 +348,7 @@ window.randomParent = function(slave) {
/**
* @param {App.Entity.SlaveState} slave
- * @returns {object}
+ * @returns {App.Entity.SlaveState}
*/
window.randomAvailableParent = function(slave) {
return randomRelatedSlave(slave, function(s) {
diff --git a/src/js/futureSocietyJS.js b/src/js/futureSocietyJS.js
index 2351c02c0bc5d0ec4705e97052e21de49be73100..db9b215b112286b2da03160bdb42e532e8a46ad4 100644
--- a/src/js/futureSocietyJS.js
+++ b/src/js/futureSocietyJS.js
@@ -212,7 +212,7 @@ window.FutureSocieties = (function() {
*/
function FSHighestDecoration() {
const arcology = State.variables.arcologies[0];
- const decorationList = SocietyList.map(FS => FS + "Decoration");
+ const decorationList = SocietyList.map(FS => `${FS}Decoration`);
let level = 20; // All decorations start at 20
for (let i = 0; i < decorationList.length; i++) {
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index d4c93f9c3a537245759dde843b071f57be4b6cfb..bf5f797eea7d2fa9fe79f19520e65ae9245a5f5e 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -342,7 +342,7 @@ window.generateGenetics = (function() {
eyeColor = mother.origEye;
} else if (mother.origEye === "red" || mother.origEye === "pale red" || mother.origEye === "light red" || mother.origEye === "pale gray" || mother.origEye === "milky white") {
eyeColor = fatherEye;
- } else if (fatherEye === "blue") {
+ } else if (mother.origEye === "blue") {
if (jsRandom(1, 4) === 2) {
eyeColor = mother.origEye;
} else {
diff --git a/src/js/generateMarketSlave.js b/src/js/generateMarketSlave.js
index 1f153839b5139434d4a69747faefa6fd2ac028b4..bdd215fab5f241ba03ee984bff0aff54b345f1e5 100644
--- a/src/js/generateMarketSlave.js
+++ b/src/js/generateMarketSlave.js
@@ -903,7 +903,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
V.activeSlave.devotion = jsRandom(-90, -60);
V.activeSlave.trust = -20;
r += `<b>${V.arcologies[market].name}</b> is Paternalist, and your arcology is Degradationist. To its slaves, other niceties of social alignment are trivial. They view your arcology as a literal Hell on Earth. `;
- } else if ((V.arcologies[0].FSDegradationist !== "unset") && (V.arcologies[market].FSPaternalist !== "unset")) {
+ } else if ((V.arcologies[0].FSPaternalist !== "unset") && (V.arcologies[market].FSDegradationist !== "unset")) {
V.activeSlave.devotion = jsRandom(60, 90);
V.activeSlave.trust = 20;
r += `<b>${V.arcologies[market].name}</b> is Degradationist, and your arcology is Paternalist. To its slaves, other niceties of social alignment are trivial. They view your arcology as a promised land. `;
diff --git a/src/js/hTagMacroJS.js b/src/js/hTagMacroJS.js
index 3226d538fa31308ab76a8ef7e5defeeaefbf890a..3c1121896fadc5a562a145fe04b35e509e1580d2 100644
--- a/src/js/hTagMacroJS.js
+++ b/src/js/hTagMacroJS.js
@@ -1,5 +1,5 @@
- /*
+/*
* <<htag>> macro
* A simple macro which allows to create wrapping html elements with dynamic IDs.
* idea blatantly robbed from the spanMacroJS.tw but expanded to a more generic
@@ -24,18 +24,18 @@ Macro.add('htag', {
return `${key}="${val}"`;
}
- if (1 > this.args.length) { return this.error('invalid syntax, format: <<htag [id [ tag ] | attributes [ tag ] >>'); }
- if (1 < this.args.length) { htag = String(this.args[1]).trim(); }
- if ("object" === typeof this.args[0]) {
+ if (this.args.length < 1) { return this.error('invalid syntax, format: <<htag [id [ tag ] | attributes [ tag ] >>'); }
+ if (this.args.length > 1) { htag = String(this.args[1]).trim(); }
+ if (typeof this.args[0] === "object") {
attributes = $.map(this.args[0], munge).join(" ");
} else {
attributes = `id="${String(this.args[0]).trim()}"`;
}
if (Config.debug) {
-this.debugView.modes({
+ this.debugView.modes({
block: true
});
-}
+ }
jQuery(`<${htag} ${attributes} />`)
.wiki(payload)
diff --git a/src/js/quickListJS.js b/src/js/quickListJS.js
index 27fe34eed16eabb291a8b9a4fe1a9dfb792d7c9c..f8c514eb9f238acf52d3aa0932a9ce04d846a173 100644
--- a/src/js/quickListJS.js
+++ b/src/js/quickListJS.js
@@ -70,14 +70,14 @@ window.sortIncubatorPossiblesByReservedSpots = function() {
window.sortIncubatorPossiblesByPreviousSort = function() {
let sort = State.variables.sortIncubatorList;
- if ('unsorted' !== sort) {
- if ('Name' === sort) {
+ if (sort !== 'unsorted') {
+ if (sort === 'Name') {
sortIncubatorPossiblesByName();
- } else if ('Reserved Incubator Spots' === sort) {
+ } else if (sort === 'Reserved Incubator Spots') {
sortIncubatorPossiblesByReservedSpots();
- } else if ('Pregnancy Week' === sort) {
+ } else if (sort === 'Pregnancy Week') {
sortIncubatorPossiblesByPregnancyWeek();
- } else if ('Number of Children' === sort) {
+ } else if (sort === 'Number of Children') {
sortIncubatorPossiblesByPregnancyCount();
}
}
@@ -109,14 +109,14 @@ window.sortNurseryPossiblesByReservedSpots = function() {
window.sortNurseryPossiblesByPreviousSort = function() {
let sort = State.variables.sortNurseryList;
- if ('unsorted' !== sort) {
- if ('Name' === sort) {
+ if (sort !== 'unsorted') {
+ if (sort === 'Name') {
sortNurseryPossiblesByName();
- } else if ('Reserved Nursery Spots' === sort) {
+ } else if (sort === 'Reserved Nursery Spots') {
sortNurseryPossiblesByReservedSpots();
- } else if ('Pregnancy Week' === sort) {
+ } else if (sort === 'Pregnancy Week') {
sortNurseryPossiblesByPregnancyWeek();
- } else if ('Number of Children' === sort) {
+ } else if (sort === 'Number of Children') {
sortNurseryPossiblesByPregnancyCount();
}
}
diff --git a/src/js/sexActsJS.js b/src/js/sexActsJS.js
index 3a968af5faeb8d47a8e4a253c1fae0b230db06c3..579eea5689e8fe229c1a404a1ff10361df9714f5 100644
--- a/src/js/sexActsJS.js
+++ b/src/js/sexActsJS.js
@@ -1,6 +1,6 @@
window.VCheck = (function() {
"use strict";
- /* eslint-disable */
+ /* eslint-disable no-unused*/
let he;
let him;
let his;
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 7c86fa4b538720c84db1e4932faf044783f318ea..6f4a2976f68ac706b79a716c9d8a44bcc014a2b9 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -388,7 +388,7 @@ App.UI.SlaveList.listSJFacilitySlaves = function(facility, facilityPassage, show
r += this.sortingLinks(facilityPassage) + '<br>';
}
r += '<div class="tab">' +
- App.UI.tabbar.tabButton('assign', tabCaptions.assign) +
+ App.UI.tabbar.tabButton('assign', tabCaptions.assign) +
App.UI.tabbar.tabButton('remove', tabCaptions.remove) +
(showTransfersTab ? App.UI.tabbar.tabButton('transfer', tabCaptions.transfer) : '')+
'</div>';
@@ -763,13 +763,13 @@ App.UI.SlaveList.penthousePage = function() {
* @returns {string[]}
*/
- /**
+/**
* @callback slaveFilterCallbackSimple
* @param {App.Entity.SlaveState} slave
* @returns {boolean}
*/
- /**
+/**
* @callback slaveTestCallback
* @param {App.Entity.SlaveState} slave
* @returns {boolean}
diff --git a/src/js/textbox2.js b/src/js/textbox2.js
index cebb01edecd516ec0c1e319a9e5a37ffac76051f..7fcb99021036246ea0d311028425439e6de862d4 100644
--- a/src/js/textbox2.js
+++ b/src/js/textbox2.js
@@ -4,9 +4,9 @@ Macro.add("textbox2", {
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`);
}
- if ("string" !== typeof this.args[0]) { return this.error("variable name argument is not a string"); }
+ if (typeof this.args[0] !== "string") { return this.error("variable name argument is not a string"); }
const t = this.args[0].trim();
- if ("$" !== t[0] && "_" !== t[0]) { return this.error(`variable name "${this.args[0]}" is missing its sigil ($ or _)`); }
+ if (t[0] !== "$" && t[0] !== "_") { return this.error(`variable name "${this.args[0]}" is missing its sigil ($ or _)`); }
Config.debug && this.debugView.modes({
block: true
});
@@ -19,12 +19,12 @@ Macro.add("textbox2", {
let setargs = null;
if (this.args.length > 3) {
passage = this.args[2];
- autofocus = "autofocus" === this.args[3];
+ autofocus = this.args[3] === "autofocus";
if (!autofocus) {
setargs = this.args[3];
}
} else if (this.args.length > 2) {
- if ("autofocus" === this.args[2]) {
+ if (this.args[2] === "autofocus") {
autofocus = true;
} else {
passage = this.args[2];
@@ -78,7 +78,7 @@ Macro.add("textbox2", {
}
})
.on("keypress", function(e) {
- 13 === e.which && (e.preventDefault(), State.setVar(t, valueToNumberIfSame(this.value)), gotoPassage());
+ e.which === 13 && (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() {
return inputElement.focus();
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index 658f0f6f6340f35703b8adb71cba33183a518373..7371986280fae3311af417e6dbbeb93aa50648ca 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1844,7 +1844,7 @@ App.UI.tabbar = function() {
* @returns {string}
*/
function makeTab(name, content) {
- return `<div id="${name}" class="tabcontent"><div class="content">` + content + '</div></div>';
+ return `<div id="${name}" class="tabcontent"><div class="content">${content}</div></div>`;
}
function handlePreSelectedTab() {
@@ -1941,7 +1941,7 @@ App.UI.replace = function(selector, newContent) {
App.UI.htag = function(text, attributes, tag = 'div') {
const payload = text.replace(/(^\n+|\n+$)/, "");
- if ("object" === typeof attributes) {
+ if (typeof attributes === "object") {
attributes = $.map(attributes, (val, key) => `${key}="${val}"`).join(" ");
} else {
attributes = `id="${attributes.trim()}"`;
@@ -2210,19 +2210,11 @@ window.upgradeMultiplierTrade = function() {
};
window.jsNdef = function(input) {
- if (typeof input === "undefined") {
- return true;
- } else {
- return false;
- }
+ return typeof input === "undefined";
};
window.jsDef = function(input) {
- if (typeof input !== "undefined") {
- return true;
- } else {
- return false;
- }
+ return typeof input !== "undefined";
};
/**