From 27ea61f8cd305ab51f51b83a3feee2f5e70206ae Mon Sep 17 00:00:00 2001
From: DCoded <dicoded@email.com>
Date: Fri, 3 Jun 2022 09:02:45 -0400
Subject: [PATCH] Linting
---
src/cheats/cheatEditArcology.js | 23 +++++++++++------------
src/endWeek/saDrugs.js | 2 +-
src/futureSocieties/fsPassage.js | 12 ++++++------
src/js/DefaultRules.js | 4 ++--
src/js/reminder.js | 8 ++++----
src/js/slaveCostJS.js | 10 +++++-----
src/js/storyJS.js | 2 +-
src/js/utilsSlave.js | 2 +-
src/markets/marketUI.js | 2 +-
src/player/MpregSelf.js | 1 -
src/player/electiveSurgery.js | 2 +-
11 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/src/cheats/cheatEditArcology.js b/src/cheats/cheatEditArcology.js
index aebc9076f1a..315d736c73f 100644
--- a/src/cheats/cheatEditArcology.js
+++ b/src/cheats/cheatEditArcology.js
@@ -15,27 +15,26 @@ App.UI.Cheat.arcology = function(num) {
el.append(tabBar.render());
}
- if(num === 0) {
- if(arc.FSMaturityPreferentialist !== "unset") {
- if(V.idealAge < 30) {
+ if (num === 0) {
+ if (arc.FSMaturityPreferentialist !== "unset") {
+ if (V.idealAge < 30) {
V.idealAge = 30;
}
- if(V.targetIdealAge < 30) {
+ if (V.targetIdealAge < 30) {
V.targetIdealAge = 30;
}
V.policies.idealAge = 1;
- }
- else if(arc.FSYouthPreferentialist !== "unset") {
- if(V.idealAge >= 30) {
+ } else if (arc.FSYouthPreferentialist !== "unset") {
+ if (V.idealAge >= 30) {
V.idealAge = 29;
- }
- if(V.targetIdealAge >= 30) {
+ }
+ if (V.targetIdealAge >= 30) {
V.targetIdealAge = 29;
}
- if(V.targetIdealAge !== 18) {
+ if (V.targetIdealAge !== 18) {
V.policies.idealAge = 1;
- }
- }
+ }
+ }
}
return el;
diff --git a/src/endWeek/saDrugs.js b/src/endWeek/saDrugs.js
index 6ff47053c6f..9c47f80ea24 100644
--- a/src/endWeek/saDrugs.js
+++ b/src/endWeek/saDrugs.js
@@ -928,7 +928,7 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
}
}
// evaluate against slave expected height, with neoteny slaves comparing against expected height for 12 year olds...
- let heightDiff
+ let heightDiff;
if (slave.geneticQuirks.neoteny === 2 && slave.physicalAge > 12) {
heightDiff = (slave.height - slave.heightImplant * 10) / Height.mean(slave.nationality, slave.race, slave.genes, 12);
} else {
diff --git a/src/futureSocieties/fsPassage.js b/src/futureSocieties/fsPassage.js
index a43f65ae91f..a9c23ed21eb 100644
--- a/src/futureSocieties/fsPassage.js
+++ b/src/futureSocieties/fsPassage.js
@@ -718,15 +718,15 @@ App.UI.fsPassage = function() {
"Youth Preferentialism",
() => {
arc.FSYouthPreferentialist = 4;
- if(V.idealAge >= 30) {
+ if (V.idealAge >= 30) {
V.idealAge = 29;
}
- if(V.targetIdealAge >= 30) {
+ if (V.targetIdealAge >= 30) {
V.targetIdealAge = 29;
}
- if(V.targetIdealAge !== 18) {
+ if (V.targetIdealAge !== 18) {
V.policies.idealAge = 1;
- }
+ }
App.UI.reload();
}
)
@@ -751,10 +751,10 @@ App.UI.fsPassage = function() {
"Maturity Preferentialism",
() => {
arc.FSMaturityPreferentialist = 4;
- if(V.idealAge < 30) {
+ if (V.idealAge < 30) {
V.idealAge = 30;
}
- if(V.targetIdealAge < 30) {
+ if (V.targetIdealAge < 30) {
V.targetIdealAge = 30;
}
V.policies.idealAge = 1;
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 5a6583e19a1..6f9d03512a0 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -7,8 +7,8 @@ globalThis.DefaultRules = (function() {
"allowed": {success: "is allowed", unable: "could not be allowed"},
};
const getAssignmentDescription = function({rule, slave, assignmentResult, append = null}) {
- const assignment = rule.setAssignment === Job.CHOICE ?
- {
+ const assignment = rule.setAssignment === Job.CHOICE
+ ? {
descriptionType: "allowed",
work: `select ${pronouns.his} own assignments`
} : {
diff --git a/src/js/reminder.js b/src/js/reminder.js
index ad3db63521f..719581a6c74 100644
--- a/src/js/reminder.js
+++ b/src/js/reminder.js
@@ -101,14 +101,14 @@ App.Reminders = (function() {
div.append(entry.message, " ", App.UI.DOM.makeElement("span", week.toString(), classes));
const slave = getSlave(entry.slaveID);
if (slave) {
- const slaveName = link ?
- App.UI.DOM.passageLink(SlaveFullName(slave), "Slave Interact", () => {
+ const slaveName = link
+ ? App.UI.DOM.passageLink(SlaveFullName(slave), "Slave Interact", () => {
V.AS = slave.ID;
if (Dialog.isOpen()) {
Dialog.close();
}
- }) :
- SlaveFullName(slave);
+ })
+ : SlaveFullName(slave);
div.append(" (for ", slaveName, ")");
}
div.append(" ", App.UI.DOM.link("Clear", clearEntry, [entry]));
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index ff84712c598..4b0b63df148 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -431,12 +431,12 @@ globalThis.BeautyArray = (function() {
adjustBeauty("Skilled: Slave Professionalism", ((arcology.FSSlaveProfessionalism / 50) * ((slave.skill.entertainment + slave.skill.whoring + slave.skill.oral + slave.skill.anal + slave.skill.vaginal) / 100))); /* 10 */
}
if (arcology.FSYouthPreferentialist !== "unset") {
- if(slave.visualAge < 30) {
- adjustBeauty("Age: Youth Preferentialist", Math.clamp(((arcology.FSYouthPreferentialist / 2) + (arcology.FSYouthPreferentialistLaw * 10)) - Math.round(Math.abs(slave.visualAge - V.idealAge) * 2.222),0,60)); /* max 60 */
+ if (slave.visualAge < 30) {
+ adjustBeauty("Age: Youth Preferentialist", Math.clamp(((arcology.FSYouthPreferentialist / 2) + (arcology.FSYouthPreferentialistLaw * 10)) - Math.round(Math.abs(slave.visualAge - V.idealAge) * 2.222), 0, 60)); /* max 60 */
}
} else if (arcology.FSMaturityPreferentialist !== "unset") {
- if(slave.visualAge >= 30 && slave.visualAge < 60) {
- adjustBeauty("Age: Maturity Preferentialist", Math.clamp(((arcology.FSMaturityPreferentialist / 2) + (arcology.FSMaturityPreferentialistLaw * 10)) - Math.round(Math.abs(slave.visualAge - V.idealAge) * 2.222),0,60)); /* max 60 */
+ if (slave.visualAge >= 30 && slave.visualAge < 60) {
+ adjustBeauty("Age: Maturity Preferentialist", Math.clamp(((arcology.FSMaturityPreferentialist / 2) + (arcology.FSMaturityPreferentialistLaw * 10)) - Math.round(Math.abs(slave.visualAge - V.idealAge) * 2.222), 0, 60)); /* max 60 */
}
}
if (arcology.FSBodyPurist > 20) {
@@ -2476,7 +2476,7 @@ globalThis.slaveCostBeauty = function(slave, isStartingSlave, followLaws, isSpec
if (fromMarket) {
if (fromMarket.limitReached) {
cost += cost * ((V.slavesSeen - V.slaveMarketLimit) * 0.1); // updateMultiplier(`Market reach exceeded`, (cost * (V.slavesSeen - V.slaveMarketLimit)));
- }
+ }
if (fromMarket.costMod > 0 && fromMarket.costMod <= 1) {
cost *= fromMarket.costMod;
} else {
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index c5b3f795609..c36fc5b4fd9 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -3,7 +3,7 @@
globalThis.peacekeepersCanBeEstablished = function() {
return V.invasionVictory > 0 && App.Events.effectiveWeek() > 48;
-}
+};
/**
* @param {number} x
diff --git a/src/js/utilsSlave.js b/src/js/utilsSlave.js
index 90c210301fe..67d141e7aeb 100644
--- a/src/js/utilsSlave.js
+++ b/src/js/utilsSlave.js
@@ -3394,7 +3394,7 @@ globalThis.slaveSkillIncrease = function(targetSkill, slave, skillIncrease = 1)
['farmer', 'farmer'],
['wardeness', 'wardeness']
];
- const isLeadershipRole = isLeadership.find(s => s[0].includes(targetSkill))
+ const isLeadershipRole = isLeadership.find(s => s[0].includes(targetSkill));
if (isLeadershipRole) {
if (!App.Data.Careers.Leader[isLeadershipRole[1]].includes(slave.career)) {
if (slave.skill[targetSkill] <= 20) {
diff --git a/src/markets/marketUI.js b/src/markets/marketUI.js
index 05013f197e8..eb60b9b4b80 100644
--- a/src/markets/marketUI.js
+++ b/src/markets/marketUI.js
@@ -16,7 +16,7 @@ App.Markets.purchaseFramework = function(slaveMarket, {sTitleSingular = "slave",
} else {
$(el).append(` ${text}`);
}
-
+
const applyLaw = applyLawCheck(slaveMarket);
const complianceResult = applyLaw ? App.Desc.lawCompliance(slave, slaveMarket) : ``;
const limitReached = V.slavesSeen > V.slaveMarketLimit;
diff --git a/src/player/MpregSelf.js b/src/player/MpregSelf.js
index 64e87b4bd4d..02bd651e7e1 100644
--- a/src/player/MpregSelf.js
+++ b/src/player/MpregSelf.js
@@ -153,7 +153,6 @@ globalThis.MpregSelf = function() {
r.push(`You feel ${hisU} soft lips pressed to your vulva as ${heU} works to retrieve ${hisU} treat. You hear some soft slurping noises and feel a warm tongue worming its way inside you to retrieve any lingering cum. You relax and enjoy the afterglow of your orgasms while ${heU} works, proud of your ingenious idea to take advantage of your own balls for a satisfying creampie. There's always a slave to do that, of course, but why use slave cum when you have such obviously superior material available?`);
}
r.push(knockMeUp(V.PC, 100, 0, -1));
-
}
App.Events.addParagraph(node, r);
return node;
diff --git a/src/player/electiveSurgery.js b/src/player/electiveSurgery.js
index b78f705dac0..5b04f4d6342 100644
--- a/src/player/electiveSurgery.js
+++ b/src/player/electiveSurgery.js
@@ -47,7 +47,7 @@ App.UI.electiveSurgery = function() {
r.push(`You could undergo facial surgery to make yourself look older${(V.PC.visualAge >= 25) ? ", though you could also make yourself look even younger" : ""}.`);
}
if (V.PC.visualAge >= 25) {
- linkArray.push(surgeryLink(`${V.PC.actualAge < 35 ? 'Remodel your face to appear younger' : 'Get a face lift'}`, "ageDown", () => {
+ linkArray.push(surgeryLink(`${V.PC.actualAge < 35 ? 'Remodel your face to appear younger' : 'Get a face lift'}`, "ageDown", () => {
V.PC.faceImplant = 1;
cashX(forceNeg(5000), "PCmedical");
}));
--
GitLab