From 295274143d33ac031cb3e1b64e8628994dfb4dfc Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Wed, 29 Jan 2025 21:14:40 +0100 Subject: [PATCH] Make schema layout more explicit --- LLib | 2 +- QuestPaths/quest-v1.json | 51 ++++++++++++++++++++++++++-------------- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/LLib b/LLib index b1059871..746d1468 160000 --- a/LLib +++ b/LLib @@ -1 +1 @@ -Subproject commit b1059871154b84401020c0072fd089fcc022fb77 +Subproject commit 746d14681baa91132784ab17f8f49671e86ea211 diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 0ca8c368..83f05261 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -217,7 +217,10 @@ ] }, "Diving": { - "type": ["boolean", "null"] + "type": [ + "boolean", + "null" + ] }, "NotTargetable": { "type": "boolean" @@ -715,25 +718,37 @@ }, { "if": { - "anyOf": [ - { - "properties": { - "InteractionType": { - "const": "UseItem" - } - } - }, - { - "properties": { - "InteractionType": { - "const": "Combat" - }, - "EnemySpawnType": { - "const": "AfterItemUse" - } - } + "properties": { + "InteractionType": { + "const": "UseItem" } + } + }, + "then": { + "properties": { + "GroundTarget": { + "type": [ + "boolean", + "null" + ], + "default": false + } + }, + "required": [ + "ItemId" ] + } + }, + { + "if": { + "properties": { + "InteractionType": { + "const": "Combat" + }, + "EnemySpawnType": { + "const": "AfterItemUse" + } + } }, "then": { "properties": {