From d19defe480cf76baedc6c9c2374fbbdd5367928b Mon Sep 17 00:00:00 2001 From: Keith Jackson Date: Sun, 5 Nov 2023 01:56:38 -0700 Subject: [PATCH 1/2] Suggestion for fixing WaypointTrait filter. --- reference/SpaceTraders.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/SpaceTraders.json b/reference/SpaceTraders.json index 53f6a08..cc59042 100644 --- a/reference/SpaceTraders.json +++ b/reference/SpaceTraders.json @@ -518,12 +518,12 @@ "schema": { "oneOf": [ { - "$ref": "../models/WaypointTrait.json" + "$ref": "../models/WaypointTrait.json#/properties/symbol" }, { "type": "array", "items": { - "$ref": "../models/WaypointTrait.json" + "$ref": "../models/WaypointTrait.json#/properties/symbol" } } ] From 7a677b5b2b86e8203fd0a290839b6c97ff8143c2 Mon Sep 17 00:00:00 2001 From: Keith Jackson Date: Sun, 5 Nov 2023 02:27:27 -0800 Subject: [PATCH 2/2] Normalize some schema. --- models/Faction.json | 2 +- ...FactionSymbols.json => FactionSymbol.json} | 0 models/FactionTrait.json | 64 +--------------- models/FactionTraitSymbol.json | 65 ++++++++++++++++ models/SystemFaction.json | 2 +- models/WaypointFaction.json | 2 +- models/WaypointTrait.json | 73 +----------------- models/WaypointTraitSymbol.json | 74 +++++++++++++++++++ reference/SpaceTraders.json | 6 +- 9 files changed, 147 insertions(+), 141 deletions(-) rename models/{FactionSymbols.json => FactionSymbol.json} (100%) create mode 100644 models/FactionTraitSymbol.json create mode 100644 models/WaypointTraitSymbol.json diff --git a/models/Faction.json b/models/Faction.json index f1306f4..563c69b 100644 --- a/models/Faction.json +++ b/models/Faction.json @@ -3,7 +3,7 @@ "type": "object", "properties": { "symbol": { - "$ref": "./FactionSymbols.json", + "$ref": "./FactionSymbol.json", "description": "Faction symbol." }, "name": { diff --git a/models/FactionSymbols.json b/models/FactionSymbol.json similarity index 100% rename from models/FactionSymbols.json rename to models/FactionSymbol.json diff --git a/models/FactionTrait.json b/models/FactionTrait.json index 34ed847..96da583 100644 --- a/models/FactionTrait.json +++ b/models/FactionTrait.json @@ -2,69 +2,7 @@ "type": "object", "properties": { "symbol": { - "type": "string", - "description": "The unique identifier of the trait.", - "enum": [ - "BUREAUCRATIC", - "SECRETIVE", - "CAPITALISTIC", - "INDUSTRIOUS", - "PEACEFUL", - "DISTRUSTFUL", - "WELCOMING", - "SMUGGLERS", - "SCAVENGERS", - "REBELLIOUS", - "EXILES", - "PIRATES", - "RAIDERS", - "CLAN", - "GUILD", - "DOMINION", - "FRINGE", - "FORSAKEN", - "ISOLATED", - "LOCALIZED", - "ESTABLISHED", - "NOTABLE", - "DOMINANT", - "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" - ] + "$ref": "./FactionTraitSymbol.json" }, "name": { "type": "string", diff --git a/models/FactionTraitSymbol.json b/models/FactionTraitSymbol.json new file mode 100644 index 0000000..2d33324 --- /dev/null +++ b/models/FactionTraitSymbol.json @@ -0,0 +1,65 @@ +{ + "type": "string", + "description": "The unique identifier of the trait.", + "enum": [ + "BUREAUCRATIC", + "SECRETIVE", + "CAPITALISTIC", + "INDUSTRIOUS", + "PEACEFUL", + "DISTRUSTFUL", + "WELCOMING", + "SMUGGLERS", + "SCAVENGERS", + "REBELLIOUS", + "EXILES", + "PIRATES", + "RAIDERS", + "CLAN", + "GUILD", + "DOMINION", + "FRINGE", + "FORSAKEN", + "ISOLATED", + "LOCALIZED", + "ESTABLISHED", + "NOTABLE", + "DOMINANT", + "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" + ] +} \ No newline at end of file diff --git a/models/SystemFaction.json b/models/SystemFaction.json index aa2a0ef..8384749 100644 --- a/models/SystemFaction.json +++ b/models/SystemFaction.json @@ -2,7 +2,7 @@ "type": "object", "properties": { "symbol": { - "$ref": "./FactionSymbols.json" + "$ref": "./FactionSymbol.json" } }, "required": [ diff --git a/models/WaypointFaction.json b/models/WaypointFaction.json index c8dac07..1ca1401 100644 --- a/models/WaypointFaction.json +++ b/models/WaypointFaction.json @@ -3,7 +3,7 @@ "description": "The faction that controls the waypoint.", "properties": { "symbol": { - "$ref": "./FactionSymbols.json" + "$ref": "./FactionSymbol.json" } }, "required": [ diff --git a/models/WaypointTrait.json b/models/WaypointTrait.json index 66de7dc..828f2ef 100644 --- a/models/WaypointTrait.json +++ b/models/WaypointTrait.json @@ -2,78 +2,7 @@ "type": "object", "properties": { "symbol": { - "type": "string", - "description": "The unique identifier of the trait.", - "enum": [ - "UNCHARTED", - "UNDER_CONSTRUCTION", - "MARKETPLACE", - "SHIPYARD", - "OUTPOST", - "SCATTERED_SETTLEMENTS", - "SPRAWLING_CITIES", - "MEGA_STRUCTURES", - "OVERCROWDED", - "HIGH_TECH", - "CORRUPT", - "BUREAUCRATIC", - "TRADING_HUB", - "INDUSTRIAL", - "BLACK_MARKET", - "RESEARCH_FACILITY", - "MILITARY_BASE", - "SURVEILLANCE_OUTPOST", - "EXPLORATION_OUTPOST", - "MINERAL_DEPOSITS", - "COMMON_METAL_DEPOSITS", - "PRECIOUS_METAL_DEPOSITS", - "RARE_METAL_DEPOSITS", - "METHANE_POOLS", - "ICE_CRYSTALS", - "EXPLOSIVE_GASES", - "STRONG_MAGNETOSPHERE", - "VIBRANT_AURORAS", - "SALT_FLATS", - "CANYONS", - "PERPETUAL_DAYLIGHT", - "PERPETUAL_OVERCAST", - "DRY_SEABEDS", - "MAGMA_SEAS", - "SUPERVOLCANOES", - "ASH_CLOUDS", - "VAST_RUINS", - "MUTATED_FLORA", - "TERRAFORMED", - "EXTREME_TEMPERATURES", - "EXTREME_PRESSURE", - "DIVERSE_LIFE", - "SCARCE_LIFE", - "FOSSILS", - "WEAK_GRAVITY", - "STRONG_GRAVITY", - "CRUSHING_GRAVITY", - "TOXIC_ATMOSPHERE", - "CORROSIVE_ATMOSPHERE", - "BREATHABLE_ATMOSPHERE", - "THIN_ATMOSPHERE", - "JOVIAN", - "ROCKY", - "VOLCANIC", - "FROZEN", - "SWAMP", - "BARREN", - "TEMPERATE", - "JUNGLE", - "OCEAN", - "RADIOACTIVE", - "MICRO_GRAVITY_ANOMALIES", - "DEBRIS_CLUSTER", - "DEEP_CRATERS", - "SHALLOW_CRATERS", - "UNSTABLE_COMPOSITION", - "HOLLOWED_INTERIOR", - "STRIPPED" - ] + "$ref": "./WaypointTraitSymbol.json" }, "name": { "type": "string", diff --git a/models/WaypointTraitSymbol.json b/models/WaypointTraitSymbol.json new file mode 100644 index 0000000..b0311a4 --- /dev/null +++ b/models/WaypointTraitSymbol.json @@ -0,0 +1,74 @@ +{ + "type": "string", + "description": "The unique identifier of the trait.", + "enum": [ + "UNCHARTED", + "UNDER_CONSTRUCTION", + "MARKETPLACE", + "SHIPYARD", + "OUTPOST", + "SCATTERED_SETTLEMENTS", + "SPRAWLING_CITIES", + "MEGA_STRUCTURES", + "OVERCROWDED", + "HIGH_TECH", + "CORRUPT", + "BUREAUCRATIC", + "TRADING_HUB", + "INDUSTRIAL", + "BLACK_MARKET", + "RESEARCH_FACILITY", + "MILITARY_BASE", + "SURVEILLANCE_OUTPOST", + "EXPLORATION_OUTPOST", + "MINERAL_DEPOSITS", + "COMMON_METAL_DEPOSITS", + "PRECIOUS_METAL_DEPOSITS", + "RARE_METAL_DEPOSITS", + "METHANE_POOLS", + "ICE_CRYSTALS", + "EXPLOSIVE_GASES", + "STRONG_MAGNETOSPHERE", + "VIBRANT_AURORAS", + "SALT_FLATS", + "CANYONS", + "PERPETUAL_DAYLIGHT", + "PERPETUAL_OVERCAST", + "DRY_SEABEDS", + "MAGMA_SEAS", + "SUPERVOLCANOES", + "ASH_CLOUDS", + "VAST_RUINS", + "MUTATED_FLORA", + "TERRAFORMED", + "EXTREME_TEMPERATURES", + "EXTREME_PRESSURE", + "DIVERSE_LIFE", + "SCARCE_LIFE", + "FOSSILS", + "WEAK_GRAVITY", + "STRONG_GRAVITY", + "CRUSHING_GRAVITY", + "TOXIC_ATMOSPHERE", + "CORROSIVE_ATMOSPHERE", + "BREATHABLE_ATMOSPHERE", + "THIN_ATMOSPHERE", + "JOVIAN", + "ROCKY", + "VOLCANIC", + "FROZEN", + "SWAMP", + "BARREN", + "TEMPERATE", + "JUNGLE", + "OCEAN", + "RADIOACTIVE", + "MICRO_GRAVITY_ANOMALIES", + "DEBRIS_CLUSTER", + "DEEP_CRATERS", + "SHALLOW_CRATERS", + "UNSTABLE_COMPOSITION", + "HOLLOWED_INTERIOR", + "STRIPPED" + ] +} \ No newline at end of file diff --git a/reference/SpaceTraders.json b/reference/SpaceTraders.json index cc59042..1023f0b 100644 --- a/reference/SpaceTraders.json +++ b/reference/SpaceTraders.json @@ -254,7 +254,7 @@ "schema": { "properties": { "faction": { - "$ref": "../models/FactionSymbols.json", + "$ref": "../models/FactionSymbol.json", "example": "COSMIC" }, "symbol": { @@ -518,12 +518,12 @@ "schema": { "oneOf": [ { - "$ref": "../models/WaypointTrait.json#/properties/symbol" + "$ref": "../models/WaypointTraitSymbol.json" }, { "type": "array", "items": { - "$ref": "../models/WaypointTrait.json#/properties/symbol" + "$ref": "../models/WaypointTraitSymbol.json" } } ]