From deb5f1670de9d8e0a7f6348d5e54e2ab017bb426 Mon Sep 17 00:00:00 2001 From: ChibiMango <32205345+ChibiMango@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:21:29 +0100 Subject: [PATCH 1/9] Update admire_item.json #41 --- .../entities/format/behaviors/admire_item.json | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/source/behavior/entities/format/behaviors/admire_item.json b/source/behavior/entities/format/behaviors/admire_item.json index 83f42e5e..a1d904b9 100644 --- a/source/behavior/entities/format/behaviors/admire_item.json +++ b/source/behavior/entities/format/behaviors/admire_item.json @@ -9,26 +9,24 @@ "$ref": "types/priority.json" }, "admire_item_sound": { + "title": "Admire Item Sound", "type": "string", - "description": "The sound event to play when admiring the item", - "title": "Admire Item Sound" + "description": "The sound event to play when admiring the item" }, "on_admire_item_start": { - "$ref": "../types/event.json", "title": "On Admire Item Start", - "description": "The event to run when admiring the item", - "$comment": "UNDOCUMENTED" + "$ref": "../types/event.json", + "description": "The event to run when admiring the item" }, "on_admire_item_stop": { - "$ref": "../types/event.json", "title": "On Admire Item Stop", - "description": "The event to run when no longer admiring the item", - "$comment": "UNDOCUMENTED" + "$ref": "../types/event.json", + "description": "The event to run when no longer admiring the item" }, "sound_interval": { + "title": "Sound Interval", "default": 0, "description": "The range of time in seconds to randomly wait before playing the sound again.", - "title": "Sound Interval", "oneOf": [ { "type": "array", From 1df85299cd5006fb07bea6947dc0145fc7bab74e Mon Sep 17 00:00:00 2001 From: ChibiMango <32205345+ChibiMango@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:21:48 +0100 Subject: [PATCH 2/9] Update defend_trusted_target.json #38 #51 --- .../behaviors/defend_trusted_target.json | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/source/behavior/entities/format/behaviors/defend_trusted_target.json b/source/behavior/entities/format/behaviors/defend_trusted_target.json index ef670577..f77aea70 100644 --- a/source/behavior/entities/format/behaviors/defend_trusted_target.json +++ b/source/behavior/entities/format/behaviors/defend_trusted_target.json @@ -9,52 +9,52 @@ "$ref": "types/priority.json" }, "aggro_sound": { + "title": "Aggro Sound", "type": "string", "default": "", - "description": "Sound to occasionally play while defending.", - "title": "Aggro Sound" + "description": "Sound to occasionally play while defending." }, "attack_interval": { + "title": "Attack Interval", "type": "integer", "default": 0, - "description": "Time in seconds between attacks", - "title": "Attack Interval" + "description": "Time in seconds between attacks" }, "must_see": { + "title": "Must See", "type": "boolean", "default": false, - "description": "If true, only entities in this mob's viewing range can be selected as targets", - "title": "Must See" + "description": "If true, only entities in this mob's viewing range can be selected as targets" }, "must_see_forget_duration": { + "title": "Must See Forget Duration", "type": "number", "default": 3, - "description": "Determines the amount of time in seconds that this mob will look for a target before forgetting about it and looking for a new one when the target isn't visible any more", - "title": "Must See Forget Duration" + "description": "Determines the amount of time in seconds that this mob will look for a target before forgetting about it and looking for a new one when the target isn't visible any more" + }, "on_defend_start": { - "$ref": "../types/event.json", "title": "On Defend Start", - "description": "The event to run when this mob starts to defend the entity it trusts.", - "$comment": "UNDOCUMENTED" + "$ref": "../types/event.json", + "description": "The event to run when this mob starts to defend the entity it trusts." }, "within_radius": { + "title": "Within Radius", "type": "number", "default": 0, - "description": "Distance in blocks that the target can be within to launch an attack", - "title": "Within Radius" + "description": "Distance in blocks that the target can be within to launch an attack" }, "entity_types": { + "title": "Entity Types", "type": "object", "description": "List of entity types that this mob considers valid targets", - "title": "Entity Types", "additionalProperties": false }, "sound_chance": { "title": "Sound Chance", - "description": "The chance that the `aggro_sound` will play", - "$comment": "UNDOCUMENTED", "type": "number", + "default": 0.05, + "description": "Probability that a sound will play.", "minimum": 0, "maximum": 1 } @@ -67,7 +67,7 @@ "must_see_forget_duration": 3, "within_radius": 0, "entity_types": {}, - "sound_chance": 0.0 + "sound_chance": 0.05 } ] } \ No newline at end of file From ed3464c5e692f7b2a34629cebea22cc5ba1f3404 Mon Sep 17 00:00:00 2001 From: ChibiMango <32205345+ChibiMango@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:22:02 +0100 Subject: [PATCH 3/9] Update look_at_player.json #48 --- .../format/behaviors/look_at_player.json | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/source/behavior/entities/format/behaviors/look_at_player.json b/source/behavior/entities/format/behaviors/look_at_player.json index e0bc2780..62bc6979 100644 --- a/source/behavior/entities/format/behaviors/look_at_player.json +++ b/source/behavior/entities/format/behaviors/look_at_player.json @@ -9,45 +9,45 @@ "$ref": "./types/priority.json" }, "angle_of_view_vertical": { + "title": "Angle Of View Vertical", "type": "integer", "default": 360, - "description": "The angle in degrees that the mob can see in the X-axis (left-right)", - "title": "Angle Of View Vertical" + "description": "The angle in degrees that the mob can see in the X-axis (left-right)" }, "angle_of_view_horizontal": { + "title": "Angle Of View Horizontal", "type": "integer", "default": 360, - "description": "The angle in degrees that the mob can see in the Y-axis (up-down)", - "title": "Angle Of View Horizontal" + "description": "The angle in degrees that the mob can see in the Y-axis (up-down)" }, "look_distance": { + "title": "Look Distance", "type": "number", "default": 8.0, - "description": "The distance in blocks from which the entity will look at", - "title": "Look Distance" + "description": "The distance in blocks from which the entity will look at" }, "probability": { + "title": "Probability", "type": "number", "default": 0.02, "minimum": 0, - "description": "The probability of looking at the target. A value of 1.00 is 100%", - "title": "Probability" + "description": "The probability of looking at the target. A value of 1.00 is 100%" }, "look_time": { + "title": "Look Time", "type": "array", "default": [2, 4], "description": "Time range to look at the entity", - "title": "Look Time", "items": [ { "type": "number", "title": "Minimum", "description": "The minimum amount of time to look" }, { "type": "number", "title": "Maximum", "description": "The maximum amount of time to look" } ] }, "target_distance": { + "title": "Target Distance", "type": "number", - "description": "The distance to the target or less to be considered", - "$comment": "UNDOCUMENTED", - "title": "Target Distance" + "default": 6.0, + "description": "The distance in blocks from which the entity will choose a target" } }, "examples": [ @@ -57,7 +57,7 @@ "look_distance": 8.0, "probability": 0.02, "look_time": [], - "target_distance": 0.0 + "target_distance": 6.0 } ] } From d493a9e0721717f99fd0b922d5ea55d7101b050e Mon Sep 17 00:00:00 2001 From: ChibiMango <32205345+ChibiMango@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:22:09 +0100 Subject: [PATCH 4/9] Update melee_attack.json #47 --- source/behavior/entities/format/behaviors/melee_attack.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/behavior/entities/format/behaviors/melee_attack.json b/source/behavior/entities/format/behaviors/melee_attack.json index d30bc60c..a9b5a68c 100644 --- a/source/behavior/entities/format/behaviors/melee_attack.json +++ b/source/behavior/entities/format/behaviors/melee_attack.json @@ -65,6 +65,11 @@ "$ref": "../types/trigger.json", "description": "Defines the event to trigger when this entity successfully attacks." }, + "on_kill": { + "title": "On Kill", + "$ref": "../types/trigger.json", + "description": "Defines the event to trigger when this entity successfully kills." + }, "outer_boundary_time_increase": { "title": "Outer Boundary Time Increase", "type": "number", From 1001a955af2f25f16bbe3ee972aefb0473f7e2ab Mon Sep 17 00:00:00 2001 From: ChibiMango <32205345+ChibiMango@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:22:16 +0100 Subject: [PATCH 5/9] Update panic.json #46 --- .../entities/format/behaviors/panic.json | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/source/behavior/entities/format/behaviors/panic.json b/source/behavior/entities/format/behaviors/panic.json index faa0eb1a..0ad12313 100644 --- a/source/behavior/entities/format/behaviors/panic.json +++ b/source/behavior/entities/format/behaviors/panic.json @@ -13,6 +13,7 @@ "$ref": "./types/speed_multiplier.json" }, "damage_sources": { + "title": "Damage Sources", "type": "array", "items": { "$ref": "../../../../general/entity/damage_source.json" @@ -22,49 +23,44 @@ "all" ] ], - "description": "The list of Entity Damage Sources that will cause this mob to panic", - "title": "Damage Sources" + "description": "The list of Entity Damage Sources that will cause this mob to panic" }, "force": { + "title": "Force", "type": "boolean", "default": false, - "description": "If true, this mob will not stop panicking until it can't move anymore or the goal is removed from it", - "title": "Force" + "description": "If true, this mob will not stop panicking until it can't move anymore or the goal is removed from it" }, "ignore_mob_damage": { + "title": "Ignore Mob Damage", "type": "boolean", "default": false, - "description": "If true, the mob will not panic in response to damage from other mobs. This overrides the damage types in `damage_sources`", - "title": "Ignore Mob Damage" + "description": "If true, the mob will not panic in response to damage from other mobs. This overrides the damage types in `damage_sources`" }, "prefer_water": { + "title": "Prefer Water", "type": "boolean", "default": false, - "description": "If true, the mob will prefer water over land", - "title": "Prefer Water" + "description": "If true, the mob will prefer water over land" }, "panic_sound": { + "title": "Panic Sound", "type": "string", - "description": "The sound event to play when this mob is in panic", - "$comment": "UNDOCUMENTED", - "title": "Panic Sound" + "description": "The sound event to play when this mob is in panic" }, "sound_interval": { - "type": "object", - "description": "Determines how often the `panic_sound` will play", - "$comment": "UNDOCUMENTED", "title": "Sound Interval", + "type": "object", + "description": "The range of time in seconds to randomly wait before playing the sound again", "properties": { "range_min": { "type": "number", "description": "The minimum time in seconds before the `panic_sound` plays", - "$comment": "UNDOCUMENTED", "title": "Range Minimum" }, "range_max": { "type": "number", "description": "The maximum time in seconds before the `panic_sound` plays", - "$comment": "UNDOCUMENTED", "title": "Range Maximum" } }, From 8fe89d90b909f3868f79ed0fd62742bece57dade Mon Sep 17 00:00:00 2001 From: ChibiMango <32205345+ChibiMango@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:22:37 +0100 Subject: [PATCH 6/9] Update raid_garden.json #44 --- .../format/behaviors/raid_garden.json | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/source/behavior/entities/format/behaviors/raid_garden.json b/source/behavior/entities/format/behaviors/raid_garden.json index 999bea8f..dec49328 100644 --- a/source/behavior/entities/format/behaviors/raid_garden.json +++ b/source/behavior/entities/format/behaviors/raid_garden.json @@ -9,6 +9,7 @@ "priority": { "$ref": "types/priority.json" }, "speed_multiplier": { "$ref": "types/speed_multiplier.json" }, "blocks": { + "title": "Blocks", "type": "array", "description": "Blocks that the mob is looking for to eat", "items": { @@ -16,51 +17,50 @@ "title": "Block Id", "description": "A block identifier", "$ref": "../../../../general/block/identifier.json" - }, - "title": "Blocks" + } }, "eat_delay": { + "title": "Eat Delay", "type": "integer", "default": 2, - "description": "Time in seconds between each time it eats", - "title": "Eat Delay" + "description": "Time in seconds between each time it eats" + }, "full_delay": { + "title": "Full Delay", "type": "integer", "default": 100, - "description": "Amount of time in seconds before this mob wants to eat again", - "title": "Full Delay" + "description": "Amount of time in seconds before this mob wants to eat again" }, "initial_eat_delay": { + "title": "Initial Eat Delay", "type": "integer", "default": 0, - "description": "Time in seconds before starting to eat/raid once it arrives at it", - "title": "Initial Eat Delay" + "description": "Time in seconds before starting to eat/raid once it arrives at it" }, "goal_radius": { "type": "number", + "title": "Goal Radius", "default": 0.5, - "description": "Distance in blocks within the mob considers it has reached the goal. This is the `wiggle room` to stop the AI from bouncing back and forth trying to reach a specific spot", - "title": "Goal Radius" + "description": "Distance in blocks within the mob considers it has reached the goal. This is the `wiggle room` to stop the AI from bouncing back and forth trying to reach a specific spot" }, "max_to_eat": { + "title": "Maximum To Eat", "type": "integer", "default": 6, - "description": "Maximum number of things this entity wants to eat", - "title": "Maximum To Eat" + "description": "Maximum number of things this entity wants to eat" }, "search_range": { + "title": "Search Range", "type": "integer", "default": 0, - "description": "Distance in blocks the mob will look for crops to eat", - "title": "Search Range" + "description": "Distance in blocks the mob will look for crops to eat" }, "search_height": { + "title": "Search Height", "type": "integer", "default": 0, - "description": "Height in blocks the mob will look for crops to eat", - "$comment": "UNDOCUMENTED", - "title": "Search Height" + "description": "Height in blocks the mob will look for crops to eat" } }, "examples": [ From 686fa009dbdf9fb4e72a178793ee1682cfa96300 Mon Sep 17 00:00:00 2001 From: ChibiMango <32205345+ChibiMango@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:22:43 +0100 Subject: [PATCH 7/9] Update ram_attack.json #43 --- source/behavior/entities/format/behaviors/ram_attack.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/behavior/entities/format/behaviors/ram_attack.json b/source/behavior/entities/format/behaviors/ram_attack.json index 649049c4..adbc0bfe 100644 --- a/source/behavior/entities/format/behaviors/ram_attack.json +++ b/source/behavior/entities/format/behaviors/ram_attack.json @@ -24,7 +24,7 @@ "knockback_force": { "title": "Knockback Force", "type": "number", - "default": 5000000, + "default": 5.0, "description": "The force of the knockback of the ram attack." }, "knockback_height": { @@ -65,13 +65,13 @@ "ram_speed": { "title": "Ram Speed", "type": "number", - "default": 2000000, + "default": 2.0, "description": "Sets the entity's speed when charging toward the target." }, "run_speed": { "title": "Run Speed", "type": "number", - "default": 1000000, + "default": 1.0, "description": "Sets the entity's speed when running toward the target." }, "trigger": { From 70bea31f514c6fb6bc47fffe187b77e3da60ac8c Mon Sep 17 00:00:00 2001 From: ChibiMango <32205345+ChibiMango@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:22:52 +0100 Subject: [PATCH 8/9] Update random_look_around.json #42 --- .../format/behaviors/random_look_around.json | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/source/behavior/entities/format/behaviors/random_look_around.json b/source/behavior/entities/format/behaviors/random_look_around.json index 28316a34..4afe05a4 100644 --- a/source/behavior/entities/format/behaviors/random_look_around.json +++ b/source/behavior/entities/format/behaviors/random_look_around.json @@ -34,10 +34,28 @@ ] }, "look_distance": { - "description": "The distance in blocks from which the mob will look at", - "$comment": "UNDOCUMENTED", "title": "Look Distance", - "type": "number" + "description": "The distance in blocks from which the mob will look at", + "type": "number", + "default": 8.0 + }, + "probability": { + "title": "Probability", + "type": "number", + "default": 0.02, + "description": "The probability of looking at the target. A value of 1.00 is 100%." + }, + "angle_of_view_vertical": { + "title": "Angle Of View Vertical", + "type": "integer", + "default": 360, + "description": "The angle in degrees that the mob can see in the X-axis (left-right)" + }, + "angle_of_view_horizontal": { + "title": "Angle Of View Horizontal", + "type": "integer", + "default": 360, + "description": "The angle in degrees that the mob can see in the Y-axis (up-down)" } }, "examples": [ From f91e95a19ec44fc89156f43ab605abb16c0d876f Mon Sep 17 00:00:00 2001 From: ChibiMango <32205345+ChibiMango@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:27:03 +0100 Subject: [PATCH 9/9] Update scheduler.json #39 --- .../entities/format/components/scheduler.json | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/source/behavior/entities/format/components/scheduler.json b/source/behavior/entities/format/components/scheduler.json index 0a5650c2..c6b1c39c 100644 --- a/source/behavior/entities/format/components/scheduler.json +++ b/source/behavior/entities/format/components/scheduler.json @@ -6,29 +6,28 @@ "additionalProperties": false, "properties": { "min_delay_secs": { - "type": "integer", - "description": "The minimum time in seconds before a scheduled event occurs", - "$comment": "UNDOCUMENTED", "title": "Minimum Delay Secs", + "type": "number", + "default": 0, + "description": "The minimum the scheduler will be delayed.", "minimum": 0 }, "max_delay_secs": { - "type": "integer", - "description": "The maximum time in seconds before a scheduled event occurs", - "$comment": "UNDOCUMENTED", "title": "Maximum Delay Secs", + "type": "number", + "default": 0, + "description": "The maximum the scheduler will be delayed.", "minimum": 0 }, "scheduled_events": { + "title": "Scheduled Events", "type": "array", "description": "The list of triggers that fire when the conditions match the given filter criteria. If any filter criteria overlap the first defined event will be picked.", - "title": "Scheduled Events", "items": { + "title": "Scheduled Events", "additionalProperties": false, "type": "object", "description": "A filter and event pair. The event runs when the filter criteria succeeds", - "$comment": "UNDOCUMENTED", - "title": "Scheduled Events", "properties": { "filters": { "$ref": "../../filters/filters.json"