Merge bbdafa9033 into 3b15abf2c9

bt/tasks/bt_task.cpp

@@ -182,47 +182,60 @@ Ref<BTTask> BTTask::clone() const {
 
 	// * Children are duplicated via children property. See _set_children().
 
-	// * Make BBParam properties unique.
-	HashMap<Ref<Resource>, Ref<Resource>> duplicates;
 #ifdef LIMBOAI_MODULE
+	// Make BBParam properties unique.
 	List<PropertyInfo> props;
 	inst->get_property_list(&props);
+	HashMap<Ref<Resource>, Ref<Resource>> duplicates;
 	for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
-		PropertyInfo prop = E->get();
+		if (!(E->get().usage & PROPERTY_USAGE_STORAGE)) {
-#elif LIMBOAI_GDEXTENSION
-	TypedArray<Dictionary> props = inst->get_property_list();
-	for (int i = 0; i < props.size(); i++) {
-		PropertyInfo prop = PropertyInfo::from_dict(props[i]);
-#endif
-		if (!(prop.usage & PROPERTY_USAGE_STORAGE)) {
 			continue;
 		}
 
-		Variant prop_value = inst->get(prop.name);
+		Variant v = inst->get(E->get().name);
-		Ref<Resource> res = prop_value;
+
-		if (res.is_valid() && res->is_class("BBParam")) {
+		if (v.is_ref_counted()) {
-			// Duplicate BBParam
+			Ref<RefCounted> ref = v;
-			if (!duplicates.has(res)) {
+			if (ref.is_valid()) {
-				duplicates[res] = res->duplicate();
+				Ref<Resource> res = ref;
-			}
+				if (res.is_valid() && res->is_class("BBParam")) {
-			res = duplicates[res];
+					if (!duplicates.has(res)) {
-			inst->set(prop.name, res);
+						duplicates[res] = res->duplicate();
-		} else if (prop_value.get_type() == Variant::ARRAY) {
-			// Duplicate BBParams instances inside an array.
-			// - This code doesn't handle arrays of arrays.
-			// - A partial workaround for: https://github.com/godotengine/godot/issues/74918
-			// - We actually don't want to duplicate resources in clone() except for BBParam subtypes.
-			Array arr = prop_value;
-			if (arr.is_typed() && ClassDB::is_parent_class(arr.get_typed_class_name(), LW_NAME(BBParam))) {
-				for (int j = 0; j < arr.size(); j++) {
-					Ref<Resource> bb_param = arr[j];
-					if (bb_param.is_valid()) {
-						arr[j] = bb_param->duplicate();
 					}
+					res = duplicates[res];
+					inst->set(E->get().name, res);
 				}
 			}
 		}
 	}
+#elif LIMBOAI_GDEXTENSION
+	// Make BBParam properties unique.
+	TypedArray<Dictionary> props = inst->get_property_list();
+	HashMap<Ref<Resource>, Ref<Resource>> duplicates;
+	for (int i = 0; i < props.size(); i++) {
+		Dictionary prop = props[i];
+		if (!(int(prop["usage"]) & PROPERTY_USAGE_STORAGE)) {
+			continue;
+		}
+
+		StringName prop_name = prop["name"];
+		Variant v = inst->get(prop_name);
+
+		if (v.get_type() == Variant::OBJECT && int(prop["hint"]) == PROPERTY_HINT_RESOURCE_TYPE) {
+			Ref<RefCounted> ref = v;
+			if (ref.is_valid()) {
+				Ref<Resource> res = ref;
+				if (res.is_valid() && res->is_class("BBParam")) {
+					if (!duplicates.has(res)) {
+						duplicates[res] = res->duplicate();
+					}
+					res = duplicates[res];
+					inst->set(prop_name, res);
+				}
+			}
+		}
+	}
+#endif // LIMBOAI_MODULE & LIMBOAI_GDEXTENSION
 
 	return inst;
 }

util/limbo_string_names.cpp

@@ -40,7 +40,6 @@ LimboStringNames::LimboStringNames() {
 	add_child = SN("add_child");
 	add_child_at_index = SN("add_child_at_index");
 	AnimationFilter = SN("AnimationFilter");
-	BBParam = SN("BBParam");
 	behavior_tree_finished = SN("behavior_tree_finished");
 	bold = SN("bold");
 	button_down = SN("button_down");

util/limbo_string_names.h

@@ -56,7 +56,6 @@ public:
 	StringName add_child;
 	StringName Add;
 	StringName AnimationFilter;
-	StringName BBParam;
 	StringName behavior_tree_finished;
 	StringName bold;
 	StringName button_down;