From 9a2f8790c5b6f5cfb78f72555c701520874271fc Mon Sep 17 00:00:00 2001 From: DaanV2 Date: Wed, 10 Feb 2021 02:02:46 +0100 Subject: [PATCH] Updated --- .../1.10.0/animation_controller.json | 4 +- .../animations/1.10.0/animations.json | 5 +-- .../1.10.0/animation_controller.json | 15 +++++++- .../1.8.0/animation_controller.json | 15 +++++++- .../animations/1.10.0/actor_animation.json | 1 + .../animations/1.8.0/actor_animation.json | 37 +++++-------------- 6 files changed, 41 insertions(+), 36 deletions(-) diff --git a/source/behaviour/animation_controllers/1.10.0/animation_controller.json b/source/behaviour/animation_controllers/1.10.0/animation_controller.json index 0248509b..76f4a35e 100644 --- a/source/behaviour/animation_controllers/1.10.0/animation_controller.json +++ b/source/behaviour/animation_controllers/1.10.0/animation_controller.json @@ -113,9 +113,7 @@ "type": "array", "description": "Events, commands or transitions to preform on entry of this state", "title": "On entry", - "items": { - "$ref": "#/definitions/commands" - } + "items": { "$ref": "#/definitions/commands" } }, "on_exit": { "type": "array", diff --git a/source/behaviour/animations/1.10.0/animations.json b/source/behaviour/animations/1.10.0/animations.json index ba27a595..33e58e87 100644 --- a/source/behaviour/animations/1.10.0/animations.json +++ b/source/behaviour/animations/1.10.0/animations.json @@ -93,10 +93,7 @@ }, "additionalProperties": { "oneOf": [ - { - "type": "string", - "$ref": "#/definitions/commands" - }, + { "type": "string", "$ref": "#/definitions/commands" }, { "type": "array", "title": "Collection timelime items", diff --git a/source/resource/animation_controllers/1.10.0/animation_controller.json b/source/resource/animation_controllers/1.10.0/animation_controller.json index 233fe233..b4dd1958 100644 --- a/source/resource/animation_controllers/1.10.0/animation_controller.json +++ b/source/resource/animation_controllers/1.10.0/animation_controller.json @@ -47,7 +47,8 @@ "pre_effect_script": { "type": "string", "title": "Pre effect script", - "description": "A molang script that will be run when the particle emitter is initialized" + "description": "A molang script that will be run when the particle emitter is initialized", + "pattern": "^.+;$" } } }, @@ -197,6 +198,18 @@ } } } + }, + "on_entry": { + "title": "On Entry", + "description": "UNDOCUMENTATED", + "type": "array", + "items": { "pattern": "^.+=.+;$", "title": "Molang", "description": "UNDOCUMENTATED", "type": "string" } + }, + "on_exit": { + "title": "On Exit", + "description": "UNDOCUMENTATED", + "type": "array", + "items": { "pattern": "^.+=.+;$", "title": "Molang", "description": "UNDOCUMENTATED", "type": "string" } } } } diff --git a/source/resource/animation_controllers/1.8.0/animation_controller.json b/source/resource/animation_controllers/1.8.0/animation_controller.json index a9e9f8bd..446eba51 100644 --- a/source/resource/animation_controllers/1.8.0/animation_controller.json +++ b/source/resource/animation_controllers/1.8.0/animation_controller.json @@ -47,7 +47,8 @@ "pre_effect_script": { "type": "string", "title": "Pre effect script", - "description": "A molang script that will be run when the particle emitter is initialized" + "description": "A molang script that will be run when the particle emitter is initialized", + "pattern": "^.+;$" } } }, @@ -179,6 +180,18 @@ } } } + }, + "on_entry": { + "title": "On Entry", + "description": "UNDOCUMENTATED", + "type": "array", + "items": { "pattern": "^.+;$", "title": "Molang", "description": "UNDOCUMENTATED", "type": "string" } + }, + "on_exit": { + "title": "On Exit", + "description": "UNDOCUMENTATED", + "type": "array", + "items": { "pattern": "^.+;$", "title": "Molang", "description": "UNDOCUMENTATED", "type": "string" } } } } diff --git a/source/resource/animations/1.10.0/actor_animation.json b/source/resource/animations/1.10.0/actor_animation.json index b2211dc2..41c226ed 100644 --- a/source/resource/animations/1.10.0/actor_animation.json +++ b/source/resource/animations/1.10.0/actor_animation.json @@ -309,6 +309,7 @@ } ] }, + "override_previous_animation": { "title": "Override previous animation", "description": "Reset bones in this animation to the default pose before applying this animation.", diff --git a/source/resource/animations/1.8.0/actor_animation.json b/source/resource/animations/1.8.0/actor_animation.json index 6cc29ae1..3d47407c 100644 --- a/source/resource/animations/1.8.0/actor_animation.json +++ b/source/resource/animations/1.8.0/actor_animation.json @@ -317,33 +317,16 @@ "particle_effects": { "title": "Particle effects", "description": "TODO", - "oneOf": [ - { - "$ref": "#/definitions/ParticleEffect" - }, - { - "type": "object", - "propertyNames": { - "pattern": "^[\\d.]+$" - }, - "additionalProperties": { - "title": "Timeline object", - "description": "A single point in time", - "oneOf": [ - { - "type": "object", - "$ref": "#/definitions/ParticleEffect" - }, - { - "type": "array", - "items": { - "$ref": "#/definitions/ParticleEffect" - } - } - ] - } - } - ] + "type": "object", + "propertyNames": { + "pattern": "^[\\d.]+$", + "examples": ["0.0", "1.0", "2.3"] + }, + "additionalProperties": { + "title": "Timeline object", + "description": "A single point in time", + "$ref": "#/definitions/ParticleEffect" + } }, "start_delay": { "title": "Start delay",