From 5d375eb8d7d53e05eb6552f5e2001bbfd58b3956 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Sat, 27 Apr 2019 16:47:28 -0400
Subject: [PATCH] More linting
---
src/debugging/debugJS.js | 1 +
src/endWeek/saServeThePublic.js | 30 +++++++++++++++---------------
src/endWeek/saWhore.js | 6 +++---
src/endWeek/saWorkAGloryHole.js | 12 ++++++------
src/js/DefaultRules.js | 2 +-
src/js/familyTreeJS.js | 5 ++---
src/js/generateGenetics.js | 4 ++--
src/js/rulesAssistant.js | 2 +-
src/js/sexActsJS.js | 2 +-
src/js/storyJS.js | 4 ++--
10 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/debugging/debugJS.js b/src/debugging/debugJS.js
index 84e42693636..dd29a88a2e7 100644
--- a/src/debugging/debugJS.js
+++ b/src/debugging/debugJS.js
@@ -54,6 +54,7 @@ window.diffFlatten = function diffFlatten(data) {
if (Object(cur) !== cur) {
result[prop] = cur;
} else if (Array.isArray(cur)) {
+ // eslint-disable-next-line no-var
for (var i=0, l=cur.length; i<l; i++) // don't change the "var" to "let"
recurse(cur[i], prop + "[" + i + "]");
// eslint-disable-next-line block-scoped-var
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 49026bfbea5..b5a65e173c7 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -64,7 +64,7 @@ window.saServeThePublic = (function saServeThePublic() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function gatherStatistics(slave) {
/* Statistics gathering */
@@ -75,7 +75,7 @@ window.saServeThePublic = (function saServeThePublic() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function jobPreface(slave) {
if (slave.devotion > 95 || slave.energy > 95) {
@@ -95,7 +95,7 @@ window.saServeThePublic = (function saServeThePublic() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function bonusMultiplierText(slave) {
if (V.club > 0) {
@@ -212,7 +212,7 @@ window.saServeThePublic = (function saServeThePublic() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function usageCountDescriptions(slave) {
r += ` ${His} appearance attracted ${slave.sexAmount} members of the public (${Math.trunc(slave.sexAmount / 7)} a day)`;
@@ -255,7 +255,7 @@ window.saServeThePublic = (function saServeThePublic() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function comingOfAge(slave) {
if (slave.physicalAge === V.minimumSlaveAge && slave.physicalAge === V.fertilityAge && canGetPregnant(slave) && (arcology.FSRepopulationFocus !== "unset" || arcology.FSGenderFundamentalist !== "unset") && arcology.FSRestart === "unset") {
@@ -281,7 +281,7 @@ window.saServeThePublic = (function saServeThePublic() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function mentalEffects(slave) {
if (slave.behavioralQuirk === "advocate") {
@@ -302,7 +302,7 @@ window.saServeThePublic = (function saServeThePublic() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function physicalEffects(slave) {
let injury = 0;
@@ -448,7 +448,7 @@ window.saServeThePublic = (function saServeThePublic() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function slaveSkills(slave) {
let skillIncrease;
@@ -559,7 +559,7 @@ window.saServeThePublic = (function saServeThePublic() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function publicReactions(slave) {
let sstp;
@@ -1203,7 +1203,7 @@ window.saServeThePublic = (function saServeThePublic() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function addFlaw(slave) {
if (slave.devotion < 10) {
@@ -1224,7 +1224,7 @@ window.saServeThePublic = (function saServeThePublic() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function addRep(slave) {
if (slave.assignment !== "recruit girls") {
@@ -1241,7 +1241,7 @@ window.saServeThePublic = (function saServeThePublic() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function applyFSDecoration(slave) {
/* FACILITY DECORATION IMPACTS */
@@ -1324,7 +1324,7 @@ window.saServeThePublic = (function saServeThePublic() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function sexCounts(slave) {
/* SEX ACT COUNTS AND SEXUAL SATISFACTION */
@@ -1406,7 +1406,7 @@ window.saServeThePublic = (function saServeThePublic() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function sexualSatiation(slave) {
if (slave.need) {
@@ -1489,7 +1489,7 @@ window.saServeThePublic = (function saServeThePublic() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function assignmentVignette(slave) {
let vignette;
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index d9729133642..b4352599a9b 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -234,7 +234,7 @@ window.saWhore = (function saWhore() {
}
T.incomeStats.customers = beauty;
}
-
+
/**
* @param {App.Entity.SlaveState} slave
*/
@@ -727,7 +727,7 @@ window.saWhore = (function saWhore() {
if ((slave.releaseRules === "restrictive" || slave.releaseRules === "chastity") && slave.standardReward !== "orgasm") {
r += ` ${He}'s a better whore because prostitution is ${his} main sexual outlet.`;
}
-
+
if (V.familyTesting === 1) {
if (totalRelatives(slave) > 0) {
let children = [];
@@ -1396,7 +1396,7 @@ window.saWhore = (function saWhore() {
cashX(cash, "whoring in an unregistered building", slave);
}
}
-
+
/**
* @param {App.Entity.SlaveState} slave
*/
diff --git a/src/endWeek/saWorkAGloryHole.js b/src/endWeek/saWorkAGloryHole.js
index f0e68199857..ca4aefb3ab2 100644
--- a/src/endWeek/saWorkAGloryHole.js
+++ b/src/endWeek/saWorkAGloryHole.js
@@ -95,7 +95,7 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function physicalEffects(slave) {
// check usage counts for these — more fucks should be more damaging
@@ -171,7 +171,7 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function mentalEffects(slave) {
if (slave.fetish === "mindbroken") {
@@ -231,7 +231,7 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function jobBody(slave) {
r += ` ${His} feelings, skills, and appearance do not matter. ${He} is condemned to a world that consists of a tiny cell, featureless except for the never-ending dicks ${he} is required to service. You `;
@@ -245,7 +245,7 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function applyFSDecoration(slave) {
/* FACILITY DECORATION IMPACTS */
@@ -330,7 +330,7 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function sexCounts(slave) {
/* SEX ACT COUNTS AND SEXUAL SATISFACTION */
@@ -438,7 +438,7 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
function profitReport(slave) {
if (V.publicFuckdolls === 0) {
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index eb6ced95301..67783593c4b 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -82,7 +82,7 @@ window.DefaultRules = (function() {
/**
* @param {App.Entity.SlaveState} slave
- * @returns {map}
+ * @returns {map}
*/
function MergeRules(slave) {
// merge all rules applying on a slave into one big rule
diff --git a/src/js/familyTreeJS.js b/src/js/familyTreeJS.js
index a8954fc824c..43beb62d455 100644
--- a/src/js/familyTreeJS.js
+++ b/src/js/familyTreeJS.js
@@ -48,8 +48,8 @@ window.renderFamilyTree = function(slaves, filterID) {
}
margin = {
-top: 0, left: 0, bottom: 0, right: 0
-};
+ top: 0, left: 0, bottom: 0, right: 0
+ };
chartWidth = ftreeWidth - (margin.left + margin.right);
@@ -639,7 +639,6 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS
for (let key in spouseToChild) {
if (spouseToChild.hasOwnProperty(key)) {
let children = shouldAddChildren?spouseToChild[key]:[];
- // eslint-disable-next-line no-nested-ternary
let spouse = getSlave(key, (slaves.genes === "XX") ? "unknownXY" : (slaves.genes === "XY") ? "unknownXX" : "unknown");
let spouseName;
if (spouse.ID !== slave.ID){
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 37ce2c8112f..6d59b9863ab 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -968,7 +968,7 @@ window.generateGenetics = (function() {
}
}
}
-
+
// Gigantomastia
if (father !== 0) {
if (mother.geneticQuirks.gigantomastia >= 2 && father.geneticQuirks.gigantomastia >= 2) {
@@ -999,7 +999,7 @@ window.generateGenetics = (function() {
}
}
}
-
+
// Macromastia
if (father !== 0) {
if (mother.geneticQuirks.macromastia >= 2 && father.geneticQuirks.macromastia >= 2) {
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index 9e9d855940e..5cae9ede34f 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -392,7 +392,7 @@ window.emptyDefaultRule = function emptyDefaultRule() {
* Saves the slave, silently fires the RA, saves the slave's after-RA state, and then reverts the slave.
* Call and then check potential change against $slaveAfterRA to see if the RA would revert it.
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
window.RulesDeconfliction = function RulesDeconfliction(slave) {
const before = clone(slave);
diff --git a/src/js/sexActsJS.js b/src/js/sexActsJS.js
index e509a760fdb..ec5868851a9 100644
--- a/src/js/sexActsJS.js
+++ b/src/js/sexActsJS.js
@@ -325,7 +325,7 @@ window.PartnerVCheck = function PartnerVCheck(analTimes = 1, bothTimes = 1) {
count is how many times to increment either the Vaginal, Anal, or Oral counts, depending on availability of slave.
If count is left undefined it will assume it to be 1.
Intended to be a simple "I want to fuck x and not have to code a bunch of logic for it".
- * @param {App.Entity.SlaveState} slave
+ * @param {App.Entity.SlaveState} slave
* @param {number} fuckCount
* @returns {string}
*/
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index 80f4d3cec92..97f535d36db 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -498,7 +498,7 @@ window.jsConsoleInfo = function(obj) {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
window.SoftenBehavioralFlaw = function SoftenBehavioralFlaw(slave) {
switch (slave.behavioralFlaw) {
@@ -535,7 +535,7 @@ window.SoftenBehavioralFlaw = function SoftenBehavioralFlaw(slave) {
/**
* @param {App.Entity.SlaveState} slave
- *
+ *
*/
window.SoftenSexualFlaw = function SoftenSexualFlaw(slave) {
switch (slave.sexualFlaw) {
--
GitLab