From e36467fac3b0d35cb8f24a3d7f4050998bc98ded Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Thu, 16 May 2019 21:54:49 +0200
Subject: [PATCH] minor cleanup
---
src/js/generateNewSlaveJS.js | 6 +++---
src/js/itemAvailability.js | 2 +-
src/js/rulesAutosurgery.js | 7 +++----
src/js/sexActsJS.js | 3 +--
src/js/storyJS.js | 2 +-
5 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js
index e09b3b93bc8..9b87bbb6ffb 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -995,7 +995,7 @@ window.GenerateNewSlave = (function() {
function generateXXTeeth() {
let femaleCrookedTeethGen = slave.intelligence + slave.intelligenceImplant;
- if ("American" === slave.nationality) {
+ if (slave.nationality === "American") {
femaleCrookedTeethGen += 20;
} else if (["Andorran", "Antiguan", "Argentinian", "Aruban", "Australian", "Austrian", "Bahamian", "Bahraini", "Barbadian", "Belarusian", "Belgian", "Bermudian", "Brazilian", "British", "Bruneian", "Bulgarian", "Canadian", "Catalan", "Chilean", "a Cook Islander", "Croatian", "Curaçaoan", "Cypriot", "Czech", "Danish", "Dutch", "Emirati", "Estonian", "Finnish", "French", "German", "Greek", "Greenlandic", "Guamanian", "Hungarian", "Icelandic", "Irish", "Israeli", "Italian", "Japanese", "Kazakh", "Korean", "Kuwaiti", "Latvian", "a Liechtensteiner", "Lithuanian", "Luxembourgian", "Malaysian", "Maltese", "Mauritian", "Monégasque", "Montenegrin", "New Caledonian", "a New Zealander", "Niuean", "Norwegian", "Omani", "Palauan", "Panamanian", "Polish", "Portuguese", "Puerto Rican", "Qatari", "Romanian", "Russian", "Sammarinese", "Saudi", "Seychellois", "Singaporean", "Slovak", "Slovene", "Spanish", "Swedish", "Swiss", "Taiwanese", "Trinidadian", "Uruguayan", "Vatican"].includes(slave.nationality)) {
/* do nothing */
@@ -1016,7 +1016,7 @@ window.GenerateNewSlave = (function() {
function generateXYTeeth() {
let maleCrookedTeethGen = slave.intelligence + slave.intelligenceImplant;
- if ("American" === slave.nationality) {
+ if (slave.nationality === "American") {
maleCrookedTeethGen += 22;
} else if (["Andorran", "Antiguan", "Argentinian", "Aruban", "Australian", "Austrian", "Bahamian", "Bahraini", "Barbadian", "Belarusian", "Belgian", "Bermudian", "Brazilian", "British", "Bruneian", "Bulgarian", "Canadian", "Catalan", "Chilean", "a Cook Islander", "Croatian", "Curaçaoan", "Cypriot", "Czech", "Danish", "Dutch", "Emirati", "Estonian", "Finnish", "French", "German", "Greek", "Greenlandic", "Guamanian", "Hungarian", "Icelandic", "Irish", "Israeli", "Italian", "Japanese", "Kazakh", "Korean", "Kuwaiti", "Latvian", "a Liechtensteiner", "Lithuanian", "Luxembourgian", "Malaysian", "Maltese", "Mauritian", "Monégasque", "Montenegrin", "New Caledonian", "a New Zealander", "Niuean", "Norwegian", "Omani", "Palauan", "Panamanian", "Polish", "Portuguese", "Puerto Rican", "Qatari", "Romanian", "Russian", "Sammarinese", "Saudi", "Seychellois", "Singaporean", "Slovak", "Slovene", "Spanish", "Swedish", "Swiss", "Taiwanese", "Trinidadian", "Uruguayan", "Vatican"].includes(slave.nationality)) {
/* do nothing */
@@ -1584,7 +1584,7 @@ window.GenerateNewSlave = (function() {
}
}
if (slave.geneticQuirks.rearLipedema === 2) {
- slave.butt += jsRandom(.2 * slave.physicalAge, .5 * slave.physicalAge);
+ slave.butt += jsRandom(0.2 * slave.physicalAge, 0.5 * slave.physicalAge);
slave.butt = Math.clamp(slave.butt, 0, 24);
}
if (slave.geneticQuirks.macromastia === 3) {
diff --git a/src/js/itemAvailability.js b/src/js/itemAvailability.js
index e7c07a12666..6a21e561829 100644
--- a/src/js/itemAvailability.js
+++ b/src/js/itemAvailability.js
@@ -2,7 +2,7 @@
/**
* Checks whether item is accessible
- * @param {string} string Name of the item
+ * @param {string} string Name of wearable item
* @returns {boolean}
*/
window.isItemAccessible = function(string) {
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index 6cc77c4bfc9..0c65cf6e970 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -24,11 +24,10 @@ window.rulesAutosurgery = (function() {
}
/**
- * @param {App.Entity.SlaveState} slave
* @param {Object[]} ruleset
* @returns {Object}
*/
- function autoSurgerySelector(slave, ruleset) {
+ function autoSurgerySelector(ruleset) {
const surgery = {};
ruleset.forEach(rule => {
Object.keys(rule)
@@ -115,8 +114,8 @@ window.rulesAutosurgery = (function() {
thisSurgery = autoSurgerySelector(
slave,
V.defaultRules
- .filter(x => ruleApplied(slave, x) && x.set.autoSurgery === 1)
- .map(x => x.set));
+ .filter(x => ruleApplied(slave, x) && x.set.autoSurgery === 1)
+ .map(x => x.set));
if ((thisSurgery.surgery_hips !== "no default setting") && (thisSurgery.surgery_butt !== "no default setting")) {
if (slave.hips < -1) {
if (thisSurgery.surgery_butt > 2) {
diff --git a/src/js/sexActsJS.js b/src/js/sexActsJS.js
index f9ec0a9bf52..9ab9ceb09db 100644
--- a/src/js/sexActsJS.js
+++ b/src/js/sexActsJS.js
@@ -16,7 +16,7 @@ window.VCheck = (function () {
Simple: SimpleVCheck,
Partner: PartnerVCheck
};
-
+
function setScopedPronouns(slave) {
const pronouns = getPronouns(slave);
he = pronouns.pronoun;
@@ -315,7 +315,6 @@ window.VCheck = (function () {
}
return r;
}
-
})();
/**
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index 41a57b6307f..995c5267e41 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -387,7 +387,7 @@ window.bodyguardSuccessorEligible = function(slave) {
window.ngUpdateGenePool = function (genePool = []) {
const transferredSlaveIds = (State.variables.slaves || [])
- .filter(s => (s.ID >= 1200000))
+ .filter(s => s.ID >= 1200000)
.map(s => s.ID - 1200000);
return genePool.filter(s => (transferredSlaveIds.indexOf(s.ID) >= 0))
.map(function (s) {
--
GitLab