From a74c989fe19ed873301b0540557b6630f25c7724 Mon Sep 17 00:00:00 2001 From: Olaf Haag <83961384+Olaf-Wolf3D@users.noreply.github.com> Date: Thu, 5 Oct 2023 10:36:46 +0200 Subject: [PATCH] feat(schema): regular head & body names for costume (#14) For costumes, head and body meshes are allowed to use names without custom suffix. --- schemas/assetCostume.schema.json | 4 ++-- schemas/meshNames.schema.json | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/schemas/assetCostume.schema.json b/schemas/assetCostume.schema.json index d7cce63..9bd95b3 100644 --- a/schemas/assetCostume.schema.json +++ b/schemas/assetCostume.schema.json @@ -38,7 +38,7 @@ { "if": { "properties": { - "name": { "const": "Wolf3D_Body_Custom" } + "name": { "enum": ["Wolf3D_Body", "Wolf3D_Body_Custom"] } } }, "then": { @@ -69,7 +69,7 @@ { "if": { "properties": { - "name": { "const": "Wolf3D_Head_Custom" } + "name": { "enum": ["Wolf3D_Head", "Wolf3D_Head_Custom"] } } }, "then": { diff --git a/schemas/meshNames.schema.json b/schemas/meshNames.schema.json index b14ba57..7cb5b1d 100644 --- a/schemas/meshNames.schema.json +++ b/schemas/meshNames.schema.json @@ -60,8 +60,8 @@ "enum": [ "EyeLeft", "EyeRight", - "Wolf3D_Body_Custom", - "Wolf3D_Head_Custom", + "Wolf3D_Body", + "Wolf3D_Head", "Wolf3D_Outfit_Bottom", "Wolf3D_Outfit_Footwear", "Wolf3D_Outfit_Top", @@ -70,9 +70,12 @@ "Wolf3D_Facewear", "Wolf3D_Glasses", "Wolf3D_Hair", - "Wolf3D_Headwear" + "Wolf3D_Headwear", + "Wolf3D_Body_Custom", + "Wolf3D_Head_Custom" ], - "errorMessage": "Mesh name should be one of 'EyeLeft', 'EyeRight', 'Wolf3D_Body_Custom', 'Wolf3D_Head_Custom', 'Wolf3D_Outfit_Bottom', 'Wolf3D_Outfit_Footwear', 'Wolf3D_Outfit_Top', 'Wolf3D_Teeth', 'Wolf3D_Beard', 'Wolf3D_Facewear', 'Wolf3D_Glasses', 'Wolf3D_Hair', 'Wolf3D_Headwear'. Found ${0} instead." + "$comment": "Wolf3D_Body_Custom and Wolf3D_Head_Custom are deprecated, but allowed for backwards compatibility.", + "errorMessage": "Mesh name should be one of 'EyeLeft', 'EyeRight', 'Wolf3D_Body', 'Wolf3D_Head', 'Wolf3D_Outfit_Bottom', 'Wolf3D_Outfit_Footwear', 'Wolf3D_Outfit_Top', 'Wolf3D_Teeth', 'Wolf3D_Beard', 'Wolf3D_Facewear', 'Wolf3D_Glasses', 'Wolf3D_Hair', 'Wolf3D_Headwear'. Found ${0} instead." }, "outfit": { "type": "string",