diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js index 173a6fa47ceb39d80cfb643b20a98de36f94a7b4..3c43be115f4a98e6020988feed522fb583b1ffeb 100644 --- a/src/endWeek/saChoosesOwnClothes.js +++ b/src/endWeek/saChoosesOwnClothes.js @@ -671,7 +671,7 @@ window.saChoosesOwnClothes = (function() { } } } - + if (V.arcologies[0].FSSubjugationist > 0) { if (V.arcologies[0].FSSubjugationistRace === "black") { if (isItemAccessible("a klan robe")) { diff --git a/src/js/assayJS.js b/src/js/assayJS.js index 6bc856d5fe1e3f8054a2aeb1439cff33c35aca66..12d66183801c4fcaa74ea169d9130202d75cdb8a 100644 --- a/src/js/assayJS.js +++ b/src/js/assayJS.js @@ -44,8 +44,6 @@ window.hasVisibleHeterochromia = function hasVisibleHeterochromia(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]; return leaders.some(leader => leader.ID && leader.ID === slave.ID); }; diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js index b3afe04950d86170278960e82d319ed0591caf57..d0460d7b5f2e25b792d4ab91721b3d525bf238fa 100644 --- a/src/js/rulesAssistant.js +++ b/src/js/rulesAssistant.js @@ -93,6 +93,7 @@ window.ruleApplied = function(slave, rule) { * remove slave from the facility described by the rule * @param {App.Entity.SlaveState} slave * @param {Object} rule + * @returns {string} */ window.RAFacilityRemove = function RAFacilityRemove(slave, rule) { const V = State.variables; @@ -194,7 +195,7 @@ window.RAFacilityRemove = function RAFacilityRemove(slave, rule) { /** * return whether the rule applies to the slave - * @param {{function:boolean|string, data, specialSlaves, selectedSlaves, excludedSlaves, assignment}} cond + * @param {function} cond // I think * @param {App.Entity.SlaveState} slave * @returns {boolean} flag */ window.ruleAppliesP = function ruleAppliesP(cond, slave) { diff --git a/src/js/utilJS.js b/src/js/utilJS.js index ffce2d69b0d2f06289879a348514b17e90958bbb..658f0f6f6340f35703b8adb71cba33183a518373 100644 --- a/src/js/utilJS.js +++ b/src/js/utilJS.js @@ -544,10 +544,11 @@ window.Height = (function() { /** * FIXME: JSdoc syntax error * Helper method - table lookup for nationality/race combinations - * @param {{ [table: string]: number; }} table + * @param {object} table // I think * @param {string|Object} nationality * @param {string} race * @param {undefined} [def] + * @returns {object} // I think */ const nationalityMeanHeight = function(table, nationality, race, def) { return table[`${nationality}.${race}`] || table[nationality] || table[`.${race}`] || table[""] || def; @@ -784,9 +785,9 @@ window.Intelligence = (function() { let maxIntelligence = 100; /** - * FIXME: JSdoc syntax error * Configuration method for the above values - * @param {{ mean: number; limitMult: number[]; limitIntelligence: number[]; skew: number; spread: number; } | { limitMult: number[]; limitIntelligence: number[]; skew: number; spread: number; mean?: undefined; }} [conf] + * @param {object} [conf] // I'm pretty sure + * @returns {object} */ const _config = function(conf) { if (_.isUndefined(conf)) { @@ -862,8 +863,8 @@ window.Intelligence = (function() { /** * FIXME: JSdoc syntax error - * @param {{ mean: number; limitMult: number[]; limitIntelligence: number[]; skew: number; spread: number; } | { limitMult: number[]; limitIntelligence: number[]; skew: number; spread: number; mean?: undefined; }} settings - * @returns {number} + * @param {boolean} settings // no idea for this one + * @returns {object} */ const _randomIntelligence = function(settings) { if (settings) {