Reorganize BT tasks

SCsub

@@ -9,10 +9,11 @@ module_env.add_source_files(env.modules_sources, "*.cpp")
 module_env.add_source_files(env.modules_sources, "blackboard/*.cpp")
 module_env.add_source_files(env.modules_sources, "blackboard/bb_param/*.cpp")
 module_env.add_source_files(env.modules_sources, "bt/*.cpp")
-module_env.add_source_files(env.modules_sources, "bt/composites/*.cpp")
-module_env.add_source_files(env.modules_sources, "bt/actions/*.cpp")
-module_env.add_source_files(env.modules_sources, "bt/decorators/*.cpp")
-module_env.add_source_files(env.modules_sources, "bt/conditions/*.cpp")
+module_env.add_source_files(env.modules_sources, "bt/tasks/*.cpp")
+module_env.add_source_files(env.modules_sources, "bt/tasks/composites/*.cpp")
+module_env.add_source_files(env.modules_sources, "bt/tasks/actions/*.cpp")
+module_env.add_source_files(env.modules_sources, "bt/tasks/decorators/*.cpp")
+module_env.add_source_files(env.modules_sources, "bt/tasks/conditions/*.cpp")
 if env.editor_build:
     module_env.add_source_files(env.modules_sources, "editor/*.cpp")
 module_env.add_source_files(env.modules_sources, "editor/debugger/*.cpp")

bt/behavior_tree.cpp

@@ -13,7 +13,6 @@
 
 #include "core/error/error_macros.h"
 #include "core/object/class_db.h"
-#include "core/object/object.h"
 #include "core/templates/list.h"
 #include "core/variant/variant.h"
 

bt/behavior_tree.h

@@ -12,12 +12,10 @@
 #ifndef BEHAVIOR_TREE_H
 #define BEHAVIOR_TREE_H
 
-#include "bt_task.h"
+#include "core/io/resource.h"
 
 #include "modules/limboai/blackboard/blackboard.h"
-
-#include "core/io/resource.h"
-#include "core/object/object.h"
+#include "tasks/bt_task.h"
 
 class BehaviorTree : public Resource {
 	GDCLASS(BehaviorTree, Resource);

bt/bt_player.cpp

@@ -11,7 +11,6 @@
 
 #include "bt_player.h"
 
-#include "bt_task.h"
 #include "modules/limboai/blackboard/blackboard.h"
 #include "modules/limboai/editor/debugger/limbo_debugger.h"
 #include "modules/limboai/util/limbo_string_names.h"
@@ -20,7 +19,6 @@
 #include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/object/class_db.h"
-#include "core/object/object.h"
 #include "core/os/memory.h"
 #include "core/string/string_name.h"
 #include "core/variant/variant.h"

bt/bt_player.h

@@ -12,13 +12,12 @@
 #ifndef BT_PLAYER_H
 #define BT_PLAYER_H
 
-#include "behavior_tree.h"
-#include "bt_task.h"
-#include "modules/limboai/blackboard/blackboard.h"
-
-#include "core/object/object.h"
 #include "scene/main/node.h"
 
+#include "behavior_tree.h"
+#include "modules/limboai/blackboard/blackboard.h"
+#include "tasks/bt_task.h"
+
 class BTPlayer : public Node {
 	GDCLASS(BTPlayer, Node);
 

bt/bt_state.cpp

@@ -11,7 +11,6 @@
 
 #include "bt_state.h"
 
-#include "modules/limboai/bt/bt_task.h"
 #include "modules/limboai/editor/debugger/limbo_debugger.h"
 #include "modules/limboai/hsm/limbo_state.h"
 #include "modules/limboai/util/limbo_string_names.h"

bt/bt_state.h

@@ -12,11 +12,10 @@
 #ifndef BT_STATE_H
 #define BT_STATE_H
 
-#include "modules/limboai/bt/behavior_tree.h"
-#include "modules/limboai/bt/bt_task.h"
 #include "modules/limboai/hsm/limbo_state.h"
 
-#include "core/object/object.h"
+#include "modules/limboai/bt/behavior_tree.h"
+#include "modules/limboai/bt/tasks/bt_task.h"
 
 class BTState : public LimboState {
 	GDCLASS(BTState, LimboState);

bt/tasks/actions/bt_await_animation.h

@@ -12,7 +12,7 @@
 #ifndef BT_AWAIT_ANIMATION_H
 #define BT_AWAIT_ANIMATION_H
 
-#include "bt_action.h"
+#include "../bt_action.h"
 
 #include "modules/limboai/blackboard/bb_param/bb_node.h"
 

bt/tasks/actions/bt_call_method.h

@@ -12,7 +12,7 @@
 #ifndef BT_CALL_METHOD_H
 #define BT_CALL_METHOD_H
 
-#include "bt_action.h"
+#include "../bt_action.h"
 
 #include "modules/limboai/blackboard/bb_param/bb_node.h"
 

bt/tasks/actions/bt_console_print.cpp

@@ -11,8 +11,6 @@
 
 #include "bt_console_print.h"
 
-#include "modules/limboai/bt/actions/bt_action.h"
-
 #include "core/object/object.h"
 #include "core/string/print_string.h"
 

bt/tasks/actions/bt_console_print.h

@@ -12,9 +12,8 @@
 #ifndef BT_CONSOLE_PRINT_H
 #define BT_CONSOLE_PRINT_H
 
-#include "bt_action.h"
+#include "../bt_action.h"
 
-#include "core/object/object.h"
 #include "core/variant/variant.h"
 
 class BTConsolePrint : public BTAction {

bt/tasks/actions/bt_fail.h

@@ -12,9 +12,7 @@
 #ifndef BT_FAIL_H
 #define BT_FAIL_H
 
-#include "bt_action.h"
-
-#include "core/object/object.h"
+#include "../bt_action.h"
 
 class BTFail : public BTAction {
 	GDCLASS(BTFail, BTAction);

bt/tasks/actions/bt_pause_animation.h

@@ -12,7 +12,7 @@
 #ifndef BT_PAUSE_ANIMATION_H
 #define BT_PAUSE_ANIMATION_H
 
-#include "bt_action.h"
+#include "../bt_action.h"
 
 #include "modules/limboai/blackboard/bb_param/bb_node.h"
 

bt/tasks/actions/bt_play_animation.h

@@ -12,7 +12,7 @@
 #ifndef BT_PLAY_ANIMATION_H
 #define BT_PLAY_ANIMATION_H
 
-#include "bt_action.h"
+#include "../bt_action.h"
 
 #include "modules/limboai/blackboard/bb_param/bb_node.h"
 

bt/tasks/actions/bt_random_wait.h

@@ -12,9 +12,7 @@
 #ifndef BT_RANDOM_WAIT_H
 #define BT_RANDOM_WAIT_H
 
-#include "bt_action.h"
-
-#include "core/object/object.h"
+#include "../bt_action.h"
 
 class BTRandomWait : public BTAction {
 	GDCLASS(BTRandomWait, BTAction);

bt/tasks/actions/bt_set_agent_property.h

@@ -12,13 +12,10 @@
 #ifndef BT_SET_AGENT_PROPERTY_H
 #define BT_SET_AGENT_PROPERTY_H
 
-#include "modules/limboai/bt/actions/bt_action.h"
+#include "../bt_action.h"
 
 #include "modules/limboai/blackboard/bb_param/bb_variant.h"
 
-#include "core/object/class_db.h"
-#include "core/object/object.h"
-
 class BTSetAgentProperty : public BTAction {
 	GDCLASS(BTSetAgentProperty, BTAction);
 

bt/tasks/actions/bt_set_var.h

@@ -13,11 +13,10 @@
 #ifndef BT_SET_VAR_H
 #define BT_SET_VAR_H
 
-#include "../actions/bt_action.h"
+#include "../bt_action.h"
 
-#include "../../blackboard/bb_param/bb_variant.h"
+#include "modules/limboai/blackboard/bb_param/bb_variant.h"
 
-#include "core/object/object.h"
 #include "core/string/ustring.h"
 
 class BTSetVar : public BTAction {

bt/tasks/actions/bt_stop_animation.cpp

@@ -9,7 +9,7 @@
  * =============================================================================
  */
 
-#include "modules/limboai/bt/actions/bt_stop_animation.h"
+#include "bt_stop_animation.h"
 
 //**** Setters / Getters
 

bt/tasks/actions/bt_stop_animation.h

@@ -12,7 +12,7 @@
 #ifndef BT_STOP_ANIMATION_H
 #define BT_STOP_ANIMATION_H
 
-#include "bt_action.h"
+#include "../bt_action.h"
 
 #include "modules/limboai/blackboard/bb_param/bb_node.h"
 

bt/tasks/actions/bt_wait.h

@@ -12,9 +12,7 @@
 #ifndef BT_WAIT_H
 #define BT_WAIT_H
 
-#include "bt_action.h"
-
-#include "core/object/object.h"
+#include "../bt_action.h"
 
 class BTWait : public BTAction {
 	GDCLASS(BTWait, BTAction);

bt/tasks/actions/bt_wait_ticks.cpp

@@ -11,7 +11,6 @@
 
 #include "bt_wait_ticks.h"
 
-#include "core/object/class_db.h"
 #include "core/object/object.h"
 #include "core/variant/variant.h"
 

bt/tasks/actions/bt_wait_ticks.h

@@ -12,9 +12,7 @@
 #ifndef BT_WAIT_TICKS_H
 #define BT_WAIT_TICKS_H
 
-#include "bt_action.h"
-
-#include "core/object/object.h"
+#include "../bt_action.h"
 
 class BTWaitTicks : public BTAction {
 	GDCLASS(BTWaitTicks, BTAction);

bt/tasks/bt_action.h

@@ -12,9 +12,7 @@
 #ifndef BT_ACTION_H
 #define BT_ACTION_H
 
-#include "../bt_task.h"
-
-#include "core/object/object.h"
+#include "bt_task.h"
 
 class BTAction : public BTTask {
 	GDCLASS(BTAction, BTTask);

bt/tasks/bt_composite.h

@@ -12,9 +12,7 @@
 #ifndef BT_COMPOSITE_H
 #define BT_COMPOSITE_H
 
-#include "../bt_task.h"
-
-#include "core/object/object.h"
+#include "bt_task.h"
 
 class BTComposite : public BTTask {
 	GDCLASS(BTComposite, BTTask);

bt/tasks/bt_condition.h

@@ -12,9 +12,7 @@
 #ifndef BT_CONDITION_H
 #define BT_CONDITION_H
 
-#include "../bt_task.h"
-
-#include "core/object/object.h"
+#include "bt_task.h"
 
 class BTCondition : public BTTask {
 	GDCLASS(BTCondition, BTTask);

bt/tasks/bt_decorator.h

@@ -12,9 +12,7 @@
 #ifndef BT_DECORATOR_H
 #define BT_DECORATOR_H
 
-#include "../bt_task.h"
-
-#include "core/object/object.h"
+#include "bt_task.h"
 
 class BTDecorator : public BTTask {
 	GDCLASS(BTDecorator, BTTask)

bt/tasks/composites/bt_dynamic_selector.h

@@ -12,9 +12,7 @@
 #ifndef BT_DYNAMIC_SELECTOR_H
 #define BT_DYNAMIC_SELECTOR_H
 
-#include "bt_composite.h"
-
-#include "core/object/object.h"
+#include "../bt_composite.h"
 
 class BTDynamicSelector : public BTComposite {
 	GDCLASS(BTDynamicSelector, BTComposite);

bt/tasks/composites/bt_dynamic_sequence.h

@@ -12,9 +12,7 @@
 #ifndef BT_DYNAMIC_SEQUENCE_H
 #define BT_DYNAMIC_SEQUENCE_H
 
-#include "bt_composite.h"
-
-#include "core/object/object.h"
+#include "../bt_composite.h"
 
 class BTDynamicSequence : public BTComposite {
 	GDCLASS(BTDynamicSequence, BTComposite);

bt/tasks/composites/bt_parallel.h

@@ -12,9 +12,7 @@
 #ifndef BT_PARALLEL_H
 #define BT_PARALLEL_H
 
-#include "bt_composite.h"
-
-#include "core/object/object.h"
+#include "../bt_composite.h"
 
 class BTParallel : public BTComposite {
 	GDCLASS(BTParallel, BTComposite);

bt/tasks/composites/bt_random_selector.h

@@ -12,7 +12,7 @@
 #ifndef BT_RANDOM_SELECTOR_H
 #define BT_RANDOM_SELECTOR_H
 
-#include "bt_composite.h"
+#include "../bt_composite.h"
 
 #include "core/templates/vector.h"
 

bt/tasks/composites/bt_random_sequence.h

@@ -12,7 +12,7 @@
 #ifndef BT_RANDOM_SEQUENCE_H
 #define BT_RANDOM_SEQUENCE_H
 
-#include "bt_composite.h"
+#include "../bt_composite.h"
 
 #include "core/templates/vector.h"
 

bt/tasks/composites/bt_selector.h

@@ -12,7 +12,7 @@
 #ifndef BT_SELECTOR_H
 #define BT_SELECTOR_H
 
-#include "bt_composite.h"
+#include "../bt_composite.h"
 
 class BTSelector : public BTComposite {
 	GDCLASS(BTSelector, BTComposite);

bt/tasks/composites/bt_sequence.h

@@ -12,9 +12,7 @@
 #ifndef BT_SEQUENCE_H
 #define BT_SEQUENCE_H
 
-#include "bt_composite.h"
-
-#include "core/object/object.h"
+#include "../bt_composite.h"
 
 class BTSequence : public BTComposite {
 	GDCLASS(BTSequence, BTComposite);

bt/tasks/conditions/bt_check_agent_property.h

@@ -12,12 +12,11 @@
 #ifndef BT_CHECK_AGENT_PROPERTY
 #define BT_CHECK_AGENT_PROPERTY
 
-#include "bt_condition.h"
+#include "../bt_condition.h"
 
 #include "modules/limboai/blackboard/bb_param/bb_variant.h"
 #include "modules/limboai/util/limbo_utility.h"
 
-#include "core/object/object.h"
 #include "core/string/string_name.h"
 
 class BTCheckAgentProperty : public BTCondition {

bt/tasks/conditions/bt_check_trigger.cpp

@@ -11,7 +11,6 @@
 
 #include "bt_check_trigger.h"
 
-#include "bt_condition.h"
 #include "modules/limboai/util/limbo_utility.h"
 
 #include "core/variant/variant.h"

bt/tasks/conditions/bt_check_trigger.h

@@ -14,13 +14,10 @@
 #ifndef BT_CHECK_TRIGGER_H
 #define BT_CHECK_TRIGGER_H
 
-#include "bt_condition.h"
+#include "../bt_condition.h"
 
-#include "core/object/object.h"
 #include "core/string/ustring.h"
 
-#include "core/object/class_db.h"
-
 class BTCheckTrigger : public BTCondition {
 	GDCLASS(BTCheckTrigger, BTCondition);
 

bt/tasks/conditions/bt_check_var.h

@@ -12,7 +12,7 @@
 #ifndef BT_CHECK_VAR_H
 #define BT_CHECK_VAR_H
 
-#include "bt_condition.h"
+#include "../bt_condition.h"
 
 #include "modules/limboai/blackboard/bb_param/bb_variant.h"
 #include "modules/limboai/util/limbo_utility.h"

bt/tasks/decorators/bt_always_fail.h

@@ -12,9 +12,7 @@
 #ifndef BT_ALWAYS_FAIL_H
 #define BT_ALWAYS_FAIL_H
 
-#include "bt_decorator.h"
-
-#include "core/object/object.h"
+#include "../bt_decorator.h"
 
 class BTAlwaysFail : public BTDecorator {
 	GDCLASS(BTAlwaysFail, BTDecorator);

bt/tasks/decorators/bt_always_succeed.h

@@ -12,9 +12,7 @@
 #ifndef BT_ALWAYS_SUCCEED_H
 #define BT_ALWAYS_SUCCEED_H
 
-#include "bt_decorator.h"
-
-#include "core/object/object.h"
+#include "../bt_decorator.h"
 
 class BTAlwaysSucceed : public BTDecorator {
 	GDCLASS(BTAlwaysSucceed, BTDecorator);

bt/tasks/decorators/bt_cooldown.h

@@ -12,9 +12,8 @@
 #ifndef BT_COOLDOWN_H
 #define BT_COOLDOWN_H
 
-#include "bt_decorator.h"
+#include "../bt_decorator.h"
 
-#include "core/object/object.h"
 #include "scene/main/scene_tree.h"
 
 class BTCooldown : public BTDecorator {

bt/tasks/decorators/bt_delay.h

@@ -12,9 +12,7 @@
 #ifndef BT_DELAY_H
 #define BT_DELAY_H
 
-#include "bt_decorator.h"
-
-#include "core/object/object.h"
+#include "../bt_decorator.h"
 
 class BTDelay : public BTDecorator {
 	GDCLASS(BTDelay, BTDecorator);

bt/tasks/decorators/bt_for_each.h

@@ -12,9 +12,7 @@
 #ifndef BT_FOR_EACH_H
 #define BT_FOR_EACH_H
 
-#include "bt_decorator.h"
-
-#include "core/object/object.h"
+#include "../bt_decorator.h"
 
 class BTForEach : public BTDecorator {
 	GDCLASS(BTForEach, BTDecorator);

bt/tasks/decorators/bt_invert.h

@@ -12,9 +12,7 @@
 #ifndef BT_INVERT_H
 #define BT_INVERT_H
 
-#include "bt_decorator.h"
-
-#include "core/object/object.h"
+#include "../bt_decorator.h"
 
 class BTInvert : public BTDecorator {
 	GDCLASS(BTInvert, BTDecorator);

bt/tasks/decorators/bt_new_scope.h

@@ -12,9 +12,7 @@
 #ifndef BT_NEW_SCOPE_H
 #define BT_NEW_SCOPE_H
 
-#include "bt_decorator.h"
-
-#include "core/object/object.h"
+#include "../bt_decorator.h"
 
 class BTNewScope : public BTDecorator {
 	GDCLASS(BTNewScope, BTDecorator);

bt/tasks/decorators/bt_probability.h

@@ -12,7 +12,7 @@
 #ifndef BT_PROBABILITY_H
 #define BT_PROBABILITY_H
 
-#include "bt_decorator.h"
+#include "../bt_decorator.h"
 
 class BTProbability : public BTDecorator {
 	GDCLASS(BTProbability, BTDecorator);

bt/tasks/decorators/bt_repeat.h

@@ -12,9 +12,7 @@
 #ifndef BT_REPEAT_H
 #define BT_REPEAT_H
 
-#include "bt_decorator.h"
-
-#include "core/object/object.h"
+#include "../bt_decorator.h"
 
 class BTRepeat : public BTDecorator {
 	GDCLASS(BTRepeat, BTDecorator);

bt/tasks/decorators/bt_repeat_until_failure.h

@@ -12,9 +12,7 @@
 #ifndef BT_REPEAT_UNTIL_FAILURE_H
 #define BT_REPEAT_UNTIL_FAILURE_H
 
-#include "bt_decorator.h"
-
-#include "core/object/object.h"
+#include "../bt_decorator.h"
 
 class BTRepeatUntilFailure : public BTDecorator {
 	GDCLASS(BTRepeatUntilFailure, BTDecorator);

bt/tasks/decorators/bt_repeat_until_success.h

@@ -12,9 +12,7 @@
 #ifndef BT_REPEAT_UNTIL_SUCCESS_H
 #define BT_REPEAT_UNTIL_SUCCESS_H
 
-#include "bt_decorator.h"
-
-#include "core/object/object.h"
+#include "../bt_decorator.h"
 
 class BTRepeatUntilSuccess : public BTDecorator {
 	GDCLASS(BTRepeatUntilSuccess, BTDecorator);

bt/tasks/decorators/bt_run_limit.h

@@ -12,7 +12,7 @@
 #ifndef BT_RUN_LIMIT_H
 #define BT_RUN_LIMIT_H
 
-#include "bt_decorator.h"
+#include "../bt_decorator.h"
 
 class BTRunLimit : public BTDecorator {
 	GDCLASS(BTRunLimit, BTDecorator);

bt/tasks/decorators/bt_subtree.cpp

@@ -11,12 +11,8 @@
 
 #include "bt_subtree.h"
 
+#include "bt_new_scope.h"
 #include "modules/limboai/blackboard/blackboard.h"
-#include "modules/limboai/bt/actions/bt_action.h"
-#include "modules/limboai/bt/actions/bt_fail.h"
-#include "modules/limboai/bt/bt_task.h"
-#include "modules/limboai/bt/decorators/bt_decorator.h"
-#include "modules/limboai/bt/decorators/bt_new_scope.h"
 
 #include "core/config/engine.h"
 #include "core/error/error_macros.h"

bt/tasks/decorators/bt_time_limit.h

@@ -12,9 +12,7 @@
 #ifndef BT_TIME_LIMIT_H
 #define BT_TIME_LIMIT_H
 
-#include "bt_decorator.h"
-
-#include "core/object/object.h"
+#include "../bt_decorator.h"
 
 class BTTimeLimit : public BTDecorator {
 	GDCLASS(BTTimeLimit, BTDecorator);

editor/debugger/behavior_tree_data.h

@@ -12,9 +12,7 @@
 #ifndef BEHAVIOR_TREE_DATA_H
 #define BEHAVIOR_TREE_DATA_H
 
-#include "modules/limboai/bt/bt_task.h"
-
-#include "core/object/object.h"
+#include "modules/limboai/bt/tasks/bt_task.h"
 
 class BehaviorTreeData {
 public:

editor/debugger/behavior_tree_view.cpp

@@ -12,8 +12,9 @@
 #ifdef TOOLS_ENABLED
 
 #include "behavior_tree_view.h"
+
 #include "behavior_tree_data.h"
-#include "modules/limboai/bt/bt_task.h"
+#include "modules/limboai/bt/tasks/bt_task.h"
 #include "modules/limboai/util/limbo_utility.h"
 
 #include "core/math/color.h"

editor/debugger/limbo_debugger.cpp

@@ -12,7 +12,7 @@
 #include "limbo_debugger.h"
 
 #include "behavior_tree_data.h"
-#include "modules/limboai/bt/bt_task.h"
+#include "modules/limboai/bt/tasks/bt_task.h"
 
 #include "core/debugger/engine_debugger.h"
 #include "core/error/error_macros.h"

editor/debugger/limbo_debugger.h

@@ -12,7 +12,7 @@
 #ifndef LIMBO_DEBUGGER_H
 #define LIMBO_DEBUGGER_H
 
-#include "modules/limboai/bt/bt_task.h"
+#include "modules/limboai/bt/tasks/bt_task.h"
 
 #include "core/object/class_db.h"
 #include "core/object/object.h"

editor/limbo_ai_editor_plugin.cpp

@@ -13,12 +13,12 @@
 
 #include "limbo_ai_editor_plugin.h"
 
-#include "modules/limboai/bt/actions/bt_action.h"
 #include "modules/limboai/bt/behavior_tree.h"
-#include "modules/limboai/bt/bt_task.h"
-#include "modules/limboai/bt/composites/bt_parallel.h"
-#include "modules/limboai/bt/composites/bt_selector.h"
-#include "modules/limboai/bt/composites/bt_sequence.h"
+#include "modules/limboai/bt/tasks/bt_action.h"
+#include "modules/limboai/bt/tasks/bt_task.h"
+#include "modules/limboai/bt/tasks/composites/bt_parallel.h"
+#include "modules/limboai/bt/tasks/composites/bt_selector.h"
+#include "modules/limboai/bt/tasks/composites/bt_sequence.h"
 #include "modules/limboai/editor/debugger/limbo_debugger_plugin.h"
 #include "modules/limboai/util/limbo_utility.h"
 

editor/limbo_ai_editor_plugin.h

@@ -14,7 +14,7 @@
 #define LIMBO_AI_EDITOR_PLUGIN_H
 
 #include "modules/limboai/bt/behavior_tree.h"
-#include "modules/limboai/bt/bt_task.h"
+#include "modules/limboai/bt/tasks/bt_task.h"
 
 #include "core/object/class_db.h"
 #include "core/object/object.h"

register_types.cpp

@@ -44,50 +44,50 @@
 #include "blackboard/bb_param/bb_vector4.h"
 #include "blackboard/bb_param/bb_vector4i.h"
 #include "blackboard/blackboard.h"
-#include "bt/actions/bt_action.h"
-#include "bt/actions/bt_await_animation.h"
-#include "bt/actions/bt_call_method.h"
-#include "bt/actions/bt_console_print.h"
-#include "bt/actions/bt_fail.h"
-#include "bt/actions/bt_pause_animation.h"
-#include "bt/actions/bt_play_animation.h"
-#include "bt/actions/bt_random_wait.h"
-#include "bt/actions/bt_set_agent_property.h"
-#include "bt/actions/bt_set_var.h"
-#include "bt/actions/bt_stop_animation.h"
-#include "bt/actions/bt_wait.h"
-#include "bt/actions/bt_wait_ticks.h"
 #include "bt/behavior_tree.h"
 #include "bt/bt_player.h"
 #include "bt/bt_state.h"
-#include "bt/bt_task.h"
-#include "bt/composites/bt_composite.h"
-#include "bt/composites/bt_dynamic_selector.h"
-#include "bt/composites/bt_dynamic_sequence.h"
-#include "bt/composites/bt_parallel.h"
-#include "bt/composites/bt_random_selector.h"
-#include "bt/composites/bt_random_sequence.h"
-#include "bt/composites/bt_selector.h"
-#include "bt/composites/bt_sequence.h"
-#include "bt/conditions/bt_check_agent_property.h"
-#include "bt/conditions/bt_check_trigger.h"
-#include "bt/conditions/bt_check_var.h"
-#include "bt/conditions/bt_condition.h"
-#include "bt/decorators/bt_always_fail.h"
-#include "bt/decorators/bt_always_succeed.h"
-#include "bt/decorators/bt_cooldown.h"
-#include "bt/decorators/bt_decorator.h"
-#include "bt/decorators/bt_delay.h"
-#include "bt/decorators/bt_for_each.h"
-#include "bt/decorators/bt_invert.h"
-#include "bt/decorators/bt_new_scope.h"
-#include "bt/decorators/bt_probability.h"
-#include "bt/decorators/bt_repeat.h"
-#include "bt/decorators/bt_repeat_until_failure.h"
-#include "bt/decorators/bt_repeat_until_success.h"
-#include "bt/decorators/bt_run_limit.h"
-#include "bt/decorators/bt_subtree.h"
-#include "bt/decorators/bt_time_limit.h"
+#include "bt/tasks/actions/bt_await_animation.h"
+#include "bt/tasks/actions/bt_call_method.h"
+#include "bt/tasks/actions/bt_console_print.h"
+#include "bt/tasks/actions/bt_fail.h"
+#include "bt/tasks/actions/bt_pause_animation.h"
+#include "bt/tasks/actions/bt_play_animation.h"
+#include "bt/tasks/actions/bt_random_wait.h"
+#include "bt/tasks/actions/bt_set_agent_property.h"
+#include "bt/tasks/actions/bt_set_var.h"
+#include "bt/tasks/actions/bt_stop_animation.h"
+#include "bt/tasks/actions/bt_wait.h"
+#include "bt/tasks/actions/bt_wait_ticks.h"
+#include "bt/tasks/bt_action.h"
+#include "bt/tasks/bt_composite.h"
+#include "bt/tasks/bt_condition.h"
+#include "bt/tasks/bt_decorator.h"
+#include "bt/tasks/bt_task.h"
+#include "bt/tasks/composites/bt_dynamic_selector.h"
+#include "bt/tasks/composites/bt_dynamic_sequence.h"
+#include "bt/tasks/composites/bt_parallel.h"
+#include "bt/tasks/composites/bt_random_selector.h"
+#include "bt/tasks/composites/bt_random_sequence.h"
+#include "bt/tasks/composites/bt_selector.h"
+#include "bt/tasks/composites/bt_sequence.h"
+#include "bt/tasks/conditions/bt_check_agent_property.h"
+#include "bt/tasks/conditions/bt_check_trigger.h"
+#include "bt/tasks/conditions/bt_check_var.h"
+#include "bt/tasks/decorators/bt_always_fail.h"
+#include "bt/tasks/decorators/bt_always_succeed.h"
+#include "bt/tasks/decorators/bt_cooldown.h"
+#include "bt/tasks/decorators/bt_delay.h"
+#include "bt/tasks/decorators/bt_for_each.h"
+#include "bt/tasks/decorators/bt_invert.h"
+#include "bt/tasks/decorators/bt_new_scope.h"
+#include "bt/tasks/decorators/bt_probability.h"
+#include "bt/tasks/decorators/bt_repeat.h"
+#include "bt/tasks/decorators/bt_repeat_until_failure.h"
+#include "bt/tasks/decorators/bt_repeat_until_success.h"
+#include "bt/tasks/decorators/bt_run_limit.h"
+#include "bt/tasks/decorators/bt_subtree.h"
+#include "bt/tasks/decorators/bt_time_limit.h"
 #include "editor/debugger/limbo_debugger.h"
 #include "hsm/limbo_hsm.h"
 #include "hsm/limbo_state.h"

util/limbo_utility.cpp

@@ -11,7 +11,7 @@
 
 #include "limbo_utility.h"
 
-#include "modules/limboai/bt/bt_task.h"
+#include "modules/limboai/bt/tasks/bt_task.h"
 
 #include "core/variant/variant.h"
 #include "scene/resources/texture.h"

util/limbo_utility.h

@@ -12,8 +12,9 @@
 #ifndef LIMBO_UTILITY_H
 #define LIMBO_UTILITY_H
 
-#include "core/object/class_db.h"
 #include "core/object/object.h"
+
+#include "core/object/class_db.h"
 #include "core/variant/variant.h"
 #include "scene/resources/texture.h"