diff --git a/src/004-base/facility.js b/src/004-base/facility.js
index 465475f98395b36a0d53a928ba156a241c8d07b4..8ad4843add6a9bc00db2ab64cdc44f99bb911790 100644
--- a/src/004-base/facility.js
+++ b/src/004-base/facility.js
@@ -41,7 +41,7 @@ App.Data.FacilityDesc = class {
* If null, baseName is used instead
*/
this.genericName = "";
- /** @type {Object.<string, App.Data.JobDesc>} */
+ /** @type {object.<string, App.Data.JobDesc>} */
this.jobs = {};
this.defaultJob = "";
/** @type {App.Data.ManagerJobDesc} */
@@ -271,13 +271,13 @@ App.Entity.Facilities.ManagingJob = class extends App.Entity.Facilities.Job {
App.Entity.Facilities.Facility = class {
/**
* @param {App.Data.FacilityDesc} desc defines state variable for this facility
- * @param {Object.<string, App.Entity.Facilities.Job>} [jobs] job object that are not default
+ * @param {object.<string, App.Entity.Facilities.Job>} [jobs] job object that are not default
* @param {App.Entity.Facilities.ManagingJob} [manager]
*/
constructor(desc, jobs, manager) {
this.desc = desc;
jobs = jobs || {};
- /** @private @type {Object.<string, App.Entity.Facilities.Job>} */
+ /** @private @type {object.<string, App.Entity.Facilities.Job>} */
this._jobs = {};
for (const jn in this.desc.jobs) {
diff --git a/src/art/artJS.js b/src/art/artJS.js
index 23d58e2ed46ec0524bdd8fde1a205b0b5d6742cc..022fbeca7b95061e5a5227091d7a07371f53f617 100644
--- a/src/art/artJS.js
+++ b/src/art/artJS.js
@@ -1882,7 +1882,7 @@ window.skinColorCatcher = function(artSlave) {
App.Art.cacheArtData = function() {
/**
* @param {NodeListOf<Element>} imagePassages
- * @param {Object} obj
+ * @param {object} obj
*/
function cacheImages(imagePassages, obj) {
obj.nodes = document.createDocumentFragment();
diff --git a/src/facilities/nursery/nurseryWidgets.js b/src/facilities/nursery/nurseryWidgets.js
index 2c66c7a65d24fe8848e7095808d4115b8ed8b551..40bcc3a84550772c1d95d44e808633cf1e61ec19 100644
--- a/src/facilities/nursery/nurseryWidgets.js
+++ b/src/facilities/nursery/nurseryWidgets.js
@@ -16085,7 +16085,7 @@ App.Facilities.Nursery.newChild = function newChild(child) {
/**
* @param {App.Entity.ChildState[]} [cribs]
- * @returns {Object.<number, number>}
+ * @returns {object.<number, number>}
*/
App.Facilities.Nursery.cribsToIndices = function cribsToIndices(cribs = State.variables.cribs) {
return cribs.reduce((acc, child, i) => { acc[child.ID] = i; return acc; }, {});
@@ -17566,7 +17566,7 @@ App.Facilities.Nursery.ChildState = class ChildState {
/**
* brand
*
- * @type {Object.<string, string>} */
+ * @type {object.<string, string>} */
this.brand = {};
/** Has pierced ears
*
diff --git a/src/js/CustomSlave.js b/src/js/CustomSlave.js
index 3bcca823e97f263579a19ddffceab174a675aca5..503f0e79f04bc57fd66222fd6aee43275e59fb6f 100644
--- a/src/js/CustomSlave.js
+++ b/src/js/CustomSlave.js
@@ -133,7 +133,7 @@ App.Entity.CustomSlaveOrder = class CustomSlaveOrder {
/** desired skills rating (.whore controls both whoring and entertainment, .combat controls combat)
* Values as in SlaveState.
- * @type {Object.<number, number>}
+ * @type {object.<number, number>}
*/
this.skill = {whore: 15, combat: 0};
@@ -156,12 +156,12 @@ App.Entity.CustomSlaveOrder = class CustomSlaveOrder {
this.nationality = "Stateless";
/** desired left and right leg state
- * @type {Object.<App.Entity.LimbState, App.Entity.LimbState>}
+ * @type {object.<App.Entity.LimbState, App.Entity.LimbState>}
*/
this.leg = {left: new App.Entity.LimbState(), right: new App.Entity.LimbState()};
/** desired left and right arm state
- * @type {Object.<App.Entity.LimbState, App.Entity.LimbState>}
+ * @type {object.<App.Entity.LimbState, App.Entity.LimbState>}
*/
this.arm = {left: new App.Entity.LimbState(), right: new App.Entity.LimbState()};
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 86c6f69fa9d32443c9a8d476f8e02fec5bae0874..35af2b5171474a8d4b6c09994b155267b39ff8e2 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -1456,7 +1456,7 @@ App.Entity.SlaveState = class SlaveState {
/**
* brand
*
- * @type {Object.<string, string>} */
+ * @type {object.<string, string>} */
this.brand = {};
/** has pierced ears
*
@@ -2279,7 +2279,7 @@ App.Entity.SlaveState = class SlaveState {
* Sub-object:
* the body part in question, such as back or left hand
* the key of that part is the type of scar they can have and the value is how serious it is, from 0 up
- * @type {Object.Object} */
+ * @type {object.Object} */
this.scar = {};
/**
* In a eugenics society, this slave is a designated breeder.
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index b0142fbdc71096e0edecba02f0c2dcaa610d005e..3329b4556ca2b581c91a313cc8cb1f336167c3d8 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -281,7 +281,7 @@ window.removeSlave = function removeSlave(index) {
/**
* @param {App.Entity.SlaveState[]} [slaves]
- * @returns {Object.<number, number>}
+ * @returns {object.<number, number>}
*/
window.slaves2indices = function slaves2indices(slaves = State.variables.slaves) {
return slaves.reduce((acc, slave, i) => { acc[slave.ID] = i; return acc; }, {});
@@ -376,7 +376,7 @@ App.Utils.Pronouns = class {
/**
* @param {string} suffix
- * @returns {Object.<string, string>}
+ * @returns {object.<string, string>}
*/
appendSuffix(suffix) {
const r = {};
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index cd6f66f96a9c9e63d118c45ddaa730b0e7336c64..60ef44a356f5cf4f5bcefd4058b7e9cbd3189511 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -2328,7 +2328,7 @@ App.Entity.Utils.RARuleDatatypeCleanup = function() {
function settersSchemeCleanup(set) {
/**
* Moves properties of the given object, whose names start with prefix to the suboject newProp
- * @param {Object} obj
+ * @param {object} obj
* @param {string} prefix
* @param {string} newProp
*/
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 136e4193bacfd9beb893d0216a9f3e71850f5957..e74605496609577346f2654fc930ee68c5686f47 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -999,7 +999,7 @@ window.getSlaveCostArray = function(s) {
/**
* @param {App.Entity.SlaveState} s
- * @returns {Number}
+ * @returns {number}
*/
window.getSlaveCost = function(s) {
return getSlaveCostArray(s).reduce((result, {value})=>result + value, 0);
@@ -1008,8 +1008,8 @@ window.getSlaveCost = function(s) {
/**
* Supply and Demand for slaves (linear, simple)
* PC buying slaves reduces supply, selling slaves reduces demand.
- * @param {Number} q
- * @returns {Number}
+ * @param {number} q
+ * @returns {number}
*/
window.menialSlaveCost = function(q = 0) {
const demand = State.variables.menialDemandFactor;
@@ -1886,8 +1886,8 @@ window.endWeekSlaveMarket = function() {
/**
* @param {App.Entity.SlaveState} s
- * @param {Object|undefined} facility
- * @returns {Object}
+ * @param {object|undefined} facility
+ * @returns {object}
*/
window.getSlaveStatisticData = function(s, facility) {
if (!facility) { // Base data, even without facility
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 548d119fb77dd6a6e779fdefc0974dda29ee7e32..ef2fa96e827204cab2ff54bde44e802d31235c69 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -670,7 +670,7 @@ window.generateGenetics = (function() {
* @param {App.Entity.SlaveState|number} father
* @param {App.Entity.SlaveState} mother
* @param {string} sex
- * @returns {Object}
+ * @returns {object}
*/
function setGeneticQuirks(father, mother, sex) {
let quirks = {
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index a9197586e597329a885d858a7e9a7f4ce53e6494..2e1a0a5003941c37bfdc760256a623b0d1472e51 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -1,6 +1,6 @@
/**
* @param {App.Entity.SlaveState} slave
- * @param {Object[]} rules
+ * @param {object[]} rules
* @returns {boolean}
*/
window.hasSurgeryRule = function(slave, rules) {
@@ -10,7 +10,7 @@ window.hasSurgeryRule = function(slave, rules) {
/**
* @param {App.Entity.SlaveState} slave
- * @param {Object[]} rules
+ * @param {object[]} rules
* @param {string} what
* @returns {boolean}
*/
@@ -21,7 +21,7 @@ window.hasRuleFor = function(slave, rules, what) {
/**
* @param {App.Entity.SlaveState} slave
- * @param {Object[]} rules
+ * @param {object[]} rules
* @returns {boolean}
*/
window.hasHColorRule = function(slave, rules) {
@@ -87,7 +87,7 @@ window.ruleApplied = function(slave, rule) {
/**
* remove slave from the facility described by the rule
* @param {App.Entity.SlaveState} slave
- * @param {Object} rule
+ * @param {object} rule
* @returns {string}
*/
window.RAFacilityRemove = function RAFacilityRemove(slave, rule) {
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index a089d206b8e19659d5b54a5d6a61a36dd0f11dd4..fb9d7170fe60285c4c1b66393fbc4610cd7ada2d 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -458,7 +458,7 @@ window.rulesAutosurgery = (function() {
/**
* @param {App.Entity.SlaveState} slave
- * @param {Object} thisSurgery
+ * @param {object} thisSurgery
* @param {string[]} surgeries
*/
function PrintResult(slave, thisSurgery, surgeries) {
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 75aa237091bbc8d18b558e4272b18d7ed8370aac..f62e0a87d18aa06f46b051928cd9728b10648739 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -2067,7 +2067,7 @@ window.FResultArray = (function() {
/**
* @param {string} text blurb
- * @param {Number} FResultChange
+ * @param {number} FResultChange
*/
function adjustFResult(text, FResultChange) {
retval.push({text: text, value: FResultChange});
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 4c9bd8e53b6aac555648479cdb34302eb43534b3..6fcbac674d00528308123a9018c79908b7f01d65 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -32,7 +32,7 @@ App.UI.SlaveList.render = function() {
// potentially can be a problem if played long enough to reach Number.MAX_SAFE_INTEGER
let listID = Number.MIN_SAFE_INTEGER;
- /** @type {Object.<number, Node>}*/
+ /** @type {object.<number, Node>}*/
const readyResults = {
};
@@ -349,7 +349,7 @@ App.UI.SlaveList.render = function() {
* @param {string} tagName
* @param {string} [content]
* @param {string|string[]} [classNames]
- * @param {Object.<string, any>} [attributes]
+ * @param {object.<string, any>} [attributes]
* @returns {HTMLElement}
*/
function makeElement(container, tagName, content, classNames, attributes) {
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index 0452e0e2bb549cd55cbca8db5cc8ff040e8165b5..cdc6800b86477a330918dff62111274028b48ec3 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -345,7 +345,7 @@ window.lispReplace = function(text) {
/**
* @param {App.Entity.SlaveState} slave
- * @param {Object} arcology
+ * @param {object} arcology
* @returns {number}
*/
window.repGainSacrifice = function(slave, arcology) {
@@ -439,7 +439,7 @@ window.nippleColor = function(slave) {
/**
* @param {App.Entity.SlaveState} slave
- * @param {Object} PC
+ * @param {object} PC
* @returns {number}
*/
window.overpowerCheck = function(slave, PC) {
diff --git a/src/js/surgery.js b/src/js/surgery.js
index 98b802e27ed61bde64b54f41f2f086eb05ff04c6..dd95e5408b37162c2c53d2ec9a098aa30421b450 100644
--- a/src/js/surgery.js
+++ b/src/js/surgery.js
@@ -118,7 +118,7 @@ App.Medicine.Surgery.ListHelpers = class {
/**
* @param {App.Entity.SlaveState} slave
* @param {string} bodyPart
- * @param {Object.<string, string>} keys
+ * @param {object.<string, string>} keys
* @param {App.Utils.Pronouns} pronouns
* @param {boolean} showCCs
*/
diff --git a/src/player/js/PlayerState.js b/src/player/js/PlayerState.js
index 828a0d442b325bffbd66478399b85d93c2405b81..c54298041767f0bb17a78ff01dc536ccd09d6c57 100644
--- a/src/player/js/PlayerState.js
+++ b/src/player/js/PlayerState.js
@@ -1224,7 +1224,7 @@ App.Entity.PlayerState = class PlayerState {
/**
* brand
*
- * @type {Object.<string, string>} */
+ * @type {object.<string, string>} */
this.brand = {};
/** has pierced ears
*
@@ -1851,7 +1851,7 @@ App.Entity.PlayerState = class PlayerState {
* Sub-object:
* the body part in question, such as back or left hand
* the key of that part is the type of scar they can have and the value is how serious it is, from 0 up
- * @type {Object.Object} */
+ * @type {object.Object} */
this.scar = {};
/**
* In a eugenics society, you are a designated breeder.