diff --git a/models/FactionTrait.json b/models/FactionTrait.json index 2e95d0c..4c0fe72 100644 --- a/models/FactionTrait.json +++ b/models/FactionTrait.json @@ -35,7 +35,42 @@ "ESTABLISHED", "NOTABLE", "DOMINANT", - "INESCAPABLE" + "INESCAPABLE", + "INNOVATIVE", + "BOLD", + "VISIONARY", + "CURIOUS", + "DARING", + "EXPLORATORY", + "RESOURCEFUL", + "FLEXIBLE", + "COOPERATIVE", + "UNITED", + "STRATEGIC", + "INTELLIGENT", + "RESEARCH_FOCUSED", + "COLLABORATIVE", + "PROGRESSIVE", + "MILITARISTIC", + "TECHNOLOGICALLY_ADVANCED", + "AGGRESSIVE", + "IMPERIALISTIC", + "TREASURE_HUNTERS", + "DEXTEROUS", + "UNPREDICTABLE", + "BRUTAL", + "FLEETING", + "ADAPTABLE", + "SELF_SUFFICIENT", + "DEFENSIVE", + "PROUD", + "DIVERSE", + "INDEPENDENT", + "SELF_INTERESTED", + "FRAGMENTED", + "COMMERCIAL", + "FREE_MARKETS", + "ENTREPRENEURIAL" ] }, "name": { diff --git a/models/ShipCargoItem.json b/models/ShipCargoItem.json index 1a1621c..052a220 100644 --- a/models/ShipCargoItem.json +++ b/models/ShipCargoItem.json @@ -10,6 +10,10 @@ "type": "string", "description": "The name of the cargo item type." }, + "description": { + "type": "string", + "description": "The description of the cargo item type." + }, "units": { "type": "integer", "description": "The number of units of the cargo item.", @@ -19,6 +23,7 @@ "required": [ "symbol", "name", + "description", "units" ] } \ No newline at end of file diff --git a/models/ShipEngine.json b/models/ShipEngine.json index 5b0b1de..65cae0b 100644 --- a/models/ShipEngine.json +++ b/models/ShipEngine.json @@ -5,15 +5,18 @@ "symbol": { "type": "string", "enum": [ - "IMPULSE_DRIVE", - "ION_DRIVE_I", - "ION_DRIVE_II", - "HYPER_DRIVE" + "ENGINE_IMPULSE_DRIVE", + "ENGINE_ION_DRIVE_I", + "ENGINE_ION_DRIVE_II", + "ENGINE_HYPER_DRIVE" ] }, "name": { "type": "string" }, + "description": { + "type": "string" + }, "condition": { "$ref": "./ShipCondition.json" }, diff --git a/models/ShipFrame.json b/models/ShipFrame.json index 03b5782..2bb856e 100644 --- a/models/ShipFrame.json +++ b/models/ShipFrame.json @@ -5,6 +5,7 @@ "symbol": { "type": "string", "enum": [ + "FRAME_PROBE", "FRAME_DRONE", "FRAME_INTERCEPTOR", "FRAME_RACER", @@ -23,6 +24,9 @@ "name": { "type": "string" }, + "description": { + "type": "string" + }, "condition": { "$ref": "./ShipCondition.json" }, diff --git a/models/ShipModule.json b/models/ShipModule.json index 9b6c866..4e3c145 100644 --- a/models/ShipModule.json +++ b/models/ShipModule.json @@ -5,20 +5,26 @@ "symbol": { "type": "string", "enum": [ - "MODULE_PASSENGER_CABIN", - "MODULE_ENVOY_QUARTERS", - "MODULE_MICRO_REFINERY", "MODULE_MINERAL_PROCESSOR", "MODULE_CARGO_HOLD", + "MODULE_CREW_QUARTERS", + "MODULE_ENVOY_QUARTERS", + "MODULE_PASSENGER_CABIN", + "MODULE_MICRO_REFINERY", + "MODULE_SCIENCE_LAB", "MODULE_JUMP_DRIVE_I", "MODULE_JUMP_DRIVE_II", "MODULE_JUMP_DRIVE_III", - "MODULE_CREW_QUARTERS" + "MODULE_SHIELD_GENERATOR_I", + "MODULE_SHIELD_GENERATOR_II" ] }, "name": { "type": "string" }, + "description": { + "type": "string" + }, "requirements": { "$ref": "./ShipRequirements.json" } diff --git a/models/ShipMount.json b/models/ShipMount.json index 043c3c1..889cf8d 100644 --- a/models/ShipMount.json +++ b/models/ShipMount.json @@ -13,12 +13,18 @@ "MOUNT_SENSOR_ARRAY_III", "MOUNT_MINING_LASER_I", "MOUNT_MINING_LASER_II", - "MOUNT_MINING_LASER_III" + "MOUNT_MINING_LASER_III", + "MOUNT_LASER_CANNON_I", + "MOUNT_MISSILE_LAUNCHER_I", + "MOUNT_TURRET_I" ] }, "name": { "type": "string" }, + "description": { + "type": "string" + }, "requirements": { "$ref": "./ShipRequirements.json" } diff --git a/models/ShipReactor.json b/models/ShipReactor.json index 4a96c85..d6573f9 100644 --- a/models/ShipReactor.json +++ b/models/ShipReactor.json @@ -5,16 +5,19 @@ "symbol": { "type": "string", "enum": [ - "SOLAR_REACTOR", - "FUSION_REACTOR", - "FISSION_REACTOR", - "CHEMICAL_REACTOR", - "DARK_MATTER_REACTOR" + "REACTOR_SOLAR_I", + "REACTOR_FUSION_I", + "REACTOR_FISSION_I", + "REACTOR_CHEMICAL_I", + "REACTOR_ANTIMATTER_I" ] }, "name": { "type": "string" }, + "description": { + "type": "string" + }, "condition": { "$ref": "./ShipCondition.json" }, diff --git a/models/ShipRole.json b/models/ShipRole.json index 01863b1..23d7210 100644 --- a/models/ShipRole.json +++ b/models/ShipRole.json @@ -1,17 +1,4 @@ { "type": "string", - "description": "The registered role of the ship", - "enum": [ - "FABRICATOR", - "HARVESTER", - "HAULER", - "EXCAVATOR", - "TRANSPORT", - "REPAIR", - "SURVEYOR", - "COMMAND", - "CARRIER", - "PATROL", - "SATELLITE" - ] + "description": "The registered role of the ship" } \ No newline at end of file diff --git a/models/ShipyardShip.json b/models/ShipyardShip.json index 393807f..3df7d82 100644 --- a/models/ShipyardShip.json +++ b/models/ShipyardShip.json @@ -4,7 +4,23 @@ "properties": { "symbol": { "type": "string", - "minLength": 1 + "enum": [ + "SHIP_PROBE_SATELLITE", + "SHIP_MINING_DRONE", + "SHIP_INTERCEPTOR", + "SHIP_LIGHT_HAULER", + "SHIP_COMMAND_FRIGATE", + "SHIP_EXPLORER", + "SHIP_HEAVY_FREIGHTER", + "SHIP_LIGHT_SHUTTLE", + "SHIP_ORE_HOUND" + ] + }, + "name": { + "type": "string" + }, + "description": { + "type": "string" }, "purchasePrice": { "type": "integer" @@ -33,6 +49,8 @@ }, "required": [ "symbol", + "name", + "description", "purchasePrice", "frame", "reactor", diff --git a/models/System.json b/models/System.json index bb6da08..4be99e0 100644 --- a/models/System.json +++ b/models/System.json @@ -11,19 +11,7 @@ "minLength": 1 }, "type": { - "type": "string", - "enum": [ - "NEUTRON_STAR", - "RED_STAR", - "ORANGE_STAR", - "BLUE_STAR", - "YOUNG_STAR", - "WHITE_DWARF", - "BLACK_HOLE", - "HYPERGIANT", - "NEBULA", - "UNSTABLE" - ] + "$ref": "./SystemType.json" }, "x": { "type": "integer" diff --git a/models/SystemType.json b/models/SystemType.json new file mode 100644 index 0000000..16f3dcc --- /dev/null +++ b/models/SystemType.json @@ -0,0 +1,16 @@ +{ + "type": "string", + "description": "The type of waypoint.", + "enum": [ + "NEUTRON_STAR", + "RED_STAR", + "ORANGE_STAR", + "BLUE_STAR", + "YOUNG_STAR", + "WHITE_DWARF", + "BLACK_HOLE", + "HYPERGIANT", + "NEBULA", + "UNSTABLE" + ] +} \ No newline at end of file diff --git a/models/TradeGood.json b/models/TradeGood.json new file mode 100644 index 0000000..c67768d --- /dev/null +++ b/models/TradeGood.json @@ -0,0 +1,134 @@ +{ + "symbol": { + "type": "string", + "enum": [ + "PRECIOUS_STONES", + "QUARTZ_SAND", + "SILICON_CRYSTALS", + "AMMONIA_ICE", + "LIQUID_HYDROGEN", + "LIQUID_NITROGEN", + "ICE_WATER", + "EXOTIC_MATTER", + "ADVANCED_CIRCUITRY", + "GRAVITON_EMITTERS", + "IRON", + "IRON_ORE", + "COPPER", + "COPPER_ORE", + "ALUMINUM", + "ALUMINUM_ORE", + "SILVER", + "SILVER_ORE", + "GOLD", + "GOLD_ORE", + "PLATINUM", + "PLATINUM_ORE", + "DIAMONDS", + "URANITE", + "URANITE_ORE", + "MERITIUM", + "MERITIUM_ORE", + "HYDROCARBON", + "ANTIMATTER", + "FERTILIZERS", + "FABRICS", + "FOOD", + "JEWELRY", + "MACHINERY", + "FIREARMS", + "ASSAULT_RIFLES", + "MILITARY_EQUIPMENT", + "EXPLOSIVES", + "LAB_INSTRUMENTS", + "AMMUNITION", + "ELECTRONICS", + "SHIP_PLATING", + "EQUIPMENT", + "FUEL", + "MEDICINE", + "DRUGS", + "CLOTHING", + "MICROPROCESSORS", + "PLASTICS", + "POLYNUCLEOTIDES", + "BIOCOMPOSITES", + "NANOBOTS", + "AI_MAINFRAMES", + "QUANTUM_DRIVES", + "ROBOTIC_DRONES", + "CYBER_IMPLANTS", + "GENE_THERAPEUTICS", + "NEURAL_CHIPS", + "MOOD_REGULATORS", + "VIRAL_AGENTS", + "MICRO_FUSION_GENERATORS", + "SUPERGRAINS", + "LASER_RIFLES", + "HOLOGRAPHICS", + "SHIP_SALVAGE", + "RELIC_TECH", + "NOVEL_LIFEFORMS", + "BOTANICAL_SPECIMENS", + "CULTURAL_ARTIFACTS", + "FRAME_PROBE", + "FRAME_DRONE", + "FRAME_INTERCEPTOR", + "FRAME_RACER", + "FRAME_FIGHTER", + "FRAME_FRIGATE", + "FRAME_SHUTTLE", + "FRAME_EXPLORER", + "FRAME_LIGHT_FREIGHTER", + "FRAME_HEAVY_FREIGHTER", + "FRAME_TRANSPORT", + "FRAME_DESTROYER", + "FRAME_CRUISER", + "FRAME_CARRIER", + "REACTOR_SOLAR_I", + "REACTOR_FUSION_I", + "REACTOR_FISSION_I", + "REACTOR_CHEMICAL_I", + "REACTOR_ANTIMATTER_I", + "ENGINE_IMPULSE_DRIVE", + "ENGINE_ION_DRIVE_I", + "ENGINE_ION_DRIVE_II", + "ENGINE_HYPER_DRIVE", + "MODULE_MINERAL_PROCESSOR", + "MODULE_CARGO_HOLD", + "MODULE_CREW_QUARTERS", + "MODULE_ENVOY_QUARTERS", + "MODULE_PASSENGER_CABIN", + "MODULE_MICRO_REFINERY", + "MODULE_SCIENCE_LAB", + "MODULE_JUMP_DRIVE_I", + "MODULE_JUMP_DRIVE_II", + "MODULE_JUMP_DRIVE_III", + "MODULE_SHIELD_GENERATOR_I", + "MODULE_SHIELD_GENERATOR_II", + "MOUNT_GAS_SIPHON_I", + "MOUNT_GAS_SIPHON_II", + "MOUNT_GAS_SIPHON_III", + "MOUNT_SENSOR_ARRAY_I", + "MOUNT_SENSOR_ARRAY_II", + "MOUNT_SENSOR_ARRAY_III", + "MOUNT_MINING_LASER_I", + "MOUNT_MINING_LASER_II", + "MOUNT_MINING_LASER_III", + "MOUNT_LASER_CANNON_I", + "MOUNT_MISSILE_LAUNCHER_I", + "MOUNT_TURRET_I" + ] + }, + "name": { + "type": "string" + }, + "description": { + "type": "string" + }, + "required": [ + "symbol", + "name", + "description" + ] +} \ No newline at end of file diff --git a/models/WaypointTrait.json b/models/WaypointTrait.json index 8d28956..97b68c1 100644 --- a/models/WaypointTrait.json +++ b/models/WaypointTrait.json @@ -6,6 +6,8 @@ "description": "The unique identifier of the trait.", "enum": [ "UNCHARTED", + "MARKETPLACE", + "SHIPYARD", "OUTPOST", "SCATTERED_SETTLEMENTS", "SPRAWLING_CITIES", @@ -28,6 +30,7 @@ "METHANE_POOLS", "ICE_CRYSTALS", "EXPLOSIVE_GASES", + "STRONG_MAGNETOSPHERE", "VIBRANT_AURORAS", "SALT_FLATS", "CANYONS", @@ -39,6 +42,9 @@ "ASH_CLOUDS", "VAST_RUINS", "MUTATED_FLORA", + "TERRAFORMED", + "EXTREME_TEMPERATURES", + "EXTREME_PRESSURE", "DIVERSE_LIFE", "SCARCE_LIFE", "FOSSILS", @@ -48,7 +54,6 @@ "TOXIC_ATMOSPHERE", "CORROSIVE_ATMOSPHERE", "BREATHABLE_ATMOSPHERE", - "COMM_RELAY_I", "JOVIAN", "ROCKY", "VOLCANIC", diff --git a/models/WaypointType.json b/models/WaypointType.json index 1f8f820..4b978cb 100644 --- a/models/WaypointType.json +++ b/models/WaypointType.json @@ -8,8 +8,8 @@ "ORBITAL_STATION", "JUMP_GATE", "ASTEROID_FIELD", + "NEBULA", "DEBRIS_FIELD", - "GRAVITY_WELL", - "NEBULA" + "GRAVITY_WELL" ] } \ No newline at end of file