botaccount
/
limboai
mirror of https://github.com/limbonaut/limboai.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bugs in loading user tasks

This commit is contained in:
Serhii Snitsaruk 2022-10-30 12:33:38 +01:00
parent db0c903ca8
commit cc49834994
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
editor/limbo_ai_editor_plugin.cpp
View File

@ -372,15 +372,12 @@ void TaskPanel::refresh() {
String dir1 = GLOBAL_GET("limbo_ai/behavior_tree/user_task_dir_1"); String dir1 = GLOBAL_GET("limbo_ai/behavior_tree/user_task_dir_1");
_populate_from_user_dir(dir1, &categories); _populate_from_user_dir(dir1, &categories);
_populate_scripted_tasks_from_dir(dir1, &categories["User"]);
String dir2 = GLOBAL_GET("limbo_ai/behavior_tree/user_task_dir_2"); String dir2 = GLOBAL_GET("limbo_ai/behavior_tree/user_task_dir_2");
_populate_from_user_dir(dir2, &categories); _populate_from_user_dir(dir2, &categories);
_populate_scripted_tasks_from_dir(dir2, &categories["User"]);
String dir3 = GLOBAL_GET("limbo_ai/behavior_tree/user_task_dir_3"); String dir3 = GLOBAL_GET("limbo_ai/behavior_tree/user_task_dir_3");
_populate_from_user_dir(dir3, &categories); _populate_from_user_dir(dir3, &categories);
_populate_scripted_tasks_from_dir(dir3, &categories["User"]);
List<String> keys; List<String> keys;
categories.get_key_list(&keys); categories.get_key_list(&keys);
@ -427,11 +424,20 @@ void TaskPanel::_populate_from_user_dir(String p_path, HashMap<String, List<Stri
String fn = dir->get_next(); String fn = dir->get_next();
while (!fn.empty()) { while (!fn.empty()) {
if (dir->current_is_dir()) { if (dir->current_is_dir()) {
String full_path = p_path.plus_file(fn); String full_path;
String category = fn.capitalize(); String category;
if (fn == ".") {
full_path = p_path;
category = "User";
} else {
full_path = p_path.plus_file(fn);
category = fn.capitalize();
}
if (!p_categories->has(category)) { if (!p_categories->has(category)) {
p_categories->set(category, List<String>()); p_categories->set(category, List<String>());
} }
_populate_scripted_tasks_from_dir(full_path, &p_categories->get(category)); _populate_scripted_tasks_from_dir(full_path, &p_categories->get(category));
} }
fn = dir->get_next(); fn = dir->get_next();
@ -689,7 +695,7 @@ void LimboAIEditor::_on_tree_task_selected(const Ref<BTTask> &p_task) const {
void LimboAIEditor::_on_panel_task_selected(String p_task) { void LimboAIEditor::_on_panel_task_selected(String p_task) {
if (p_task.begins_with("res:")) { if (p_task.begins_with("res:")) {
Ref<Script> script = ResourceLoader::load(p_task, "Script"); Ref<Script> script = ResourceLoader::load(p_task, "Script");
ERR_FAIL_COND_MSG(!script->is_valid(), vformat("LimboAI: Failed to instance task. Bad script: %s", p_task)); ERR_FAIL_COND_MSG(script.is_null() || !script->is_valid(), vformat("LimboAI: Failed to instance task. Bad script: %s", p_task));
Variant inst = ClassDB::instance(script->get_instance_base_type()); Variant inst = ClassDB::instance(script->get_instance_base_type());
ERR_FAIL_COND_MSG(inst.is_zero(), vformat("LimboAI: Failed to instance base type \"%s\".", script->get_instance_base_type())); ERR_FAIL_COND_MSG(inst.is_zero(), vformat("LimboAI: Failed to instance base type \"%s\".", script->get_instance_base_type()));