From 4433b3f1399a0533b366f94185a5d139f1c26452 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Sat, 30 Mar 2019 10:27:13 -0400
Subject: [PATCH] Formatting
---
src/js/assayJS.js | 76 ++++++++++++++++-------------------------------
1 file changed, 25 insertions(+), 51 deletions(-)
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 797ddc67fae..4b794f3ea70 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -1,11 +1,8 @@
-/* eslint-disable no-unused-vars */
-/* eslint-disable no-undef */
-window.isSlim =
/**
* @param {App.Entity.SlaveState} slave
- * @returns {}
+ * @returns {boolean}
*/
-function(slave) {
+window.isSlim = function(slave) {
let slim = false;
const ArcologyZero = State.variables.arcologies[0];
@@ -34,12 +31,11 @@ function(slave) {
return slim;
};
-window.slimPass =
/**
* @param {App.Entity.SlaveState} slave
* @returns {number}
*/
-function(slave) {
+window.slimPass = function(slave) {
let slimPass = 0;
const ArcologyZero = State.variables.arcologies[0];
@@ -78,39 +74,35 @@ window.isRivalP = function isRivalP(slave, target) {
return slave.rivalryTarget === target.ID;
};
-window.supremeRaceP =
/**
* @param {App.Entity.SlaveState} slave
* @returns {boolean}
*/
-function supremeRaceP(slave) {
+window.supremeRaceP = function supremeRaceP(slave) {
return State.variables.arcologies[0].FSSupremacistRace === slave.race;
};
-window.inferiorRaceP =
/**
* @param {App.Entity.SlaveState} slave
* @returns {boolean}
*/
-function inferiorRaceP(slave) {
+window.inferiorRaceP = function inferiorRaceP(slave) {
return State.variables.arcologies[0].FSSubjugationistRace === slave.race;
};
-window.hasVisibleHeterochromia =
/**
* @param {App.Entity.SlaveState} slave
* @returns {boolean}
*/
-function hasVisibleHeterochromia(slave) {
+window.hasVisibleHeterochromia = function hasVisibleHeterochromia(slave) {
return slave.geneticQuirks.heterochromia !== 0 && slave.geneticQuirks.heterochromia !== 1 && slave.geneticQuirks.albinism !== 2 && slave.geneticQuirks.heterochromia !== slave.eyeColor && slave.eyeColor === slave.origEye;
};
-window.isLeaderP =
/**
* @param {App.Entity.SlaveState} slave
* @returns {boolean} // I think
*/
-function isLeaderP(slave) {
+window.isLeaderP = function isLeaderP(slave) {
const V = State.variables;
/** @type {App.Entity.SlaveState[]}*/
const leaders = [V.HeadGirl, V.Bodyguard, V.Recruiter, V.Concubine, V.Nurse, V.Attendant, V.Matron, V.Madam, V.DJ, V.Milkmaid, V. Farmer, V.Stewardess, V.Schoolteacher, V.Wardeness];
@@ -133,11 +125,10 @@ window.properMaster = function properMaster() {
else return "Mistress";
};
-window.newSlave =
/**
* @param {App.Entity.SlaveState} slave
*/
-function newSlave(slave) {
+window.newSlave = function newSlave(slave) {
const V = State.variables;
if (slave.override_Eye_Color !== 1) {
@@ -274,11 +265,10 @@ function newSlave(slave) {
}
};
-window.newChild =
/**
* @param {App.Entity.SlaveState} child
*/
-function newChild(child) {
+window.newChild = function newChild(child) {
const V = State.variables;
child.age = 0; /* not sure if this is the correct way to do this or if more is required */
@@ -361,11 +351,10 @@ function newChild(child) {
State.variables.nurseryBabies++;
};
-window.addSlave =
/**
* @param {App.Entity.SlaveState} slave
*/
-function addSlave(slave) {
+window.addSlave = function addSlave(slave) {
State.variables.slaves.push(slave);
State.variables.slaveIndices[slave.ID] = State.variables.slaves.length - 1;
};
@@ -383,12 +372,11 @@ window.slaves2indices = function slaves2indices() {
State.variables.slaves.forEach((slave, i) => obj[slave.ID] = i);
return obj;
};
-window.getSlave =
/**
* @param {number} ID
* @returns {App.Entity.SlaveState}
*/
-function getSlave(ID) {
+window.getSlave = function getSlave(ID) {
const index = State.variables.slaveIndices[ID];
if (index === undefined) return undefined;
else return State.variables.slaves[index];
@@ -397,12 +385,11 @@ window.getChild = function getChild(ID) {
const V = State.variables;
return V.cribs.find(function(s) { return s.ID === ID; });
};
-window.getPronouns =
/**
* @param {App.Entity.SlaveState} slave
* @returns {object}
*/
-function getPronouns(slave) {
+window.getPronouns = function getPronouns(slave) {
return {
pronoun: slave.pronoun,
possessivePronoun: slave.possessivePronoun,
@@ -412,11 +399,10 @@ function getPronouns(slave) {
noun: slave.noun};
};
-window.SlavePronouns =
/**
* @param {App.Entity.SlaveState} slave
*/
-function SlavePronouns(slave) {
+window.SlavePronouns = function SlavePronouns(slave) {
const V = State.variables;
const pronouns = getPronouns(slave);
V.pronoun = pronouns.pronoun;
@@ -426,12 +412,11 @@ function SlavePronouns(slave) {
V.object = pronouns.object;
};
-window.WrittenMaster =
/**
* @param {App.Entity.SlaveState} slave
* @returns {string} // I think
*/
-function WrittenMaster(slave) {
+window.WrittenMaster = function WrittenMaster(slave) {
const V = State.variables;
if (slave !== undefined)
Enunciate(slave);
@@ -440,11 +425,10 @@ function WrittenMaster(slave) {
return V.writtenTitle;
};
-window.Enunciate =
/**
* @param {App.Entity.SlaveState} slave
*/
-function Enunciate(slave) {
+window.Enunciate = function Enunciate(slave) {
const V = State.variables;
if (SlaveStatsChecker.checkForLisp(slave)) {
if (V.PC.customTitleLisp !== undefined)
@@ -585,12 +569,11 @@ function Enunciate(slave) {
}
};
-window.fetishChangeChance =
/**
* @param {App.Entity.SlaveState} slave
* @returns {number}
*/
-function fetishChangeChance(slave) {
+window.fetishChangeChance = function fetishChangeChance(slave) {
const V = State.variables;
let chance = 0, sex = 0;
@@ -607,12 +590,11 @@ function fetishChangeChance(slave) {
return chance;
};
-window.SlaveFullName =
/**
* @param {App.Entity.SlaveState} slave
* @returns {string}
*/
-function SlaveFullName(slave) {
+window.SlaveFullName = function SlaveFullName(slave) {
const V = State.variables;
const pair = slave.slaveSurname ? [slave.slaveName, slave.slaveSurname] : [slave.slaveName];
if ((V.surnameOrder !== 1 && ["Cambodian", "Chinese", "Hungarian", "Japanese", "Korean", "Mongolian", "Taiwanese", "Vietnamese"].includes(slave.nationality)) || (V.surnameOrder === 2))
@@ -620,12 +602,11 @@ function SlaveFullName(slave) {
return pair.join(" ");
};
-window.SlaveFullBirthName =
/**
* @param {App.Entity.SlaveState} slave
* @returns {string}
*/
-function SlaveFullBirthName(slave) {
+window.SlaveFullBirthName = function SlaveFullBirthName(slave) {
const V = State.variables;
const pair = slave.birthSurname ? [slave.birthName, slave.birthSurname] : [slave.birthName];
if ((V.surnameOrder !== 1 && ["Cambodian", "Chinese", "Hungarian", "Japanese", "Korean", "Mongolian", "Taiwanese", "Vietnamese"].includes(slave.nationality)) || (V.surnameOrder === 2))
@@ -1177,12 +1158,11 @@ window.PCTitle = function PCTitle() {
}
};
-window.PoliteRudeTitle =
/**
* @param {App.Entity.SlaveState} slave
* @returns {string}
*/
-function PoliteRudeTitle(slave) {
+window.PoliteRudeTitle = function PoliteRudeTitle(slave) {
const V = State.variables;
const PC = V.PC;
const s = V.sEnunciate;
@@ -1209,12 +1189,11 @@ function PoliteRudeTitle(slave) {
return r;
};
-window.SlaveTitle =
/**
* @param {App.Entity.SlaveState} slave
* @returns {string}
*/
-function SlaveTitle(slave) {
+window.SlaveTitle = function SlaveTitle(slave) {
const V = State.variables;
let r = "";
if (V.newDescriptions === 1) {
@@ -1572,11 +1551,10 @@ function SlaveTitle(slave) {
return r;
};
-window.DegradingName =
/**
* @param {App.Entity.SlaveState} slave
*/
-function DegradingName(slave) {
+window.DegradingName = function DegradingName(slave) {
const V = State.variables;
const leadershipPosition = [
"be the Attendant",
@@ -1976,12 +1954,11 @@ function DegradingName(slave) {
slave.slaveSurname = surname;
};
-window.SlaveSort =
/**
* @param {App.Entity.SlaveState[]} slaves
* @param {boolean} main
*/
-function SlaveSort(slaves, main = false) {
+window.SlaveSort = function SlaveSort(slaves, main = false) {
const V = State.variables;
if (main) {
switch (V.sortSlavesBy) {
@@ -2036,12 +2013,10 @@ function SlaveSort(slaves, main = false) {
}
};
-window.slaveSortMinor =
/**
* @param {App.Entity.SlaveState[]} slaves
*/
-// eslint-disable-next-line no-unused-vars
-function slaveSortMinor(slaves) {
+window.slaveSortMinor = function slaveSortMinor(slaves) {
slaves = slaves.sort((a, b) => a.slaveName < b.slaveName ? -1 : 1);
};
@@ -2099,10 +2074,10 @@ window.MenialPopCap = function MenialPopCap() {
return r;
};
-window.faceIncrease =
/**
* @param {App.Entity.SlaveState} slave
* @param {number} amount
+ window.faceIncrease =
* @returns {string}
*/
function faceIncrease(slave, amount) {
@@ -2127,12 +2102,11 @@ function faceIncrease(slave, amount) {
return r;
};
-window.Deadliness =
/**
* @param {App.Entity.SlaveState} slave
* @returns {number}
*/
-function Deadliness(slave) {
+window.Deadliness = function Deadliness(slave) {
const V = State.variables;
let deadliness = 2;
--
GitLab