diff --git a/src/js/sexActsJS.js b/src/js/sexActsJS.js index 395640919be661695b0e4c2cf53133c0069be54f..c2e72b41f850b834560be2ac2f533d739d1b8ab8 100644 --- a/src/js/sexActsJS.js +++ b/src/js/sexActsJS.js @@ -508,7 +508,7 @@ window.actX = function actX(slave, act, count = 1) { * Sex is between two. This is a handy wrapper for actX that emphasizes that. * @param {App.Entity.SlaveState} slave1 always a slave * @param {string} act1 oral, anal, etc - * @param {App.Entity.SlaveState || string} slave2 slave or PC or "public" + * @param {App.Entity.SlaveState | string} slave2 slave or PC or "public" * @param {string} act2 oral, anal, etc * @param {number} count */ diff --git a/src/js/utilsFC.js b/src/js/utilsFC.js index cf29f65fa0c810a6646432b77e6a84843ec3162a..df0e360f6fa7476297c548e333822dfcc70d184c 100644 --- a/src/js/utilsFC.js +++ b/src/js/utilsFC.js @@ -1212,7 +1212,7 @@ window.years = function(weeks) { /** * @param {number} [weeks] * @param {number} [bonusDay] - * @return {Date} + * @returns {Date} */ window.asDate = function(weeks = null, bonusDay = 0) { if (weeks == null) { @@ -1225,7 +1225,7 @@ window.asDate = function(weeks = null, bonusDay = 0) { /** * @param {number} [weeks] * @param {number} [bonusDay] - * @return {string} + * @returns {string} */ window.asDateString = function(weeks = null, bonusDay = 0) { return asDate(weeks, bonusDay).toLocaleString(undefined, {year: 'numeric', month: 'long', day: 'numeric'}); @@ -2327,7 +2327,7 @@ window.SkillIncrease = (function() { })(); window.upgradeMultiplier = function(skill) { - if (skill === 'medicine' && V.PC.career === "medicine" || skill === 'engineering' && V.PC.career === "engineer" + if (skill === 'medicine' && V.PC.career === "medicine" || skill === 'engineering' && V.PC.career === "engineer" || ((skill === 'medicine' || skill === 'engineering') && V.arcologies[0].FSRestartDecoration >= 100 && V.eugenicsFullControl === 0)) { return 0.6; } @@ -2757,7 +2757,7 @@ window.disobedience = function(slave) { /** * Returns a valid rape target for a slave who is going to rape one of his peers into rivalry with him. * @param {App.Entity.SlaveState} slave - * @param {function} predicate + * @param {function(App.Entity.SlaveState): boolean} predicate * @returns {App.Entity.SlaveState | undefined} */ window.randomRapeRivalryTarget = function(slave, predicate) { @@ -2788,7 +2788,7 @@ window.randomRapeRivalryTarget = function(slave, predicate) { * @param {number} [count] number of slaves to return * @param {boolean} [largest] should it search for the biggest or smallest value * @param {function(App.Entity.SlaveState): boolean} [filter] filter out undesired slaves - * @return {App.Entity.SlaveState[]} sorted from best to worst + * @returns {App.Entity.SlaveState[]} sorted from best to worst */ window.getBestSlaves = function({part, count = 3, largest = true, filter = (() => true)} = {}) { if (!_.isFunction(part)) { @@ -2804,7 +2804,7 @@ window.getBestSlaves = function({part, count = 3, largest = true, filter = (() = }; /** * @param {{}} info see getBestSlaves() - * @return {number[]} + * @returns {number[]} */ window.getBestSlavesIndices = function(info) { return getBestSlaves(info).map(slave => V.slaveIndices[slave.ID]); diff --git a/src/js/utilsSC.js b/src/js/utilsSC.js index 44adff3c742af50971702ebc3ca999706085c351..684f625b4f41699463cf0a97aa698f34a96d8ea2 100644 --- a/src/js/utilsSC.js +++ b/src/js/utilsSC.js @@ -1,7 +1,7 @@ /** * circumvents SugarCube, allowing a plain HTML5 UI within it * - * @param passageFunction + * @param {function(HTMLElement): HTMLElement} passageFunction */ window.html5passage = function html5passage(passageFunction) { $(document).one(":passagedisplay", (ev) => {