From ba72f7853c42379edf028192cd9c59ef4f4d88b4 Mon Sep 17 00:00:00 2001 From: SpaceAdmiral Date: Fri, 15 Sep 2023 08:57:04 -0700 Subject: [PATCH] update: add orbits property to Waypoint and SystemWaypoint --- models/System.json | 4 ++-- models/SystemWaypoint.json | 19 ++++++++++++++++--- models/Waypoint.json | 9 +++++++-- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/models/System.json b/models/System.json index 50d9ade..2080d07 100644 --- a/models/System.json +++ b/models/System.json @@ -16,11 +16,11 @@ }, "x": { "type": "integer", - "description": "Position in the universe in the x axis." + "description": "Relative position of the system in the sector in the x axis." }, "y": { "type": "integer", - "description": "Position in the universe in the y axis." + "description": "Relative position of the system in the sector in the y axis." }, "waypoints": { "type": "array", diff --git a/models/SystemWaypoint.json b/models/SystemWaypoint.json index c5317a5..04aa605 100644 --- a/models/SystemWaypoint.json +++ b/models/SystemWaypoint.json @@ -10,17 +10,30 @@ }, "x": { "type": "integer", - "description": "Position in the universe in the x axis." + "description": "Relative position of the waypoint on the system's x axis. This is not an absolute position in the universe." }, "y": { "type": "integer", - "description": "Position in the universe in the y axis." + "description": "Relative position of the waypoint on the system's y axis. This is not an absolute position in the universe." + }, + "orbitals": { + "type": "array", + "description": "Waypoints that orbit this waypoint.", + "items": { + "$ref": "./WaypointOrbital.json" + } + }, + "orbits": { + "type": "string", + "minLength": 1, + "description": "The symbol of the parent waypoint, if this waypoint is in orbit around another waypoint. Otherwise this value is undefined." } }, "required": [ "symbol", "type", "x", - "y" + "y", + "orbitals" ] } \ No newline at end of file diff --git a/models/Waypoint.json b/models/Waypoint.json index f86664d..1836da5 100644 --- a/models/Waypoint.json +++ b/models/Waypoint.json @@ -17,11 +17,11 @@ }, "x": { "type": "integer", - "description": "Position in the universe in the x axis." + "description": "Relative position of the waypoint on the system's x axis. This is not an absolute position in the universe." }, "y": { "type": "integer", - "description": "Position in the universe in the Y axis." + "description": "Relative position of the waypoint on the system's y axis. This is not an absolute position in the universe." }, "orbitals": { "type": "array", @@ -30,6 +30,11 @@ "$ref": "./WaypointOrbital.json" } }, + "orbits": { + "type": "string", + "minLength": 1, + "description": "The symbol of the parent waypoint, if this waypoint is in orbit around another waypoint. Otherwise this value is undefined." + }, "faction": { "$ref": "./WaypointFaction.json" },