Reorganize task categories

SCsub

@@ -10,10 +10,12 @@ 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/tasks/*.cpp")
+module_env.add_source_files(env.modules_sources, "bt/tasks/blackboard/*.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")
+module_env.add_source_files(env.modules_sources, "bt/tasks/misc/*.cpp")
+module_env.add_source_files(env.modules_sources, "bt/tasks/scene/*.cpp")
+module_env.add_source_files(env.modules_sources, "bt/tasks/utility/*.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/tasks/blackboard/bt_check_trigger.h

@@ -18,7 +18,7 @@
 
 class BTCheckTrigger : public BTCondition {
 	GDCLASS(BTCheckTrigger, BTCondition);
-	TASK_CATEGORY(Conditions);
+	TASK_CATEGORY(Blackboard);
 
 private:
 	String variable;

bt/tasks/blackboard/bt_check_var.h

@@ -19,7 +19,7 @@
 
 class BTCheckVar : public BTCondition {
 	GDCLASS(BTCheckVar, BTCondition);
-	TASK_CATEGORY(Conditions);
+	TASK_CATEGORY(Blackboard);
 
 private:
 	String variable;

bt/tasks/blackboard/bt_set_var.h

@@ -20,7 +20,7 @@
 
 class BTSetVar : public BTAction {
 	GDCLASS(BTSetVar, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Blackboard);
 
 private:
 	String variable;

bt/tasks/bt_comment.h

@@ -16,10 +16,9 @@
 
 class BTComment : public BTTask {
 	GDCLASS(BTComment, BTTask);
+	TASK_CATEGORY(Utility);
 
 public:
-	static _FORCE_INLINE_ String get_task_category() { return LimboTaskDB::get_misc_category(); }
-
 	virtual Ref<BTTask> clone() const override;
 	virtual PackedStringArray get_configuration_warnings() const override;
 };

bt/tasks/decorators/bt_new_scope.h

@@ -16,7 +16,7 @@
 
 class BTNewScope : public BTDecorator {
 	GDCLASS(BTNewScope, BTDecorator);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Decorators);
 
 private:
 	Dictionary blackboard_data;

bt/tasks/decorators/bt_subtree.h

@@ -18,7 +18,7 @@
 
 class BTSubtree : public BTNewScope {
 	GDCLASS(BTSubtree, BTNewScope);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Decorators);
 
 private:
 	Ref<BehaviorTree> subtree;

bt/tasks/scene/bt_await_animation.h

@@ -20,7 +20,7 @@
 
 class BTAwaitAnimation : public BTAction {
 	GDCLASS(BTAwaitAnimation, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Scene);
 
 private:
 	Ref<BBNode> animation_player_param;

bt/tasks/scene/bt_call_method.h

@@ -18,7 +18,7 @@
 
 class BTCallMethod : public BTAction {
 	GDCLASS(BTCallMethod, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Scene);
 
 private:
 	StringName method_name;

bt/tasks/scene/bt_check_agent_property.h

@@ -21,7 +21,7 @@
 
 class BTCheckAgentProperty : public BTCondition {
 	GDCLASS(BTCheckAgentProperty, BTCondition);
-	TASK_CATEGORY(Conditions);
+	TASK_CATEGORY(Scene);
 
 private:
 	StringName property;

bt/tasks/scene/bt_pause_animation.h

@@ -20,7 +20,7 @@
 
 class BTPauseAnimation : public BTAction {
 	GDCLASS(BTPauseAnimation, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Scene);
 
 private:
 	Ref<BBNode> animation_player_param;

bt/tasks/scene/bt_play_animation.h

@@ -20,7 +20,7 @@
 
 class BTPlayAnimation : public BTAction {
 	GDCLASS(BTPlayAnimation, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Scene);
 
 private:
 	Ref<BBNode> animation_player_param;

bt/tasks/scene/bt_set_agent_property.h

@@ -18,7 +18,7 @@
 
 class BTSetAgentProperty : public BTAction {
 	GDCLASS(BTSetAgentProperty, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Scene);
 
 private:
 	StringName property;

bt/tasks/scene/bt_stop_animation.h

@@ -20,7 +20,7 @@
 
 class BTStopAnimation : public BTAction {
 	GDCLASS(BTStopAnimation, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Scene);
 
 private:
 	Ref<BBNode> animation_player_param;

bt/tasks/utility/bt_console_print.h

@@ -18,7 +18,7 @@
 
 class BTConsolePrint : public BTAction {
 	GDCLASS(BTConsolePrint, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Utility);
 
 private:
 	String text;

bt/tasks/utility/bt_fail.h

@@ -16,7 +16,7 @@
 
 class BTFail : public BTAction {
 	GDCLASS(BTFail, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Utility);
 
 protected:
 	virtual int _tick(double p_delta) override;

bt/tasks/utility/bt_random_wait.h

@@ -16,7 +16,7 @@
 
 class BTRandomWait : public BTAction {
 	GDCLASS(BTRandomWait, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Utility);
 
 private:
 	double min_duration = 1.0;

bt/tasks/utility/bt_wait.h

@@ -16,7 +16,7 @@
 
 class BTWait : public BTAction {
 	GDCLASS(BTWait, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Utility);
 
 private:
 	double duration = 1.0;

bt/tasks/utility/bt_wait_ticks.h

@@ -16,7 +16,7 @@
 
 class BTWaitTicks : public BTAction {
 	GDCLASS(BTWaitTicks, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Utility);
 
 private:
 	int num_ticks = 1;

register_types.cpp

@@ -47,18 +47,9 @@
 #include "bt/behavior_tree.h"
 #include "bt/bt_player.h"
 #include "bt/bt_state.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/blackboard/bt_check_trigger.h"
+#include "bt/tasks/blackboard/bt_check_var.h"
+#include "bt/tasks/blackboard/bt_set_var.h"
 #include "bt/tasks/bt_action.h"
 #include "bt/tasks/bt_comment.h"
 #include "bt/tasks/bt_composite.h"
@@ -72,9 +63,6 @@
 #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"
@@ -89,6 +77,18 @@
 #include "bt/tasks/decorators/bt_run_limit.h"
 #include "bt/tasks/decorators/bt_subtree.h"
 #include "bt/tasks/decorators/bt_time_limit.h"
+#include "bt/tasks/scene/bt_await_animation.h"
+#include "bt/tasks/scene/bt_call_method.h"
+#include "bt/tasks/scene/bt_check_agent_property.h"
+#include "bt/tasks/scene/bt_pause_animation.h"
+#include "bt/tasks/scene/bt_play_animation.h"
+#include "bt/tasks/scene/bt_set_agent_property.h"
+#include "bt/tasks/scene/bt_stop_animation.h"
+#include "bt/tasks/utility/bt_console_print.h"
+#include "bt/tasks/utility/bt_fail.h"
+#include "bt/tasks/utility/bt_random_wait.h"
+#include "bt/tasks/utility/bt_wait.h"
+#include "bt/tasks/utility/bt_wait_ticks.h"
 #include "editor/debugger/limbo_debugger.h"
 #include "hsm/limbo_hsm.h"
 #include "hsm/limbo_state.h"