Merge remote-tracking branch 'upstream/main' into normalize-schemas

models/ActivityLevel.json

@@ -1,9 +1,16 @@
 {
   "type": "string",
-  "description": "The activity level of a trade good. If the good is an import, this represents how strong consumption is for the good. If the good is an export, this represents how strong the production is for the good.",
+  "description": "The activity level of a trade good. If the good is an import, this represents how strong consumption is. If the good is an export, this represents how strong the production is for the good. When activity is strong, consumption or production is near maximum capacity. When activity is weak, consumption or production is near minimum capacity.",
   "enum": [
     "WEAK",
     "GROWING",
-    "STRONG"
+    "STRONG",
-  ]
+    "RESTRICTED"
+  ],
+  "x-enumDescriptions": {
+    "WEAK": "Indicates very low production or consumption activity. This may suggest a surplus in supply or a lack of demand.",
+    "GROWING": "Represents increasing activity in production or consumption, suggesting a developing market.",
+    "STRONG": "Signifies high levels of production or consumption. Indicates a healthy and active market with high demand or supply.",
+    "RESTRICTED": "Reflects a bottlneck in production or consumption, possibly due to a lack of supply or demand in related goods."
+  }
 }

models/TradeSymbol.json

@@ -30,6 +30,7 @@
     "MERITIUM_ORE",
     "HYDROCARBON",
     "ANTIMATTER",
+    "FAB_MATS",
     "FERTILIZERS",
     "FABRICS",
     "FOOD",
@@ -51,9 +52,9 @@
     "CLOTHING",
     "MICROPROCESSORS",
     "PLASTICS",
-    "QUANTUM_STABILIZERS",
     "POLYNUCLEOTIDES",
     "BIOCOMPOSITES",
+    "QUANTUM_STABILIZERS",
     "NANOBOTS",
     "AI_MAINFRAMES",
     "QUANTUM_DRIVES",
@@ -72,6 +73,21 @@
     "NOVEL_LIFEFORMS",
     "BOTANICAL_SPECIMENS",
     "CULTURAL_ARTIFACTS",
+    "FRAME_PROBE",
+    "FRAME_DRONE",
+    "FRAME_INTERCEPTOR",
+    "FRAME_RACER",
+    "FRAME_FIGHTER",
+    "FRAME_FRIGATE",
+    "FRAME_SHUTTLE",
+    "FRAME_EXPLORER",
+    "FRAME_MINER",
+    "FRAME_LIGHT_FREIGHTER",
+    "FRAME_HEAVY_FREIGHTER",
+    "FRAME_TRANSPORT",
+    "FRAME_DESTROYER",
+    "FRAME_CRUISER",
+    "FRAME_CARRIER",
     "REACTOR_SOLAR_I",
     "REACTOR_FUSION_I",
     "REACTOR_FISSION_I",
@@ -90,8 +106,6 @@
     "MODULE_ENVOY_QUARTERS_I",
     "MODULE_PASSENGER_CABIN_I",
     "MODULE_MICRO_REFINERY_I",
-    "MODULE_ORE_REFINERY_I",
-    "MODULE_FUEL_REFINERY_I",
     "MODULE_SCIENCE_LAB_I",
     "MODULE_JUMP_DRIVE_I",
     "MODULE_JUMP_DRIVE_II",
@@ -101,6 +115,8 @@
     "MODULE_WARP_DRIVE_III",
     "MODULE_SHIELD_GENERATOR_I",
     "MODULE_SHIELD_GENERATOR_II",
+    "MODULE_ORE_REFINERY_I",
+    "MODULE_FUEL_REFINERY_I",
     "MOUNT_GAS_SIPHON_I",
     "MOUNT_GAS_SIPHON_II",
     "MOUNT_GAS_SIPHON_III",
@@ -116,7 +132,18 @@
     "MOUNT_LASER_CANNON_I",
     "MOUNT_MISSILE_LAUNCHER_I",
     "MOUNT_TURRET_I",
-    "FAB_MATS"
+    "SHIP_PROBE",
+    "SHIP_MINING_DRONE",
+    "SHIP_SIPHON_DRONE",
+    "SHIP_INTERCEPTOR",
+    "SHIP_LIGHT_HAULER",
+    "SHIP_COMMAND_FRIGATE",
+    "SHIP_EXPLORER",
+    "SHIP_HEAVY_FREIGHTER",
+    "SHIP_LIGHT_SHUTTLE",
+    "SHIP_ORE_HOUND",
+    "SHIP_REFINING_FREIGHTER",
+    "SHIP_SURVEYOR"
   ],
   "description": "The good's symbol."
 }

models/WaypointTraitSymbol.json

@@ -10,6 +10,7 @@
       "SCATTERED_SETTLEMENTS",
       "SPRAWLING_CITIES",
       "MEGA_STRUCTURES",
+      "PIRATE_BASE",
       "OVERCROWDED",
       "HIGH_TECH",
       "CORRUPT",

reference/SpaceTraders.json

@@ -3072,6 +3072,11 @@
                     "description": "The amount of fuel to fill in the ship's tanks. When not specified, the ship will be refueled to its maximum fuel capacity. If the amount specified is greater than the ship's remaining capacity, the ship will only be refueled to its maximum fuel capacity. The amount specified is not in market units but in ship fuel units.",
                     "example": "100",
                     "minimum": 1
+                  },
+                  "fromCargo": {
+                    "type": "boolean",
+                    "description": "Wether to use the FUEL thats in your cargo or not. Default: false",
+                    "example": false
                   }
                 }
               }