From ff0e77f1c2883a2e5bf0c8a25a514f93e4779047 Mon Sep 17 00:00:00 2001
From: ezsh <ezsh.junk@gmail.com>
Date: Thu, 20 Feb 2020 00:24:07 +0100
Subject: [PATCH] Revert "type as well"
This reverts commit 8129a1db74be01e0ff2c42fc8c92460c1428ab2c.
---
src/004-base/facility.js | 4 ++--
src/facilities/nursery/nurseryWidgets.js | 2 +-
src/js/CustomSlave.js | 6 +++---
src/js/SlaveState.js | 4 ++--
src/js/slaveListing.js | 2 +-
src/player/js/PlayerState.js | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/004-base/facility.js b/src/004-base/facility.js
index 8ad4843add6..0b5246c0a78 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} */
@@ -277,7 +277,7 @@ App.Entity.Facilities.Facility = class {
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/facilities/nursery/nurseryWidgets.js b/src/facilities/nursery/nurseryWidgets.js
index 869f93e70aa..7e7630f26f2 100644
--- a/src/facilities/nursery/nurseryWidgets.js
+++ b/src/facilities/nursery/nurseryWidgets.js
@@ -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 503f0e79f04..3bcca823e97 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 28cec7f2c28..156751c2bd9 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.<string, Object>} */
this.scar = {};
/**
* In a eugenics society, this slave is a designated breeder.
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 6fcbac674d0..7c1186df79b 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 = {
};
diff --git a/src/player/js/PlayerState.js b/src/player/js/PlayerState.js
index 03965b9d258..137e80a63ec 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.<string, object>} */
this.scar = {};
/**
* In a eugenics society, you are a designated breeder.
--
GitLab