From 439d2eca04671825e0e469c8cdaf60af1f63e682 Mon Sep 17 00:00:00 2001
From: Space Admiral <joel@spacetraders.io>
Date: Mon, 19 Sep 2022 10:22:16 -0700
Subject: [PATCH] minor cleanup of types

---
 models/Cooldown.json         |  2 +-
 models/ShipCargo.json        |  2 +-
 models/ShipCrew.json         |  5 ++---
 models/ShipFuel.json         |  2 +-
 models/ShipRegistration.json |  2 +-
 models/ShipRequirements.json | 14 +++++++-------
 reference/SpaceTraders.json  |  2 +-
 7 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/models/Cooldown.json b/models/Cooldown.json
index cec9ffe..6711be5 100644
--- a/models/Cooldown.json
+++ b/models/Cooldown.json
@@ -12,7 +12,7 @@
       "description": "The remaining duration of the cooldown in seconds",
       "minimum": 0
     },
-    "expiresAt": {
+    "expiration": {
       "type": "string",
       "format": "date-time",
       "description": "The date and time when the cooldown expires in ISO 8601 format",
diff --git a/models/ShipCargo.json b/models/ShipCargo.json
index 4f8edbd..93fca08 100644
--- a/models/ShipCargo.json
+++ b/models/ShipCargo.json
@@ -1,7 +1,7 @@
 {
   "type": "object",
   "properties": {
-    "size": {
+    "capacity": {
       "type": "integer",
       "minimum": 0
     },
diff --git a/models/ShipCrew.json b/models/ShipCrew.json
index ca6ee29..db12854 100644
--- a/models/ShipCrew.json
+++ b/models/ShipCrew.json
@@ -23,13 +23,12 @@
     },
     "rotation": {
       "type": "string",
-      "description": "The rotation of crew shifts. Stricter shifts can improve the ship's performance, and more relaxed shifts can improve the crew's morale.",
+      "description": "The rotation of crew shifts. A stricter shift improves the ship's performance. A more relaxed shift improves the crew's morale.",
       "enum": [
         "STRICT",
-        "STANDARD",
         "RELAXED"
       ],
-      "default": "STANDARD"
+      "default": "STRICT"
     },
     "morale": {
       "type": "integer",
diff --git a/models/ShipFuel.json b/models/ShipFuel.json
index 94f3f1e..e2a5081 100644
--- a/models/ShipFuel.json
+++ b/models/ShipFuel.json
@@ -7,7 +7,7 @@
       "description": "The amount of fuel in the ship's tanks.",
       "minimum": 0
     },
-    "max": {
+    "capacity": {
       "type": "integer",
       "description": "The maximum amount of fuel the ship's tanks can hold.",
       "minimum": 0
diff --git a/models/ShipRegistration.json b/models/ShipRegistration.json
index b682a33..8017311 100644
--- a/models/ShipRegistration.json
+++ b/models/ShipRegistration.json
@@ -17,7 +17,7 @@
         "The Flying Dutchman"
       ]
     },
-    "faction": {
+    "factionSymbol": {
       "type": "string",
       "description": "The symbol of the faction the ship is registered with",
       "minLength": 1,
diff --git a/models/ShipRequirements.json b/models/ShipRequirements.json
index 4a65b3f..2510319 100644
--- a/models/ShipRequirements.json
+++ b/models/ShipRequirements.json
@@ -4,15 +4,15 @@
   "properties": {
     "power": {
       "type": "integer",
-      "minimum": 0
+      "description": "The amount of power required from the reactor."
     },
     "crew": {
       "type": "integer",
-      "minimum": 0
+      "description": "The number of crew required for operation."
+    },
+    "slots": {
+      "type": "integer",
+      "description": "The number of module slots required for installation."
     }
-  },
-  "required": [
-    "power",
-    "crew"
-  ]
+  }
 }
\ No newline at end of file
diff --git a/reference/SpaceTraders.json b/reference/SpaceTraders.json
index b4bf174..00314ca 100644
--- a/reference/SpaceTraders.json
+++ b/reference/SpaceTraders.json
@@ -496,7 +496,7 @@
                   "Success": {
                     "value": {
                       "data": {
-                        "status": "ORBIT"
+                        "status": "IN_ORBIT"
                       }
                     }
                   }