Fxing animations controllers to accept molang

This commit is contained in:
DaanV2
2021-01-28 00:03:39 +01:00
parent a5e6e6176e
commit 92d4a4fd46
2 changed files with 24 additions and 3 deletions

View File

@@ -31,18 +31,22 @@
"properties": { "properties": {
"bind_to_actor": { "bind_to_actor": {
"type": "boolean", "type": "boolean",
"title": "Bind to actor",
"description": "Set to false to have the effect spawned in the world without being bound to an actor (by default an effect is bound to the actor)." "description": "Set to false to have the effect spawned in the world without being bound to an actor (by default an effect is bound to the actor)."
}, },
"effect": { "effect": {
"type": "string", "type": "string",
"title": "Effect",
"description": "The name of a particle effect that should be played" "description": "The name of a particle effect that should be played"
}, },
"locator": { "locator": {
"type": "string", "type": "string",
"title": "Locator",
"description": "The name of a locator on the actor where the effect should be located" "description": "The name of a locator on the actor where the effect should be located"
}, },
"pre_effect_script": { "pre_effect_script": {
"type": "string", "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"
} }
} }
@@ -50,7 +54,14 @@
"commands": { "commands": {
"type": "string", "type": "string",
"description": "The event or commands to execute", "description": "The event or commands to execute",
"pattern": "^(@s .+|/.+)$" "examples": [
"@s example:event"
],
"oneOf": [
{ "pattern": "^@s .+$", "title": "Event" },
{ "pattern": "^/.+$", "title": "Command" },
{ "pattern": "^.+;$", "title": "Molang" }
]
} }
}, },
"required": ["format_version", "animation_controllers"], "required": ["format_version", "animation_controllers"],
@@ -103,6 +114,7 @@
"on_entry": { "on_entry": {
"type": "array", "type": "array",
"description": "Events, commands or transitions to preform on entry of this state", "description": "Events, commands or transitions to preform on entry of this state",
"title": "On entry",
"items": { "items": {
"$ref": "#/definitions/commands" "$ref": "#/definitions/commands"
} }
@@ -110,12 +122,13 @@
"on_exit": { "on_exit": {
"type": "array", "type": "array",
"description": "Events, commands or transitions to preform on exit of this state", "description": "Events, commands or transitions to preform on exit of this state",
"title": "On exit",
"items": { "items": {
"$ref": "#/definitions/commands" "$ref": "#/definitions/commands"
} }
}, },
"transitions": { "transitions": {
"title": "Transition definition", "title": "Transition",
"description": "The transition definition for 1.10.0", "description": "The transition definition for 1.10.0",
"minProperties": 1, "minProperties": 1,
"type": "array", "type": "array",

View File

@@ -31,18 +31,22 @@
"properties": { "properties": {
"bind_to_actor": { "bind_to_actor": {
"type": "boolean", "type": "boolean",
"title": "Bind to actor",
"description": "Set to false to have the effect spawned in the world without being bound to an actor (by default an effect is bound to the actor)." "description": "Set to false to have the effect spawned in the world without being bound to an actor (by default an effect is bound to the actor)."
}, },
"effect": { "effect": {
"type": "string", "type": "string",
"title": "Effect",
"description": "The name of a particle effect that should be played" "description": "The name of a particle effect that should be played"
}, },
"locator": { "locator": {
"type": "string", "type": "string",
"title": "Locator",
"description": "The name of a locator on the actor where the effect should be located" "description": "The name of a locator on the actor where the effect should be located"
}, },
"pre_effect_script": { "pre_effect_script": {
"type": "string", "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"
} }
} }
@@ -50,7 +54,11 @@
"commands": { "commands": {
"type": "string", "type": "string",
"description": "The event or commands to execute", "description": "The event or commands to execute",
"pattern": "^(@s .+|/.+)$" "oneOf": [
{ "pattern": "^@s .+$", "title": "Event" },
{ "pattern": "^/.+$", "title": "Command" },
{ "pattern": "^.+;$", "title": "Molang" }
]
} }
}, },
"required": ["format_version", "animation_controllers"], "required": ["format_version", "animation_controllers"],