Fix behavior property generation and value.

4ian · Jan 18, 2025 · 006777b · 006777b
1 parent 4a685db
commit 006777b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/Core/GDCore/Project/CustomConfigurationHelper.cpp b/Core/GDCore/Project/CustomConfigurationHelper.cpp
@@ -22,11 +22,13 @@ void CustomConfigurationHelper::InitializeContent(
     gd::SerializerElement &configurationContent) {
   for (auto &&property : properties.GetInternalVector()) {
     auto &element = configurationContent.AddChild(property->GetName());
-    auto propertyType = property->GetType();
 
-    const auto &primitiveType = gd::ValueTypeMetadata::GetPrimitiveValueType(
-        gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(propertyType));
-    if (primitiveType == "string") {
+    const auto &valueType =
+        gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
+            property->GetType());
+    const auto &primitiveType =
+        gd::ValueTypeMetadata::GetPrimitiveValueType(valueType);
+    if (primitiveType == "string" || valueType == "behavior") {
       element.SetStringValue(property->GetValue());
     } else if (primitiveType == "number") {
       element.SetDoubleValue(property->GetValue().To<double>());
@@ -43,17 +45,19 @@ std::map<gd::String, gd::PropertyDescriptor> CustomConfigurationHelper::GetPrope
 
   for (auto &property : properties.GetInternalVector()) {
     const auto &propertyName = property->GetName();
-    const auto &propertyType = property->GetType();
 
     // Copy the property
     objectProperties[propertyName] = *property;
 
     auto &newProperty = objectProperties[propertyName];
 
-    const auto &primitiveType = gd::ValueTypeMetadata::GetPrimitiveValueType(
-        gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(propertyType));
+    const auto &valueType =
+        gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
+            property->GetType());
+    const auto &primitiveType =
+        gd::ValueTypeMetadata::GetPrimitiveValueType(valueType);
     if (configurationContent.HasChild(propertyName)) {
-      if (primitiveType == "string") {
+      if (primitiveType == "string" || valueType == "behavior") {
         newProperty.SetValue(
             configurationContent.GetChild(propertyName).GetStringValue());
       } else if (primitiveType == "number") {
@@ -85,11 +89,12 @@ bool CustomConfigurationHelper::UpdateProperty(
   const auto &property = properties.Get(propertyName);
 
   auto &element = configurationContent.AddChild(propertyName);
-  const gd::String &propertyType = property.GetType();
 
-  const auto &primitiveType = gd::ValueTypeMetadata::GetPrimitiveValueType(
-      gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(propertyType));
-  if (primitiveType == "string") {
+  const auto &valueType =
+      gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(property.GetType());
+  const auto &primitiveType =
+      gd::ValueTypeMetadata::GetPrimitiveValueType(valueType);
+  if (primitiveType == "string" || valueType == "behavior") {
     element.SetStringValue(newValue);
   } else if (primitiveType == "number") {
     element.SetDoubleValue(newValue.To<double>());

diff --git a/GDJS/GDJS/Events/CodeGeneration/BehaviorCodeGenerator.cpp b/GDJS/GDJS/Events/CodeGeneration/BehaviorCodeGenerator.cpp
@@ -421,10 +421,11 @@ gd::String BehaviorCodeGenerator::GenerateUpdatePropertyFromNetworkSyncDataCode(
 gd::String BehaviorCodeGenerator::GeneratePropertyValueCode(
     const gd::PropertyDescriptor& property) {
 
-  const auto &primitiveType = gd::ValueTypeMetadata::GetPrimitiveValueType(
-      gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
-          property.GetType()));
-  if (primitiveType == "string") {
+  const auto &valueType =
+      gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(property.GetType());
+  const auto &primitiveType =
+      gd::ValueTypeMetadata::GetPrimitiveValueType(valueType);
+  if (primitiveType == "string" || valueType == "behavior") {
     return EventsCodeGenerator::ConvertToStringExplicit(property.GetValue());
   } else if (primitiveType == "number") {
     return "Number(" +