Add explanation of date accessors in long description

* Don't show in changelog

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -43,7 +43,7 @@ gd::String EventsCodeGenerator::GenerateRelationalOperatorCall(
   std::size_t relationalOperatorIndex = instrInfos.parameters.size();
   for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters[i].type == "relationalOperator")
+    if (instrInfos.parameters[i].GetType() == "relationalOperator")
       relationalOperatorIndex = i;
   }
   // Ensure that there is at least one parameter after the relational operator
@@ -95,7 +95,7 @@ gd::String EventsCodeGenerator::GenerateOperatorCall(
   std::size_t operatorIndex = instrInfos.parameters.size();
   for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters[i].type == "operator") operatorIndex = i;
+    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
   }
 
   // Ensure that there is at least one parameter after the operator
@@ -164,7 +164,7 @@ gd::String EventsCodeGenerator::GenerateCompoundOperatorCall(
   std::size_t operatorIndex = instrInfos.parameters.size();
   for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters[i].type == "operator") operatorIndex = i;
+    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
   }
 
   // Ensure that there is at least one parameter after the operator
@@ -215,7 +215,7 @@ gd::String EventsCodeGenerator::GenerateMutatorCall(
   std::size_t operatorIndex = instrInfos.parameters.size();
   for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters[i].type == "operator") operatorIndex = i;
+    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
   }
 
   // Ensure that there is at least one parameter after the operator
@@ -293,7 +293,7 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
 
   // Verify that there are no mismatchs between object type in parameters.
   for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
-    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].type)) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType())) {
       gd::String objectInParameter =
           condition.GetParameter(pNb).GetPlainString();
 
@@ -303,11 +303,11 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
           !GetGlobalObjectsAndGroups().GetObjectGroups().Has(
               objectInParameter)) {
         return "/* Unknown object - skipped. */";
-      } else if (!instrInfos.parameters[pNb].supplementaryInformation.empty() &&
+      } else if (!instrInfos.parameters[pNb].GetExtraInfo().empty() &&
                  gd::GetTypeOfObject(GetGlobalObjectsAndGroups(),
                                      GetObjectsAndGroups(),
                                      objectInParameter) !=
-                     instrInfos.parameters[pNb].supplementaryInformation) {
+                     instrInfos.parameters[pNb].GetExtraInfo()) {
         return "/* Mismatched object type - skipped. */";
       }
     }
@@ -485,7 +485,7 @@ gd::String EventsCodeGenerator::GenerateActionCode(
 
   // Verify that there are no mismatchs between object type in parameters.
   for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
-    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].type)) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType())) {
       gd::String objectInParameter = action.GetParameter(pNb).GetPlainString();
       if (!GetObjectsAndGroups().HasObjectNamed(objectInParameter) &&
           !GetGlobalObjectsAndGroups().HasObjectNamed(objectInParameter) &&
@@ -493,11 +493,11 @@ gd::String EventsCodeGenerator::GenerateActionCode(
           !GetGlobalObjectsAndGroups().GetObjectGroups().Has(
               objectInParameter)) {
         return "/* Unknown object - skipped. */";
-      } else if (!instrInfos.parameters[pNb].supplementaryInformation.empty() &&
+      } else if (!instrInfos.parameters[pNb].GetExtraInfo().empty() &&
                  gd::GetTypeOfObject(GetGlobalObjectsAndGroups(),
                                      GetObjectsAndGroups(),
                                      objectInParameter) !=
-                     instrInfos.parameters[pNb].supplementaryInformation) {
+                     instrInfos.parameters[pNb].GetExtraInfo()) {
         return "/* Mismatched object type - skipped. */";
       }
     }
@@ -670,6 +670,18 @@ gd::String EventsCodeGenerator::GenerateActionsListCode(
   return outputCode;
 }
 
+const gd::String EventsCodeGenerator::GenerateRelationalOperatorCodes(const gd::String &operatorString) {
+    if (operatorString == "=") {
+        return "==";
+    }
+    if (operatorString != "<" && operatorString != ">" &&
+        operatorString != "<=" && operatorString != ">=" && operatorString != "!=") {
+      cout << "Warning: Bad relational operator: Set to == by default." << endl;
+      return "==";
+    }
+    return operatorString;
+}
+
 gd::String EventsCodeGenerator::GenerateParameterCodes(
     const gd::Expression& parameter,
     const gd::ParameterMetadata& metadata,
@@ -679,31 +691,24 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
         supplementaryParametersTypes) {
   gd::String argOutput;
 
-  if (ParameterMetadata::IsExpression("number", metadata.type)) {
+  if (ParameterMetadata::IsExpression("number", metadata.GetType())) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
         *this, context, "number", parameter, lastObjectName);
-  } else if (ParameterMetadata::IsExpression("string", metadata.type)) {
+  } else if (ParameterMetadata::IsExpression("string", metadata.GetType())) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
         *this, context, "string", parameter, lastObjectName);
-  } else if (ParameterMetadata::IsExpression("variable", metadata.type)) {
+  } else if (ParameterMetadata::IsExpression("variable", metadata.GetType())) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this, context, metadata.type, parameter, lastObjectName);
-  } else if (ParameterMetadata::IsObject(metadata.type)) {
+        *this, context, metadata.GetType(), parameter, lastObjectName);
+  } else if (ParameterMetadata::IsObject(metadata.GetType())) {
     // It would be possible to run a gd::ExpressionCodeGenerator if later
     // objects can have nested objects, or function returning objects.
     argOutput =
-        GenerateObject(parameter.GetPlainString(), metadata.type, context);
-  } else if (metadata.type == "relationalOperator") {
-    auto parameterString = parameter.GetPlainString();
-    argOutput += parameterString == "=" ? "==" : parameterString;
-    if (argOutput != "==" && argOutput != "<" && argOutput != ">" &&
-        argOutput != "<=" && argOutput != ">=" && argOutput != "!=") {
-      cout << "Warning: Bad relational operator: Set to == by default." << endl;
-      argOutput = "==";
-    }
-
+        GenerateObject(parameter.GetPlainString(), metadata.GetType(), context);
+  } else if (metadata.GetType() == "relationalOperator") {
+    argOutput += GenerateRelationalOperatorCodes(parameter.GetPlainString());
     argOutput = "\"" + argOutput + "\"";
-  } else if (metadata.type == "operator") {
+  } else if (metadata.GetType() == "operator") {
     argOutput += parameter.GetPlainString();
     if (argOutput != "=" && argOutput != "+" && argOutput != "-" &&
         argOutput != "/" && argOutput != "*") {
@@ -712,28 +717,28 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
     }
 
     argOutput = "\"" + argOutput + "\"";
-  } else if (ParameterMetadata::IsBehavior(metadata.type)) {
+  } else if (ParameterMetadata::IsBehavior(metadata.GetType())) {
     argOutput = GenerateGetBehaviorNameCode(parameter.GetPlainString());
-  } else if (metadata.type == "key") {
+  } else if (metadata.GetType() == "key") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
-  } else if (metadata.type == "audioResource" ||
-             metadata.type == "bitmapFontResource" ||
-             metadata.type == "fontResource" ||
-             metadata.type == "imageResource" ||
-             metadata.type == "jsonResource" ||
-             metadata.type == "videoResource" ||
+  } else if (metadata.GetType() == "audioResource" ||
+             metadata.GetType() == "bitmapFontResource" ||
+             metadata.GetType() == "fontResource" ||
+             metadata.GetType() == "imageResource" ||
+             metadata.GetType() == "jsonResource" ||
+             metadata.GetType() == "videoResource" ||
              // Deprecated, old parameter names:
-             metadata.type == "password" || metadata.type == "musicfile" ||
-             metadata.type == "soundfile" || metadata.type == "police") {
+             metadata.GetType() == "password" || metadata.GetType() == "musicfile" ||
+             metadata.GetType() == "soundfile" || metadata.GetType() == "police") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
-  } else if (metadata.type == "mouse") {
+  } else if (metadata.GetType() == "mouse") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
-  } else if (metadata.type == "yesorno") {
+  } else if (metadata.GetType() == "yesorno") {
     auto parameterString = parameter.GetPlainString();
     argOutput += (parameterString == "yes" || parameterString == "oui")
                      ? GenerateTrue()
                      : GenerateFalse();
-  } else if (metadata.type == "trueorfalse") {
+  } else if (metadata.GetType() == "trueorfalse") {
     auto parameterString = parameter.GetPlainString();
     // This is duplicated in AdvancedExtension.cpp for GDJS
     argOutput += (parameterString == "True" || parameterString == "Vrai")
@@ -741,21 +746,21 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
                      : GenerateFalse();
   }
   // Code only parameter type
-  else if (metadata.type == "inlineCode") {
-    argOutput += metadata.supplementaryInformation;
+  else if (metadata.GetType() == "inlineCode") {
+    argOutput += metadata.GetExtraInfo();
   } else {
     // Try supplementary types if provided
     if (supplementaryParametersTypes) {
       for (std::size_t i = 0; i < supplementaryParametersTypes->size(); ++i) {
-        if ((*supplementaryParametersTypes)[i].first == metadata.type)
+        if ((*supplementaryParametersTypes)[i].first == metadata.GetType())
           argOutput += (*supplementaryParametersTypes)[i].second;
       }
     }
 
     // Type unknown
     if (argOutput.empty()) {
-      if (!metadata.type.empty())
-        cout << "Warning: Unknown type of parameter \"" << metadata.type
+      if (!metadata.GetType().empty())
+        cout << "Warning: Unknown type of parameter \"" << metadata.GetType()
              << "\"." << std::endl;
       argOutput += "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
     }
@@ -1030,7 +1035,7 @@ gd::String EventsCodeGenerator::GenerateFreeCondition(
   for (std::size_t i = 0; i < instrInfos.parameters.size();
        ++i)  // Some conditions already have a "conditionInverted" parameter
   {
-    if (instrInfos.parameters[i].type == "conditionInverted")
+    if (instrInfos.parameters[i].GetType() == "conditionInverted")
       conditionAlreadyTakeCareOfInversion = true;
   }
   if (!conditionAlreadyTakeCareOfInversion && conditionInverted)
@@ -1051,7 +1056,7 @@ gd::String EventsCodeGenerator::GenerateObjectCondition(
   // Prepare call
   // Add a static_cast if necessary
   gd::String objectFunctionCallNamePart =
-      (!instrInfos.parameters[0].supplementaryInformation.empty())
+      (!instrInfos.parameters[0].GetExtraInfo().empty())
           ? "static_cast<" + objInfo.className + "*>(" +
                 GetObjectListName(objectName, context) + "[i])->" +
                 instrInfos.codeExtraInformation.functionCallName

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -481,6 +481,9 @@ class GD_CORE_API EventsCodeGenerator {
    */
   size_t GenerateSingleUsageUniqueIdForEventsList();
 
+  virtual const gd::String GenerateRelationalOperatorCodes(
+      const gd::String& operatorString);
+
  protected:
   /**
    * \brief Generate the code for a single parameter.

Core/GDCore/Events/Instruction.cpp

@@ -55,6 +55,10 @@ void Instruction::SetParameter(std::size_t nb, const gd::Expression& val) {
   parameters[nb] = val;
 }
 
+void Instruction::AddParameter(const gd::Expression& val) {
+  parameters.push_back(val);
+}
+
 std::shared_ptr<Instruction> GD_CORE_API
 CloneRememberingOriginalElement(std::shared_ptr<Instruction> instruction) {
   std::shared_ptr<Instruction> copy =

Core/GDCore/Events/Instruction.h

@@ -123,6 +123,11 @@ class GD_CORE_API Instruction {
    */
   void SetParameter(std::size_t nb, const gd::Expression& val);
 
+  /** Add a parameter at the end
+   * \param val The new value of the parameter
+   */
+  void AddParameter(const gd::Expression& val);
+
   /** \brief Get a reference to the std::vector containing the parameters.
    * \return A std::vector containing the parameters
    */

Core/GDCore/Events/Serialization.cpp

@@ -184,8 +184,8 @@ void EventsListSerialization::UpdateInstructionsFromGD2x(
     for (std::size_t j = 0;
          j < parameters.size() && j < metadata.parameters.size();
          ++j) {
-      if (metadata.parameters[j].type == "relationalOperator" ||
-          metadata.parameters[j].type == "operator") {
+      if (metadata.parameters[j].GetType() == "relationalOperator" ||
+          metadata.parameters[j].GetType() == "operator") {
         if (j == parameters.size() - 1) {
           std::cout << "ERROR: No more parameters after a [relational]operator "
                        "when trying to update an instruction from GD2.x";

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -81,7 +81,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .AddExpression(
           "GetArgumentAsNumber",
           _("Get function parameter value"),
-          _("Get function parameter (also called \"argument\") value"),
+          _("Get function parameter (also called \"argument\") value."),
           "",
           "res/function16.png")
       .AddParameter("functionParameterName", "Parameter name");
@@ -90,10 +90,34 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .AddStrExpression(
           "GetArgumentAsString",
           _("Get function parameter text"),
-          _("Get function parameter (also called \"argument\") text "),
+          _("Get function parameter (also called \"argument\") text."),
           "",
           "res/function16.png")
       .AddParameter("functionParameterName", "Parameter name");
+
+  extension
+      .AddCondition(
+          "CompareArgumentAsNumber",
+          _("Compare function parameter value"),
+          _("Compare function parameter (also called \"argument\") value."),
+          _("Parameter _PARAM0_"),
+          "",
+          "res/function32.png",
+          "res/function16.png")
+      .AddParameter("functionParameterName", "Parameter name")
+      .UseStandardRelationalOperatorParameters("number");
+
+  extension
+      .AddCondition(
+          "CompareArgumentAsString",
+          _("Compare function parameter text"),
+          _("Compare function parameter (also called \"argument\") text."),
+          _("Parameter _PARAM0_"),
+          "",
+          "res/function32.png",
+          "res/function16.png")
+      .AddParameter("functionParameterName", "Parameter name")
+      .UseStandardRelationalOperatorParameters("string");
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp

@@ -96,7 +96,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
           "JSONToVariableStructure",
           _("Convert JSON to a scene variable"),
           _("Parse a JSON object and store it into a scene variable"),
-          _("Parse JSON string _PARAM0_ and store it into variable _PARAM1_"),
+          _("Convert JSON string _PARAM0_ and store it into variable _PARAM1_"),
           "",
           "res/actions/net24.png",
           "res/actions/net.png")
@@ -108,7 +108,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
       .AddAction("JSONToGlobalVariableStructure",
                  _("Convert JSON to global variable"),
                  _("Parse a JSON object and store it into a global variable"),
-                 _("Parse JSON string _PARAM0_ and store it into global "
+                 _("Convert JSON string _PARAM0_ and store it into global "
                    "variable _PARAM1_"),
                  "",
                  "res/actions/net24.png",

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteExtension.cpp

@@ -324,6 +324,19 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    "res/conditions/animation24.png",
                    "res/conditions/animation.png")
 
+      .AddParameter("object", _("Object"), "Sprite")
+      .MarkAsSimple()
+      .SetHidden();
+
+  obj.AddCondition("AnimationEnded2",
+                   _("Animation finished"),
+                   _("Check if the animation being played by the Sprite object "
+                     "is finished."),
+                   _("The animation of _PARAM0_ is finished"),
+                   _("Animations and images"),
+                   "res/conditions/animation24.png",
+                   "res/conditions/animation.png")
+
       .AddParameter("object", _("Object"), "Sprite")
       .MarkAsSimple();
 

Core/GDCore/Extensions/Builtin/TimeExtension.cpp

@@ -155,7 +155,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                  "",
                  "res/timer_black.svg",
                  "res/timer_black.svg")
-      .AddParameter("expression", "Time to wait in seconds")
+      .AddParameter("expression", _("Time to wait in seconds"))
       .SetHelpPath("/all-features/timers-and-time/wait-action");
 
   extension
@@ -227,12 +227,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter(
           "stringWithSelector",
+          _("Date part"),
+          "[\"hour\", \"min\", \"sec\", \"mon\", \"year\", \"fullyear\", "
+          "\"wday\", \"mday\", \"yday\", \"timestamp\"]")
+      .SetParameterLongDescription(
           _("Hour: hour - Minutes: min - Seconds: sec - Day of month: "
-            "mday - Months since January: mon - Year since 1900: year - Days "
-            "since Sunday: wday - Days since Jan 1st: yday - Timestamp (ms): "
-            "timestamp\""),
-          "[\"hour\", \"min\", \"sec\", \"mon\", \"year\", \"wday\", \"mday\", "
-          "\"yday\", \"timestamp\"]");
+            "mday - Months since January (January being 0): mon - Year: "
+            "fullyear - Year since 1900: year - Days since Sunday: wday - Days "
+            "since Jan 1st: yday - Timestamp (ms): timestamp\""));
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -236,7 +236,6 @@ class GD_CORE_API BehaviorMetadata {
   }
 
   const gd::String& GetName() const;
-#if defined(GD_IDE_ONLY)
   const gd::String& GetFullName() const { return fullname; }
   const gd::String& GetDefaultName() const { return defaultName; }
   const gd::String& GetDescription() const { return description; }
@@ -257,7 +256,21 @@ class GD_CORE_API BehaviorMetadata {
    * \note An empty string means the base object, so any object.
    */
   const gd::String& GetObjectType() const { return objectType; }
-#endif
+
+  /**
+   * Check if the behavior is private - it can't be used outside of its
+   * extension.
+   */
+  bool IsPrivate() const { return isPrivate; }
+
+  /**
+   * Set that the behavior is private - it can't be used outside of its
+   * extension.
+   */
+  BehaviorMetadata &SetPrivate() {
+    isPrivate = true;
+    return *this;
+  }
 
   /**
    * \brief Return the associated gd::Behavior, handling behavior contents.
@@ -315,6 +328,7 @@ class GD_CORE_API BehaviorMetadata {
   gd::String group;
   gd::String iconFilename;
   gd::String objectType;
+  bool isPrivate = false;
 
   // TODO: Nitpicking: convert these to std::unique_ptr to clarify ownership.
   std::shared_ptr<gd::Behavior> instance;

Core/GDCore/Extensions/Metadata/ExpressionMetadata.cpp

@@ -37,22 +37,24 @@ gd::ExpressionMetadata& ExpressionMetadata::AddParameter(
     const gd::String& supplementaryInformation,
     bool parameterIsOptional) {
   gd::ParameterMetadata info;
-  info.type = type;
+  info.SetType(type);
   info.description = description;
   info.codeOnly = false;
-  info.optional = parameterIsOptional;
-  info.supplementaryInformation =
+  info.SetOptional(parameterIsOptional);
+  info.SetExtraInfo(
       // For objects/behavior, the supplementary information
       // parameter is an object/behavior type...
-      (gd::ParameterMetadata::IsObject(type) ||
+      ((gd::ParameterMetadata::IsObject(type) ||
        gd::ParameterMetadata::IsBehavior(type))
+       // Prefix with the namespace if it's not already there.
+       && !(supplementaryInformation.rfind(extensionNamespace, 0) == 0))
           ? (supplementaryInformation.empty()
                  ? ""
                  : extensionNamespace +
                        supplementaryInformation  //... so prefix it with the extension
                                            // namespace.
              )
-          : supplementaryInformation;  // Otherwise don't change anything
+          : supplementaryInformation);  // Otherwise don't change anything
 
   // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.
@@ -64,9 +66,9 @@ gd::ExpressionMetadata& ExpressionMetadata::AddParameter(
 gd::ExpressionMetadata& ExpressionMetadata::AddCodeOnlyParameter(
     const gd::String& type, const gd::String& supplementaryInformation) {
   gd::ParameterMetadata info;
-  info.type = type;
+  info.SetType(type);
   info.codeOnly = true;
-  info.supplementaryInformation = supplementaryInformation;
+  info.SetExtraInfo(supplementaryInformation);
 
   parameters.push_back(info);
   return *this;

Core/GDCore/Extensions/Metadata/ExpressionMetadata.h

@@ -222,6 +222,18 @@ class GD_CORE_API ExpressionMetadata {
     return *this;
   };
 
+  /**
+   * \brief Set the additional information, used for some parameters
+   * with special type (for example, it can contains the type of object accepted
+   * by the parameter), for the last added parameter.
+   *
+   * \see AddParameter
+   */
+  ExpressionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) {
+    if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
+    return *this;
+  }
+
   /**
    * \brief Mark this (object) expression as requiring the specified capability,
    * offered by the base object.
@@ -256,7 +268,30 @@ class GD_CORE_API ExpressionMetadata {
    */
   ExpressionCodeGenerationInformation& GetCodeExtraInformation() {
     return codeExtraInformation;
-  };
+  }
+
+  /**
+   * \brief Erase any existing include file and add the specified include.
+   */
+  ExpressionMetadata &SetIncludeFile(const gd::String &includeFile) {
+    codeExtraInformation.SetIncludeFile(includeFile);
+    return *this;
+  }
+
+  /**
+   * \brief Add a file to the already existing include files.
+   */
+  ExpressionMetadata &AddIncludeFile(const gd::String &includeFile) {
+    codeExtraInformation.AddIncludeFile(includeFile);
+    return *this;
+  }
+
+  /**
+   * \brief Get the files that must be included to use the instruction.
+   */
+  const std::vector<gd::String>& GetIncludeFiles() const {
+    return codeExtraInformation.GetIncludeFiles();
+  }
 
   ExpressionCodeGenerationInformation codeExtraInformation;
 

Core/GDCore/Extensions/Metadata/InstructionMetadata.cpp

@@ -55,15 +55,17 @@ InstructionMetadata& InstructionMetadata::AddParameter(
     const gd::String& supplementaryInformation,
     bool parameterIsOptional) {
   ParameterMetadata info;
-  info.type = type;
+  info.SetType(type);
   info.description = description;
   info.codeOnly = false;
-  info.optional = parameterIsOptional;
-  info.supplementaryInformation =
+  info.SetOptional(parameterIsOptional);
+  info.SetExtraInfo(
       // For objects/behavior, the supplementary information
       // parameter is an object/behavior type...
-      (gd::ParameterMetadata::IsObject(type) ||
+      ((gd::ParameterMetadata::IsObject(type) ||
        gd::ParameterMetadata::IsBehavior(type))
+       // Prefix with the namespace if it's not already there.
+       && !(supplementaryInformation.rfind(extensionNamespace, 0) == 0))
           ? (supplementaryInformation.empty()
                  ? ""
                  : extensionNamespace +
@@ -71,7 +73,7 @@ InstructionMetadata& InstructionMetadata::AddParameter(
                                                  // extension
                                                  // namespace.
              )
-          : supplementaryInformation;  // Otherwise don't change anything
+          : supplementaryInformation);  // Otherwise don't change anything
 
   // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.
@@ -83,17 +85,19 @@ InstructionMetadata& InstructionMetadata::AddParameter(
 InstructionMetadata& InstructionMetadata::AddCodeOnlyParameter(
     const gd::String& type, const gd::String& supplementaryInformation) {
   ParameterMetadata info;
-  info.type = type;
+  info.SetType(type);
   info.codeOnly = true;
-  info.supplementaryInformation = supplementaryInformation;
+  info.SetExtraInfo(supplementaryInformation);
 
   parameters.push_back(info);
   return *this;
 }
 
 InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
-    const gd::String& type) {
-  SetManipulatedType(type);
+    const gd::String& type, const gd::String& typeExtraInfo) {
+  const gd::String& expressionValueType =
+      gd::ValueTypeMetadata::GetPrimitiveValueType(type);
+  SetManipulatedType(expressionValueType);
 
   if (type == "boolean") {
     AddParameter("yesorno", _("New value"));
@@ -117,8 +121,8 @@ InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
                               "_PARAM" + gd::String::From(valueParamIndex) + "_");
     }
   } else {
-    AddParameter("operator", _("Modification's sign"), type);
-    AddParameter(type == "number" ? "expression" : type, _("Value"));
+    AddParameter("operator", _("Modification's sign"), expressionValueType);
+    AddParameter(type, _("Value"), typeExtraInfo);
 
     size_t operatorParamIndex = parameters.size() - 2;
     size_t valueParamIndex = parameters.size() - 1;
@@ -151,8 +155,10 @@ InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
 
 InstructionMetadata&
 InstructionMetadata::UseStandardRelationalOperatorParameters(
-    const gd::String& type) {
-  SetManipulatedType(type);
+    const gd::String& type, const gd::String& typeExtraInfo) {
+  const gd::String& expressionValueType =
+      gd::ValueTypeMetadata::GetPrimitiveValueType(type);
+  SetManipulatedType(expressionValueType);
 
   if (type == "boolean") {
     if (isObjectInstruction || isBehaviorInstruction) {
@@ -168,8 +174,8 @@ InstructionMetadata::UseStandardRelationalOperatorParameters(
           templateSentence.FindAndReplace("<subject>", sentence);
     }
   } else {
-    AddParameter("relationalOperator", _("Sign of the test"), type);
-    AddParameter(type == "number" ? "expression" : type, _("Value to compare"));
+    AddParameter("relationalOperator", _("Sign of the test"), expressionValueType);
+    AddParameter(type, _("Value to compare"), typeExtraInfo);
     size_t operatorParamIndex = parameters.size() - 2;
     size_t valueParamIndex = parameters.size() - 1;
 

Core/GDCore/Extensions/Metadata/InstructionMetadata.h

@@ -206,7 +206,7 @@ class GD_CORE_API InstructionMetadata {
     if (!parameters.empty())
       parameters.back().SetLongDescription(longDescription);
     return *this;
-  };
+  }
 
   /**
    * \brief Set the additional information, used for some parameters
@@ -218,20 +218,26 @@ class GD_CORE_API InstructionMetadata {
   InstructionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) {
     if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
     return *this;
-  };
+  }
 
   /**
    * \brief Add the default parameters for an instruction manipulating the
    * specified type ("string", "number") with the default operators.
+   * 
+   * \note The type "string" can be declined in several subtypes.
+   * \see ParameterMetadata
    */
-  InstructionMetadata &UseStandardOperatorParameters(const gd::String &type);
+  InstructionMetadata &UseStandardOperatorParameters(const gd::String &type, const gd::String& typeExtraInfo = "");
 
   /**
    * \brief Add the default parameters for an instruction comparing the
    * specified type ("string", "number") with the default relational operators.
+   * 
+   * \note The type "string" can be declined in several subtypes.
+   * \see ParameterMetadata
    */
   InstructionMetadata &UseStandardRelationalOperatorParameters(
-      const gd::String &type);
+      const gd::String &type, const gd::String& typeExtraInfo = "");
 
   /**
    * \brief Mark the instruction as an object instruction. Automatically called
@@ -276,7 +282,7 @@ class GD_CORE_API InstructionMetadata {
    */
   const gd::String &GetRequiredBaseObjectCapability() const {
     return requiredBaseObjectCapability;
-  };
+  }
 
   /**
    * \brief Consider that the instruction is easy for a user to understand.
@@ -487,6 +493,29 @@ class GD_CORE_API InstructionMetadata {
     return codeExtraInformation.SetAsyncFunctionName(functionName);
   }
 
+  /**
+   * \brief Erase any existing include file and add the specified include.
+   */
+  InstructionMetadata &SetIncludeFile(const gd::String &includeFile) {
+    codeExtraInformation.SetIncludeFile(includeFile);
+    return *this;
+  }
+
+  /**
+   * \brief Add a file to the already existing include files.
+   */
+  InstructionMetadata &AddIncludeFile(const gd::String &includeFile) {
+    codeExtraInformation.AddIncludeFile(includeFile);
+    return *this;
+  }
+
+  /**
+   * \brief Get the files that must be included to use the instruction.
+   */
+  const std::vector<gd::String>& GetIncludeFiles() const {
+    return codeExtraInformation.GetIncludeFiles();
+  };
+
   std::vector<ParameterMetadata> parameters;
 
  private:

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.h

@@ -80,6 +80,16 @@ class GD_CORE_API MultipleInstructionMetadata {
     return *this;
   };
 
+  /**
+   * \see gd::InstructionMetadata::SetParameterExtraInfo
+   */
+  MultipleInstructionMetadata &SetParameterExtraInfo(const gd::String &defaultValue) {
+    if (expression) expression->SetParameterExtraInfo(defaultValue);
+    if (condition) condition->SetParameterExtraInfo(defaultValue);
+    if (action) action->SetParameterExtraInfo(defaultValue);
+    return *this;
+  };
+
   /**
    * \see gd::InstructionMetadata::SetParameterLongDescription
    */
@@ -116,9 +126,9 @@ class GD_CORE_API MultipleInstructionMetadata {
    * \see gd::InstructionMetadata::UseStandardOperatorParameters
    * \see gd::InstructionMetadata::UseStandardRelationalOperatorParameters
    */
-  MultipleInstructionMetadata &UseStandardParameters(const gd::String &type) {
-    if (condition) condition->UseStandardRelationalOperatorParameters(type);
-    if (action) action->UseStandardOperatorParameters(type);
+  MultipleInstructionMetadata &UseStandardParameters(const gd::String &type, const gd::String& typeExtraInfo = "") {
+    if (condition) condition->UseStandardRelationalOperatorParameters(type, typeExtraInfo);
+    if (action) action->UseStandardOperatorParameters(type, typeExtraInfo);
     return *this;
   }
 
@@ -154,6 +164,33 @@ class GD_CORE_API MultipleInstructionMetadata {
     return *this;
   }
 
+  /**
+   * \brief Get the files that must be included to use the instruction.
+   */
+  const std::vector<gd::String>& GetIncludeFiles() const {
+    if (expression)
+      return expression->GetCodeExtraInformation().GetIncludeFiles();
+    if (condition)
+      return condition->GetCodeExtraInformation().GetIncludeFiles();
+    if (action)
+      return action->GetCodeExtraInformation().GetIncludeFiles();
+    // It can't actually happen.
+    throw std::logic_error("no instruction metadata");
+  }
+
+  /**
+   * \see gd::InstructionMetadata::SetPrivate
+   */
+  MultipleInstructionMetadata &SetPrivate() {
+    if (expression)
+      expression->SetPrivate();
+    if (condition)
+      condition->SetPrivate();
+    if (action)
+      action->SetPrivate();
+    return *this;
+  }
+
   /**
    * \see gd::InstructionMetadata::MarkAsSimple
    */

Core/GDCore/Extensions/Metadata/ParameterMetadata.cpp

@@ -10,43 +10,26 @@
 
 namespace gd {
 
-ParameterMetadata::ParameterMetadata() : optional(false), codeOnly(false) {}
+ParameterMetadata::ParameterMetadata() : codeOnly(false) {}
 
 void ParameterMetadata::SerializeTo(SerializerElement& element) const {
-  element.SetAttribute("type", type);
-  element.SetAttribute("supplementaryInformation", supplementaryInformation);
-  element.SetAttribute("optional", optional);
+  valueTypeMetadata.SerializeTo(element);
   element.SetAttribute("description", description);
-  element.SetAttribute("longDescription", longDescription);
-  element.SetAttribute("codeOnly", codeOnly);
-  element.SetAttribute("defaultValue", defaultValue);
+  if (!longDescription.empty()) {
+    element.SetAttribute("longDescription", longDescription);
+  }
+  if (codeOnly) {
+   element.SetAttribute("codeOnly", codeOnly);
+  }
   element.SetAttribute("name", name);
 }
 
 void ParameterMetadata::UnserializeFrom(const SerializerElement& element) {
-  type = element.GetStringAttribute("type");
-  supplementaryInformation =
-      element.GetStringAttribute("supplementaryInformation");
-  optional = element.GetBoolAttribute("optional");
+  valueTypeMetadata.UnserializeFrom(element);
   description = element.GetStringAttribute("description");
   longDescription = element.GetStringAttribute("longDescription");
   codeOnly = element.GetBoolAttribute("codeOnly");
-  defaultValue = element.GetStringAttribute("defaultValue");
   name = element.GetStringAttribute("name");
 }
 
-  // TODO factorize in a file with an enum and helpers?
-  const gd::String ParameterMetadata::numberType = "number";
-  const gd::String ParameterMetadata::stringType = "string";
-
-  const gd::String &ParameterMetadata::GetExpressionValueType(const gd::String &parameterType) {
-    if (parameterType == "number" || gd::ParameterMetadata::IsExpression("number", parameterType)) {
-      return ParameterMetadata::numberType;
-    }
-    if (parameterType == "string" || gd::ParameterMetadata::IsExpression("string", parameterType)) {
-      return ParameterMetadata::stringType;
-    }
-    return parameterType;
-  }
-
 }  // namespace gd

Core/GDCore/Extensions/Metadata/ParameterMetadata.h

@@ -6,16 +6,13 @@
 
 #ifndef PARAMETER_METADATA_H
 #define PARAMETER_METADATA_H
-#if defined(GD_IDE_ONLY)
 #include <map>
 #include <memory>
 
 #include "GDCore/String.h"
+#include "GDCore/Extensions/Metadata/ValueTypeMetadata.h"
+
 namespace gd {
-class Project;
-class Layout;
-class EventsCodeGenerator;
-class EventsCodeGenerationContext;
 class SerializerElement;
 }  // namespace gd
 
@@ -32,17 +29,32 @@ class GD_CORE_API ParameterMetadata {
   ParameterMetadata();
   virtual ~ParameterMetadata(){};
 
+  /**
+   * \brief Return the metadata of the parameter type.
+   */
+  gd::ValueTypeMetadata &GetValueTypeMetadata() { return valueTypeMetadata; }
+
+  /**
+   * \brief Set the metadata of the parameter type.
+   */
+  ParameterMetadata &SetValueTypeMetadata(const gd::ValueTypeMetadata &valueTypeMetadata_) {
+    valueTypeMetadata = valueTypeMetadata_;
+    return *this;
+  }
+
   /**
    * \brief Return the type of the parameter.
    * \see gd::ParameterMetadata::IsObject
+   * \deprecated Use gd::ValueTypeMetadata instead.
    */
-  const gd::String &GetType() const { return type; }
+  const gd::String &GetType() const { return valueTypeMetadata.GetName(); }
 
   /**
    * \brief Set the type of the parameter.
+   * \deprecated Use gd::ValueTypeMetadata instead.
    */
   ParameterMetadata &SetType(const gd::String &type_) {
-    type = type_;
+    valueTypeMetadata.SetName(type_);
     return *this;
   }
 
@@ -71,29 +83,33 @@ class GD_CORE_API ParameterMetadata {
    * \brief Return an optional additional information, used for some parameters
    * with special type (for example, it can contains the type of object accepted
    * by the parameter).
+   * \deprecated Use gd::ValueTypeMetadata instead.
    */
-  const gd::String &GetExtraInfo() const { return supplementaryInformation; }
+  const gd::String &GetExtraInfo() const { return valueTypeMetadata.GetExtraInfo(); }
 
   /**
    * \brief Set an optional additional information, used for some parameters
    * with special type (for example, it can contains the type of object accepted
    * by the parameter).
+   * \deprecated Use gd::ValueTypeMetadata instead.
    */
   ParameterMetadata &SetExtraInfo(const gd::String &supplementaryInformation_) {
-    supplementaryInformation = supplementaryInformation_;
+    valueTypeMetadata.SetExtraInfo(supplementaryInformation_);
     return *this;
   }
 
   /**
    * \brief Return true if the parameter is optional.
+   * \deprecated Use gd::ValueTypeMetadata instead.
    */
-  bool IsOptional() const { return optional; }
+  bool IsOptional() const { return valueTypeMetadata.IsOptional(); }
 
   /**
    * \brief Set if the parameter is optional.
+   * \deprecated Use gd::ValueTypeMetadata instead.
    */
   ParameterMetadata &SetOptional(bool optional_ = true) {
-    optional = optional_;
+    valueTypeMetadata.SetOptional(optional_);
     return *this;
   }
 
@@ -128,13 +144,15 @@ class GD_CORE_API ParameterMetadata {
   /**
    * \brief Get the default value for the parameter.
    */
-  const gd::String &GetDefaultValue() const { return defaultValue; }
+  const gd::String &GetDefaultValue() const {
+    return valueTypeMetadata.GetDefaultValue();
+  }
 
   /**
    * \brief Set the default value, if the parameter is optional.
    */
   ParameterMetadata &SetDefaultValue(const gd::String &defaultValue_) {
-    defaultValue = defaultValue_;
+    valueTypeMetadata.SetDefaultValue(defaultValue_);
     return *this;
   }
 
@@ -151,26 +169,27 @@ class GD_CORE_API ParameterMetadata {
     return *this;
   }
 
+  // TODO Remove these deprecated functions.
+
   /**
    * \brief Return true if the type of the parameter is representing one object
    * (or more, i.e: an object group).
    *
    * \see gd::ParameterMetadata::GetType
+   * \deprecated Use gd::ValueTypeMetadata instead.
    */
   static bool IsObject(const gd::String &parameterType) {
-    return parameterType == "object" || parameterType == "objectPtr" ||
-           parameterType == "objectList" ||
-           parameterType == "objectListOrEmptyIfJustDeclared" ||
-           parameterType == "objectListOrEmptyWithoutPicking";
+    return gd::ValueTypeMetadata::IsTypeObject(parameterType);
   }
 
   /**
    * \brief Return true if the type of the parameter is "behavior".
    *
    * \see gd::ParameterMetadata::GetType
+   * \deprecated Use gd::ValueTypeMetadata instead.
    */
   static bool IsBehavior(const gd::String &parameterType) {
-    return parameterType == "behavior";
+    return gd::ValueTypeMetadata::IsTypeBehavior(parameterType);
   }
 
   /**
@@ -179,43 +198,22 @@ class GD_CORE_API ParameterMetadata {
    * \note If you had a new type of parameter, also add it in the IDE (
    * see EventsFunctionParametersEditor, ParameterRenderingService
    * and ExpressionAutocompletion) and in the EventsCodeGenerator.
+   * \deprecated Use gd::ValueTypeMetadata instead.
    */
   static bool IsExpression(const gd::String &type,
                            const gd::String &parameterType) {
-    if (type == "number") {
-      return parameterType == "expression" || parameterType == "camera" ||
-             parameterType == "forceMultiplier";
-    } else if (type == "string") {
-      return parameterType == "string" || parameterType == "layer" ||
-             parameterType == "color" || parameterType == "file" ||
-             parameterType == "joyaxis" ||
-             parameterType == "stringWithSelector" ||
-             parameterType == "sceneName" ||
-             parameterType == "layerEffectName" ||
-             parameterType == "layerEffectParameterName" ||
-             parameterType == "objectEffectName" ||
-             parameterType == "objectEffectParameterName" ||
-             parameterType == "objectPointName" ||
-             parameterType == "objectAnimationName" ||
-             parameterType == "functionParameterName" ||
-             parameterType == "externalLayoutName" ||
-             parameterType == "leaderboardId" ||
-             parameterType == "identifier";
-    } else if (type == "variable") {
-      return parameterType == "objectvar" || parameterType == "globalvar" ||
-             parameterType == "scenevar";
-    }
-    return false;
+    return gd::ValueTypeMetadata::IsTypeExpression(type, parameterType);
   }
 
   /**
    * \brief Return the expression type from the parameter type.
    * Declinations of "number" and "string" types (like "forceMultiplier" or
    * "sceneName") are replaced by "number" and "string".
+   * \deprecated Use gd::ValueTypeMetadata instead.
    */
-  static const gd::String &GetExpressionValueType(const gd::String &parameterType);
-  static const gd::String numberType;
-  static const gd::String stringType;
+  static const gd::String &GetExpressionValueType(const gd::String &parameterType) {
+    return gd::ValueTypeMetadata::GetPrimitiveValueType(parameterType);
+  }
 
   /** \name Serialization
    */
@@ -233,22 +231,17 @@ class GD_CORE_API ParameterMetadata {
 
   // TODO: Deprecated public fields. Any direct usage should be moved to
   // getter/setter.
-  gd::String type;                      ///< Parameter type
-  gd::String supplementaryInformation;  ///< Used if needed
-  bool optional;                        ///< True if the parameter is optional
 
   gd::String description;  ///< Description shown in editor
   bool codeOnly;  ///< True if parameter is relative to code generation only,
                   ///< i.e. must not be shown in editor
  private:
+  gd::ValueTypeMetadata valueTypeMetadata; ///< Parameter type
   gd::String longDescription;  ///< Long description shown in the editor.
-  gd::String defaultValue;     ///< Used as a default value in editor or if an
-                               ///< optional parameter is empty.
   gd::String name;             ///< The name of the parameter to be used in code
                                ///< generation. Optional.
 };
 
 }  // namespace gd
 
-#endif
 #endif  // PARAMETER_METADATA_H

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp

@@ -85,7 +85,7 @@ void ParameterMetadataTools::IterateOverParametersWithIndex(
     const gd::Expression& parameterValue =
         pNb < parameters.size() ? parameters[pNb].GetPlainString() : "";
     const gd::Expression& parameterValueOrDefault =
-        parameterValue.GetPlainString().empty() && parameterMetadata.optional
+        parameterValue.GetPlainString().empty() && parameterMetadata.IsOptional()
             ? Expression(parameterMetadata.GetDefaultValue())
             : parameterValue;
 

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp

@@ -0,0 +1,70 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "ValueTypeMetadata.h"
+
+#include "GDCore/CommonTools.h"
+#include "GDCore/Serialization/SerializerElement.h"
+
+namespace gd {
+
+ValueTypeMetadata::ValueTypeMetadata() : optional(false) {}
+
+void ValueTypeMetadata::SerializeTo(SerializerElement& element) const {
+  element.SetAttribute("type", name);
+  if (!supplementaryInformation.empty()) {
+    element.SetAttribute("supplementaryInformation", supplementaryInformation);
+  }
+  if (optional) {
+    element.SetAttribute("optional", optional);
+  }
+  if (!defaultValue.empty()) {
+    element.SetAttribute("defaultValue", defaultValue);
+  }
+}
+
+void ValueTypeMetadata::UnserializeFrom(const SerializerElement& element) {
+  name = element.GetStringAttribute("type");
+  supplementaryInformation =
+      element.GetStringAttribute("supplementaryInformation");
+  optional = element.GetBoolAttribute("optional");
+  defaultValue = element.GetStringAttribute("defaultValue");
+}
+
+const gd::String ValueTypeMetadata::numberType = "number";
+const gd::String ValueTypeMetadata::stringType = "string";
+
+const gd::String &ValueTypeMetadata::GetPrimitiveValueType(const gd::String &parameterType) {
+  if (parameterType == "number" || gd::ValueTypeMetadata::IsTypeExpression("number", parameterType)) {
+    return ValueTypeMetadata::numberType;
+  }
+  if (parameterType == "string" || gd::ValueTypeMetadata::IsTypeExpression("string", parameterType)) {
+    return ValueTypeMetadata::stringType;
+  }
+  return parameterType;
+}
+
+const gd::String ValueTypeMetadata::numberValueType = "number";
+const gd::String ValueTypeMetadata::booleanValueType = "boolean";
+const gd::String ValueTypeMetadata::colorValueType = "color";
+const gd::String ValueTypeMetadata::choiceValueType = "stringWithSelector";
+const gd::String ValueTypeMetadata::stringValueType = "string";
+
+const gd::String &ValueTypeMetadata::ConvertPropertyTypeToValueType(
+    const gd::String &propertyType) {
+  if (propertyType == "Number") {
+    return numberValueType;
+  } else if (propertyType == "Boolean") {
+    return booleanValueType;
+  } else if (propertyType == "Color") {
+    return colorValueType;
+  } else if (propertyType == "Choice") {
+    return choiceValueType;
+  }
+  // For "String" or default
+  return stringValueType;
+};
+
+}  // namespace gd

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.h

@@ -0,0 +1,231 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#ifndef VALUE_TYPE_METADATA_H
+#define VALUE_TYPE_METADATA_H
+#include <map>
+#include <memory>
+
+#include "GDCore/String.h"
+namespace gd {
+class SerializerElement;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Define a type for parameters of a function (action, condition or
+ * expression) or the returned value of an expression.
+ *
+ * \see gd::EventsFunction
+ * \ingroup Events
+ */
+class GD_CORE_API ValueTypeMetadata {
+ public:
+  ValueTypeMetadata();
+  virtual ~ValueTypeMetadata(){};
+
+  /**
+   * \brief Return the string representation of the type.
+   */
+  const gd::String &GetName() const { return name; }
+
+  /**
+   * \brief Set the string representation of the type.
+   */
+  ValueTypeMetadata &SetName(const gd::String &name_) {
+    name = name_;
+    return *this;
+  }
+
+  /**
+   * \brief Return an optional additional information, used for some parameters
+   * with special type (for example, it can contains the type of object accepted
+   * by the parameter).
+   */
+  const gd::String &GetExtraInfo() const { return supplementaryInformation; }
+
+  /**
+   * \brief Set an optional additional information, used for some parameters
+   * with special type (for example, it can contains the type of object accepted
+   * by the parameter).
+   */
+  ValueTypeMetadata &SetExtraInfo(const gd::String &supplementaryInformation_) {
+    supplementaryInformation = supplementaryInformation_;
+    return *this;
+  }
+
+  /**
+   * \brief Return true if the parameter is optional.
+   */
+  bool IsOptional() const { return optional; }
+
+  /**
+   * \brief Set if the parameter is optional.
+   */
+  ValueTypeMetadata &SetOptional(bool optional_ = true) {
+    optional = optional_;
+    return *this;
+  }
+
+  /**
+   * \brief Get the default value for the parameter.
+   */
+  const gd::String &GetDefaultValue() const { return defaultValue; }
+
+  /**
+   * \brief Set the default value, if the parameter is optional.
+   */
+  ValueTypeMetadata &SetDefaultValue(const gd::String &defaultValue_) {
+    defaultValue = defaultValue_;
+    return *this;
+  }
+
+  /**
+   * \brief Return true if the type is defined.
+   */
+  bool IsDefined() const {
+    return !name.empty();
+  }
+
+  /**
+   * \brief Return true if the type is representing one object
+   * (or more, i.e: an object group).
+   */
+  bool IsObject() const {
+    return gd::ValueTypeMetadata::IsTypeObject(name);
+  }
+
+  /**
+   * \brief Return true if the type is "behavior".
+   */
+  bool IsBehavior() const {
+    return gd::ValueTypeMetadata::IsTypeBehavior(name);
+  }
+
+  /**
+   * \brief Return true if the type is an expression of the
+   * given type.
+   */
+  bool IsNumber() const {
+    return gd::ValueTypeMetadata::IsTypeExpression("number", name);
+  }
+
+  /**
+   * \brief Return true if the type is a string.
+   */
+  bool IsString() const {
+    return gd::ValueTypeMetadata::IsTypeExpression("string", name);
+  }
+
+  /**
+   * \brief Return true if the type of the parameter is a number.
+   * \note If you had a new type of parameter, also add it in the IDE (
+   * see EventsFunctionParametersEditor, ParameterRenderingService
+   * and ExpressionAutocompletion) and in the EventsCodeGenerator.
+   */
+  bool IsVariable() const {
+    return gd::ValueTypeMetadata::IsTypeExpression("variable", name);
+  }
+
+  /**
+   * \brief Return true if the type is representing one object
+   * (or more, i.e: an object group).
+   */
+  static bool IsTypeObject(const gd::String &parameterType) {
+    return parameterType == "object" || parameterType == "objectPtr" ||
+           parameterType == "objectList" ||
+           parameterType == "objectListOrEmptyIfJustDeclared" ||
+           parameterType == "objectListOrEmptyWithoutPicking";
+  }
+
+  /**
+   * \brief Return true if the type is "behavior".
+   */
+  static bool IsTypeBehavior(const gd::String &parameterType) {
+    return parameterType == "behavior";
+  }
+
+  /**
+   * \brief Return true if the type is an expression of the given type.
+   * \note If you are adding a new type of parameter, also add it in the IDE (
+   * see EventsFunctionParametersEditor, ParameterRenderingService
+   * and ExpressionAutocompletion) and in the EventsCodeGenerator.
+   */
+  static bool IsTypeExpression(const gd::String &type,
+                           const gd::String &parameterType) {
+    if (type == "number") {
+      return parameterType == "number" || parameterType == "expression" ||
+             parameterType == "camera" || parameterType == "forceMultiplier";
+    } else if (type == "string") {
+      return parameterType == "string" || parameterType == "layer" ||
+             parameterType == "color" || parameterType == "file" ||
+             parameterType == "joyaxis" ||
+             parameterType == "stringWithSelector" ||
+             parameterType == "sceneName" ||
+             parameterType == "layerEffectName" ||
+             parameterType == "layerEffectParameterName" ||
+             parameterType == "objectEffectName" ||
+             parameterType == "objectEffectParameterName" ||
+             parameterType == "objectPointName" ||
+             parameterType == "objectAnimationName" ||
+             parameterType == "functionParameterName" ||
+             parameterType == "externalLayoutName" ||
+             parameterType == "leaderboardId" ||
+             parameterType == "identifier";
+    } else if (type == "variable") {
+      return parameterType == "objectvar" || parameterType == "globalvar" ||
+             parameterType == "scenevar";
+    }
+    return false;
+  }
+
+  /**
+   * \brief Return the expression type from the parameter type.
+   * Declinations of "number" and "string" types (like "forceMultiplier" or
+   * "sceneName") are replaced by "number" and "string".
+   */
+  static const gd::String &GetPrimitiveValueType(const gd::String &parameterType);
+  static const gd::String numberType;
+  static const gd::String stringType;
+
+  /**
+   * \brief Return the ValueTypeMetadata name for a property type.
+   * \see gd::PropertyDescriptor
+   */
+  static const gd::String &ConvertPropertyTypeToValueType(const gd::String &propertyType);
+
+  /** \name Serialization
+   */
+  ///@{
+  /**
+   * \brief Serialize the ParameterMetadata to the specified element
+   */
+  void SerializeTo(gd::SerializerElement &element) const;
+
+  /**
+   * \brief Load the ParameterMetadata from the specified element
+   */
+  void UnserializeFrom(const gd::SerializerElement &element);
+  ///@}
+
+ private:
+  gd::String name;                      ///< Parameter type
+  gd::String supplementaryInformation;  ///< Used if needed
+  bool optional;                        ///< True if the parameter is optional
+  gd::String defaultValue;     ///< Used as a default value in editor or if an
+                               ///< optional parameter is empty.
+
+  static const gd::String numberValueType;
+  static const gd::String booleanValueType;
+  static const gd::String colorValueType;
+  static const gd::String choiceValueType;
+  static const gd::String stringValueType;
+};
+
+}  // namespace gd
+
+#endif  // VALUE_TYPE_METADATA_H

Core/GDCore/Extensions/PlatformExtension.cpp

@@ -24,14 +24,12 @@
 
 namespace gd {
 
-#if defined(GD_IDE_ONLY)
 std::map<gd::String, gd::InstructionMetadata>
     PlatformExtension::badConditionsMetadata;
 std::map<gd::String, gd::InstructionMetadata>
     PlatformExtension::badActionsMetadata;
 std::map<gd::String, gd::ExpressionMetadata>
     PlatformExtension::badExpressionsMetadata;
-#endif
 
 gd::InstructionMetadata& PlatformExtension::AddCondition(
     const gd::String& name,
@@ -41,7 +39,6 @@ gd::InstructionMetadata& PlatformExtension::AddCondition(
     const gd::String& group,
     const gd::String& icon,
     const gd::String& smallicon) {
-#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name;
   conditionsInfos[nameWithNamespace] = InstructionMetadata(GetNameSpace(),
                                                            nameWithNamespace,
@@ -53,7 +50,6 @@ gd::InstructionMetadata& PlatformExtension::AddCondition(
                                                            smallicon)
                                            .SetHelpPath(GetHelpPath());
   return conditionsInfos[nameWithNamespace];
-#endif
 }
 
 gd::InstructionMetadata& PlatformExtension::AddAction(
@@ -64,7 +60,6 @@ gd::InstructionMetadata& PlatformExtension::AddAction(
     const gd::String& group,
     const gd::String& icon,
     const gd::String& smallicon) {
-#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name;
   actionsInfos[nameWithNamespace] = InstructionMetadata(GetNameSpace(),
                                                         nameWithNamespace,
@@ -76,7 +71,6 @@ gd::InstructionMetadata& PlatformExtension::AddAction(
                                                         smallicon)
                                         .SetHelpPath(GetHelpPath());
   return actionsInfos[nameWithNamespace];
-#endif
 }
 
 gd::ExpressionMetadata& PlatformExtension::AddExpression(
@@ -85,7 +79,6 @@ gd::ExpressionMetadata& PlatformExtension::AddExpression(
     const gd::String& description,
     const gd::String& group,
     const gd::String& smallicon) {
-#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name;
   expressionsInfos[nameWithNamespace] = ExpressionMetadata("number",
                                                            GetNameSpace(),
@@ -96,7 +89,6 @@ gd::ExpressionMetadata& PlatformExtension::AddExpression(
                                                            smallicon)
                                             .SetHelpPath(GetHelpPath());
   return expressionsInfos[nameWithNamespace];
-#endif
 }
 
 gd::ExpressionMetadata& PlatformExtension::AddStrExpression(
@@ -105,7 +97,6 @@ gd::ExpressionMetadata& PlatformExtension::AddStrExpression(
     const gd::String& description,
     const gd::String& group,
     const gd::String& smallicon) {
-#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name;
   strExpressionsInfos[nameWithNamespace] = ExpressionMetadata("string",
                                                               GetNameSpace(),
@@ -116,7 +107,6 @@ gd::ExpressionMetadata& PlatformExtension::AddStrExpression(
                                                               smallicon)
                                                .SetHelpPath(GetHelpPath());
   return strExpressionsInfos[nameWithNamespace];
-#endif
 }
 
 gd::MultipleInstructionMetadata PlatformExtension::AddExpressionAndCondition(
@@ -220,12 +210,10 @@ PlatformExtension::AddExpressionAndConditionAndAction(
       expression, condition, action);
 }
 
-#if defined(GD_IDE_ONLY)
 gd::DependencyMetadata& PlatformExtension::AddDependency() {
   extensionDependenciesMetadata.push_back(DependencyMetadata());
   return extensionDependenciesMetadata.back();
 }
-#endif
 
 gd::ObjectMetadata& PlatformExtension::AddObject(
     const gd::String& name,
@@ -317,7 +305,6 @@ gd::EventMetadata& PlatformExtension::AddEvent(
     const gd::String& group_,
     const gd::String& smallicon_,
     std::shared_ptr<gd::BaseEvent> instance_) {
-#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name_;
   eventsInfos[nameWithNamespace] = gd::EventMetadata(nameWithNamespace,
                                                      fullname_,
@@ -326,7 +313,6 @@ gd::EventMetadata& PlatformExtension::AddEvent(
                                                      smallicon_,
                                                      instance_);
   return eventsInfos[nameWithNamespace];
-#endif
 }
 
 PlatformExtension& PlatformExtension::SetExtensionInformation(
@@ -406,8 +392,6 @@ std::vector<gd::String> PlatformExtension::GetBehaviorsTypes() const {
   return behaviors;
 }
 
-#if defined(GD_IDE_ONLY)
-
 gd::InstructionMetadata& PlatformExtension::AddDuplicatedAction(
     const gd::String& newActionName, const gd::String& copiedActionName) {
   gd::String newNameWithNamespace = GetNameSpace() + newActionName;
@@ -586,7 +570,6 @@ gd::BaseEventSPtr PlatformExtension::CreateEvent(
 
   return std::shared_ptr<gd::BaseEvent>();
 }
-#endif
 
 CreateFunPtr PlatformExtension::GetObjectCreationFunctionPtr(
     const gd::String& objectType) const {
@@ -665,7 +648,6 @@ bool PlatformExtension::IsBuiltin() const {
          builtinExtensions.end();
 }
 
-#if defined(GD_IDE_ONLY)
 void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
   for (std::map<gd::String, gd::InstructionMetadata>::iterator it =
            GetAllActions().begin();
@@ -810,7 +792,40 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
       ++it;
   }
 }
-#endif
+
+gd::String
+PlatformExtension::GetEventsFunctionFullType(const gd::String &extensionName,
+                                             const gd::String &functionName) {
+  const auto &separator = GetNamespaceSeparator();
+  return extensionName + separator + functionName;
+}
+
+gd::String PlatformExtension::GetBehaviorEventsFunctionFullType(
+    const gd::String &extensionName, const gd::String &behaviorName,
+    const gd::String &functionName) {
+  const auto &separator = GetNamespaceSeparator();
+  return extensionName + separator + behaviorName + separator + functionName;
+}
+
+gd::String
+PlatformExtension::GetBehaviorFullType(const gd::String &extensionName,
+                                       const gd::String &behaviorName) {
+  const auto &separator = GetNamespaceSeparator();
+  return extensionName + separator + behaviorName;
+}
+
+gd::String PlatformExtension::GetObjectEventsFunctionFullType(
+    const gd::String &extensionName, const gd::String &objectName,
+    const gd::String &functionName) {
+  const auto &separator = GetNamespaceSeparator();
+  return extensionName + separator + objectName + separator + functionName;
+}
+
+gd::String PlatformExtension::GetObjectFullType(const gd::String &extensionName,
+                                                const gd::String &objectName) {
+  const auto &separator = GetNamespaceSeparator();
+  return extensionName + separator + objectName;
+}
 
 PlatformExtension::PlatformExtension()
     : deprecated(false), category(_("General")) {}

Core/GDCore/Extensions/PlatformExtension.h

@@ -620,7 +620,26 @@ class GD_CORE_API PlatformExtension {
    */
   static gd::String GetNamespaceSeparator() { return "::"; }
 
- private:
+  static gd::String GetEventsFunctionFullType(const gd::String &extensionName,
+                                              const gd::String &functionName);
+
+  static gd::String
+  GetBehaviorEventsFunctionFullType(const gd::String &extensionName,
+                                    const gd::String &behaviorName,
+                                    const gd::String &functionName);
+
+  static gd::String GetBehaviorFullType(const gd::String &extensionName,
+                                        const gd::String &behaviorName);
+
+  static gd::String
+  GetObjectEventsFunctionFullType(const gd::String &extensionName,
+                                  const gd::String &objectName,
+                                  const gd::String &functionName);
+
+  static gd::String GetObjectFullType(const gd::String &extensionName,
+                                      const gd::String &objectName);
+
+private:
   /**
    * Set the namespace (the string all actions/conditions/expressions start
    * with).

Core/GDCore/IDE/Events/EventsBehaviorRenamer.cpp

@@ -120,7 +120,7 @@ bool EventsBehaviorRenamer::DoVisitInstruction(gd::Instruction& instruction,
           const gd::Expression& parameterValue,
           size_t parameterIndex,
           const gd::String& lastObjectName) {
-        const gd::String& type = parameterMetadata.type;
+        const gd::String& type = parameterMetadata.GetType();
 
         if (gd::ParameterMetadata::IsBehavior(type)) {
           if (lastObjectName == objectName) {

Core/GDCore/IDE/Events/EventsIdentifiersFinder.cpp

@@ -149,8 +149,8 @@ class GD_CORE_API IdentifierFinderEventWorker
                               platform, instruction.GetType());
       for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
         // The parameter has the searched type...
-      if (instrInfos.parameters[pNb].type == "identifier"
-       && instrInfos.parameters[pNb].supplementaryInformation == identifierType) {
+      if (instrInfos.parameters[pNb].GetType() == "identifier"
+       && instrInfos.parameters[pNb].GetExtraInfo() == identifierType) {
           //...remember the value of the parameter.
           if (objectName.empty() || lastObjectParameter == objectName) {
             results.insert(instruction.GetParameter(pNb).GetPlainString());
@@ -158,9 +158,9 @@ class GD_CORE_API IdentifierFinderEventWorker
         }
         // Search in expressions
         else if (ParameterMetadata::IsExpression(
-                    "number", instrInfos.parameters[pNb].type) ||
+                    "number", instrInfos.parameters[pNb].GetType()) ||
                 ParameterMetadata::IsExpression(
-                    "string", instrInfos.parameters[pNb].type)) {
+                    "string", instrInfos.parameters[pNb].GetType())) {
           auto node = instruction.GetParameter(pNb).GetRootNode();
 
           IdentifierFinderExpressionNodeWorker searcher(
@@ -174,7 +174,7 @@ class GD_CORE_API IdentifierFinderEventWorker
         }
         // Remember the value of the last "object" parameter.
         else if (gd::ParameterMetadata::IsObject(
-                    instrInfos.parameters[pNb].type)) {
+                    instrInfos.parameters[pNb].GetType())) {
           lastObjectParameter =
               instruction.GetParameter(pNb).GetPlainString();
         }

Core/GDCore/IDE/Events/EventsLeaderboardsLister.cpp

@@ -30,7 +30,7 @@ bool EventsLeaderboardsLister::DoVisitInstruction(gd::Instruction& instruction,
   for (int i = 0; i < instruction.GetParametersCount() &&
                   i < instrInfo.GetParametersCount();
        ++i)
-    if (instrInfo.GetParameter(i).type == "leaderboardId") {
+    if (instrInfo.GetParameter(i).GetType() == "leaderboardId") {
       leaderboardIds.insert(instruction.GetParameter(i).GetPlainString());
     }
   return false;

Core/GDCore/IDE/Events/EventsLeaderboardsRenamer.cpp

@@ -32,7 +32,7 @@ bool EventsLeaderboardsRenamer::DoVisitInstruction(gd::Instruction& instruction,
        ++i) {
     const gd::ParameterMetadata parameter = instrInfo.GetParameter(i);
 
-    if (parameter.type == "leaderboardId") {
+    if (parameter.GetType() == "leaderboardId") {
       const gd::String leaderboardId =
           instruction.GetParameter(i).GetPlainString();
 

Core/GDCore/IDE/Events/EventsRefactorer.cpp

@@ -237,12 +237,12 @@ bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
         MetadataProvider::GetActionMetadata(platform, actions[aId].GetType());
     for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
       // Replace object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].type) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
           actions[aId].GetParameter(pNb).GetPlainString() == oldName)
         actions[aId].SetParameter(pNb, gd::Expression(newName));
       // Replace object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].type)) {
+                   "number", instrInfos.parameters[pNb].GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, project, layout, "number", *node, oldName, newName)) {
@@ -252,7 +252,7 @@ bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
       }
       // Replace object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].type)) {
+                   "string", instrInfos.parameters[pNb].GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, project, layout, "string", *node, oldName, newName)) {
@@ -291,12 +291,12 @@ bool EventsRefactorer::RenameObjectInConditions(
                                                conditions[cId].GetType());
     for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
       // Replace object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].type) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
           conditions[cId].GetParameter(pNb).GetPlainString() == oldName)
         conditions[cId].SetParameter(pNb, gd::Expression(newName));
       // Replace object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].type)) {
+                   "number", instrInfos.parameters[pNb].GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, project, layout, "number", *node, oldName, newName)) {
@@ -306,7 +306,7 @@ bool EventsRefactorer::RenameObjectInConditions(
       }
       // Replace object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].type)) {
+                   "string", instrInfos.parameters[pNb].GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, project, layout, "string", *node, oldName, newName)) {
@@ -425,14 +425,14 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
         MetadataProvider::GetActionMetadata(platform, actions[aId].GetType());
     for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
       // Find object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].type) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
           actions[aId].GetParameter(pNb).GetPlainString() == name) {
         deleteMe = true;
         break;
       }
       // Find object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].type)) {
+                   "number", instrInfos.parameters[pNb].GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "number", *node, name)) {
@@ -442,7 +442,7 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
       }
       // Find object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].type)) {
+                   "string", instrInfos.parameters[pNb].GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "string", *node, name)) {
@@ -485,14 +485,14 @@ bool EventsRefactorer::RemoveObjectInConditions(
                                                conditions[cId].GetType());
     for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
       // Find object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].type) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
           conditions[cId].GetParameter(pNb).GetPlainString() == name) {
         deleteMe = true;
         break;
       }
       // Find object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].type)) {
+                   "number", instrInfos.parameters[pNb].GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "number", *node, name)) {
@@ -502,7 +502,7 @@ bool EventsRefactorer::RemoveObjectInConditions(
       }
       // Find object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].type)) {
+                   "string", instrInfos.parameters[pNb].GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "string", *node, name)) {

Core/GDCore/IDE/Events/EventsVariablesFinder.cpp

@@ -148,16 +148,16 @@ class GD_CORE_API VariableFinderEventWorker
                               platform, instruction.GetType());
       for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
         // The parameter has the searched type...
-        if (instrInfos.parameters[pNb].type == parameterType) {
+        if (instrInfos.parameters[pNb].GetType() == parameterType) {
           //...remember the value of the parameter.
           if (objectName.empty() || lastObjectParameter == objectName)
             results.insert(instruction.GetParameter(pNb).GetPlainString());
         }
         // Search in expressions
         else if (ParameterMetadata::IsExpression(
-                    "number", instrInfos.parameters[pNb].type) ||
+                    "number", instrInfos.parameters[pNb].GetType()) ||
                 ParameterMetadata::IsExpression(
-                    "string", instrInfos.parameters[pNb].type)) {
+                    "string", instrInfos.parameters[pNb].GetType())) {
           auto node = instruction.GetParameter(pNb).GetRootNode();
 
           VariableFinderExpressionNodeWorker searcher(
@@ -171,7 +171,7 @@ class GD_CORE_API VariableFinderEventWorker
         }
         // Remember the value of the last "object" parameter.
         else if (gd::ParameterMetadata::IsObject(
-                    instrInfos.parameters[pNb].type)) {
+                    instrInfos.parameters[pNb].GetType())) {
           lastObjectParameter =
               instruction.GetParameter(pNb).GetPlainString();
         }

Core/GDCore/IDE/Events/ExpressionValidator.cpp

@@ -36,7 +36,7 @@ size_t GetMinimumParametersNumber(
     size_t initialParameterIndex) {
   size_t nb = 0;
   for (std::size_t i = initialParameterIndex; i < parameters.size(); ++i) {
-    if (!parameters[i].optional && !parameters[i].codeOnly) nb++;
+    if (!parameters[i].IsOptional() && !parameters[i].codeOnly) nb++;
   }
 
   return nb;

Core/GDCore/IDE/Events/ExpressionsParameterMover.cpp

@@ -150,7 +150,7 @@ bool ExpressionsParameterMover::DoVisitInstruction(gd::Instruction& instruction,
   for (std::size_t pNb = 0; pNb < metadata.parameters.size() &&
                             pNb < instruction.GetParametersCount();
        ++pNb) {
-    const gd::String& type = metadata.parameters[pNb].type;
+    const gd::String& type = metadata.parameters[pNb].GetType();
     const gd::Expression& expression = instruction.GetParameter(pNb);
 
     auto node = expression.GetRootNode();

Core/GDCore/IDE/EventsFunctionTools.cpp

@@ -20,6 +20,7 @@ namespace gd {
 
 void EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
     const gd::Project& project,
+    const gd::EventsFunctionsContainer functionContainer,
     const gd::EventsFunction& eventsFunction,
     gd::ObjectsContainer& outputGlobalObjectsContainer,
     gd::ObjectsContainer& outputObjectsContainer) {
@@ -31,8 +32,12 @@ void EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
   // to parameters
   outputObjectsContainer.GetObjects().clear();
   outputObjectsContainer.GetObjectGroups().Clear();
+
+  auto &parameters = eventsFunction.GetParametersForEvents(functionContainer);
   gd::ParameterMetadataTools::ParametersToObjectsContainer(
-      project, eventsFunction.GetParameters(), outputObjectsContainer);
+      project,
+      parameters,
+      outputObjectsContainer);
   outputObjectsContainer.GetObjectGroups() = eventsFunction.GetObjectGroups();
 }
 
@@ -44,6 +49,7 @@ void EventsFunctionTools::BehaviorEventsFunctionToObjectsContainer(
     gd::ObjectsContainer& outputObjectsContainer) {
   // The context is build the same way as free function...
   FreeEventsFunctionToObjectsContainer(project,
+                                       eventsBasedBehavior.GetEventsFunctions(),
                                        eventsFunction,
                                        outputGlobalObjectsContainer,
                                        outputObjectsContainer);
@@ -81,6 +87,7 @@ void EventsFunctionTools::ObjectEventsFunctionToObjectsContainer(
     gd::ObjectsContainer& outputObjectsContainer) {
   // The context is build the same way as free function...
   FreeEventsFunctionToObjectsContainer(project,
+                                       eventsBasedObject.GetEventsFunctions(),
                                        eventsFunction,
                                        outputGlobalObjectsContainer,
                                        outputObjectsContainer);

Core/GDCore/IDE/EventsFunctionTools.h

@@ -10,6 +10,7 @@
 #include "GDCore/String.h"
 namespace gd {
 class Project;
+class EventsFunctionsContainer;
 class ObjectsContainer;
 class ParameterMetadata;
 class EventsFunction;
@@ -34,6 +35,7 @@ class GD_CORE_API EventsFunctionTools {
    */
   static void FreeEventsFunctionToObjectsContainer(
       const gd::Project& project,
+      const gd::EventsFunctionsContainer functionContainer,
       const gd::EventsFunction& eventsFunction,
       gd::ObjectsContainer& outputGlobalObjectsContainer,
       gd::ObjectsContainer& outputObjectsContainer);

Core/GDCore/IDE/PropertyFunctionGenerator.cpp

@@ -0,0 +1,301 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2022 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "PropertyFunctionGenerator.h"
+
+#include "GDCore/Events/Builtin/StandardEvent.h"
+#include "GDCore/Events/Event.h"
+#include "GDCore/Extensions/Metadata/ValueTypeMetadata.h"
+#include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/Project/EventsBasedObject.h"
+#include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/PropertyDescriptor.h"
+#include "GDCore/String.h"
+
+namespace gd {
+
+void PropertyFunctionGenerator::GenerateBehaviorGetterAndSetter(
+    gd::Project &project, gd::EventsFunctionsExtension &extension,
+    gd::EventsBasedBehavior &eventsBasedBehavior,
+    const gd::NamedPropertyDescriptor &property, bool isSharedProperties) {
+  GenerateGetterAndSetter(project, extension, eventsBasedBehavior, property,
+                          eventsBasedBehavior.GetObjectType(), true,
+                          isSharedProperties);
+}
+
+void PropertyFunctionGenerator::GenerateObjectGetterAndSetter(
+    gd::Project &project, gd::EventsFunctionsExtension &extension,
+    gd::EventsBasedObject &eventsBasedObject,
+    const gd::NamedPropertyDescriptor &property) {
+  GenerateGetterAndSetter(project, extension, eventsBasedObject, property, "",
+                          false, false);
+}
+
+void PropertyFunctionGenerator::GenerateGetterAndSetter(
+    gd::Project &project, gd::EventsFunctionsExtension &extension,
+    gd::AbstractEventsBasedEntity &eventsBasedEntity,
+    const gd::NamedPropertyDescriptor &property, const gd::String &objectType,
+    bool isBehavior, bool isSharedProperties) {
+  auto &propertyName = property.GetName();
+  auto &functionsContainer = eventsBasedEntity.GetEventsFunctions();
+  gd::String capitalizedName = CapitalizeFirstLetter(property.GetName());
+  gd::String setterName = "Set" + capitalizedName;
+
+  gd::String functionGroupName =
+      (eventsBasedEntity.GetFullName().empty()
+           ? eventsBasedEntity.GetName()
+           : eventsBasedEntity.GetFullName()) +
+      (property.GetGroup().empty()
+           ? ""
+           : " " + UnCapitalizeFirstLetter(property.GetGroup())) +
+      " configuration";
+
+  gd::String propertyLabel =
+      property.GetLabel().empty() ? property.GetName() : property.GetLabel();
+
+  gd::String descriptionSubject =
+      (property.GetType() == "Boolean" ? "if " : "the ") +
+      UnCapitalizeFirstLetter(propertyLabel) +
+      (isSharedProperties || property.GetType() == "Boolean"
+           ? "."
+           : " of the object.") +
+      (property.GetDescription().empty() ? ""
+                                         : " " + property.GetDescription()) +
+      (isSharedProperties
+           ? " While an object is needed, this will apply to all "
+             "objects using the behavior."
+           : "");
+
+  gd::String propertyGetterName =
+      (isSharedProperties ? "SharedProperty" : "Property") + property.GetName();
+  gd::String getterType =
+      gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+          extension.GetName(), eventsBasedEntity.GetName(), propertyGetterName);
+  gd::String setterType =
+      gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+          extension.GetName(), eventsBasedEntity.GetName(),
+          "Set" + propertyGetterName);
+
+  gd::String getterName = capitalizedName;
+  gd::String numberOrString =
+      property.GetType() == "Number" ? "Number" : "String";
+
+  if (!functionsContainer.HasEventsFunctionNamed(getterName)) {
+    auto &getter = functionsContainer.InsertNewEventsFunction(
+        getterName, functionsContainer.GetEventsFunctionsCount());
+    auto &expressionType =
+        gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
+            property.GetType());
+    // TODO Stop replacing number by expression when it"s handled by the UI
+    // and released.
+    auto &legacyExpressionType =
+        expressionType == "number" ? "expression" : expressionType;
+    getter.GetExpressionType()
+        .SetName(legacyExpressionType)
+        .SetExtraInfo(GetStringifiedExtraInfo(property));
+    getter.SetFullName(propertyLabel).SetGroup(functionGroupName);
+    if (property.GetType() == "Boolean") {
+      getter.SetFunctionType(gd::EventsFunction::Condition)
+          .SetDescription("Check " + descriptionSubject)
+          .SetSentence("_PARAM0_ " + UnCapitalizeFirstLetter(propertyLabel));
+    } else {
+      getter.SetFunctionType(gd::EventsFunction::ExpressionAndCondition)
+          .SetDescription(descriptionSubject)
+          .SetSentence("the " + UnCapitalizeFirstLetter(propertyLabel));
+    }
+
+    auto &event =
+        dynamic_cast<gd::StandardEvent &>(getter.GetEvents().InsertNewEvent(
+            project, "BuiltinCommonInstructions::Standard", 0));
+    if (property.GetType() == "Boolean") {
+      gd::Instruction condition;
+      condition.SetType(getterType);
+      condition.AddParameter("Object");
+      if (isBehavior) {
+        condition.AddParameter("Behavior");
+      }
+      event.GetConditions().Insert(condition, 0);
+
+      gd::Instruction action;
+      action.SetType("SetReturnBoolean");
+      action.AddParameter("True");
+      event.GetActions().Insert(action, 0);
+    } else {
+      gd::Instruction action;
+      action.SetType("SetReturn" + numberOrString);
+      gd::String receiver = isBehavior ? "Object.Behavior::" : "Object.";
+      gd::String propertyPrefix =
+          (isSharedProperties ? "SharedProperty" : "Property");
+      action.AddParameter(receiver + propertyPrefix + property.GetName() +
+                          "()");
+      event.GetActions().Insert(action, 0);
+    }
+  }
+
+  if (!functionsContainer.HasEventsFunctionNamed(setterName)) {
+    auto &setter = functionsContainer.InsertNewEventsFunction(
+        setterName, functionsContainer.GetEventsFunctionsCount());
+    if (property.GetType() == "Boolean") {
+      setter.SetFunctionType(gd::EventsFunction::Action)
+          .SetFullName(propertyLabel)
+          .SetGroup(functionGroupName)
+          .SetDescription("Change " + descriptionSubject)
+          .SetSentence("_PARAM0_ " + UnCapitalizeFirstLetter(propertyLabel) +
+                       (isBehavior ? ": _PARAM2_" : ": _PARAM1_"));
+      gd::ParameterMetadata objectParameter;
+      objectParameter.SetType("object")
+          .SetName("Object")
+          .SetDescription("Object")
+          .SetExtraInfo(objectType);
+      if (!isBehavior) {
+        gd::String objectFullType = gd::PlatformExtension::GetObjectFullType(
+            extension.GetName(), eventsBasedEntity.GetName());
+        objectParameter.SetExtraInfo(objectFullType);
+      }
+      setter.GetParameters().push_back(objectParameter);
+      if (isBehavior) {
+        gd::ParameterMetadata behaviorParameter;
+        gd::String behaviorFullType =
+            gd::PlatformExtension::GetBehaviorFullType(
+                extension.GetName(), eventsBasedEntity.GetName());
+        behaviorParameter.SetType("behavior")
+            .SetName("Behavior")
+            .SetDescription("Behavior")
+            .SetExtraInfo(behaviorFullType);
+        setter.GetParameters().push_back(behaviorParameter);
+      }
+      gd::ParameterMetadata valueParameter;
+      valueParameter.SetType("yesorno")
+          .SetName("Value")
+          .SetDescription(capitalizedName)
+          .SetOptional(true)
+          .SetDefaultValue("yes");
+      setter.GetParameters().push_back(valueParameter);
+    } else {
+      setter.SetFunctionType(gd::EventsFunction::ActionWithOperator);
+      setter.SetGetterName(getterName);
+    }
+
+    if (property.GetType() == "Boolean") {
+      {
+        auto &event =
+            dynamic_cast<gd::StandardEvent &>(setter.GetEvents().InsertNewEvent(
+                project, "BuiltinCommonInstructions::Standard", 0));
+
+        gd::Instruction condition;
+        condition.SetType("GetArgumentAsBoolean");
+        condition.AddParameter("\"Value\"");
+        event.GetConditions().Insert(condition, 0);
+
+        gd::Instruction action;
+        action.SetType(setterType);
+        action.AddParameter("Object");
+        if (isBehavior) {
+          action.AddParameter("Behavior");
+          action.AddParameter("yes");
+        } else {
+          action.AddParameter("yes");
+        }
+        event.GetActions().Insert(action, 0);
+      }
+      {
+        auto &event =
+            dynamic_cast<gd::StandardEvent &>(setter.GetEvents().InsertNewEvent(
+                project, "BuiltinCommonInstructions::Standard", 0));
+
+        gd::Instruction condition;
+        condition.SetType("GetArgumentAsBoolean");
+        condition.AddParameter("\"Value\"");
+        condition.SetInverted(true);
+        event.GetConditions().Insert(condition, 0);
+
+        gd::Instruction action;
+        action.SetType(setterType);
+        action.AddParameter("Object");
+        if (isBehavior) {
+          action.AddParameter("Behavior");
+          action.AddParameter("no");
+        } else {
+          action.AddParameter("no");
+        }
+        event.GetActions().Insert(action, 0);
+      }
+    } else {
+      auto &event =
+          dynamic_cast<gd::StandardEvent &>(setter.GetEvents().InsertNewEvent(
+              project, "BuiltinCommonInstructions::Standard", 0));
+
+      gd::Instruction action;
+      action.SetType(setterType);
+      action.AddParameter("Object");
+      gd::String parameterGetterCall =
+          "GetArgumentAs" + numberOrString + "(\"Value\")";
+      if (isBehavior) {
+        action.AddParameter("Behavior");
+        action.AddParameter("=");
+        action.AddParameter(parameterGetterCall);
+      } else {
+        action.AddParameter("=");
+        action.AddParameter(parameterGetterCall);
+      }
+      event.GetActions().Insert(action, 0);
+    }
+  }
+}
+
+bool PropertyFunctionGenerator::CanGenerateGetterAndSetter(
+    const gd::AbstractEventsBasedEntity &eventsBasedEntity,
+    const gd::NamedPropertyDescriptor &property) {
+  auto &type = property.GetType();
+  if (type != "Boolean" && type != "Number" && type != "String" &&
+      type != "Choice" && type != "Color") {
+    return false;
+  }
+
+  auto &functionsContainer = eventsBasedEntity.GetEventsFunctions();
+  auto getterName = CapitalizeFirstLetter(property.GetName());
+  auto setterName = "Set" + getterName;
+  return !functionsContainer.HasEventsFunctionNamed(setterName) &&
+         !functionsContainer.HasEventsFunctionNamed(getterName);
+};
+
+gd::String PropertyFunctionGenerator::GetStringifiedExtraInfo(
+    const gd::PropertyDescriptor &property) {
+  if (property.GetType() == "Choice") {
+    gd::String arrayString;
+    arrayString += "[";
+    bool isFirst = true;
+    for (const gd::String &choice : property.GetExtraInfo()) {
+      if (!isFirst) {
+        arrayString += ",";
+      }
+      isFirst = false;
+      arrayString += "\"" + choice + "\"";
+    }
+    arrayString += "]";
+    return arrayString;
+  }
+  return "";
+}
+
+gd::String
+PropertyFunctionGenerator::CapitalizeFirstLetter(const gd::String &string) {
+  if (string.empty()) {
+    return string;
+  }
+  return string.substr(0, 1).UpperCase() + string.substr(1);
+}
+
+gd::String
+PropertyFunctionGenerator::UnCapitalizeFirstLetter(const gd::String &string) {
+  if (string.empty()) {
+    return string;
+  }
+  return string.substr(0, 1).LowerCase() + string.substr(1);
+}
+
+} // namespace gd

Core/GDCore/IDE/PropertyFunctionGenerator.h

@@ -0,0 +1,65 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2022 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_PROPERTYFUNCTIONGENERATOR_H
+#define GDCORE_PROPERTYFUNCTIONGENERATOR_H
+
+namespace gd {
+class String;
+class Project;
+class EventsFunctionsExtension;
+class EventsBasedBehavior;
+class EventsBasedObject;
+class AbstractEventsBasedEntity;
+class PropertyDescriptor;
+class NamedPropertyDescriptor;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Generate a getter and a setter functions for properties.
+ */
+class GD_CORE_API PropertyFunctionGenerator {
+public:
+  /**
+   * \brief Generate a getter and a setter for the given behavior property.
+   */
+  static void GenerateBehaviorGetterAndSetter(
+      gd::Project &project, gd::EventsFunctionsExtension &extension,
+      gd::EventsBasedBehavior &eventsBasedBehavior,
+      const gd::NamedPropertyDescriptor &property, bool isSharedProperties);
+  /**
+   * \brief Generate a getter and a setter for the given object property.
+   */
+  static void
+  GenerateObjectGetterAndSetter(gd::Project &project,
+                                gd::EventsFunctionsExtension &extension,
+                                gd::EventsBasedObject &eventsBasedObject,
+                                const gd::NamedPropertyDescriptor &property);
+  static bool CanGenerateGetterAndSetter(
+      const gd::AbstractEventsBasedEntity &eventsBasedEntity,
+      const gd::NamedPropertyDescriptor &property);
+
+  ~PropertyFunctionGenerator();
+
+private:
+  static void GenerateGetterAndSetter(
+      gd::Project &project, gd::EventsFunctionsExtension &extension,
+      gd::AbstractEventsBasedEntity &eventsBasedEntity,
+      const gd::NamedPropertyDescriptor &property, const gd::String &objectType,
+      bool isBehavior, bool isSharedProperties);
+
+  static gd::String CapitalizeFirstLetter(const gd::String &string);
+  static gd::String UnCapitalizeFirstLetter(const gd::String &string);
+  static gd::String
+  GetStringifiedExtraInfo(const gd::PropertyDescriptor &property);
+
+  PropertyFunctionGenerator();
+};
+
+} // namespace gd
+
+#endif // GDCORE_PROPERTYFUNCTIONGENERATOR_H

Core/GDCore/IDE/WholeProjectRefactorer.cpp

@@ -35,40 +35,6 @@
 #include "GDCore/String.h"
 #include "GDCore/Tools/Log.h"
 
-namespace {
-// These functions are doing the reverse of what is done when adding
-// instructions/expression to extension/behaviors. If needed, they could be
-// moved to gd::PlatformExtension to colocate the usage of the namespace
-// separator?
-gd::String GetEventsFunctionFullType(const gd::String& extensionName,
-                                     const gd::String& functionName) {
-  const auto& separator = gd::PlatformExtension::GetNamespaceSeparator();
-  return extensionName + separator + functionName;
-}
-gd::String GetBehaviorEventsFunctionFullType(const gd::String& extensionName,
-                                             const gd::String& behaviorName,
-                                             const gd::String& functionName) {
-  const auto& separator = gd::PlatformExtension::GetNamespaceSeparator();
-  return extensionName + separator + behaviorName + separator + functionName;
-}
-gd::String GetBehaviorFullType(const gd::String& extensionName,
-                               const gd::String& behaviorName) {
-  const auto& separator = gd::PlatformExtension::GetNamespaceSeparator();
-  return extensionName + separator + behaviorName;
-}
-gd::String GetObjectEventsFunctionFullType(const gd::String& extensionName,
-                                             const gd::String& objectName,
-                                             const gd::String& functionName) {
-  const auto& separator = gd::PlatformExtension::GetNamespaceSeparator();
-  return extensionName + separator + objectName + separator + functionName;
-}
-gd::String GetObjectFullType(const gd::String& extensionName,
-                               const gd::String& objectName) {
-  const auto& separator = gd::PlatformExtension::GetNamespaceSeparator();
-  return extensionName + separator + objectName;
-}
-}  // namespace
-
 namespace gd {
 
 // By convention, the first parameter of an events based behavior method is
@@ -154,7 +120,11 @@ void WholeProjectRefactorer::ExposeProjectEvents(
       gd::ObjectsContainer globalObjectsAndGroups;
       gd::ObjectsContainer objectsAndGroups;
       gd::EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
-          project, *eventsFunction, globalObjectsAndGroups, objectsAndGroups);
+          project,
+          eventsFunctionsExtension,
+          *eventsFunction,
+          globalObjectsAndGroups,
+          objectsAndGroups);
 
       worker.Launch(eventsFunction->GetEvents(),
                     globalObjectsAndGroups,
@@ -248,7 +218,7 @@ WholeProjectRefactorer::GetAllObjectTypesUsingEventsBasedBehavior(
     const gd::EventsFunctionsExtension& eventsFunctionsExtension,
     const gd::EventsBasedBehavior& eventsBasedBehavior) {
   std::set<gd::String> allTypes;
-  const gd::String behaviorType = GetBehaviorFullType(
+  const gd::String behaviorType = gd::PlatformExtension::GetBehaviorFullType(
       eventsFunctionsExtension.GetName(), eventsBasedBehavior.GetName());
 
   auto addTypesOfObjectsIn =
@@ -291,7 +261,7 @@ void WholeProjectRefactorer::EnsureBehaviorEventsFunctionsProperParameters(
         .SetType("behavior")
         .SetName("Behavior")
         .SetDescription("Behavior")
-        .SetExtraInfo(GetBehaviorFullType(eventsFunctionsExtension.GetName(),
+        .SetExtraInfo(gd::PlatformExtension::GetBehaviorFullType(eventsFunctionsExtension.GetName(),
                                           eventsBasedBehavior.GetName()));
   }
 }
@@ -311,7 +281,7 @@ void WholeProjectRefactorer::EnsureObjectEventsFunctionsProperParameters(
         .SetType("object")
         .SetName(parentObjectParameterName)
         .SetDescription("Object")
-        .SetExtraInfo(GetObjectFullType(eventsFunctionsExtension.GetName(),
+        .SetExtraInfo(gd::PlatformExtension::GetObjectFullType(eventsFunctionsExtension.GetName(),
                                         eventsBasedObject.GetName()));
   }
 }
@@ -326,30 +296,27 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
         DoRenameEventsFunction(
             project,
             eventsFunction,
-            GetEventsFunctionFullType(oldName, eventsFunction.GetName()),
-            GetEventsFunctionFullType(newName, eventsFunction.GetName()));
+            gd::PlatformExtension::GetEventsFunctionFullType(oldName, eventsFunction.GetName()),
+            gd::PlatformExtension::GetEventsFunctionFullType(newName, eventsFunction.GetName()));
       };
 
   auto renameBehaviorEventsFunction =
       [&project, &oldName, &newName](
           const gd::EventsBasedBehavior& eventsBasedBehavior,
           const gd::EventsFunction& eventsFunction) {
-        if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
-            eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
+        if (eventsFunction.IsExpression()) {
+          // Nothing to do, expressions are not including the extension name
+        }
+        if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
           gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
               project,
-              GetBehaviorEventsFunctionFullType(oldName,
+              gd::PlatformExtension::GetBehaviorEventsFunctionFullType(oldName,
                                                 eventsBasedBehavior.GetName(),
                                                 eventsFunction.GetName()),
-              GetBehaviorEventsFunctionFullType(newName,
+              gd::PlatformExtension::GetBehaviorEventsFunctionFullType(newName,
                                                 eventsBasedBehavior.GetName(),
                                                 eventsFunction.GetName()));
           ExposeProjectEvents(project, renamer);
-        } else if (eventsFunction.GetFunctionType() ==
-                       gd::EventsFunction::Expression ||
-                   eventsFunction.GetFunctionType() ==
-                       gd::EventsFunction::StringExpression) {
-          // Nothing to do, expressions are not including the extension name
         }
       };
 
@@ -359,12 +326,12 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
           const gd::NamedPropertyDescriptor& property) {
         gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
             project,
-            GetBehaviorEventsFunctionFullType(
+            gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
                 oldName,
                 eventsBasedBehavior.GetName(),
                 gd::EventsBasedBehavior::GetPropertyActionName(
                     property.GetName())),
-            GetBehaviorEventsFunctionFullType(
+            gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
                 newName,
                 eventsBasedBehavior.GetName(),
                 gd::EventsBasedBehavior::GetPropertyActionName(
@@ -374,12 +341,12 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
         gd::InstructionsTypeRenamer conditionRenamer =
             gd::InstructionsTypeRenamer(
                 project,
-                GetBehaviorEventsFunctionFullType(
+                gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
                     oldName,
                     eventsBasedBehavior.GetName(),
                     gd::EventsBasedBehavior::GetPropertyConditionName(
                         property.GetName())),
-                GetBehaviorEventsFunctionFullType(
+                gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
                     newName,
                     eventsBasedBehavior.GetName(),
                     gd::EventsBasedBehavior::GetPropertyConditionName(
@@ -390,26 +357,60 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
         // extension name
       };
 
+  auto renameBehaviorSharedPropertyFunctions =
+      [&project, &oldName, &newName](
+          const gd::EventsBasedBehavior& eventsBasedBehavior,
+          const gd::NamedPropertyDescriptor& property) {
+        gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
+            project,
+            gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+                oldName,
+                eventsBasedBehavior.GetName(),
+                gd::EventsBasedBehavior::GetSharedPropertyActionName(
+                    property.GetName())),
+            gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+                newName,
+                eventsBasedBehavior.GetName(),
+                gd::EventsBasedBehavior::GetSharedPropertyActionName(
+                    property.GetName())));
+        ExposeProjectEvents(project, actionRenamer);
+
+        gd::InstructionsTypeRenamer conditionRenamer =
+            gd::InstructionsTypeRenamer(
+                project,
+                gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+                    oldName,
+                    eventsBasedBehavior.GetName(),
+                    gd::EventsBasedBehavior::GetSharedPropertyConditionName(
+                        property.GetName())),
+                gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+                    newName,
+                    eventsBasedBehavior.GetName(),
+                    gd::EventsBasedBehavior::GetSharedPropertyConditionName(
+                        property.GetName())));
+        ExposeProjectEvents(project, conditionRenamer);
+
+        // Nothing to do for expressions, expressions are not including the
+        // extension name
+      };
+
   auto renameObjectEventsFunction =
       [&project, &oldName, &newName](
           const gd::EventsBasedObject& eventsBasedObject,
           const gd::EventsFunction& eventsFunction) {
-        if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
-            eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
+        if (eventsFunction.IsExpression()) {
+          // Nothing to do, expressions are not including the extension name
+        }
+        if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
           gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
               project,
-              GetObjectEventsFunctionFullType(oldName,
+              gd::PlatformExtension::GetObjectEventsFunctionFullType(oldName,
                                                 eventsBasedObject.GetName(),
                                                 eventsFunction.GetName()),
-              GetObjectEventsFunctionFullType(newName,
+              gd::PlatformExtension::GetObjectEventsFunctionFullType(newName,
                                                 eventsBasedObject.GetName(),
                                                 eventsFunction.GetName()));
           ExposeProjectEvents(project, renamer);
-        } else if (eventsFunction.GetFunctionType() ==
-                       gd::EventsFunction::Expression ||
-                   eventsFunction.GetFunctionType() ==
-                       gd::EventsFunction::StringExpression) {
-          // Nothing to do, expressions are not including the extension name
         }
       };
 
@@ -419,12 +420,12 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
           const gd::NamedPropertyDescriptor& property) {
         gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
             project,
-            GetObjectEventsFunctionFullType(
+            gd::PlatformExtension::GetObjectEventsFunctionFullType(
                 oldName,
                 eventsBasedObject.GetName(),
                 gd::EventsBasedObject::GetPropertyActionName(
                     property.GetName())),
-            GetObjectEventsFunctionFullType(
+            gd::PlatformExtension::GetObjectEventsFunctionFullType(
                 newName,
                 eventsBasedObject.GetName(),
                 gd::EventsBasedObject::GetPropertyActionName(
@@ -434,12 +435,12 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
         gd::InstructionsTypeRenamer conditionRenamer =
             gd::InstructionsTypeRenamer(
                 project,
-                GetObjectEventsFunctionFullType(
+                gd::PlatformExtension::GetObjectEventsFunctionFullType(
                     oldName,
                     eventsBasedObject.GetName(),
                     gd::EventsBasedObject::GetPropertyConditionName(
                         property.GetName())),
-                GetObjectEventsFunctionFullType(
+                gd::PlatformExtension::GetObjectEventsFunctionFullType(
                     newName,
                     eventsBasedObject.GetName(),
                     gd::EventsBasedObject::GetPropertyConditionName(
@@ -456,9 +457,7 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
 
   // Free expressions
   for (auto&& eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
-    if (eventsFunction->GetFunctionType() == gd::EventsFunction::Expression ||
-        eventsFunction->GetFunctionType() ==
-            gd::EventsFunction::StringExpression) {
+    if (eventsFunction->IsExpression()) {
       renameEventsFunction(*eventsFunction);
     }
   }
@@ -467,9 +466,7 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
        eventsFunctionsExtension.GetEventsBasedBehaviors().GetInternalVector()) {
     auto& behaviorEventsFunctions = eventsBasedBehavior->GetEventsFunctions();
     for (auto&& eventsFunction : behaviorEventsFunctions.GetInternalVector()) {
-      if (eventsFunction->GetFunctionType() == gd::EventsFunction::Expression ||
-          eventsFunction->GetFunctionType() ==
-              gd::EventsFunction::StringExpression) {
+      if (eventsFunction->IsExpression()) {
         renameBehaviorEventsFunction(*eventsBasedBehavior, *eventsFunction);
       }
     }
@@ -477,8 +474,7 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
 
   // Free instructions
   for (auto&& eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
-    if (eventsFunction->GetFunctionType() == gd::EventsFunction::Action ||
-        eventsFunction->GetFunctionType() == gd::EventsFunction::Condition) {
+    if (eventsFunction->IsAction() || eventsFunction->IsCondition()) {
       renameEventsFunction(*eventsFunction);
     }
   }
@@ -488,21 +484,26 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
        eventsFunctionsExtension.GetEventsBasedBehaviors().GetInternalVector()) {
     auto& behaviorEventsFunctions = eventsBasedBehavior->GetEventsFunctions();
     for (auto&& eventsFunction : behaviorEventsFunctions.GetInternalVector()) {
-      if (eventsFunction->GetFunctionType() == gd::EventsFunction::Action ||
-          eventsFunction->GetFunctionType() == gd::EventsFunction::Condition) {
+      if (eventsFunction->IsAction() || eventsFunction->IsCondition()) {
         renameBehaviorEventsFunction(*eventsBasedBehavior, *eventsFunction);
       }
     }
   }
 
   // Behavior properties
-  for (auto&& eventsBasedBehavior :
+  for (auto &&eventsBasedBehavior :
        eventsFunctionsExtension.GetEventsBasedBehaviors().GetInternalVector()) {
-    auto& behaviorProperties = eventsBasedBehavior->GetPropertyDescriptors();
-    for (auto&& propertyDescriptor : behaviorProperties.GetInternalVector()) {
+    for (auto &&propertyDescriptor :
+         eventsBasedBehavior->GetPropertyDescriptors().GetInternalVector()) {
       renameBehaviorPropertyFunctions(*eventsBasedBehavior,
                                       *propertyDescriptor);
     }
+    for (auto &&propertyDescriptor :
+         eventsBasedBehavior->GetSharedPropertyDescriptors()
+             .GetInternalVector()) {
+      renameBehaviorSharedPropertyFunctions(*eventsBasedBehavior,
+                                            *propertyDescriptor);
+    }
   }
 
   // Object instructions
@@ -510,8 +511,7 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
        eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
     auto& objectEventsFunctions = eventsBasedObject->GetEventsFunctions();
     for (auto&& eventsFunction : objectEventsFunctions.GetInternalVector()) {
-      if (eventsFunction->GetFunctionType() == gd::EventsFunction::Action ||
-          eventsFunction->GetFunctionType() == gd::EventsFunction::Condition) {
+      if (eventsFunction->IsAction() || eventsFunction->IsCondition()) {
         renameObjectEventsFunction(*eventsBasedObject, *eventsFunction);
       }
     }
@@ -532,8 +532,8 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
        eventsFunctionsExtension.GetEventsBasedBehaviors().GetInternalVector()) {
     DoRenameBehavior(
         project,
-        GetBehaviorFullType(oldName, eventsBasedBehavior->GetName()),
-        GetBehaviorFullType(newName, eventsBasedBehavior->GetName()));
+        gd::PlatformExtension::GetBehaviorFullType(oldName, eventsBasedBehavior->GetName()),
+        gd::PlatformExtension::GetBehaviorFullType(newName, eventsBasedBehavior->GetName()));
   }
 
   // Finally, rename custom objects type
@@ -541,8 +541,8 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
        eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
     DoRenameObject(
         project,
-        GetObjectFullType(oldName, eventsBasedObject->GetName()),
-        GetObjectFullType(newName, eventsBasedObject->GetName()));
+        gd::PlatformExtension::GetObjectFullType(oldName, eventsBasedObject->GetName()),
+        gd::PlatformExtension::GetObjectFullType(newName, eventsBasedObject->GetName()));
   }
 }
 
@@ -559,10 +559,20 @@ void WholeProjectRefactorer::RenameEventsFunction(
   DoRenameEventsFunction(
       project,
       eventsFunction,
-      GetEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+      gd::PlatformExtension::GetEventsFunctionFullType(eventsFunctionsExtension.GetName(),
                                 oldFunctionName),
-      GetEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+      gd::PlatformExtension::GetEventsFunctionFullType(eventsFunctionsExtension.GetName(),
                                 newFunctionName));
+  
+  if (eventsFunction.GetFunctionType() == gd::EventsFunction::ExpressionAndCondition) {
+    for (auto&& otherFunction : eventsFunctionsExtension.GetInternalVector())
+    {
+      if (otherFunction->GetFunctionType() == gd::EventsFunction::ActionWithOperator &&
+          otherFunction->GetGetterName() == oldFunctionName) {
+        otherFunction->SetGetterName(newFunctionName);
+      }
+    }
+  }
 }
 
 void WholeProjectRefactorer::RenameBehaviorEventsFunction(
@@ -577,30 +587,39 @@ void WholeProjectRefactorer::RenameBehaviorEventsFunction(
   const gd::EventsFunction& eventsFunction =
       eventsFunctions.GetEventsFunction(oldFunctionName);
 
-  if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
-      eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
-    gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
-        project,
-        GetBehaviorEventsFunctionFullType(eventsFunctionsExtension.GetName(),
-                                          eventsBasedBehavior.GetName(),
-                                          oldFunctionName),
-        GetBehaviorEventsFunctionFullType(eventsFunctionsExtension.GetName(),
-                                          eventsBasedBehavior.GetName(),
-                                          newFunctionName));
-    ExposeProjectEvents(project, renamer);
-  } else if (eventsFunction.GetFunctionType() ==
-                 gd::EventsFunction::Expression ||
-             eventsFunction.GetFunctionType() ==
-                 gd::EventsFunction::StringExpression) {
+  // Order is important: we first rename the expressions then the instructions,
+  // to avoid being unable to fetch the metadata (the types of parameters) of
+  // instructions after they are renamed.
+  if (eventsFunction.IsExpression()) {
     gd::ExpressionsRenamer renamer =
         gd::ExpressionsRenamer(project.GetCurrentPlatform());
     renamer.SetReplacedBehaviorExpression(
-        GetBehaviorFullType(eventsFunctionsExtension.GetName(),
+        gd::PlatformExtension::GetBehaviorFullType(eventsFunctionsExtension.GetName(),
                             eventsBasedBehavior.GetName()),
         oldFunctionName,
         newFunctionName);
     ExposeProjectEvents(project, renamer);
   }
+  if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
+    gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
+        project,
+        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+                                          eventsBasedBehavior.GetName(),
+                                          oldFunctionName),
+        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+                                          eventsBasedBehavior.GetName(),
+                                          newFunctionName));
+    ExposeProjectEvents(project, renamer);
+  }
+  if (eventsFunction.GetFunctionType() == gd::EventsFunction::ExpressionAndCondition) {
+    for (auto&& otherFunction : eventsBasedBehavior.GetEventsFunctions().GetInternalVector())
+    {
+      if (otherFunction->GetFunctionType() == gd::EventsFunction::ActionWithOperator &&
+          otherFunction->GetGetterName() == oldFunctionName) {
+        otherFunction->SetGetterName(newFunctionName);
+      }
+    }
+  }
 }
 
 void WholeProjectRefactorer::RenameObjectEventsFunction(
@@ -615,30 +634,36 @@ void WholeProjectRefactorer::RenameObjectEventsFunction(
   const gd::EventsFunction& eventsFunction =
       eventsFunctions.GetEventsFunction(oldFunctionName);
 
-  if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
-      eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
-    gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
-        project,
-        GetObjectEventsFunctionFullType(eventsFunctionsExtension.GetName(),
-                                          eventsBasedObject.GetName(),
-                                          oldFunctionName),
-        GetObjectEventsFunctionFullType(eventsFunctionsExtension.GetName(),
-                                          eventsBasedObject.GetName(),
-                                          newFunctionName));
-    ExposeProjectEvents(project, renamer);
-  } else if (eventsFunction.GetFunctionType() ==
-                 gd::EventsFunction::Expression ||
-             eventsFunction.GetFunctionType() ==
-                 gd::EventsFunction::StringExpression) {
+  if (eventsFunction.IsExpression()) {
     gd::ExpressionsRenamer renamer =
         gd::ExpressionsRenamer(project.GetCurrentPlatform());
     renamer.SetReplacedObjectExpression(
-        GetObjectFullType(eventsFunctionsExtension.GetName(),
+        gd::PlatformExtension::GetObjectFullType(eventsFunctionsExtension.GetName(),
                             eventsBasedObject.GetName()),
         oldFunctionName,
         newFunctionName);
     ExposeProjectEvents(project, renamer);
   }
+  if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
+    gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
+        project,
+        gd::PlatformExtension::GetObjectEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+                                          eventsBasedObject.GetName(),
+                                          oldFunctionName),
+        gd::PlatformExtension::GetObjectEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+                                          eventsBasedObject.GetName(),
+                                          newFunctionName));
+    ExposeProjectEvents(project, renamer);
+  }
+  if (eventsFunction.GetFunctionType() == gd::EventsFunction::ExpressionAndCondition) {
+    for (auto&& otherFunction : eventsBasedObject.GetEventsFunctions().GetInternalVector())
+    {
+      if (otherFunction->GetFunctionType() == gd::EventsFunction::ActionWithOperator &&
+          otherFunction->GetGetterName() == oldFunctionName) {
+        otherFunction->SetGetterName(newFunctionName);
+      }
+    }
+  }
 }
 
 void WholeProjectRefactorer::MoveEventsFunctionParameter(
@@ -652,24 +677,25 @@ void WholeProjectRefactorer::MoveEventsFunctionParameter(
   const gd::EventsFunction& eventsFunction =
       eventsFunctionsExtension.GetEventsFunction(functionName);
 
-  const gd::String& eventsFunctionType = GetEventsFunctionFullType(
+  const gd::String& eventsFunctionType = gd::PlatformExtension::GetEventsFunctionFullType(
       eventsFunctionsExtension.GetName(), functionName);
 
-  if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
-      eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
-    gd::InstructionsParameterMover mover = gd::InstructionsParameterMover(
-        project, eventsFunctionType, oldIndex, newIndex);
-    ExposeProjectEvents(project, mover);
-  } else if (eventsFunction.GetFunctionType() ==
-                 gd::EventsFunction::Expression ||
-             eventsFunction.GetFunctionType() ==
-                 gd::EventsFunction::StringExpression) {
+  if (eventsFunction.IsExpression()) {
     gd::ExpressionsParameterMover mover =
         gd::ExpressionsParameterMover(project.GetCurrentPlatform());
     mover.SetFreeExpressionMovedParameter(
         eventsFunctionType, oldIndex, newIndex);
     ExposeProjectEvents(project, mover);
   }
+  if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
+    const int operatorIndexOffset = eventsFunction.IsExpression() ? 2 : 0;
+    gd::InstructionsParameterMover mover = gd::InstructionsParameterMover(
+        project,
+        eventsFunctionType,
+        oldIndex + operatorIndexOffset,
+        newIndex + operatorIndexOffset);
+    ExposeProjectEvents(project, mover);
+  }
 }
 
 void WholeProjectRefactorer::MoveBehaviorEventsFunctionParameter(
@@ -686,29 +712,30 @@ void WholeProjectRefactorer::MoveBehaviorEventsFunctionParameter(
       eventsFunctions.GetEventsFunction(functionName);
 
   const gd::String& eventsFunctionType =
-      GetBehaviorEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+      gd::PlatformExtension::GetBehaviorEventsFunctionFullType(eventsFunctionsExtension.GetName(),
                                         eventsBasedBehavior.GetName(),
                                         functionName);
 
-  if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
-      eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
-    gd::InstructionsParameterMover mover = gd::InstructionsParameterMover(
-        project, eventsFunctionType, oldIndex, newIndex);
-    ExposeProjectEvents(project, mover);
-  } else if (eventsFunction.GetFunctionType() ==
-                 gd::EventsFunction::Expression ||
-             eventsFunction.GetFunctionType() ==
-                 gd::EventsFunction::StringExpression) {
+  if (eventsFunction.IsExpression()) {
     gd::ExpressionsParameterMover mover =
         gd::ExpressionsParameterMover(project.GetCurrentPlatform());
     mover.SetBehaviorExpressionMovedParameter(
-        GetBehaviorFullType(eventsFunctionsExtension.GetName(),
+        gd::PlatformExtension::GetBehaviorFullType(eventsFunctionsExtension.GetName(),
                             eventsBasedBehavior.GetName()),
         functionName,
         oldIndex,
         newIndex);
     ExposeProjectEvents(project, mover);
   }
+  if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
+    const int operatorIndexOffset = eventsFunction.IsExpression() ? 2 : 0;
+    gd::InstructionsParameterMover mover = gd::InstructionsParameterMover(
+        project,
+        eventsFunctionType,
+        oldIndex + operatorIndexOffset,
+        newIndex + operatorIndexOffset);
+    ExposeProjectEvents(project, mover);
+  }
 }
 
 void WholeProjectRefactorer::MoveObjectEventsFunctionParameter(
@@ -725,29 +752,30 @@ void WholeProjectRefactorer::MoveObjectEventsFunctionParameter(
       eventsFunctions.GetEventsFunction(functionName);
 
   const gd::String& eventsFunctionType =
-      GetObjectEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+      gd::PlatformExtension::GetObjectEventsFunctionFullType(eventsFunctionsExtension.GetName(),
                                         eventsBasedObject.GetName(),
                                         functionName);
 
-  if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
-      eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
-    gd::InstructionsParameterMover mover = gd::InstructionsParameterMover(
-        project, eventsFunctionType, oldIndex, newIndex);
-    ExposeProjectEvents(project, mover);
-  } else if (eventsFunction.GetFunctionType() ==
-                 gd::EventsFunction::Expression ||
-             eventsFunction.GetFunctionType() ==
-                 gd::EventsFunction::StringExpression) {
+  if (eventsFunction.IsExpression()) {
     gd::ExpressionsParameterMover mover =
         gd::ExpressionsParameterMover(project.GetCurrentPlatform());
     mover.SetObjectExpressionMovedParameter(
-        GetObjectFullType(eventsFunctionsExtension.GetName(),
+        gd::PlatformExtension::GetObjectFullType(eventsFunctionsExtension.GetName(),
                             eventsBasedObject.GetName()),
         functionName,
         oldIndex,
         newIndex);
     ExposeProjectEvents(project, mover);
   }
+  if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
+    const int operatorIndexOffset = eventsFunction.IsExpression() ? 2 : 0;
+    gd::InstructionsParameterMover mover = gd::InstructionsParameterMover(
+        project,
+        eventsFunctionType,
+        oldIndex + operatorIndexOffset,
+        newIndex + operatorIndexOffset);
+    ExposeProjectEvents(project, mover);
+  }
 }
 
 void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
@@ -784,7 +812,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
     gd::ExpressionsRenamer expressionRenamer =
         gd::ExpressionsRenamer(project.GetCurrentPlatform());
     expressionRenamer.SetReplacedBehaviorExpression(
-        GetBehaviorFullType(eventsFunctionsExtension.GetName(),
+        gd::PlatformExtension::GetBehaviorFullType(eventsFunctionsExtension.GetName(),
                             eventsBasedBehavior.GetName()),
         EventsBasedBehavior::GetPropertyExpressionName(oldPropertyName),
         EventsBasedBehavior::GetPropertyExpressionName(newPropertyName));
@@ -792,11 +820,11 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
 
     gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
         project,
-        GetBehaviorEventsFunctionFullType(
+        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             eventsBasedBehavior.GetName(),
             EventsBasedBehavior::GetPropertyActionName(oldPropertyName)),
-        GetBehaviorEventsFunctionFullType(
+        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             eventsBasedBehavior.GetName(),
             EventsBasedBehavior::GetPropertyActionName(newPropertyName)));
@@ -804,11 +832,11 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
 
     gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
         project,
-        GetBehaviorEventsFunctionFullType(
+        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             eventsBasedBehavior.GetName(),
             EventsBasedBehavior::GetPropertyConditionName(oldPropertyName)),
-        GetBehaviorEventsFunctionFullType(
+        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             eventsBasedBehavior.GetName(),
             EventsBasedBehavior::GetPropertyConditionName(newPropertyName)));
@@ -816,6 +844,72 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
   }
 }
 
+void WholeProjectRefactorer::RenameEventsBasedBehaviorSharedProperty(
+    gd::Project& project,
+    const gd::EventsFunctionsExtension& eventsFunctionsExtension,
+    const gd::EventsBasedBehavior& eventsBasedBehavior,
+    const gd::String& oldPropertyName,
+    const gd::String& newPropertyName) {
+  auto& properties = eventsBasedBehavior.GetPropertyDescriptors();
+  if (!properties.Has(oldPropertyName)) return;
+
+  if (properties.Get(oldPropertyName).GetType() == "Behavior") {
+    // This is a property representing another behavior that must exist on the
+    // object.
+
+    // This other "required behavior" uses the property name, that is about to
+    // change, as its name.
+    // So we must change all reference to this name in the events of the
+    // behavior functions.
+    gd::EventsBehaviorRenamer behaviorRenamer(project.GetCurrentPlatform(),
+                                              behaviorObjectParameterName,
+                                              oldPropertyName,
+                                              newPropertyName);
+
+    ExposeEventsBasedBehaviorEvents(
+        project, eventsBasedBehavior, behaviorRenamer);
+  } else {
+    // Properties that represent primitive values will be used through
+    // their related actions/conditions/expressions. Rename these.
+
+    // Order is important: we first rename the expressions then the
+    // instructions, to avoid being unable to fetch the metadata (the types of
+    // parameters) of instructions after they are renamed.
+    gd::ExpressionsRenamer expressionRenamer =
+        gd::ExpressionsRenamer(project.GetCurrentPlatform());
+    expressionRenamer.SetReplacedBehaviorExpression(
+        gd::PlatformExtension::GetBehaviorFullType(eventsFunctionsExtension.GetName(),
+                            eventsBasedBehavior.GetName()),
+        EventsBasedBehavior::GetSharedPropertyExpressionName(oldPropertyName),
+        EventsBasedBehavior::GetSharedPropertyExpressionName(newPropertyName));
+    ExposeProjectEvents(project, expressionRenamer);
+
+    gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
+        project,
+        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+            eventsFunctionsExtension.GetName(),
+            eventsBasedBehavior.GetName(),
+            EventsBasedBehavior::GetSharedPropertyActionName(oldPropertyName)),
+        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+            eventsFunctionsExtension.GetName(),
+            eventsBasedBehavior.GetName(),
+            EventsBasedBehavior::GetSharedPropertyActionName(newPropertyName)));
+    ExposeProjectEvents(project, actionRenamer);
+
+    gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
+        project,
+        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+            eventsFunctionsExtension.GetName(),
+            eventsBasedBehavior.GetName(),
+            EventsBasedBehavior::GetSharedPropertyConditionName(oldPropertyName)),
+        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+            eventsFunctionsExtension.GetName(),
+            eventsBasedBehavior.GetName(),
+            EventsBasedBehavior::GetSharedPropertyConditionName(newPropertyName)));
+    ExposeProjectEvents(project, conditionRenamer);
+  }
+}
+
 void WholeProjectRefactorer::RenameEventsBasedObjectProperty(
     gd::Project& project,
     const gd::EventsFunctionsExtension& eventsFunctionsExtension,
@@ -834,7 +928,7 @@ void WholeProjectRefactorer::RenameEventsBasedObjectProperty(
   gd::ExpressionsRenamer expressionRenamer =
       gd::ExpressionsRenamer(project.GetCurrentPlatform());
   expressionRenamer.SetReplacedObjectExpression(
-      GetObjectFullType(eventsFunctionsExtension.GetName(),
+      gd::PlatformExtension::GetObjectFullType(eventsFunctionsExtension.GetName(),
                           eventsBasedObject.GetName()),
       EventsBasedObject::GetPropertyExpressionName(oldPropertyName),
       EventsBasedObject::GetPropertyExpressionName(newPropertyName));
@@ -842,11 +936,11 @@ void WholeProjectRefactorer::RenameEventsBasedObjectProperty(
 
   gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
       project,
-      GetObjectEventsFunctionFullType(
+      gd::PlatformExtension::GetObjectEventsFunctionFullType(
           eventsFunctionsExtension.GetName(),
           eventsBasedObject.GetName(),
           EventsBasedObject::GetPropertyActionName(oldPropertyName)),
-      GetObjectEventsFunctionFullType(
+      gd::PlatformExtension::GetObjectEventsFunctionFullType(
           eventsFunctionsExtension.GetName(),
           eventsBasedObject.GetName(),
           EventsBasedObject::GetPropertyActionName(newPropertyName)));
@@ -854,11 +948,11 @@ void WholeProjectRefactorer::RenameEventsBasedObjectProperty(
 
   gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
       project,
-      GetObjectEventsFunctionFullType(
+      gd::PlatformExtension::GetObjectEventsFunctionFullType(
           eventsFunctionsExtension.GetName(),
           eventsBasedObject.GetName(),
           EventsBasedObject::GetPropertyConditionName(oldPropertyName)),
-      GetObjectEventsFunctionFullType(
+      gd::PlatformExtension::GetObjectEventsFunctionFullType(
           eventsFunctionsExtension.GetName(),
           eventsBasedObject.GetName(),
           EventsBasedObject::GetPropertyConditionName(newPropertyName)));
@@ -1088,25 +1182,22 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
        &eventsFunctionsExtension,
        &oldBehaviorName,
        &newBehaviorName](const gd::EventsFunction& eventsFunction) {
-        if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
-            eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
+        if (eventsFunction.IsExpression()) {
+          // Nothing to do, expressions are not including the name of the
+          // behavior
+        }
+        if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
           gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
               project,
-              GetBehaviorEventsFunctionFullType(
+              gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
                   eventsFunctionsExtension.GetName(),
                   oldBehaviorName,
                   eventsFunction.GetName()),
-              GetBehaviorEventsFunctionFullType(
+              gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
                   eventsFunctionsExtension.GetName(),
                   newBehaviorName,
                   eventsFunction.GetName()));
           ExposeProjectEvents(project, renamer);
-        } else if (eventsFunction.GetFunctionType() ==
-                       gd::EventsFunction::Expression ||
-                   eventsFunction.GetFunctionType() ==
-                       gd::EventsFunction::StringExpression) {
-          // Nothing to do, expressions are not including the name of the
-          // behavior
         }
       };
 
@@ -1118,11 +1209,11 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
                                         property) {
     gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
         project,
-        GetBehaviorEventsFunctionFullType(
+        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             oldBehaviorName,
             EventsBasedBehavior::GetPropertyActionName(property.GetName())),
-        GetBehaviorEventsFunctionFullType(
+        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             newBehaviorName,
             EventsBasedBehavior::GetPropertyActionName(property.GetName())));
@@ -1130,11 +1221,11 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
 
     gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
         project,
-        GetBehaviorEventsFunctionFullType(
+        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             oldBehaviorName,
             EventsBasedBehavior::GetPropertyConditionName(property.GetName())),
-        GetBehaviorEventsFunctionFullType(
+        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             newBehaviorName,
             EventsBasedBehavior::GetPropertyConditionName(property.GetName())));
@@ -1144,6 +1235,40 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
     // the behavior
   };
 
+  auto renameBehaviorSharedProperty = [&project,
+                                 &eventsFunctionsExtension,
+                                 &oldBehaviorName,
+                                 &newBehaviorName](
+                                    const gd::NamedPropertyDescriptor&
+                                        property) {
+    gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
+        project,
+        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+            eventsFunctionsExtension.GetName(),
+            oldBehaviorName,
+            EventsBasedBehavior::GetSharedPropertyActionName(property.GetName())),
+        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+            eventsFunctionsExtension.GetName(),
+            newBehaviorName,
+            EventsBasedBehavior::GetSharedPropertyActionName(property.GetName())));
+    ExposeProjectEvents(project, actionRenamer);
+
+    gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
+        project,
+        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+            eventsFunctionsExtension.GetName(),
+            oldBehaviorName,
+            EventsBasedBehavior::GetSharedPropertyConditionName(property.GetName())),
+        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+            eventsFunctionsExtension.GetName(),
+            newBehaviorName,
+            EventsBasedBehavior::GetSharedPropertyConditionName(property.GetName())));
+    ExposeProjectEvents(project, conditionRenamer);
+
+    // Nothing to do for expression, expressions are not including the name of
+    // the behavior
+  };
+
   // Order is important: we first rename the expressions then the instructions,
   // to avoid being unable to fetch the metadata (the types of parameters) of
   // instructions after they are renamed.
@@ -1151,31 +1276,30 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
 
   // Behavior expressions
   for (auto&& eventsFunction : behaviorEventsFunctions.GetInternalVector()) {
-    if (eventsFunction->GetFunctionType() == gd::EventsFunction::Expression ||
-        eventsFunction->GetFunctionType() ==
-            gd::EventsFunction::StringExpression) {
+    if (eventsFunction->IsExpression()) {
       renameBehaviorEventsFunction(*eventsFunction);
     }
   }
 
   // Behavior instructions
   for (auto&& eventsFunction : behaviorEventsFunctions.GetInternalVector()) {
-    if (eventsFunction->GetFunctionType() == gd::EventsFunction::Action ||
-        eventsFunction->GetFunctionType() == gd::EventsFunction::Condition) {
+    if (eventsFunction->IsAction() || eventsFunction->IsCondition()) {
       renameBehaviorEventsFunction(*eventsFunction);
     }
   }
 
   // Behavior properties
-  auto& properties = eventsBasedBehavior.GetPropertyDescriptors();
-  for (auto&& property : properties.GetInternalVector()) {
+  for (auto&& property : eventsBasedBehavior.GetPropertyDescriptors().GetInternalVector()) {
     renameBehaviorProperty(*property);
   }
+  for (auto&& property : eventsBasedBehavior.GetSharedPropertyDescriptors().GetInternalVector()) {
+    renameBehaviorSharedProperty(*property);
+  }
 
   DoRenameBehavior(
       project,
-      GetBehaviorFullType(eventsFunctionsExtension.GetName(), oldBehaviorName),
-      GetBehaviorFullType(eventsFunctionsExtension.GetName(), newBehaviorName));
+      gd::PlatformExtension::GetBehaviorFullType(eventsFunctionsExtension.GetName(), oldBehaviorName),
+      gd::PlatformExtension::GetBehaviorFullType(eventsFunctionsExtension.GetName(), newBehaviorName));
 }
 
 void WholeProjectRefactorer::RenameEventsBasedObject(
@@ -1197,25 +1321,22 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
        &eventsFunctionsExtension,
        &oldObjectName,
        &newObjectName](const gd::EventsFunction& eventsFunction) {
-        if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
-            eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
+        if (eventsFunction.IsExpression()) {
+          // Nothing to do, expressions are not including the name of the
+          // object
+        }
+        if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
           gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
               project,
-              GetObjectEventsFunctionFullType(
+              gd::PlatformExtension::GetObjectEventsFunctionFullType(
                   eventsFunctionsExtension.GetName(),
                   oldObjectName,
                   eventsFunction.GetName()),
-              GetObjectEventsFunctionFullType(
+              gd::PlatformExtension::GetObjectEventsFunctionFullType(
                   eventsFunctionsExtension.GetName(),
                   newObjectName,
                   eventsFunction.GetName()));
           ExposeProjectEvents(project, renamer);
-        } else if (eventsFunction.GetFunctionType() ==
-                       gd::EventsFunction::Expression ||
-                   eventsFunction.GetFunctionType() ==
-                       gd::EventsFunction::StringExpression) {
-          // Nothing to do, expressions are not including the name of the
-          // object
         }
       };
 
@@ -1227,11 +1348,11 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
                                         property) {
     gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
         project,
-        GetObjectEventsFunctionFullType(
+        gd::PlatformExtension::GetObjectEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             oldObjectName,
             EventsBasedObject::GetPropertyActionName(property.GetName())),
-        GetObjectEventsFunctionFullType(
+        gd::PlatformExtension::GetObjectEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             newObjectName,
             EventsBasedObject::GetPropertyActionName(property.GetName())));
@@ -1239,11 +1360,11 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
 
     gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
         project,
-        GetObjectEventsFunctionFullType(
+        gd::PlatformExtension::GetObjectEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             oldObjectName,
             EventsBasedObject::GetPropertyConditionName(property.GetName())),
-        GetObjectEventsFunctionFullType(
+        gd::PlatformExtension::GetObjectEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             newObjectName,
             EventsBasedObject::GetPropertyConditionName(property.GetName())));
@@ -1260,17 +1381,14 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
 
   // Object expressions
   for (auto&& eventsFunction : objectEventsFunctions.GetInternalVector()) {
-    if (eventsFunction->GetFunctionType() == gd::EventsFunction::Expression ||
-        eventsFunction->GetFunctionType() ==
-            gd::EventsFunction::StringExpression) {
+    if (eventsFunction->IsExpression()) {
       renameObjectEventsFunction(*eventsFunction);
     }
   }
 
   // Object instructions
   for (auto&& eventsFunction : objectEventsFunctions.GetInternalVector()) {
-    if (eventsFunction->GetFunctionType() == gd::EventsFunction::Action ||
-        eventsFunction->GetFunctionType() == gd::EventsFunction::Condition) {
+    if (eventsFunction->IsAction() || eventsFunction->IsCondition()) {
       renameObjectEventsFunction(*eventsFunction);
     }
   }
@@ -1283,8 +1401,8 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
 
   DoRenameObject(
       project,
-      GetObjectFullType(eventsFunctionsExtension.GetName(), oldObjectName),
-      GetObjectFullType(eventsFunctionsExtension.GetName(), newObjectName));
+      gd::PlatformExtension::GetObjectFullType(eventsFunctionsExtension.GetName(), oldObjectName),
+      gd::PlatformExtension::GetObjectFullType(eventsFunctionsExtension.GetName(), newObjectName));
 }
 
 void WholeProjectRefactorer::DoRenameEventsFunction(
@@ -1292,20 +1410,20 @@ void WholeProjectRefactorer::DoRenameEventsFunction(
     const gd::EventsFunction& eventsFunction,
     const gd::String& oldFullType,
     const gd::String& newFullType) {
-  if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
-      eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
-    gd::InstructionsTypeRenamer renamer =
-        gd::InstructionsTypeRenamer(project, oldFullType, newFullType);
-    ExposeProjectEvents(project, renamer);
-  } else if (eventsFunction.GetFunctionType() ==
-                 gd::EventsFunction::Expression ||
-             eventsFunction.GetFunctionType() ==
-                 gd::EventsFunction::StringExpression) {
+  // Order is important: we first rename the expressions then the instructions,
+  // to avoid being unable to fetch the metadata (the types of parameters) of
+  // instructions after they are renamed.
+  if (eventsFunction.IsExpression()) {
     gd::ExpressionsRenamer renamer =
         gd::ExpressionsRenamer(project.GetCurrentPlatform());
     renamer.SetReplacedFreeExpression(oldFullType, newFullType);
     ExposeProjectEvents(project, renamer);
   }
+  if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
+    gd::InstructionsTypeRenamer renamer =
+        gd::InstructionsTypeRenamer(project, oldFullType, newFullType);
+    ExposeProjectEvents(project, renamer);
+  }
 }
 
 void WholeProjectRefactorer::DoRenameBehavior(

Core/GDCore/IDE/WholeProjectRefactorer.h

@@ -207,6 +207,21 @@ class GD_CORE_API WholeProjectRefactorer {
       const gd::String& oldPropertyName,
       const gd::String& newPropertyName);
 
+  /**
+   * \brief Refactor the project **before** a shared property of a behavior is
+   * renamed.
+   *
+   * \warning Do the renaming of the specified shared property after calling
+   * this. This is because the shared property is expected to have its old name
+   * for the refactoring.
+   */
+  static void RenameEventsBasedBehaviorSharedProperty(
+      gd::Project& project,
+      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
+      const gd::EventsBasedBehavior& eventsBasedBehavior,
+      const gd::String& oldPropertyName,
+      const gd::String& newPropertyName);
+
   /**
    * \brief Refactor the project **before** a property of an object is
    * renamed.

Core/GDCore/Project/AbstractEventsBasedEntity.cpp

@@ -10,8 +10,10 @@
 
 namespace gd {
 
-AbstractEventsBasedEntity::AbstractEventsBasedEntity(const gd::String& _name)
-    : name(_name), fullName("") {}
+AbstractEventsBasedEntity::AbstractEventsBasedEntity(
+    const gd::String& _name,
+    gd::EventsFunctionsContainer::FunctionOwner functionContainerSource)
+    : name(_name), fullName(""), eventsFunctionsContainer(functionContainerSource) {}
 
 void AbstractEventsBasedEntity::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("description", description);

Core/GDCore/Project/AbstractEventsBasedEntity.h

@@ -29,7 +29,9 @@ namespace gd {
  */
 class GD_CORE_API AbstractEventsBasedEntity {
  public:
-  AbstractEventsBasedEntity(const gd::String& _name);
+  AbstractEventsBasedEntity(
+      const gd::String& _name,
+      gd::EventsFunctionsContainer::FunctionOwner functionContainerSource);
   virtual ~AbstractEventsBasedEntity(){};
 
   /**

Core/GDCore/Project/Behavior.h

@@ -13,7 +13,8 @@ namespace gd {
 
 /**
  * \brief Base class used to represents a behavior that can be applied to an
- * object. It stores the content (i.e: the properties) of a behavior of an object.
+ * object. It stores the content (i.e: the properties) of a behavior of an object
+ * and forward the properties related functions to Javascript with Emscripten.
  *
  * \see gd::BehaviorsSharedData
  * \see gd::Object

Core/GDCore/Project/CustomBehavior.cpp

@@ -11,6 +11,7 @@
 #include "GDCore/Project/PropertyDescriptor.h"
 #include "GDCore/Serialization/Serializer.h"
 #include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/Project/CustomConfigurationHelper.h"
 
 #include <map>
 
@@ -21,52 +22,26 @@ CustomBehavior *CustomBehavior::Clone() const {
   return clone;
 }
 
+void CustomBehavior::InitializeContent(gd::SerializerElement &behaviorContent) {
+  if (!project.HasEventsBasedBehavior(GetTypeName())) {
+    return;
+  }
+  const auto &eventsBasedBehavior = project.GetEventsBasedBehavior(GetTypeName());
+  const auto &properties = eventsBasedBehavior.GetPropertyDescriptors();
+
+  gd::CustomConfigurationHelper::InitializeContent(properties, behaviorContent);
+}
+
 std::map<gd::String, gd::PropertyDescriptor> CustomBehavior::GetProperties(
     const gd::SerializerElement &behaviorContent) const {
-  auto behaviorProperties = std::map<gd::String, gd::PropertyDescriptor>();
   if (!project.HasEventsBasedBehavior(GetTypeName())) {
+    auto behaviorProperties = std::map<gd::String, gd::PropertyDescriptor>();
     return behaviorProperties;
   }
   const auto &eventsBasedBehavior = project.GetEventsBasedBehavior(GetTypeName());
   const auto &properties = eventsBasedBehavior.GetPropertyDescriptors();
 
-  for (auto &property : properties.GetInternalVector()) {
-    const auto &propertyName = property->GetName();
-    const auto &propertyType = property->GetType();
-
-    // TODO Move this into a PropertyDescriptor copy method.
-    auto &newProperty = behaviorProperties[propertyName]
-                            .SetType(property->GetType())
-                            .SetDescription(property->GetDescription())
-                            .SetGroup(property->GetGroup())
-                            .SetLabel(property->GetLabel())
-                            .SetValue(property->GetValue())
-                            .SetHidden(property->IsHidden());
-
-    for (auto &extraInfo : property->GetExtraInfo()) {
-      newProperty.AddExtraInfo(extraInfo);
-    }
-
-    if (behaviorContent.HasChild(propertyName)) {
-      if (propertyType == "String" || propertyType == "Choice" ||
-          propertyType == "Color" || propertyType == "Behavior") {
-        newProperty.SetValue(
-            behaviorContent.GetChild(propertyName).GetStringValue());
-      } else if (propertyType == "Number") {
-        newProperty.SetValue(gd::String::From(
-            behaviorContent.GetChild(propertyName).GetDoubleValue()));
-      } else if (propertyType == "Boolean") {
-        newProperty.SetValue(
-            behaviorContent.GetChild(propertyName).GetBoolValue() ? "true"
-                                                                  : "false");
-      }
-    } else {
-      // No value was serialized for this property. `newProperty`
-      // will have the default value coming from `enumeratedProperty`.
-    }
-  }
-
-  return behaviorProperties;
+  return gd::CustomConfigurationHelper::GetProperties(properties, behaviorContent);
 }
 
 bool CustomBehavior::UpdateProperty(gd::SerializerElement &behaviorContent,
@@ -77,43 +52,10 @@ bool CustomBehavior::UpdateProperty(gd::SerializerElement &behaviorContent,
   }
   const auto &eventsBasedBehavior = project.GetEventsBasedBehavior(GetTypeName());
   const auto &properties = eventsBasedBehavior.GetPropertyDescriptors();
-  if (!properties.Has(propertyName)) {
-    return false;
-  }
-  const auto &property = properties.Get(propertyName);
 
-  auto &element = behaviorContent.AddChild(propertyName);
-  const gd::String &propertyType = property.GetType();
-
-  if (propertyType == "String" || propertyType == "Choice" ||
-      propertyType == "Color" || propertyType == "Behavior") {
-    element.SetStringValue(newValue);
-  } else if (propertyType == "Number") {
-    element.SetDoubleValue(newValue.To<double>());
-  } else if (propertyType == "Boolean") {
-    element.SetBoolValue(newValue == "1");
-  }
-
-  return true;
-}
-
-void CustomBehavior::InitializeContent(gd::SerializerElement &behaviorContent) {
-  if (!project.HasEventsBasedBehavior(GetTypeName())) {
-    return;
-  }
-  const auto &eventsBasedBehavior = project.GetEventsBasedBehavior(GetTypeName());
-  const auto &properties = eventsBasedBehavior.GetPropertyDescriptors();
-  for (auto &&property : properties.GetInternalVector()) {
-    auto &element = behaviorContent.AddChild(property->GetName());
-    auto propertyType = property->GetType();
-
-    if (propertyType == "String" || propertyType == "Choice" ||
-        propertyType == "Color" || propertyType == "Behavior") {
-      element.SetStringValue(property->GetValue());
-    } else if (propertyType == "Number") {
-      element.SetDoubleValue(property->GetValue().To<double>());
-    } else if (propertyType == "Boolean") {
-      element.SetBoolValue(property->GetValue() == "true");
-    }
-  }
+  return gd::CustomConfigurationHelper::UpdateProperty(
+      properties,
+      behaviorContent,
+      propertyName,
+      newValue);
 }

Core/GDCore/Project/CustomBehavior.h

@@ -17,8 +17,7 @@ using namespace gd;
 
 namespace gd {
 /**
- * \brief A gd::Behavior that stores its content in JSON and forward the
- * properties related functions to Javascript with Emscripten.
+ * \brief A gd::Behavior that stores its content in JSON.
  */
 class CustomBehavior : public gd::Behavior {
 public:
@@ -34,13 +33,11 @@ public:
   using Behavior::UpdateProperty;
 
 protected:
-  virtual std::map<gd::String, gd::PropertyDescriptor>
+  std::map<gd::String, gd::PropertyDescriptor>
   GetProperties(const gd::SerializerElement &behaviorContent) const override;
-  virtual bool UpdateProperty(gd::SerializerElement &behaviorContent,
-                              const gd::String &name,
-                              const gd::String &value) override;
-  virtual void
-  InitializeContent(gd::SerializerElement &behaviorContent) override;
+  bool UpdateProperty(gd::SerializerElement &behaviorContent,
+                      const gd::String &name, const gd::String &value) override;
+  void InitializeContent(gd::SerializerElement &behaviorContent) override;
 
 private:
   const Project &project; ///< The project is used to get the

Core/GDCore/Project/CustomBehaviorsSharedData.cpp

@@ -0,0 +1,61 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "CustomBehaviorsSharedData.h"
+
+#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/PropertyDescriptor.h"
+#include "GDCore/Serialization/Serializer.h"
+#include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/Project/CustomConfigurationHelper.h"
+
+#include <map>
+
+using namespace gd;
+
+CustomBehaviorsSharedData *CustomBehaviorsSharedData::Clone() const {
+  CustomBehaviorsSharedData *clone = new CustomBehaviorsSharedData(*this);
+  return clone;
+}
+
+void CustomBehaviorsSharedData::InitializeContent(gd::SerializerElement &behaviorContent) {
+  if (!project.HasEventsBasedBehavior(GetTypeName())) {
+    return;
+  }
+  const auto &eventsBasedBehavior = project.GetEventsBasedBehavior(GetTypeName());
+  const auto &properties = eventsBasedBehavior.GetSharedPropertyDescriptors();
+
+  gd::CustomConfigurationHelper::InitializeContent(properties, behaviorContent);
+}
+
+std::map<gd::String, gd::PropertyDescriptor> CustomBehaviorsSharedData::GetProperties(
+    const gd::SerializerElement &behaviorContent) const {
+  if (!project.HasEventsBasedBehavior(GetTypeName())) {
+    auto behaviorProperties = std::map<gd::String, gd::PropertyDescriptor>();
+    return behaviorProperties;
+  }
+  const auto &eventsBasedBehavior = project.GetEventsBasedBehavior(GetTypeName());
+  const auto &properties = eventsBasedBehavior.GetSharedPropertyDescriptors();
+
+  return gd::CustomConfigurationHelper::GetProperties(properties, behaviorContent);
+}
+
+bool CustomBehaviorsSharedData::UpdateProperty(gd::SerializerElement &behaviorContent,
+                                    const gd::String &propertyName,
+                                    const gd::String &newValue) {
+  if (!project.HasEventsBasedBehavior(GetTypeName())) {
+    return false;
+  }
+  const auto &eventsBasedBehavior = project.GetEventsBasedBehavior(GetTypeName());
+  const auto &properties = eventsBasedBehavior.GetSharedPropertyDescriptors();
+
+  return gd::CustomConfigurationHelper::UpdateProperty(
+      properties,
+      behaviorContent,
+      propertyName,
+      newValue);
+}

Core/GDCore/Project/CustomBehaviorsSharedData.h

@@ -0,0 +1,46 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_CUSTOMBEHAVIORSSHAREDDATA_H
+#define GDCORE_CUSTOMBEHAVIORSSHAREDDATA_H
+
+#include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/PropertyDescriptor.h"
+#include "GDCore/Serialization/Serializer.h"
+#include "GDCore/Serialization/SerializerElement.h"
+
+using namespace gd;
+
+namespace gd {
+/**
+ * \brief A gd::BehaviorsSharedData that stores its content in JSON.
+ */
+class CustomBehaviorsSharedData : public gd::BehaviorsSharedData {
+public:
+  CustomBehaviorsSharedData(const gd::String &name, const Project &project_,
+                            const gd::String &fullType)
+      : BehaviorsSharedData(name, fullType), project(project_) {}
+  CustomBehaviorsSharedData *Clone() const override;
+
+  using BehaviorsSharedData::GetProperties;
+  using BehaviorsSharedData::InitializeContent;
+  using BehaviorsSharedData::UpdateProperty;
+
+protected:
+  std::map<gd::String, gd::PropertyDescriptor>
+  GetProperties(const gd::SerializerElement &behaviorContent) const override;
+  bool UpdateProperty(gd::SerializerElement &behaviorContent,
+                      const gd::String &name, const gd::String &value) override;
+  void InitializeContent(gd::SerializerElement &behaviorContent) override;
+
+private:
+  const Project &project; ///< The project is used to get the
+                          ///< EventBasedBehavior from the fullType.
+};
+} // namespace gd
+
+#endif // GDCORE_CUSTOMBEHAVIORSSHAREDDATA_H

Core/GDCore/Project/CustomConfigurationHelper.cpp

@@ -0,0 +1,104 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "CustomConfigurationHelper.h"
+
+#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/PropertyDescriptor.h"
+#include "GDCore/Serialization/Serializer.h"
+#include "GDCore/Serialization/SerializerElement.h"
+
+#include <map>
+
+using namespace gd;
+
+void CustomConfigurationHelper::InitializeContent(
+    const gd::SerializableWithNameList<gd::NamedPropertyDescriptor> &properties,
+    gd::SerializerElement &configurationContent) {
+  for (auto &&property : properties.GetInternalVector()) {
+    auto &element = configurationContent.AddChild(property->GetName());
+    auto propertyType = property->GetType();
+
+    if (propertyType == "String" || propertyType == "Choice" ||
+        propertyType == "Color" || propertyType == "Behavior") {
+      element.SetStringValue(property->GetValue());
+    } else if (propertyType == "Number") {
+      element.SetDoubleValue(property->GetValue().To<double>());
+    } else if (propertyType == "Boolean") {
+      element.SetBoolValue(property->GetValue() == "true");
+    }
+  }
+}
+
+std::map<gd::String, gd::PropertyDescriptor> CustomConfigurationHelper::GetProperties(
+    const gd::SerializableWithNameList<gd::NamedPropertyDescriptor> &properties,
+    const gd::SerializerElement &configurationContent) {
+  auto behaviorProperties = std::map<gd::String, gd::PropertyDescriptor>();
+
+  for (auto &property : properties.GetInternalVector()) {
+    const auto &propertyName = property->GetName();
+    const auto &propertyType = property->GetType();
+
+    // TODO Move this into a PropertyDescriptor copy method.
+    auto &newProperty = behaviorProperties[propertyName]
+                            .SetType(property->GetType())
+                            .SetDescription(property->GetDescription())
+                            .SetGroup(property->GetGroup())
+                            .SetLabel(property->GetLabel())
+                            .SetValue(property->GetValue())
+                            .SetHidden(property->IsHidden());
+
+    for (auto &extraInfo : property->GetExtraInfo()) {
+      newProperty.AddExtraInfo(extraInfo);
+    }
+
+    if (configurationContent.HasChild(propertyName)) {
+      if (propertyType == "String" || propertyType == "Choice" ||
+          propertyType == "Color" || propertyType == "Behavior") {
+        newProperty.SetValue(
+            configurationContent.GetChild(propertyName).GetStringValue());
+      } else if (propertyType == "Number") {
+        newProperty.SetValue(gd::String::From(
+            configurationContent.GetChild(propertyName).GetDoubleValue()));
+      } else if (propertyType == "Boolean") {
+        newProperty.SetValue(
+            configurationContent.GetChild(propertyName).GetBoolValue() ? "true"
+                                                                  : "false");
+      }
+    } else {
+      // No value was serialized for this property. `newProperty`
+      // will have the default value coming from `enumeratedProperty`.
+    }
+  }
+
+  return behaviorProperties;
+}
+
+bool CustomConfigurationHelper::UpdateProperty(
+    const gd::SerializableWithNameList<gd::NamedPropertyDescriptor> &properties,
+    gd::SerializerElement &configurationContent,
+    const gd::String &propertyName,
+    const gd::String &newValue) {
+  if (!properties.Has(propertyName)) {
+    return false;
+  }
+  const auto &property = properties.Get(propertyName);
+
+  auto &element = configurationContent.AddChild(propertyName);
+  const gd::String &propertyType = property.GetType();
+
+  if (propertyType == "String" || propertyType == "Choice" ||
+      propertyType == "Color" || propertyType == "Behavior") {
+    element.SetStringValue(newValue);
+  } else if (propertyType == "Number") {
+    element.SetDoubleValue(newValue.To<double>());
+  } else if (propertyType == "Boolean") {
+    element.SetBoolValue(newValue == "1");
+  }
+
+  return true;
+}

Core/GDCore/Project/CustomConfigurationHelper.h

@@ -0,0 +1,43 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_CUSTOMCONFIGURATIONHELPER_H
+#define GDCORE_CUSTOMCONFIGURATIONHELPER_H
+
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/PropertyDescriptor.h"
+#include "GDCore/Serialization/Serializer.h"
+#include "GDCore/Serialization/SerializerElement.h"
+
+using namespace gd;
+
+namespace gd {
+/**
+ * \brief Helper functions that gd::CustomBehavior and gd::CustomBehaviorsSharedData use to
+ * store their content in JSON.
+ */
+class CustomConfigurationHelper {
+public:
+  CustomConfigurationHelper() {}
+
+  static void InitializeContent(
+      const gd::SerializableWithNameList<gd::NamedPropertyDescriptor> &properties,
+      gd::SerializerElement &behaviorContent);
+
+  static std::map<gd::String, gd::PropertyDescriptor> GetProperties(
+      const gd::SerializableWithNameList<gd::NamedPropertyDescriptor> &properties,
+      const gd::SerializerElement &behaviorContent);
+
+  static bool UpdateProperty(
+      const gd::SerializableWithNameList<gd::NamedPropertyDescriptor> &properties,
+      gd::SerializerElement &behaviorContent,
+      const gd::String &name,
+      const gd::String &value);
+};
+}  // namespace gd
+
+#endif  // GDCORE_CUSTOMCONFIGURATIONHELPER_H

Core/GDCore/Project/CustomObjectConfiguration.cpp

@@ -12,6 +12,7 @@
 #include "GDCore/Serialization/Serializer.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Tools/Log.h"
+#include "GDCore/Project/CustomConfigurationHelper.h"
 
 using namespace gd;
 
@@ -67,50 +68,7 @@ std::map<gd::String, gd::PropertyDescriptor> CustomObjectConfiguration::GetPrope
     const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
     const auto &properties = eventsBasedObject.GetPropertyDescriptors();
 
-    for (auto &property : properties.GetInternalVector()) {
-      const auto &propertyName = property->GetName();
-      const auto &propertyType = property->GetType();
-
-      // TODO Move this into a PropertyDescriptor copy method.
-      auto &newProperty = objectProperties[propertyName]
-            .SetType(property->GetType())
-            .SetDescription(property->GetDescription())
-            .SetGroup(property->GetGroup())
-            .SetLabel(property->GetLabel())
-            .SetValue(property->GetValue())
-            .SetHidden(property->IsHidden());
-      
-      for (auto &extraInfo : property->GetExtraInfo()) {
-        newProperty.AddExtraInfo(extraInfo);
-      }
-
-      if (objectContent.HasChild(propertyName)) {
-        if (
-          propertyType == "String" ||
-          propertyType == "Choice" ||
-          propertyType == "Color"
-        ) {
-          newProperty.SetValue(
-            objectContent.GetChild(propertyName).GetStringValue()
-          );
-        } else if (propertyType == "Number") {
-          newProperty.SetValue(
-            gd::String::From(objectContent.GetChild(propertyName).GetDoubleValue())
-          );
-        } else if (propertyType == "Boolean") {
-          newProperty.SetValue(
-            objectContent.GetChild(propertyName).GetBoolValue()
-              ? "true"
-              : "false"
-          );
-        }
-      } else {
-        // No value was serialized for this property. `newProperty`
-        // will have the default value coming from `enumeratedProperty`.
-      }
-    }
-
-    return objectProperties;
+    return gd::CustomConfigurationHelper::GetProperties(properties, objectContent);
 }
 
 bool CustomObjectConfiguration::UpdateProperty(const gd::String& propertyName,
@@ -120,27 +78,12 @@ bool CustomObjectConfiguration::UpdateProperty(const gd::String& propertyName,
     }
     const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
     const auto &properties = eventsBasedObject.GetPropertyDescriptors();
-    if (!properties.Has(propertyName)) {
-      return false;
-    }
-    const auto &property = properties.Get(propertyName);
-
-    auto &element = objectContent.AddChild(propertyName);
-    const gd::String &propertyType = property.GetType();
-
-    if (
-      propertyType == "String" ||
-      propertyType == "Choice" ||
-      propertyType == "Color"
-    ) {
-      element.SetStringValue(newValue);
-    } else if (propertyType == "Number") {
-      element.SetDoubleValue(newValue.To<double>());
-    } else if (propertyType == "Boolean") {
-      element.SetBoolValue(newValue == "1");
-    }
-
-    return true;
+    
+    return gd::CustomConfigurationHelper::UpdateProperty(
+        properties,
+        objectContent,
+        propertyName,
+        newValue);
 }
 
 std::map<gd::String, gd::PropertyDescriptor>

Core/GDCore/Project/EventsBasedBehavior.cpp

@@ -11,17 +11,27 @@
 namespace gd {
 
 EventsBasedBehavior::EventsBasedBehavior()
-    : AbstractEventsBasedEntity("MyBehavior") {}
+    : AbstractEventsBasedEntity(
+        "MyBehavior",
+        gd::EventsFunctionsContainer::FunctionOwner::Behavior) {}
 
 void EventsBasedBehavior::SerializeTo(SerializerElement& element) const {
   AbstractEventsBasedEntity::SerializeTo(element);
   element.SetAttribute("objectType", objectType);
+  if (isPrivate) {
+    element.SetBoolAttribute("private", isPrivate);
+  }
+  sharedPropertyDescriptors.SerializeElementsTo(
+      "propertyDescriptor", element.AddChild("sharedPropertyDescriptors"));
 }
 
 void EventsBasedBehavior::UnserializeFrom(gd::Project& project,
                                           const SerializerElement& element) {
   AbstractEventsBasedEntity::UnserializeFrom(project, element);
   objectType = element.GetStringAttribute("objectType");
+  isPrivate = element.GetBoolAttribute("private");
+  sharedPropertyDescriptors.UnserializeElementsFrom(
+      "propertyDescriptor", element.GetChild("sharedPropertyDescriptors"));
 }
 
 }  // namespace gd

Core/GDCore/Project/EventsBasedBehavior.h

@@ -73,6 +73,58 @@ class GD_CORE_API EventsBasedBehavior: public AbstractEventsBasedEntity {
     return *this;
   }
 
+  /**
+   * \brief Check if the behavior is private - it can't be used outside of its
+   * extension.
+   */
+  bool IsPrivate() { return isPrivate; }
+
+  /**
+   * \brief Set that the behavior is private - it can't be used outside of its
+   * extension.
+   */
+  EventsBasedBehavior& SetPrivate(bool _isPrivate) {
+    isPrivate = _isPrivate;
+    return *this;
+  }
+
+  /**
+   * \brief Return a reference to the list of shared properties.
+   */
+  SerializableWithNameList<NamedPropertyDescriptor>& GetSharedPropertyDescriptors() {
+    return sharedPropertyDescriptors;
+  }
+
+  /**
+   * \brief Return a const reference to the list of shared properties.
+   */
+  const SerializableWithNameList<NamedPropertyDescriptor>& GetSharedPropertyDescriptors()
+      const {
+    return sharedPropertyDescriptors;
+  }
+
+  /**
+   * \brief Get the name of the action to change a shared property.
+   */
+  static gd::String GetSharedPropertyActionName(const gd::String &propertyName) {
+    return "SetSharedProperty" + propertyName;
+  };
+
+  /**
+   * \brief Get the name of the condition to compare a shared property.
+   */
+  static gd::String GetSharedPropertyConditionName(const gd::String &propertyName) {
+    return "SharedProperty" + propertyName;
+  };
+
+  /**
+   * \brief Get the name of the expression to get a shared property.
+   */
+  static gd::String
+  GetSharedPropertyExpressionName(const gd::String &propertyName) {
+    return "SharedProperty" + propertyName;
+  };
+
   void SerializeTo(SerializerElement& element) const override;
 
   void UnserializeFrom(gd::Project& project,
@@ -80,6 +132,8 @@ class GD_CORE_API EventsBasedBehavior: public AbstractEventsBasedEntity {
 
  private:
   gd::String objectType;
+  bool isPrivate = false;
+  SerializableWithNameList<NamedPropertyDescriptor> sharedPropertyDescriptors;
 };
 
 }  // namespace gd

Core/GDCore/Project/EventsBasedObject.cpp

@@ -10,7 +10,10 @@
 namespace gd {
 
 EventsBasedObject::EventsBasedObject()
-    : AbstractEventsBasedEntity("MyObject"), ObjectsContainer() {
+    : AbstractEventsBasedEntity(
+        "MyObject",
+        gd::EventsFunctionsContainer::FunctionOwner::Object),
+    ObjectsContainer() {
 }
 
 EventsBasedObject::~EventsBasedObject() {}

Core/GDCore/Project/EventsFunction.cpp

@@ -7,29 +7,96 @@
 #include "EventsFunction.h"
 #include <vector>
 #include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/Project/EventsFunctionsContainer.h"
+#include "GDCore/Extensions/Metadata/ParameterMetadata.h"
 
 namespace gd {
 
-EventsFunction::EventsFunction() : functionType(Action) {}
+EventsFunction::EventsFunction() : functionType(Action) {
+  expressionType.SetName("expression");
+}
+
+const std::vector<gd::ParameterMetadata>& EventsFunction::GetParametersForEvents(
+    const gd::EventsFunctionsContainer& functionsContainer) const {
+  if (functionType != FunctionType::ActionWithOperator) {
+    // For most function types, the parameters are specified in the function.
+    return parameters;
+  }
+  // For ActionWithOperator, the parameters are auto generated.
+  actionWithOperationParameters.clear();
+  if (!functionsContainer.HasEventsFunctionNamed(getterName)) {
+    return actionWithOperationParameters;
+  }
+  const auto& expression = functionsContainer.GetEventsFunction(getterName);
+  const auto& expressionParameters = expression.parameters;
+  const auto functionsSource = functionsContainer.GetOwner();
+  const int expressionValueParameterIndex =
+      functionsSource == gd::EventsFunctionsContainer::FunctionOwner::Behavior ?
+      2 : 
+      functionsSource == gd::EventsFunctionsContainer::FunctionOwner::Object ?
+      1 :
+      0;
+  
+  for (size_t i = 0;
+       i < expressionValueParameterIndex && i < expressionParameters.size();
+       i++)
+  {
+    actionWithOperationParameters.push_back(expressionParameters[i]);
+  }
+  gd::ParameterMetadata parameterMetadata;
+  parameterMetadata.SetName("Value").SetValueTypeMetadata(expression.expressionType);
+  actionWithOperationParameters.push_back(parameterMetadata);
+  for (size_t i = expressionValueParameterIndex;
+       i < expressionParameters.size();
+       i++)
+  {
+    actionWithOperationParameters.push_back(expressionParameters[i]);
+  }
+
+  return actionWithOperationParameters;
+}
 
 void EventsFunction::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", name);
   element.SetAttribute("fullName", fullName);
-  element.SetAttribute("description", description);
+  if (!description.empty()) {
+    element.SetAttribute("description", description);
+  }
   element.SetAttribute("sentence", sentence);
-  element.SetAttribute("group", group);
-  element.SetBoolAttribute("private", isPrivate);
+  if (!group.empty()) {
+    element.SetAttribute("group", group);
+  }
+  if (!getterName.empty()) {
+    element.SetAttribute("getterName", getterName);
+  }
+  if (isPrivate) {
+    element.SetBoolAttribute("private", isPrivate);
+  }
   events.SerializeTo(element.AddChild("events"));
 
   gd::String functionTypeStr = "Action";
   if (functionType == Condition)
     functionTypeStr = "Condition";
-  else if (functionType == Expression)
+  else if (functionType == Expression) {
     functionTypeStr = "Expression";
-  else if (functionType == StringExpression)
-    functionTypeStr = "StringExpression";
+
+    // Compatibility code for version 5.1.147 and older.
+    // There is no longer distinction between number and string in the function
+    // type directly. The expression type is now used for this.
+    if (expressionType.IsString()) {
+      functionTypeStr = "StringExpression";
+    }
+  }
+  else if (functionType == ExpressionAndCondition) {
+    functionTypeStr = "ExpressionAndCondition";
+  }
+  else if (functionType == ActionWithOperator)
+    functionTypeStr = "ActionWithOperator";
   element.SetAttribute("functionType", functionTypeStr);
 
+  if (this->IsExpression()) {
+    expressionType.SerializeTo(element.AddChild("expressionType"));
+  }
   gd::SerializerElement& parametersElement = element.AddChild("parameters");
   parametersElement.ConsiderAsArrayOf("parameter");
   for (const auto& parameter : parameters) {
@@ -46,16 +113,32 @@ void EventsFunction::UnserializeFrom(gd::Project& project,
   description = element.GetStringAttribute("description");
   sentence = element.GetStringAttribute("sentence");
   group = element.GetStringAttribute("group");
+  getterName = element.GetStringAttribute("getterName");
   isPrivate = element.GetBoolAttribute("private");
   events.UnserializeFrom(project, element.GetChild("events"));
 
   gd::String functionTypeStr = element.GetStringAttribute("functionType");
+
   if (functionTypeStr == "Condition")
     functionType = Condition;
-  else if (functionTypeStr == "Expression")
+  else if (functionTypeStr == "Expression" || functionTypeStr == "StringExpression") {
     functionType = Expression;
-  else if (functionTypeStr == "StringExpression")
-    functionType = StringExpression;
+    if (element.HasChild("expressionType")) {
+      expressionType.UnserializeFrom(element.GetChild("expressionType"));
+    }
+    else {
+      // Compatibility code for version 5.1.147 and older.
+      // There is no longer distinction between number and string in the function
+      // type directly. The expression type is now used for this.
+      expressionType.SetName(functionTypeStr == "StringExpression" ? "string" : "expression");
+    }
+  }
+  else if (functionTypeStr == "ExpressionAndCondition") {
+    functionType = ExpressionAndCondition;
+    expressionType.UnserializeFrom(element.GetChild("expressionType"));
+  }
+  else if (functionTypeStr == "ActionWithOperator")
+    functionType = ActionWithOperator;
   else
     functionType = Action;
 

Core/GDCore/Project/EventsFunction.h

@@ -12,6 +12,7 @@
 #include "GDCore/Events/EventsList.h"
 #include "GDCore/Project/ObjectGroupsContainer.h"
 #include "GDCore/String.h"
+#include "GDCore/Extensions/Metadata/ValueTypeMetadata.h"
 // TODO: In theory (for separation of concerns between Project and
 // extensions/events), this include should be removed and gd::ParameterMetadata
 // replaced by a new gd::EventsFunctionParameter class.
@@ -19,6 +20,7 @@
 namespace gd {
 class SerializerElement;
 class Project;
+class EventsFunctionsContainer;
 }  // namespace gd
 
 namespace gd {
@@ -115,7 +117,45 @@ class GD_CORE_API EventsFunction {
     return *this;
   }
 
-  enum FunctionType { Action, Condition, Expression, StringExpression };
+  /**
+   * \brief Get the name of the ExpressionAndCondition to use as an operand
+   * that is defined in the editor.
+   */
+  const gd::String& GetGetterName() const { return getterName; };
+
+  /**
+   * \brief Set the name of the ExpressionAndCondition to use as an operand
+   * that is defined in the editor.
+   */
+  EventsFunction& SetGetterName(const gd::String& getterName_) {
+    getterName = getterName_;
+    return *this;
+  }
+
+  /**
+   * \brief Set the type of the expression
+   */
+  EventsFunction& SetExpressionType(const gd::ValueTypeMetadata& type) {
+    expressionType = type;
+    return *this;
+  }
+
+  /**
+   * \brief Get the type of the expression
+   */
+  const gd::ValueTypeMetadata& GetExpressionType() const { return expressionType; }
+
+  /**
+   * \brief Get the type of the expression
+   */
+  gd::ValueTypeMetadata& GetExpressionType() { return expressionType; }
+
+  enum FunctionType {
+      Action,
+      Condition,
+      Expression,
+      ExpressionAndCondition,
+      ActionWithOperator };
 
   /**
    * \brief Set the type of the function
@@ -123,12 +163,40 @@ class GD_CORE_API EventsFunction {
   EventsFunction& SetFunctionType(FunctionType type) {
     functionType = type;
     return *this;
-  };
+  }
 
   /**
    * \brief Get the type of the function
    */
-  FunctionType GetFunctionType() const { return functionType; };
+  FunctionType GetFunctionType() const { return functionType; }
+
+  /**
+   * \brief Return true if the function is an action.
+   */
+  bool IsAction() const {
+    return functionType == gd::EventsFunction::Action || 
+           functionType == gd::EventsFunction::ActionWithOperator;
+ }
+
+  /**
+   * \brief Return true if the function is an expression.
+   * 
+   * Note that a function can be both an expression and a condition.
+   */
+  bool IsExpression() const {
+    return functionType == gd::EventsFunction::Expression ||
+           functionType == gd::EventsFunction::ExpressionAndCondition;
+ }
+
+  /**
+   * \brief Return true if the function is a condition.
+   * 
+   * Note that a function can be both an expression and a condition.
+   */
+  bool IsCondition() const {
+    return functionType == gd::EventsFunction::Condition ||
+           functionType == gd::EventsFunction::ExpressionAndCondition;
+ }
 
   /**
    * \brief Returns true if the function is private.
@@ -154,7 +222,20 @@ class GD_CORE_API EventsFunction {
   gd::EventsList& GetEvents() { return events; };
 
   /**
-   * \brief Return the parameters of the function.
+   * \brief Return the parameters of the function that are used in the events.
+   *
+   * \note During code/extension generation, new parameters are added
+   * to the generated function, like "runtimeScene" and "eventsFunctionContext".
+   * This should be transparent to the user.
+   */
+  const std::vector<gd::ParameterMetadata>& GetParametersForEvents(
+      const gd::EventsFunctionsContainer& functionsContainer) const;
+
+  /**
+   * \brief Return the parameters of the function that are filled in the editor.
+   * 
+   * \note They won't be used for ActionWithOperator, but they need to be kept
+   * to avoid to loose them when the function type is changed.
    *
    * \note During code/extension generation, new parameters are added
    * to the generated function, like "runtimeScene" and "eventsFunctionContext".
@@ -202,9 +283,12 @@ class GD_CORE_API EventsFunction {
   gd::String description;
   gd::String sentence;
   gd::String group;
+  gd::String getterName;
+  gd::ValueTypeMetadata expressionType;
   gd::EventsList events;
   FunctionType functionType;
   std::vector<gd::ParameterMetadata> parameters;
+  mutable std::vector<gd::ParameterMetadata> actionWithOperationParameters;
   gd::ObjectGroupsContainer objectGroups;
   bool isPrivate = false;
 };

Core/GDCore/Project/EventsFunctionsContainer.h

@@ -25,7 +25,24 @@ namespace gd {
  */
 class GD_CORE_API EventsFunctionsContainer
     : private SerializableWithNameList<gd::EventsFunction> {
- public:
+public:
+  enum FunctionOwner {
+      Extension,
+      Object,
+      Behavior};
+
+  EventsFunctionsContainer(FunctionOwner source_) : owner(source_) {}
+
+  /**
+   * \brief Get the source of the function container.
+   * 
+   * \note For instance, it can be useful to handle specific parameters for
+   * behaviors.
+   */
+  FunctionOwner GetOwner() const {
+    return owner;
+  }
+
   /** \name Events Functions management
    */
   ///@{
@@ -139,6 +156,9 @@ class GD_CORE_API EventsFunctionsContainer
   void Init(const gd::EventsFunctionsContainer& other) {
     return SerializableWithNameList<gd::EventsFunction>::Init(other);
   };
+
+private:
+  FunctionOwner owner;
 };
 
 }  // namespace gd

Core/GDCore/Project/EventsFunctionsExtension.cpp

@@ -13,10 +13,14 @@
 
 namespace gd {
 
-EventsFunctionsExtension::EventsFunctionsExtension() {}
+EventsFunctionsExtension::EventsFunctionsExtension() :
+    gd::EventsFunctionsContainer(
+        gd::EventsFunctionsContainer::FunctionOwner::Extension) {}
 
 EventsFunctionsExtension::EventsFunctionsExtension(
-    const EventsFunctionsExtension& other) {
+    const EventsFunctionsExtension& other) :
+    gd::EventsFunctionsContainer(
+        gd::EventsFunctionsContainer::FunctionOwner::Extension) {
   Init(other);
 }
 
@@ -50,7 +54,7 @@ void EventsFunctionsExtension::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("version", version);
   element.SetAttribute("extensionNamespace", extensionNamespace);
   element.SetAttribute("shortDescription", shortDescription);
-  element.SetAttribute("description", description);
+  element.AddChild("description").SetMultilineStringValue(description);
   element.SetAttribute("name", name);
   element.SetAttribute("fullName", fullName);
   element.SetAttribute("category", category);
@@ -96,7 +100,7 @@ void EventsFunctionsExtension::UnserializeExtensionDeclarationFrom(
   version = element.GetStringAttribute("version");
   extensionNamespace = element.GetStringAttribute("extensionNamespace");
   shortDescription = element.GetStringAttribute("shortDescription");
-  description = element.GetStringAttribute("description");
+  description = element.GetChild("description").GetMultilineStringValue();
   name = element.GetStringAttribute("name");
   fullName = element.GetStringAttribute("fullName");
   category = element.GetStringAttribute("category");

Core/GDCore/Project/EventsFunctionsExtension.h

@@ -20,7 +20,9 @@ class Project;
 }  // namespace gd
 
 namespace gd {
-
+// TODO Remove the EventsFunctionsContainer inheritance and make it an attribute.
+// This will allow to get EventsFunctionsContainer the same way for extensions,
+// objects and behaviors.
 /**
  * \brief Hold a list of Events Functions (gd::EventsFunction) and Events Based
  * Behaviors.

Core/GDCore/Project/InitialInstancesContainer.h

@@ -244,6 +244,15 @@ class GD_CORE_API HighestZOrderFinder : public gd::InitialInstanceFunctor {
    */
   size_t GetInstancesCount() const { return instancesCount; }
 
+  void Reset() {
+    highestZOrder = 0;
+    lowestZOrder = 0;
+    instancesCount = 0;
+    firstCall = true;
+    layerRestricted = false;
+    layerName.clear();
+  }
+
  private:
   int highestZOrder;
   int lowestZOrder;

Core/GDCore/Project/Layout.cpp

@@ -17,6 +17,7 @@
 #include "GDCore/IDE/SceneNameMangler.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/Project/CustomBehaviorsSharedData.h"
 #include "GDCore/Project/InitialInstance.h"
 #include "GDCore/Project/Layer.h"
 #include "GDCore/Project/Object.h"
@@ -26,6 +27,7 @@
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/String.h"
 #include "GDCore/Tools/PolymorphicClone.h"
+#include "GDCore/Tools/Log.h"
 
 using namespace std;
 
@@ -240,11 +242,11 @@ void Layout::UpdateBehaviorsSharedData(gd::Project& project) {
   }
 }
 
-std::unique_ptr<gd::BehaviorsSharedData> Layout::CreateBehaviorsSharedData(gd::Project& project, const gd::String& name, const gd::String& behaviorsType) {
+std::unique_ptr<gd::BehaviorsSharedData> Layout::CreateBehaviorsSharedData(
+        gd::Project& project, const gd::String& name, const gd::String& behaviorsType) {
     if (project.HasEventsBasedBehavior(behaviorsType)) {
-      // Events based behaviors don't have shared data yet.
       auto sharedData =
-          gd::make_unique<gd::BehaviorsSharedData>(name, behaviorsType);
+          gd::make_unique<gd::CustomBehaviorsSharedData>(name, project, behaviorsType);
       sharedData->InitializeContent();
       return std::move(sharedData);
     }
@@ -253,7 +255,14 @@ std::unique_ptr<gd::BehaviorsSharedData> Layout::CreateBehaviorsSharedData(gd::P
             project.GetCurrentPlatform(),
             behaviorsType);
     if (gd::MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
-      return nullptr;
+      gd::LogWarning("Tried to create a behavior shared data with an unknown type: " +
+                     behaviorsType + " on object " + GetName() + "!");
+    // It's probably an events-based behavior that was removed.
+    // Create a custom behavior shared data to preserve the properties values.
+      auto sharedData =
+          gd::make_unique<gd::CustomBehaviorsSharedData>(name, project, behaviorsType);
+      sharedData->InitializeContent();
+      return std::move(sharedData);
     }
 
     gd::BehaviorsSharedData* behaviorsSharedDataBluePrint =

Core/GDCore/Project/MeasurementBaseUnit.cpp

@@ -0,0 +1,27 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "MeasurementBaseUnit.h"
+#include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/String.h"
+#include "GDCore/Tools/Localization.h"
+#include <vector>
+
+namespace gd {
+
+MeasurementBaseUnit::~MeasurementBaseUnit() {}
+
+const gd::MeasurementBaseUnit MeasurementBaseUnit::degreeAngle =
+    MeasurementBaseUnit("degree", "deg", "");
+const gd::MeasurementBaseUnit MeasurementBaseUnit::pixel =
+    MeasurementBaseUnit("pixel", "px", "distance");
+const gd::MeasurementBaseUnit MeasurementBaseUnit::meter =
+    MeasurementBaseUnit("meter", "m", "distance");
+const gd::MeasurementBaseUnit MeasurementBaseUnit::second =
+    MeasurementBaseUnit("second", "s", "time");
+const gd::MeasurementBaseUnit MeasurementBaseUnit::kilogram =
+    MeasurementBaseUnit("kilogram", "Kg", "mass");
+
+} // namespace gd

Core/GDCore/Project/MeasurementBaseUnit.h

@@ -0,0 +1,57 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_MEASUREMENTBASEUNIT
+#define GDCORE_MEASUREMENTBASEUNIT
+#include <vector>
+
+#include "GDCore/String.h"
+namespace gd {
+class SerializerElement;
+}
+
+namespace gd {
+
+/**
+ * \brief An atomic unit of measurement.
+ */
+class GD_CORE_API MeasurementBaseUnit {
+public:
+  MeasurementBaseUnit(gd::String name_, gd::String symbol_,
+                      gd::String quantity_)
+      : name(name_), symbol(symbol_), quantity(quantity_) {}
+
+  virtual ~MeasurementBaseUnit();
+
+  /**
+   * \brief Return the unit name.
+   */
+  const gd::String &GetName() const { return name; }
+
+  /**
+   * \brief Return the unit symbol.
+   */
+  const gd::String &GetSymbol() const { return symbol; }
+
+  /**
+   * \brief Return the physical quantity.
+   */
+  const gd::String &GetQuantity() const { return quantity; }
+
+  static const gd::MeasurementBaseUnit degreeAngle;
+  static const gd::MeasurementBaseUnit pixel;
+  static const gd::MeasurementBaseUnit meter;
+  static const gd::MeasurementBaseUnit second;
+  static const gd::MeasurementBaseUnit kilogram;
+
+private:
+  gd::String name;     ///< The unit name
+  gd::String symbol;   ///< The unit symbol
+  gd::String quantity; ///< The physical quantity
+};
+
+} // namespace gd
+
+#endif // GDCORE_MEASUREMENTBASEUNIT

Core/GDCore/Project/MeasurementUnit.cpp

@@ -0,0 +1,38 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "MeasurementUnit.h"
+#include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/String.h"
+#include <vector>
+
+namespace gd {
+
+MeasurementUnit::~MeasurementUnit() {}
+
+gd::MeasurementUnit MeasurementUnit::undefined = CreateUndefined();
+gd::MeasurementUnit MeasurementUnit::dimensionless = CreateDimensionless();
+gd::MeasurementUnit MeasurementUnit::degreeAngle = CreateDegreeAngle();
+gd::MeasurementUnit MeasurementUnit::second = CreateSecond();
+gd::MeasurementUnit MeasurementUnit::pixel = CreatePixel();
+gd::MeasurementUnit MeasurementUnit::pixelSpeed = CreatePixelSpeed();
+gd::MeasurementUnit MeasurementUnit::pixelAcceleration =
+    CreatePixelAcceleration();
+gd::MeasurementUnit MeasurementUnit::newton = CreateNewton();
+gd::MeasurementUnit MeasurementUnit::angularSpeed = CreateAngularSpeed();
+
+void MeasurementUnit::ApplyTranslation() {
+  undefined = CreateUndefined();
+  dimensionless = CreateDimensionless();
+  degreeAngle = CreateDegreeAngle();
+  second = CreateSecond();
+  pixel = CreatePixel();
+  pixelSpeed = CreatePixelSpeed();
+  pixelAcceleration = CreatePixelAcceleration();
+  newton = CreateNewton();
+  angularSpeed = CreateAngularSpeed();
+}
+
+} // namespace gd

Core/GDCore/Project/MeasurementUnit.h

@@ -0,0 +1,197 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_MEASUREMENTUNIT
+#define GDCORE_MEASUREMENTUNIT
+#include <vector>
+
+#include "GDCore/Project/MeasurementUnitElement.h"
+#include "GDCore/String.h"
+#include "GDCore/Tools/Localization.h"
+
+namespace gd {
+class SerializerElement;
+class MeasurementBaseUnit;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief A unit of measurement.
+ */
+class GD_CORE_API MeasurementUnit {
+public:
+  MeasurementUnit(const std::vector<gd::MeasurementUnitElement> &elements_,
+                  gd::String name_, gd::String label_,
+                  gd::String elementsWithWords_, gd::String description_ = "")
+      : elements(elements_), name(name_), label(label_),
+        description(description_), elementsWithWords(elementsWithWords_) {}
+
+  MeasurementUnit(gd::String name_, gd::String label_,
+                  gd::String elementsWithWords_, gd::String description_ = "")
+      : name(name_), label(label_), description(description_),
+        elementsWithWords(elementsWithWords_) {}
+
+  virtual ~MeasurementUnit();
+
+  /**
+   * \brief Return the unit name.
+   */
+  const gd::String &GetName() const { return name; }
+
+  /**
+   * \brief Return the unit label.
+   */
+  const gd::String &GetLabel() const { return label; }
+
+  /**
+   * \brief Return the unit description.
+   */
+  const gd::String &GetDescription() const { return description; }
+
+  /**
+   * \brief Return the unit description.
+   */
+  const gd::String &GetElementsWithWords() const { return elementsWithWords; }
+
+  /**
+   * \brief Return the unit elements.
+   */
+  const std::vector<gd::MeasurementUnitElement> &GetElements() const {
+    return elements;
+  }
+
+  std::size_t GetElementsCount() const { return elements.size(); }
+
+  int GetElementPower(std::size_t elementIndex) const {
+    return elements.at(elementIndex).GetPower();
+  }
+
+  const gd::MeasurementBaseUnit &
+  GetElementBaseUnit(std::size_t elementIndex) const {
+    return elements.at(elementIndex).GetBaseUnit();
+  }
+
+  bool IsUndefined() const { return this == &gd::MeasurementUnit::undefined; }
+
+  static void ApplyTranslation();
+
+  static gd::MeasurementUnit &GetUndefined() { return undefined; }
+
+  static gd::MeasurementUnit &GetDimensionless() { return dimensionless; }
+
+  static gd::MeasurementUnit &GetDegreeAngle() { return degreeAngle; }
+
+  static gd::MeasurementUnit &GetSecond() { return second; }
+
+  static gd::MeasurementUnit &GetPixel() { return pixel; }
+
+  static gd::MeasurementUnit &GetPixelSpeed() { return pixelSpeed; }
+
+  static gd::MeasurementUnit &GetPixelAcceleration() {
+    return pixelAcceleration;
+  }
+
+  static gd::MeasurementUnit &GetAngularSpeed() { return angularSpeed; }
+
+  static gd::MeasurementUnit &GetNewton() { return newton; }
+
+private:
+  static gd::MeasurementUnit undefined;
+  static gd::MeasurementUnit dimensionless;
+  static gd::MeasurementUnit degreeAngle;
+  static gd::MeasurementUnit second;
+  static gd::MeasurementUnit pixel;
+  static gd::MeasurementUnit pixelSpeed;
+  static gd::MeasurementUnit pixelAcceleration;
+  static gd::MeasurementUnit newton;
+  static gd::MeasurementUnit angularSpeed;
+
+  static gd::MeasurementUnit CreateUndefined() {
+    return MeasurementUnit("Undefined", _("Undefined"), "");
+  }
+
+  static gd::MeasurementUnit CreateDimensionless() {
+    return MeasurementUnit("Dimensionless", _("Dimensionless"), "");
+  }
+
+  static gd::MeasurementUnit CreateDegreeAngle() {
+    std::vector<gd::MeasurementUnitElement> elements;
+    elements.push_back(
+        MeasurementUnitElement(gd::MeasurementBaseUnit::degreeAngle, 1));
+    return MeasurementUnit(elements, "DegreeAngle", _("Angle"), _("degree"));
+  }
+
+  static gd::MeasurementUnit CreateSecond() {
+    std::vector<gd::MeasurementUnitElement> elements;
+    elements.push_back(
+        MeasurementUnitElement(gd::MeasurementBaseUnit::second, 1));
+    return MeasurementUnit(elements, "Second", _("Duration"), _("second"));
+  }
+
+  static gd::MeasurementUnit CreatePixel() {
+    std::vector<gd::MeasurementUnitElement> elements;
+    elements.push_back(
+        MeasurementUnitElement(gd::MeasurementBaseUnit::pixel, 1));
+    return MeasurementUnit(elements, "Pixel", _("Distance"), _("pixel"));
+  }
+
+  static gd::MeasurementUnit CreatePixelSpeed() {
+    std::vector<gd::MeasurementUnitElement> elements;
+    elements.push_back(
+        MeasurementUnitElement(gd::MeasurementBaseUnit::pixel, 1));
+    elements.push_back(
+        MeasurementUnitElement(gd::MeasurementBaseUnit::second, -1));
+    return MeasurementUnit(elements, "PixelSpeed", _("Speed"),
+                           _("pixel per second"),
+                           _("How much distance is covered per second."));
+  }
+
+  static gd::MeasurementUnit CreatePixelAcceleration() {
+    std::vector<gd::MeasurementUnitElement> elements;
+    elements.push_back(
+        MeasurementUnitElement(gd::MeasurementBaseUnit::pixel, 1));
+    elements.push_back(
+        MeasurementUnitElement(gd::MeasurementBaseUnit::second, -2));
+    return MeasurementUnit(elements, "PixelAcceleration", _("Acceleration"),
+                           _("pixel per second, per second"),
+                           _("How much speed is gained (or lost) per second."));
+  }
+
+  static gd::MeasurementUnit CreateNewton() {
+    std::vector<gd::MeasurementUnitElement> elements;
+    elements.push_back(
+        MeasurementUnitElement(gd::MeasurementBaseUnit::meter, 1));
+    elements.push_back(
+        MeasurementUnitElement(gd::MeasurementBaseUnit::kilogram, 1));
+    elements.push_back(
+        MeasurementUnitElement(gd::MeasurementBaseUnit::second, -2));
+    return MeasurementUnit(
+        elements, "Newton",
+        _("Force (in Newton)"), _("meter kilogram per second, per second"),
+        _("A unit to measure forces."));
+  }
+
+  static gd::MeasurementUnit CreateAngularSpeed() {
+    std::vector<gd::MeasurementUnitElement> elements;
+    elements.push_back(
+        MeasurementUnitElement(gd::MeasurementBaseUnit::degreeAngle, 1));
+    elements.push_back(
+        MeasurementUnitElement(gd::MeasurementBaseUnit::second, -1));
+    return MeasurementUnit(elements, "AngularSpeed", _("Angular speed"),
+                           _("degree per second"),
+                           _("How much angle is covered per second."));
+  }
+
+  gd::String name;              ///< The unit name.
+  gd::String label;             ///< The unit label.
+  gd::String description;       ///< The unit description.
+  gd::String elementsWithWords; ///< The unit elements put in words.
+  std::vector<gd::MeasurementUnitElement> elements; ///< The unit elements.
+};
+
+} // namespace gd
+
+#endif // GDCORE_MEASUREMENTUNIT

Core/GDCore/Project/MeasurementUnitElement.cpp

@@ -0,0 +1,15 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "MeasurementUnitElement.h"
+#include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/String.h"
+#include <vector>
+
+namespace gd {
+
+MeasurementUnitElement::~MeasurementUnitElement() {}
+
+} // namespace gd

Core/GDCore/Project/MeasurementUnitElement.h

@@ -0,0 +1,46 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_MEASUREMENTUNITELEMENT
+#define GDCORE_MEASUREMENTUNITELEMENT
+#include <vector>
+
+#include "GDCore/Project/MeasurementBaseUnit.h"
+#include "GDCore/String.h"
+
+namespace gd {
+class SerializerElement;
+}
+
+namespace gd {
+
+/**
+ * \brief A couple of an atomic unit of measurement and its power.
+ */
+class GD_CORE_API MeasurementUnitElement {
+public:
+  MeasurementUnitElement(const gd::MeasurementBaseUnit &baseUnit_, int power_)
+      : baseUnit(baseUnit_), power(power_) {}
+
+  virtual ~MeasurementUnitElement();
+
+  /**
+   * \brief Return the base unit.
+   */
+  const gd::MeasurementBaseUnit &GetBaseUnit() const { return baseUnit; }
+
+  /**
+   * \brief Return the power on the base unit.
+   */
+  int GetPower() const { return power; }
+
+private:
+  gd::MeasurementBaseUnit baseUnit; ///< The base unit.
+  int power;                        ///< The power on the base unit.
+};
+
+} // namespace gd
+
+#endif // GDCORE_MEASUREMENTUNITELEMENT

Core/GDCore/Project/Object.cpp

@@ -114,7 +114,7 @@ gd::Behavior* Object::AddNewBehavior(const gd::Project& project,
     if (gd::MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
       gd::LogWarning("Tried to create a behavior with an unknown type: " + type
                      + " on object " + GetName() + "!");
-    // It's probably an events-based object that was removed.
+    // It's probably an events-based behavior that was removed.
     // Create a custom behavior to preserve the properties values.
     return initializeAndAdd(
         gd::make_unique<CustomBehavior>(name, project, type));

Core/GDCore/Project/PropertyDescriptor.h

@@ -8,6 +8,8 @@
 #include <vector>
 
 #include "GDCore/String.h"
+#include "GDCore/Project/MeasurementUnit.h"
+
 namespace gd {
 class SerializerElement;
 }
@@ -28,12 +30,12 @@ class GD_CORE_API PropertyDescriptor {
    * \param propertyValue The value of the property.
    */
   PropertyDescriptor(gd::String propertyValue)
-      : currentValue(propertyValue), type("string"), label(""), hidden(false) {}
+      : currentValue(propertyValue), type("string"), label(""), hidden(false), measurementUnit(gd::MeasurementUnit::GetUndefined()) {}
 
   /**
    * \brief Empty constructor creating an empty property to be displayed.
    */
-  PropertyDescriptor() : hidden(false){};
+  PropertyDescriptor() : hidden(false), measurementUnit(gd::MeasurementUnit::GetUndefined()) {};
 
   /**
    * \brief Destructor
@@ -103,12 +105,21 @@ class GD_CORE_API PropertyDescriptor {
     extraInformation.push_back(info);
     return *this;
   }
+  
+  /**
+   * \brief Change the unit of measurement of the property value.
+   */
+  PropertyDescriptor& SetMeasurementUnit(const gd::MeasurementUnit &measurementUnit_) {
+    measurementUnit = measurementUnit_;
+    return *this;
+  }
 
   const gd::String& GetValue() const { return currentValue; }
   const gd::String& GetType() const { return type; }
   const gd::String& GetLabel() const { return label; }
   const gd::String& GetDescription() const { return description; }
   const gd::String& GetGroup() const { return group; }
+  const gd::MeasurementUnit& GetMeasurementUnit() const { return measurementUnit; }
 
   const std::vector<gd::String>& GetExtraInfo() const {
     return extraInformation;
@@ -168,6 +179,7 @@ class GD_CORE_API PropertyDescriptor {
                          ///< choices, if a property is a displayed as a combo
                          ///< box.
   bool hidden;
+  gd::MeasurementUnit measurementUnit; //< The unit of measurement of the property vale.
 };
 
 }  // namespace gd

Core/GDCore/Serialization/SerializerElement.cpp

@@ -208,8 +208,7 @@ SerializerElement& SerializerElement::GetChild(
   for (size_t i = 0; i < children.size(); ++i) {
     if (children[i].second == std::shared_ptr<SerializerElement>()) continue;
 
-    if (children[i].first == name ||
-        (isArray && children[i].first.empty()) ||
+    if (children[i].first == name || (isArray && children[i].first.empty()) ||
         (!deprecatedName.empty() && children[i].first == deprecatedName)) {
       if (index == currentIndex)
         return *children[i].second;
@@ -242,8 +241,7 @@ std::size_t SerializerElement::GetChildrenCount(
   for (size_t i = 0; i < children.size(); ++i) {
     if (children[i].second == std::shared_ptr<SerializerElement>()) continue;
 
-    if (children[i].first == name ||
-        (isArray && children[i].first.empty()) ||
+    if (children[i].first == name || (isArray && children[i].first.empty()) ||
         (!deprecatedName.empty() && children[i].first == deprecatedName))
       currentIndex++;
   }
@@ -291,4 +289,31 @@ void SerializerElement::Init(const gd::SerializerElement& other) {
   deprecatedArrayOf = other.deprecatedArrayOf;
 }
 
+void SerializerElement::SetMultilineStringValue(const gd::String& value) {
+  if (value.find('\n') == gd::String::npos) {
+    SetStringValue(value);
+    return;
+  }
+
+  std::vector<gd::String> lines = value.Split('\n');
+  children.clear();
+  ConsiderAsArrayOf("");
+  for (const auto& line : lines) {
+    AddChild("").SetStringValue(line);
+  }
+}
+
+gd::String SerializerElement::GetMultilineStringValue() {
+  if (!ConsideredAsArray()) {
+    return GetValue().GetString();
+  }
+
+  gd::String value;
+  for (const auto& child : children) {
+    if (!value.empty()) value += "\n";
+    value += child.second->GetStringValue();
+  }
+  return value;
+}
+
 }  // namespace gd

Core/GDCore/Serialization/SerializerElement.h

@@ -10,6 +10,7 @@
 #include <memory>
 #include <string>
 #include <vector>
+
 #include "GDCore/Serialization/SerializerValue.h"
 #include "GDCore/String.h"
 
@@ -177,6 +178,18 @@ class GD_CORE_API SerializerElement {
    * \brief Return true if no value was set for the element.
    */
   bool IsValueUndefined() const { return valueUndefined; }
+
+  /**
+   * \brief Save the value either as a string or as an array of strings if it
+   * has line breaks.
+   */
+  void SetMultilineStringValue(const gd::String &value);
+
+  /**
+   * \brief Read the value, either represented as a string or as an array of strings,
+   * into a string.
+   */
+  gd::String GetMultilineStringValue();
   ///@}
 
   /** \name Attributes
@@ -440,7 +453,7 @@ class GD_CORE_API SerializerElement {
    * Initialize element using another element. Used by copy-ctor and assign-op.
    * Don't forget to update me if members were changed!
    */
-  void Init(const gd::SerializerElement& other);
+  void Init(const gd::SerializerElement &other);
 
   bool valueUndefined;  ///< If true, the element does not have a value.
   SerializerValue elementValue;

Core/tests/DummyPlatform.cpp

@@ -12,6 +12,7 @@
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Tools/Localization.h"
+#include "GDCore/Events/Builtin/StandardEvent.h"
 #include "catch.hpp"
 
 // TODO Remove these 2 classes and write the test with events based behaviors.
@@ -94,6 +95,13 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
   // Don't show extension loading logs for tests (too verbose).
   platform.EnableExtensionLoadingLogs(false);
 
+  // Required for tests on event generation.
+  std::shared_ptr<gd::PlatformExtension> commonInstructionsExtension =
+      std::shared_ptr<gd::PlatformExtension>(new gd::PlatformExtension);
+  commonInstructionsExtension->SetExtensionInformation(
+      "BuiltinCommonInstructions", "instruction extension", "", "", "");
+  commonInstructionsExtension->AddEvent("Standard", "Standard event", "", "", "", std::make_shared<gd::StandardEvent>());
+
   std::shared_ptr<gd::PlatformExtension> baseObjectExtension =
       std::shared_ptr<gd::PlatformExtension>(new gd::PlatformExtension);
 
@@ -373,6 +381,7 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
                        .AddUnsupportedBaseObjectCapability("effect");
   }
 
+  platform.AddExtension(commonInstructionsExtension);
   platform.AddExtension(baseObjectExtension);
   platform.AddExtension(extension);
   project.AddPlatform(platform);

Core/tests/EventsFunctionsContainer.cpp

@@ -10,7 +10,8 @@
 
 TEST_CASE("EventsFunctionsContainer", "[common]") {
   SECTION("Sanity checks") {
-    gd::EventsFunctionsContainer eventsFunctionContainer;
+    gd::EventsFunctionsContainer eventsFunctionContainer(
+        gd::EventsFunctionsContainer::FunctionOwner::Extension);
     eventsFunctionContainer.InsertNewEventsFunction("Function1", 0);
     eventsFunctionContainer.InsertNewEventsFunction("Function2", 1);
     eventsFunctionContainer.InsertNewEventsFunction("Function3", 2);
@@ -62,7 +63,8 @@ TEST_CASE("EventsFunctionsContainer", "[common]") {
   }
   SECTION("Serialization") {
     gd::Project project;
-    gd::EventsFunctionsContainer eventsFunctionContainer;
+    gd::EventsFunctionsContainer eventsFunctionContainer(
+        gd::EventsFunctionsContainer::FunctionOwner::Extension);
     eventsFunctionContainer.InsertNewEventsFunction("Function1", 0);
     eventsFunctionContainer.InsertNewEventsFunction("Function2", 1);
     eventsFunctionContainer.InsertNewEventsFunction("Function3", 2);
@@ -72,7 +74,8 @@ TEST_CASE("EventsFunctionsContainer", "[common]") {
 
     eventsFunctionContainer.RemoveEventsFunction("Function2");
 
-    gd::EventsFunctionsContainer eventsFunctionContainer2;
+    gd::EventsFunctionsContainer eventsFunctionContainer2(
+        gd::EventsFunctionsContainer::FunctionOwner::Extension);
     eventsFunctionContainer2.UnserializeEventsFunctionsFrom(project, element);
     REQUIRE(eventsFunctionContainer.GetEventsFunctionsCount() == 2);
     REQUIRE(eventsFunctionContainer.GetEventsFunction(0).GetName() ==

Core/tests/PropertyFunctionGenerator.cpp

@@ -0,0 +1,739 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+/**
+ * @file Tests covering common features of GDevelop Core.
+ */
+#include "GDCore/IDE/PropertyFunctionGenerator.h"
+#include "DummyPlatform.h"
+#include "GDCore/Events/Builtin/StandardEvent.h"
+#include "GDCore/Extensions/Metadata/ValueTypeMetadata.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/String.h"
+#include "catch.hpp"
+
+namespace {
+
+gd::EventsBasedBehavior &
+CreateBehavior(gd::EventsFunctionsExtension &eventsExtension) {
+  auto &eventsBasedBehavior =
+      eventsExtension.GetEventsBasedBehaviors().InsertNew(
+          "MyEventsBasedBehavior", 0);
+  eventsBasedBehavior.SetFullName("My events based behavior");
+  eventsBasedBehavior.SetDescription("An events based behavior for test");
+  eventsBasedBehavior.SetObjectType("");
+  return eventsBasedBehavior;
+};
+
+gd::EventsBasedObject &
+CreateObject(gd::EventsFunctionsExtension &eventsExtension) {
+  auto &eventsBasedObject = eventsExtension.GetEventsBasedObjects().InsertNew(
+      "MyEventsBasedObject", 0);
+  eventsBasedObject.SetFullName("My events based object");
+  eventsBasedObject.SetDescription("An events based object for test");
+  return eventsBasedObject;
+};
+
+} // namespace
+
+TEST_CASE("PropertyFunctionGenerator", "[common]") {
+  SECTION("Can generate functions for a number property in a behavior") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &extension =
+        project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
+    auto &behavior = CreateBehavior(extension);
+
+    auto &property =
+        behavior.GetPropertyDescriptors().InsertNew("MovementAngle", 0);
+    property.SetType("Number")
+        .SetLabel("Movement angle")
+        .SetDescription("The angle of the trajectory direction.")
+        .SetGroup("Movement");
+
+    gd::PropertyFunctionGenerator::GenerateBehaviorGetterAndSetter(
+        project, extension, behavior, property, false);
+
+    REQUIRE(
+        behavior.GetEventsFunctions().HasEventsFunctionNamed("MovementAngle"));
+    REQUIRE(behavior.GetEventsFunctions().HasEventsFunctionNamed(
+        "SetMovementAngle"));
+    {
+      auto &getter =
+          behavior.GetEventsFunctions().GetEventsFunction("MovementAngle");
+
+      REQUIRE(getter.GetFunctionType() ==
+              gd::EventsFunction::ExpressionAndCondition);
+      REQUIRE(getter.GetExpressionType().GetName() == "expression");
+      REQUIRE(getter.GetFullName() == "Movement angle");
+      REQUIRE(getter.GetGroup() ==
+              "My events based behavior movement configuration");
+      REQUIRE(getter.GetDescription() ==
+              "the movement angle of the object. The "
+              "angle of the trajectory direction.");
+      REQUIRE(getter.GetSentence() == "the movement angle");
+      // Object and behavior parameters are added automatically.
+      REQUIRE(getter.GetParameters().size() == 0);
+
+      REQUIRE(getter.GetEvents().GetEventsCount() == 1);
+      REQUIRE(getter.GetEvents().GetEvent(0).GetType() ==
+              "BuiltinCommonInstructions::Standard");
+      auto &getterEvent =
+          dynamic_cast<gd::StandardEvent &>(getter.GetEvents().GetEvent(0));
+      REQUIRE(getterEvent.GetConditions().size() == 0);
+      REQUIRE(getterEvent.GetActions().size() == 1);
+      auto &getterAction = getterEvent.GetActions().at(0);
+      REQUIRE(getterAction.GetType() == "SetReturnNumber");
+      REQUIRE(getterAction.GetParametersCount() == 1);
+      REQUIRE(getterAction.GetParameter(0).GetPlainString() ==
+              "Object.Behavior::PropertyMovementAngle()");
+    }
+    {
+      auto &setter =
+          behavior.GetEventsFunctions().GetEventsFunction("SetMovementAngle");
+
+      REQUIRE(setter.GetFunctionType() ==
+              gd::EventsFunction::ActionWithOperator);
+      REQUIRE(setter.GetGetterName() == "MovementAngle");
+      // These fields are deducted from the getter.
+      REQUIRE(setter.GetFullName() == "");
+      REQUIRE(setter.GetGroup() == "");
+      REQUIRE(setter.GetDescription() == "");
+      REQUIRE(setter.GetSentence() == "");
+      // Object and behavior parameters are added automatically.
+      REQUIRE(setter.GetParameters().size() == 0);
+
+      REQUIRE(setter.GetEvents().GetEventsCount() == 1);
+      REQUIRE(setter.GetEvents().GetEvent(0).GetType() ==
+              "BuiltinCommonInstructions::Standard");
+      auto &setterEvent =
+          dynamic_cast<gd::StandardEvent &>(setter.GetEvents().GetEvent(0));
+      REQUIRE(setterEvent.GetConditions().size() == 0);
+      REQUIRE(setterEvent.GetActions().size() == 1);
+      auto &setterAction = setterEvent.GetActions().at(0);
+      REQUIRE(
+          setterAction.GetType() ==
+          "MyEventsExtension::MyEventsBasedBehavior::SetPropertyMovementAngle");
+      REQUIRE(setterAction.GetParametersCount() == 4);
+      REQUIRE(setterAction.GetParameter(0).GetPlainString() == "Object");
+      REQUIRE(setterAction.GetParameter(1).GetPlainString() == "Behavior");
+      REQUIRE(setterAction.GetParameter(2).GetPlainString() == "=");
+      REQUIRE(setterAction.GetParameter(3).GetPlainString() ==
+              "GetArgumentAsNumber(\"Value\")");
+    }
+  }
+
+  SECTION("Can generate functions for a choice property in a behavior") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &extension =
+        project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
+    auto &behavior = CreateBehavior(extension);
+
+    auto &property =
+        behavior.GetPropertyDescriptors().InsertNew("CollisionShape", 0);
+    property.SetType("Choice")
+        .SetLabel("Collision shape")
+        .SetLabel("Dot shape")
+        .SetDescription("The shape is used for collision.")
+        .SetGroup("Movement");
+    property.GetExtraInfo().push_back("Dot shape");
+    property.GetExtraInfo().push_back("Bounding disk");
+
+    gd::PropertyFunctionGenerator::GenerateBehaviorGetterAndSetter(
+        project, extension, behavior, property, false);
+
+    REQUIRE(
+        behavior.GetEventsFunctions().HasEventsFunctionNamed("CollisionShape"));
+    REQUIRE(behavior.GetEventsFunctions().HasEventsFunctionNamed(
+        "SetCollisionShape"));
+
+    auto &getter =
+        behavior.GetEventsFunctions().GetEventsFunction("CollisionShape");
+
+    REQUIRE(getter.GetFunctionType() ==
+            gd::EventsFunction::ExpressionAndCondition);
+    REQUIRE(getter.GetExpressionType().GetName() == "stringWithSelector");
+    REQUIRE(getter.GetExpressionType().GetExtraInfo() ==
+            "[\"Dot shape\",\"Bounding disk\"]");
+  }
+
+  SECTION("Can generate functions for a boolean property in a behavior") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &extension =
+        project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
+    auto &behavior = CreateBehavior(extension);
+
+    auto &property = behavior.GetPropertyDescriptors().InsertNew("Rotate", 0);
+    property.SetType("Boolean")
+        .SetLabel("Rotate object")
+        .SetDescription(
+            "The rotation follows movements done by this behavior only.")
+        .SetGroup("Movement");
+
+    gd::PropertyFunctionGenerator::GenerateBehaviorGetterAndSetter(
+        project, extension, behavior, property, false);
+
+    REQUIRE(behavior.GetEventsFunctions().HasEventsFunctionNamed("Rotate"));
+    REQUIRE(behavior.GetEventsFunctions().HasEventsFunctionNamed("SetRotate"));
+    {
+      auto &getter = behavior.GetEventsFunctions().GetEventsFunction("Rotate");
+      REQUIRE(getter.GetFunctionType() == gd::EventsFunction::Condition);
+      REQUIRE(getter.GetExpressionType().GetName() == "boolean");
+      REQUIRE(getter.GetFullName() == "Rotate object");
+      REQUIRE(getter.GetGroup() ==
+              "My events based behavior movement configuration");
+      REQUIRE(getter.GetDescription() ==
+              "Check if rotate object. The rotation follows movements done by "
+              "this behavior only.");
+      REQUIRE(getter.GetSentence() == "_PARAM0_ rotate object");
+      // Object and behavior parameters are added automatically.
+      REQUIRE(getter.GetParameters().size() == 0);
+
+      REQUIRE(getter.GetEvents().GetEventsCount() == 1);
+      REQUIRE(getter.GetEvents().GetEvent(0).GetType() ==
+              "BuiltinCommonInstructions::Standard");
+      auto &getterEvent =
+          dynamic_cast<gd::StandardEvent &>(getter.GetEvents().GetEvent(0));
+      REQUIRE(getterEvent.GetConditions().size() == 1);
+      REQUIRE(getterEvent.GetActions().size() == 1);
+
+      auto &getterCondition = getterEvent.GetConditions().at(0);
+      REQUIRE(getterCondition.GetType() ==
+              "MyEventsExtension::MyEventsBasedBehavior::PropertyRotate");
+      REQUIRE(!getterCondition.IsInverted());
+      REQUIRE(getterCondition.GetParametersCount() == 2);
+      REQUIRE(getterCondition.GetParameter(0).GetPlainString() == "Object");
+      REQUIRE(getterCondition.GetParameter(1).GetPlainString() == "Behavior");
+
+      auto &getterAction = getterEvent.GetActions().at(0);
+      REQUIRE(getterAction.GetType() == "SetReturnBoolean");
+      REQUIRE(getterAction.GetParametersCount() == 1);
+      REQUIRE(getterAction.GetParameter(0).GetPlainString() == "True");
+    }
+    {
+      auto &setter =
+          behavior.GetEventsFunctions().GetEventsFunction("SetRotate");
+
+      REQUIRE(setter.GetFunctionType() == gd::EventsFunction::Action);
+      REQUIRE(setter.GetFullName() == "Rotate object");
+      REQUIRE(setter.GetGroup() ==
+              "My events based behavior movement configuration");
+      REQUIRE(setter.GetDescription() ==
+              "Change if rotate object. The rotation follows movements done by "
+              "this behavior only.");
+      REQUIRE(setter.GetSentence() == "_PARAM0_ rotate object: _PARAM2_");
+      // To generate the value parameter, object and behavior parameters has to
+      // be declared too.
+      REQUIRE(setter.GetParameters().size() == 3);
+      auto &objectParameter = setter.GetParameters().at(0);
+      REQUIRE(objectParameter.GetName() == "Object");
+      REQUIRE(objectParameter.GetType() == "object");
+      auto &behaviorParameter = setter.GetParameters().at(1);
+      REQUIRE(behaviorParameter.GetName() == "Behavior");
+      REQUIRE(behaviorParameter.GetType() == "behavior");
+      REQUIRE(behaviorParameter.GetExtraInfo() ==
+              "MyEventsExtension::MyEventsBasedBehavior");
+      auto &valueParameter = setter.GetParameters().at(2);
+      REQUIRE(valueParameter.GetName() == "Value");
+      REQUIRE(valueParameter.GetType() == "yesorno");
+
+      REQUIRE(setter.GetEvents().GetEventsCount() == 2);
+      REQUIRE(setter.GetEvents().GetEvent(0).GetType() ==
+              "BuiltinCommonInstructions::Standard");
+      REQUIRE(setter.GetEvents().GetEvent(1).GetType() ==
+              "BuiltinCommonInstructions::Standard");
+
+      auto &setterNoEvent =
+          dynamic_cast<gd::StandardEvent &>(setter.GetEvents().GetEvent(0));
+      REQUIRE(setterNoEvent.GetConditions().size() == 1);
+      REQUIRE(setterNoEvent.GetActions().size() == 1);
+
+      auto &setterNoCondition = setterNoEvent.GetConditions().at(0);
+      REQUIRE(setterNoCondition.GetType() == "GetArgumentAsBoolean");
+      REQUIRE(setterNoCondition.IsInverted());
+      REQUIRE(setterNoCondition.GetParametersCount() == 1);
+      REQUIRE(setterNoCondition.GetParameter(0).GetPlainString() ==
+              "\"Value\"");
+
+      auto &setterNoAction = setterNoEvent.GetActions().at(0);
+      REQUIRE(setterNoAction.GetType() ==
+              "MyEventsExtension::MyEventsBasedBehavior::SetPropertyRotate");
+      REQUIRE(setterNoAction.GetParametersCount() == 3);
+      REQUIRE(setterNoAction.GetParameter(0).GetPlainString() == "Object");
+      REQUIRE(setterNoAction.GetParameter(1).GetPlainString() == "Behavior");
+      REQUIRE(setterNoAction.GetParameter(2).GetPlainString() == "no");
+
+      auto &setterYesEvent =
+          dynamic_cast<gd::StandardEvent &>(setter.GetEvents().GetEvent(1));
+      REQUIRE(setterYesEvent.GetConditions().size() == 1);
+      REQUIRE(setterYesEvent.GetActions().size() == 1);
+
+      auto &setterYesCondition = setterYesEvent.GetConditions().at(0);
+      REQUIRE(setterYesCondition.GetType() == "GetArgumentAsBoolean");
+      REQUIRE(!setterYesCondition.IsInverted());
+      REQUIRE(setterYesCondition.GetParametersCount() == 1);
+      REQUIRE(setterYesCondition.GetParameter(0).GetPlainString() ==
+              "\"Value\"");
+
+      auto &setterYesAction = setterYesEvent.GetActions().at(0);
+      REQUIRE(setterYesAction.GetType() ==
+              "MyEventsExtension::MyEventsBasedBehavior::SetPropertyRotate");
+      REQUIRE(setterYesAction.GetParametersCount() == 3);
+      REQUIRE(setterYesAction.GetParameter(0).GetPlainString() == "Object");
+      REQUIRE(setterYesAction.GetParameter(1).GetPlainString() == "Behavior");
+      REQUIRE(setterYesAction.GetParameter(2).GetPlainString() == "yes");
+    }
+  }
+  SECTION("Can generate functions for a number property in an object") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &extension =
+        project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
+    auto &object = CreateObject(extension);
+
+    auto &property =
+        object.GetPropertyDescriptors().InsertNew("MovementAngle", 0);
+    property.SetType("Number")
+        .SetLabel("Movement angle")
+        .SetDescription("The angle of the trajectory direction.")
+        .SetGroup("Movement");
+
+    gd::PropertyFunctionGenerator::GenerateObjectGetterAndSetter(
+        project, extension, object, property);
+
+    REQUIRE(
+        object.GetEventsFunctions().HasEventsFunctionNamed("MovementAngle"));
+    REQUIRE(
+        object.GetEventsFunctions().HasEventsFunctionNamed("SetMovementAngle"));
+    {
+      auto &getter =
+          object.GetEventsFunctions().GetEventsFunction("MovementAngle");
+
+      REQUIRE(getter.GetFunctionType() ==
+              gd::EventsFunction::ExpressionAndCondition);
+      REQUIRE(getter.GetExpressionType().GetName() == "expression");
+      REQUIRE(getter.GetFullName() == "Movement angle");
+      REQUIRE(getter.GetGroup() ==
+              "My events based object movement configuration");
+      REQUIRE(getter.GetDescription() ==
+              "the movement angle of the object. The "
+              "angle of the trajectory direction.");
+      REQUIRE(getter.GetSentence() == "the movement angle");
+      // Object parameter is added automatically.
+      REQUIRE(getter.GetParameters().size() == 0);
+
+      REQUIRE(getter.GetEvents().GetEventsCount() == 1);
+      REQUIRE(getter.GetEvents().GetEvent(0).GetType() ==
+              "BuiltinCommonInstructions::Standard");
+      auto &getterEvent =
+          dynamic_cast<gd::StandardEvent &>(getter.GetEvents().GetEvent(0));
+      REQUIRE(getterEvent.GetConditions().size() == 0);
+      REQUIRE(getterEvent.GetActions().size() == 1);
+      auto &getterAction = getterEvent.GetActions().at(0);
+      REQUIRE(getterAction.GetType() == "SetReturnNumber");
+      REQUIRE(getterAction.GetParametersCount() == 1);
+      REQUIRE(getterAction.GetParameter(0).GetPlainString() ==
+              "Object.PropertyMovementAngle()");
+    }
+    {
+      auto &setter =
+          object.GetEventsFunctions().GetEventsFunction("SetMovementAngle");
+
+      REQUIRE(setter.GetFunctionType() ==
+              gd::EventsFunction::ActionWithOperator);
+      REQUIRE(setter.GetGetterName() == "MovementAngle");
+      // These fields are deducted from the getter.
+      REQUIRE(setter.GetFullName() == "");
+      REQUIRE(setter.GetGroup() == "");
+      REQUIRE(setter.GetDescription() == "");
+      REQUIRE(setter.GetSentence() == "");
+      // Object parameter is added automatically.
+      REQUIRE(setter.GetParameters().size() == 0);
+
+      REQUIRE(setter.GetEvents().GetEventsCount() == 1);
+      REQUIRE(setter.GetEvents().GetEvent(0).GetType() ==
+              "BuiltinCommonInstructions::Standard");
+      auto &setterEvent =
+          dynamic_cast<gd::StandardEvent &>(setter.GetEvents().GetEvent(0));
+      REQUIRE(setterEvent.GetConditions().size() == 0);
+      REQUIRE(setterEvent.GetActions().size() == 1);
+      auto &setterAction = setterEvent.GetActions().at(0);
+      REQUIRE(
+          setterAction.GetType() ==
+          "MyEventsExtension::MyEventsBasedObject::SetPropertyMovementAngle");
+      REQUIRE(setterAction.GetParametersCount() == 3);
+      REQUIRE(setterAction.GetParameter(0).GetPlainString() == "Object");
+      REQUIRE(setterAction.GetParameter(1).GetPlainString() == "=");
+      REQUIRE(setterAction.GetParameter(2).GetPlainString() ==
+              "GetArgumentAsNumber(\"Value\")");
+    }
+  }
+
+  SECTION("Can generate functions for a choice property in an object") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &extension =
+        project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
+    auto &object = CreateObject(extension);
+
+    auto &property =
+        object.GetPropertyDescriptors().InsertNew("CollisionShape", 0);
+    property.SetType("Choice")
+        .SetLabel("Collision shape")
+        .SetLabel("Dot shape")
+        .SetDescription("The shape is used for collision.")
+        .SetGroup("Movement");
+    property.GetExtraInfo().push_back("Dot shape");
+    property.GetExtraInfo().push_back("Bounding disk");
+
+    gd::PropertyFunctionGenerator::GenerateObjectGetterAndSetter(
+        project, extension, object, property);
+
+    REQUIRE(
+        object.GetEventsFunctions().HasEventsFunctionNamed("CollisionShape"));
+    REQUIRE(object.GetEventsFunctions().HasEventsFunctionNamed(
+        "SetCollisionShape"));
+
+    auto &getter =
+        object.GetEventsFunctions().GetEventsFunction("CollisionShape");
+
+    REQUIRE(getter.GetFunctionType() ==
+            gd::EventsFunction::ExpressionAndCondition);
+    REQUIRE(getter.GetExpressionType().GetName() == "stringWithSelector");
+    REQUIRE(getter.GetExpressionType().GetExtraInfo() ==
+            "[\"Dot shape\",\"Bounding disk\"]");
+  }
+
+  SECTION("Can generate functions for a boolean property in an object") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &extension =
+        project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
+    auto &object = CreateObject(extension);
+
+    auto &property = object.GetPropertyDescriptors().InsertNew("Rotate", 0);
+    property.SetType("Boolean")
+        .SetLabel("Rotate object")
+        .SetDescription("The rotation follows movements done by this object.")
+        .SetGroup("Movement");
+
+    gd::PropertyFunctionGenerator::GenerateObjectGetterAndSetter(
+        project, extension, object, property);
+
+    REQUIRE(object.GetEventsFunctions().HasEventsFunctionNamed("Rotate"));
+    REQUIRE(object.GetEventsFunctions().HasEventsFunctionNamed("SetRotate"));
+    {
+      auto &getter = object.GetEventsFunctions().GetEventsFunction("Rotate");
+      REQUIRE(getter.GetFunctionType() == gd::EventsFunction::Condition);
+      REQUIRE(getter.GetExpressionType().GetName() == "boolean");
+      REQUIRE(getter.GetFullName() == "Rotate object");
+      REQUIRE(getter.GetGroup() ==
+              "My events based object movement configuration");
+      REQUIRE(getter.GetDescription() ==
+              "Check if rotate object. The rotation follows movements done by "
+              "this object.");
+      REQUIRE(getter.GetSentence() == "_PARAM0_ rotate object");
+      // The Object parameter is added automatically.
+      REQUIRE(getter.GetParameters().size() == 0);
+
+      REQUIRE(getter.GetEvents().GetEventsCount() == 1);
+      REQUIRE(getter.GetEvents().GetEvent(0).GetType() ==
+              "BuiltinCommonInstructions::Standard");
+      auto &getterEvent =
+          dynamic_cast<gd::StandardEvent &>(getter.GetEvents().GetEvent(0));
+      REQUIRE(getterEvent.GetConditions().size() == 1);
+      REQUIRE(getterEvent.GetActions().size() == 1);
+
+      auto &getterCondition = getterEvent.GetConditions().at(0);
+      REQUIRE(getterCondition.GetType() ==
+              "MyEventsExtension::MyEventsBasedObject::PropertyRotate");
+      REQUIRE(!getterCondition.IsInverted());
+      REQUIRE(getterCondition.GetParametersCount() == 1);
+      REQUIRE(getterCondition.GetParameter(0).GetPlainString() == "Object");
+
+      auto &getterAction = getterEvent.GetActions().at(0);
+      REQUIRE(getterAction.GetType() == "SetReturnBoolean");
+      REQUIRE(getterAction.GetParametersCount() == 1);
+      REQUIRE(getterAction.GetParameter(0).GetPlainString() == "True");
+    }
+    {
+      auto &setter = object.GetEventsFunctions().GetEventsFunction("SetRotate");
+
+      REQUIRE(setter.GetFunctionType() == gd::EventsFunction::Action);
+      REQUIRE(setter.GetFullName() == "Rotate object");
+      REQUIRE(setter.GetGroup() ==
+              "My events based object movement configuration");
+      REQUIRE(setter.GetDescription() ==
+              "Change if rotate object. The rotation follows movements done by "
+              "this object.");
+      REQUIRE(setter.GetSentence() == "_PARAM0_ rotate object: _PARAM1_");
+      // To generate the value parameter, the object parameter has to
+      // be declared too.
+      REQUIRE(setter.GetParameters().size() == 2);
+      auto &objectParameter = setter.GetParameters().at(0);
+      REQUIRE(objectParameter.GetName() == "Object");
+      REQUIRE(objectParameter.GetType() == "object");
+      REQUIRE(objectParameter.GetExtraInfo() ==
+              "MyEventsExtension::MyEventsBasedObject");
+      auto &valueParameter = setter.GetParameters().at(1);
+      REQUIRE(valueParameter.GetName() == "Value");
+      REQUIRE(valueParameter.GetType() == "yesorno");
+
+      REQUIRE(setter.GetEvents().GetEventsCount() == 2);
+      REQUIRE(setter.GetEvents().GetEvent(0).GetType() ==
+              "BuiltinCommonInstructions::Standard");
+      REQUIRE(setter.GetEvents().GetEvent(1).GetType() ==
+              "BuiltinCommonInstructions::Standard");
+
+      auto &setterNoEvent =
+          dynamic_cast<gd::StandardEvent &>(setter.GetEvents().GetEvent(0));
+      REQUIRE(setterNoEvent.GetConditions().size() == 1);
+      REQUIRE(setterNoEvent.GetActions().size() == 1);
+
+      auto &setterNoCondition = setterNoEvent.GetConditions().at(0);
+      REQUIRE(setterNoCondition.GetType() == "GetArgumentAsBoolean");
+      REQUIRE(setterNoCondition.IsInverted());
+      REQUIRE(setterNoCondition.GetParametersCount() == 1);
+      REQUIRE(setterNoCondition.GetParameter(0).GetPlainString() ==
+              "\"Value\"");
+
+      auto &setterNoAction = setterNoEvent.GetActions().at(0);
+      REQUIRE(setterNoAction.GetType() ==
+              "MyEventsExtension::MyEventsBasedObject::SetPropertyRotate");
+      REQUIRE(setterNoAction.GetParametersCount() == 2);
+      REQUIRE(setterNoAction.GetParameter(0).GetPlainString() == "Object");
+      REQUIRE(setterNoAction.GetParameter(1).GetPlainString() == "no");
+
+      auto &setterYesEvent =
+          dynamic_cast<gd::StandardEvent &>(setter.GetEvents().GetEvent(1));
+      REQUIRE(setterYesEvent.GetConditions().size() == 1);
+      REQUIRE(setterYesEvent.GetActions().size() == 1);
+
+      auto &setterYesCondition = setterYesEvent.GetConditions().at(0);
+      REQUIRE(setterYesCondition.GetType() == "GetArgumentAsBoolean");
+      REQUIRE(!setterYesCondition.IsInverted());
+      REQUIRE(setterYesCondition.GetParametersCount() == 1);
+      REQUIRE(setterYesCondition.GetParameter(0).GetPlainString() ==
+              "\"Value\"");
+
+      auto &setterYesAction = setterYesEvent.GetActions().at(0);
+      REQUIRE(setterYesAction.GetType() ==
+              "MyEventsExtension::MyEventsBasedObject::SetPropertyRotate");
+      REQUIRE(setterYesAction.GetParametersCount() == 2);
+      REQUIRE(setterYesAction.GetParameter(0).GetPlainString() == "Object");
+      REQUIRE(setterYesAction.GetParameter(1).GetPlainString() == "yes");
+    }
+  }
+
+  SECTION("Can generate functions for a shared property") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &extension =
+        project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
+    auto &behavior = CreateBehavior(extension);
+
+    auto &property =
+        behavior.GetSharedPropertyDescriptors().InsertNew("MovementAngle", 0);
+    property.SetType("Number")
+        .SetLabel("Movement angle")
+        .SetDescription("The angle of the trajectory direction.")
+        .SetGroup("Movement");
+
+    gd::PropertyFunctionGenerator::GenerateBehaviorGetterAndSetter(
+        project, extension, behavior, property, true);
+
+    REQUIRE(
+        behavior.GetEventsFunctions().HasEventsFunctionNamed("MovementAngle"));
+    REQUIRE(behavior.GetEventsFunctions().HasEventsFunctionNamed(
+        "SetMovementAngle"));
+    {
+      auto &getter =
+          behavior.GetEventsFunctions().GetEventsFunction("MovementAngle");
+      REQUIRE(getter.GetDescription() ==
+              "the movement angle. The angle of the trajectory direction. "
+              "While an object is needed, this will apply to all objects using "
+              "the behavior.");
+
+      REQUIRE(getter.GetEvents().GetEventsCount() == 1);
+      REQUIRE(getter.GetEvents().GetEvent(0).GetType() ==
+              "BuiltinCommonInstructions::Standard");
+      auto &getterEvent =
+          dynamic_cast<gd::StandardEvent &>(getter.GetEvents().GetEvent(0));
+      REQUIRE(getterEvent.GetConditions().size() == 0);
+      REQUIRE(getterEvent.GetActions().size() == 1);
+      auto &getterAction = getterEvent.GetActions().at(0);
+      REQUIRE(getterAction.GetType() == "SetReturnNumber");
+      REQUIRE(getterAction.GetParametersCount() == 1);
+      REQUIRE(getterAction.GetParameter(0).GetPlainString() ==
+              "Object.Behavior::SharedPropertyMovementAngle()");
+    }
+    {
+      auto &setter =
+          behavior.GetEventsFunctions().GetEventsFunction("SetMovementAngle");
+
+      REQUIRE(setter.GetEvents().GetEventsCount() == 1);
+      REQUIRE(setter.GetEvents().GetEvent(0).GetType() ==
+              "BuiltinCommonInstructions::Standard");
+      auto &setterEvent =
+          dynamic_cast<gd::StandardEvent &>(setter.GetEvents().GetEvent(0));
+      REQUIRE(setterEvent.GetConditions().size() == 0);
+      REQUIRE(setterEvent.GetActions().size() == 1);
+      auto &setterAction = setterEvent.GetActions().at(0);
+      REQUIRE(setterAction.GetType() ==
+              "MyEventsExtension::MyEventsBasedBehavior::"
+              "SetSharedPropertyMovementAngle");
+    }
+  }
+
+  SECTION("Allow functions generation when there is no setter") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &extension =
+        project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
+    auto &behavior = CreateBehavior(extension);
+
+    auto &property =
+        behavior.GetPropertyDescriptors().InsertNew("MovementAngle", 0);
+    property.SetType("Number")
+        .SetLabel("Movement angle")
+        .SetDescription("The angle of the trajectory direction.")
+        .SetGroup("Movement");
+
+    REQUIRE(gd::PropertyFunctionGenerator::CanGenerateGetterAndSetter(
+        behavior, property));
+  }
+
+  SECTION("Forbid functions generation when a getter exists") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &extension =
+        project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
+    auto &behavior = CreateBehavior(extension);
+
+    auto &property =
+        behavior.GetPropertyDescriptors().InsertNew("MovementAngle", 0);
+    property.SetType("Number")
+        .SetLabel("Movement angle")
+        .SetDescription("The angle of the trajectory direction.")
+        .SetGroup("Movement");
+
+    behavior.GetEventsFunctions().InsertNewEventsFunction("MovementAngle", 0);
+
+    REQUIRE(!gd::PropertyFunctionGenerator::CanGenerateGetterAndSetter(
+        behavior, property));
+  }
+
+  SECTION("Forbid functions generation when a setter exists") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &extension =
+        project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
+    auto &behavior = CreateBehavior(extension);
+
+    auto &property =
+        behavior.GetPropertyDescriptors().InsertNew("MovementAngle", 0);
+    property.SetType("Number")
+        .SetLabel("Movement angle")
+        .SetDescription("The angle of the trajectory direction.")
+        .SetGroup("Movement");
+
+    behavior.GetEventsFunctions().InsertNewEventsFunction("SetMovementAngle",
+                                                          0);
+
+    REQUIRE(!gd::PropertyFunctionGenerator::CanGenerateGetterAndSetter(
+        behavior, property));
+  }
+
+  SECTION("Forbid functions generation when both setter and getter exist") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &extension =
+        project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
+    auto &behavior = CreateBehavior(extension);
+
+    auto &property =
+        behavior.GetPropertyDescriptors().InsertNew("MovementAngle", 0);
+    property.SetType("Number")
+        .SetLabel("Movement angle")
+        .SetDescription("The angle of the trajectory direction.")
+        .SetGroup("Movement");
+
+    behavior.GetEventsFunctions().InsertNewEventsFunction("MovementAngle", 0);
+    behavior.GetEventsFunctions().InsertNewEventsFunction("SetMovementAngle",
+                                                          0);
+
+    REQUIRE(!gd::PropertyFunctionGenerator::CanGenerateGetterAndSetter(
+        behavior, property));
+  }
+
+  SECTION("Forbid functions generation for required behavior properties") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &extension =
+        project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
+    auto &behavior = CreateBehavior(extension);
+
+    auto &property =
+        behavior.GetPropertyDescriptors().InsertNew("MovementAngle", 0);
+    property.SetType("Behavior")
+        .SetLabel("Pathfinding behavior")
+        .SetDescription("A required behavior.")
+        .SetGroup("Movement")
+        .GetExtraInfo()
+        .push_back("PlatformBehavior::PlatformerObjectBehavior");
+
+    REQUIRE(!gd::PropertyFunctionGenerator::CanGenerateGetterAndSetter(
+        behavior, property));
+  }
+
+  SECTION("Can generate functions when only the property name is filled") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &extension =
+        project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
+    auto &behavior = CreateBehavior(extension);
+
+    auto &property =
+        behavior.GetPropertyDescriptors().InsertNew("MovementAngle", 0);
+    property.SetType("Number");
+
+    gd::PropertyFunctionGenerator::GenerateBehaviorGetterAndSetter(
+        project, extension, behavior, property, false);
+
+    REQUIRE(
+        behavior.GetEventsFunctions().HasEventsFunctionNamed("MovementAngle"));
+    REQUIRE(behavior.GetEventsFunctions().HasEventsFunctionNamed(
+        "SetMovementAngle"));
+
+    auto &getter =
+        behavior.GetEventsFunctions().GetEventsFunction("MovementAngle");
+
+    REQUIRE(getter.GetFunctionType() ==
+            gd::EventsFunction::ExpressionAndCondition);
+    REQUIRE(getter.GetExpressionType().GetName() == "expression");
+    REQUIRE(getter.GetFullName() == "MovementAngle");
+    REQUIRE(getter.GetGroup() == "My events based behavior configuration");
+    REQUIRE(getter.GetDescription() == "the movementAngle of the object.");
+    REQUIRE(getter.GetSentence() == "the movementAngle");
+  }
+}

Core/tests/Serializer.cpp

@@ -81,6 +81,30 @@ TEST_CASE("SerializerElement", "[common]") {
     REQUIRE(element.GetChild(2).GetDoubleValue() == 45.6);
   }
 
+  SECTION("Multiline strings") {
+    SerializerElement element;
+
+    // A single line is saved as a string.
+    element.SetMultilineStringValue("test");
+    REQUIRE(element.GetMultilineStringValue() == "test");
+    REQUIRE(element.GetStringValue() == "test");
+
+    // A string can be read.
+    element.SetStringValue("test of\nsomething\nsaved as a string");
+    REQUIRE(element.GetMultilineStringValue() == "test of\nsomething\nsaved as a string");
+
+    // A multi lines string is saved as an array.
+    element.SetMultilineStringValue("test\nwith\nmultiple lines.");
+    REQUIRE(element.ConsideredAsArray() == true);
+    REQUIRE(element.GetChildrenCount() == 3);
+    REQUIRE(element.GetMultilineStringValue() == "test\nwith\nmultiple lines.");
+
+    element.SetMultilineStringValue("test\n\nwith\n\nmultiple lines.\n");
+    REQUIRE(element.ConsideredAsArray() == true);
+    REQUIRE(element.GetChildrenCount() == 6);
+    REQUIRE(element.GetMultilineStringValue() == "test\n\nwith\n\nmultiple lines.\n");
+  }
+
   SECTION("(Deprecated) attributes") {
     SerializerElement element;
     element.AddChild("child1").SetStringValue("value123");

Extensions/AnchorBehavior/tests/anchorruntimebehavior.spec.js

@@ -62,16 +62,6 @@ describe('gdjs.AnchorRuntimeBehavior', function () {
     return object;
   }
 
-  function getAnchorBehavior(object) {
-    const behavior = object.getBehavior(anchorBehaviorName);
-    if (!(behavior instanceof gdjs.AnchorRuntimeBehavior)) {
-      throw new Error(
-        'Expected behavior to be an instance of gdjs.AnchorBehavior'
-      );
-    }
-    return behavior;
-  }
-
   describe('(anchor horizontal edge)', function () {
     ['rightEdgeAnchor', 'leftEdgeAnchor'].forEach((objectEdge) => {
       it(`anchors the ${objectEdge} edge of object to window left (fixed)`, function () {

Extensions/DestroyOutsideBehavior/DestroyOutsideBehavior.cpp

@@ -25,6 +25,7 @@ DestroyOutsideBehavior::GetProperties(
       .SetValue(gd::String::From(
           behaviorContent.GetDoubleAttribute("extraBorder", 0)))
       .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetPixel())
       .SetLabel(_("Margin before deleting the object, in pixels"));
 
   return properties;

Extensions/DraggableBehavior/DraggableBehavior.h

@@ -28,13 +28,11 @@ class GD_EXTENSION_API DraggableBehavior : public gd::Behavior {
     return new DraggableBehavior(*this);
   }
 
-#if defined(GD_IDE_ONLY)
   virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties(
       const gd::SerializerElement& behaviorContent) const override;
   virtual bool UpdateProperty(gd::SerializerElement& behaviorContent,
                               const gd::String& name,
                               const gd::String& value) override;
-#endif
 
   virtual void InitializeContent(
       gd::SerializerElement& behaviorContent) override;

Extensions/DraggableBehavior/Extension.cpp

@@ -34,10 +34,9 @@ void DeclareDraggableBehaviorExtension(gd::PlatformExtension& extension) {
       std::make_shared<DraggableBehavior>(),
       std::shared_ptr<gd::BehaviorsSharedData>());
 
-#if defined(GD_IDE_ONLY)
   aut.AddCondition("Dragged",
                    _("Being dragged"),
-                   _("Check if the object is being dragged"),
+                   _("Check if the object is being dragged."),
                    _("_PARAM0_ is being dragged"),
                    "",
                    "CppPlatform/Extensions/draggableicon24.png",
@@ -46,5 +45,16 @@ void DeclareDraggableBehaviorExtension(gd::PlatformExtension& extension) {
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "Draggable")
       .SetFunctionName("IsDragged");
-#endif
+
+  aut.AddCondition("Dropped",
+                   _("Was just dropped"),
+                   _("Check if the object was just dropped after being dragged."),
+                   _("_PARAM0_ was just dropped"),
+                   "",
+                   "CppPlatform/Extensions/draggableicon24.png",
+                   "CppPlatform/Extensions/draggableicon16.png")
+
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "Draggable")
+      .SetFunctionName("WasJustDropped");
 }

Extensions/DraggableBehavior/JsExtension.cpp

@@ -4,7 +4,6 @@ GDevelop - Draggable Behavior Extension
 Copyright (c) 2014-2016 Florian Rival (Florian.Rival@gmail.com)
 This project is released under the MIT License.
 */
-#if defined(GD_IDE_ONLY)
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Tools/Localization.h"
 
@@ -32,6 +31,11 @@ class DraggableBehaviorJsExtension : public gd::PlatformExtension {
         .SetFunctionName("isDragged")
         .SetIncludeFile(
             "Extensions/DraggableBehavior/draggableruntimebehavior.js");
+    GetAllConditionsForBehavior(
+        "DraggableBehavior::Draggable")["DraggableBehavior::Dropped"]
+        .SetFunctionName("wasJustDropped")
+        .SetIncludeFile(
+            "Extensions/DraggableBehavior/draggableruntimebehavior.js");
     GD_COMPLETE_EXTENSION_COMPILATION_INFORMATION();
   };
 };
@@ -49,4 +53,3 @@ extern "C" gd::PlatformExtension* GD_EXTENSION_API CreateGDJSExtension() {
   return new DraggableBehaviorJsExtension;
 }
 #endif
-#endif

Extensions/DraggableBehavior/draggableruntimebehavior.ts

@@ -15,6 +15,7 @@ namespace gdjs {
      */
     _draggedByDraggableManager: DraggableManager | null = null;
     _checkCollisionMask: boolean;
+    _justDropped = false;
 
     constructor(
       instanceContainer: gdjs.RuntimeInstanceContainer,
@@ -41,6 +42,7 @@ namespace gdjs {
     _endDrag() {
       if (this._draggedByDraggableManager) {
         this._draggedByDraggableManager.endDrag();
+        this._justDropped = true;
       }
       this._draggedByDraggableManager = null;
     }
@@ -126,11 +128,17 @@ namespace gdjs {
         .getGame()
         .getInputManager()
         .isMouseButtonPressed(0);
+
+      this._justDropped = false;
     }
 
-    isDragged(instanceContainer: gdjs.RuntimeInstanceContainer): boolean {
+    isDragged(): boolean {
       return !!this._draggedByDraggableManager;
     }
+
+    wasJustDropped(): boolean {
+      return this._justDropped;
+    }
   }
 
   /**

Extensions/ExampleJsExtension/dummywithshareddataruntimebehavior.ts

@@ -15,9 +15,9 @@ namespace gdjs {
       this._textToSet = behaviorData.property1;
 
       // You can also access to the shared data:
-      const sharedData = instanceContainer
-        .getScene()
-        .getInitialSharedDataForBehavior(behaviorData.name);
+      const sharedData = instanceContainer.getInitialSharedDataForBehavior(
+        behaviorData.name
+      );
       this._textToSet = (sharedData as any).sharedProperty1;
 
       // You can also run arbitrary code at the creation of the behavior:

Extensions/LinkedObjects/tests/linkedobjects.spec.js

@@ -239,14 +239,14 @@ describe('gdjs.LinksManager', function () {
       manager.removeAllLinksOf(object1A);
       manager.removeAllLinksOf(object1A);
       {
-        const { pickedSomething, objectsLists } = pickObjectsLinkedTo(
+        const { pickedSomething } = pickObjectsLinkedTo(
           object1A,
           Hashtable.newFrom({ obj2: [object2A, object2B, object2C] })
         );
         expect(pickedSomething).to.be(false);
       }
       {
-        const { pickedSomething, objectsLists } = pickObjectsLinkedTo(
+        const { pickedSomething } = pickObjectsLinkedTo(
           object2A,
           Hashtable.newFrom({ obj1: [object1A, object1B, object1C] })
         );

Extensions/PanelSpriteObject/panelspriteruntimeobject-pixi-renderer.ts

@@ -33,27 +33,24 @@ namespace gdjs {
       const StretchedSprite = !tiled ? PIXI.Sprite : PIXI.TilingSprite;
       this._spritesContainer = new PIXI.Container();
       this._wrapperContainer = new PIXI.Container();
-      // @ts-ignore
-      this._centerSprite = new StretchedSprite(new PIXI.Texture(texture));
+      this._centerSprite = new StretchedSprite(
+        new PIXI.Texture(texture.baseTexture)
+      );
       this._borderSprites = [
-        // @ts-ignore
-        new StretchedSprite(new PIXI.Texture(texture)),
-        //Right
+        // Right
+        new StretchedSprite(new PIXI.Texture(texture.baseTexture)),
+        // Top-Right
         new PIXI.Sprite(texture),
-        //Top-Right
-        // @ts-ignore
-        new StretchedSprite(new PIXI.Texture(texture)),
-        //Top
+        // Top
+        new StretchedSprite(new PIXI.Texture(texture.baseTexture)),
+        // Top-Left
         new PIXI.Sprite(texture),
-        //Top-Left
-        // @ts-ignore
-        new StretchedSprite(new PIXI.Texture(texture)),
-        //Left
+        // Left
+        new StretchedSprite(new PIXI.Texture(texture.baseTexture)),
+        // Bottom-Left
         new PIXI.Sprite(texture),
-        //Bottom-Left
-        // @ts-ignore
-        new StretchedSprite(new PIXI.Texture(texture)),
-        //Bottom
+        // Bottom
+        new StretchedSprite(new PIXI.Texture(texture.baseTexture)),
         new PIXI.Sprite(texture),
       ];
 
@@ -77,11 +74,19 @@ namespace gdjs {
 
     ensureUpToDate() {
       if (this._spritesContainer.visible && this._wasRendered) {
-        // Cache the rendered sprites as a bitmap to speed up rendering when
-        // lots of panel sprites are on the scene.
-        // Sadly, because of this, we need a wrapper container to workaround
-        // a PixiJS issue with alpha (see updateOpacity).
-        this._spritesContainer.cacheAsBitmap = true;
+        // PIXI uses PIXI.SCALE_MODES.LINEAR for the cached image:
+        // this._spritesContainer._cacheData.sprite._texture.baseTexture.scaleMode
+        // There seems to be no way to configure this so the optimization is disabled.
+        if (
+          this._centerSprite.texture.baseTexture.scaleMode !==
+          PIXI.SCALE_MODES.NEAREST
+        ) {
+          // Cache the rendered sprites as a bitmap to speed up rendering when
+          // lots of panel sprites are on the scene.
+          // Sadly, because of this, we need a wrapper container to workaround
+          // a PixiJS issue with alpha (see updateOpacity).
+          this._spritesContainer.cacheAsBitmap = true;
+        }
       }
       this._wasRendered = true;
     }
@@ -193,14 +198,10 @@ namespace gdjs {
       instanceContainer: gdjs.RuntimeInstanceContainer
     ): void {
       const obj = this._object;
-      // @ts-ignore
       const texture = instanceContainer
         .getGame()
         .getImageManager()
-        .getPIXITexture(textureName) as PIXI.BaseTexture<
-        PIXI.Resource,
-        PIXI.IAutoDetectOptions
-      >;
+        .getPIXITexture(textureName).baseTexture;
       this._textureWidth = texture.width;
       this._textureHeight = texture.height;
 

Extensions/PathfindingBehavior/JsExtension.cpp

@@ -27,7 +27,10 @@ class PathfindingBehaviorJsExtension : public gd::PlatformExtension {
             "Extensions/PathfindingBehavior/pathfindingruntimebehavior.js")
         .AddIncludeFile(
             "Extensions/PathfindingBehavior/"
-            "pathfindingobstacleruntimebehavior.js");
+            "pathfindingobstacleruntimebehavior.js")
+        .AddIncludeFile(
+            "Extensions/PathfindingBehavior/"
+            "PathTools.js");
 
     {
       std::map<gd::String, gd::InstructionMetadata>& autActions =

Extensions/PathfindingBehavior/PathTools.ts

@@ -0,0 +1,163 @@
+namespace gdjs {
+  export namespace pathfinding {
+    /**
+     * Simplify a path according to an allowed gap.
+     *
+     * The simplified path vertices are the same instances as the one in
+     * the source. They must be cloned to make them truly independent from each
+     * other.
+     *
+     * @param sourceVertices The path to simplify.
+     * @param maxGap The maximum distance the edge of the contour may deviate
+     * from the source geometry.
+     * @param simplifiedVertices The simplified path.
+     * @param workingVertices It avoids allocations.
+     */
+    export const simplifyPath = (
+      sourceVertices: FloatPoint[],
+      maxGap: float,
+      simplifiedVertices: FloatPoint[] = [],
+      workingVertices: FloatPoint[] = []
+    ): FloatPoint[] => {
+      if (sourceVertices.length <= 2) {
+        simplifiedVertices.length = 0;
+        simplifiedVertices.push.apply(simplifiedVertices, sourceVertices);
+        return simplifiedVertices;
+      }
+      const maxGapSq = maxGap * maxGap;
+
+      // We start with only one rope part.
+      // Stretch a rope between the start and the end of the path.
+      let previousStepVertices: FloatPoint[] = workingVertices;
+      previousStepVertices.length = 0;
+      previousStepVertices.push(sourceVertices[0]);
+      previousStepVertices.push(sourceVertices[sourceVertices.length - 1]);
+
+      do {
+        simplifiedVertices.length = 0;
+        simplifiedVertices.push(previousStepVertices[0]);
+
+        // For each part of the rope...
+        let sourceIndex = 0;
+        for (
+          let previousStepVerticesIndex = 0;
+          previousStepVerticesIndex + 1 < previousStepVertices.length;
+          previousStepVerticesIndex++
+        ) {
+          const startVertex = previousStepVertices[previousStepVerticesIndex];
+          const endVertex = previousStepVertices[previousStepVerticesIndex + 1];
+
+          const startX = startVertex[0];
+          const startY = startVertex[1];
+          const endX = endVertex[0];
+          const endY = endVertex[1];
+
+          // Search the furthest vertex from the rope part.
+          let maxDeviationSq = maxGapSq;
+          let maxDeviationVertex: FloatPoint | null = null;
+          // The first and last vertices of the rope part are not checked.
+          for (
+            sourceIndex++;
+            sourceVertices[sourceIndex] !== endVertex;
+            sourceIndex++
+          ) {
+            const sourceVertex = sourceVertices[sourceIndex];
+
+            const deviationSq = gdjs.pathfinding.getPointSegmentDistanceSq(
+              sourceVertex[0],
+              sourceVertex[1],
+              startX,
+              startY,
+              endX,
+              endY
+            );
+            if (deviationSq > maxDeviationSq) {
+              maxDeviationSq = deviationSq;
+              maxDeviationVertex = sourceVertex;
+            }
+          }
+          // Add the furthest vertex to the rope.
+          // The current rope part is split in 2 for the next step.
+          if (maxDeviationVertex) {
+            simplifiedVertices.push(maxDeviationVertex);
+          }
+          simplifiedVertices.push(endVertex);
+        }
+
+        const swapVertices = previousStepVertices;
+        previousStepVertices = simplifiedVertices;
+        simplifiedVertices = swapVertices;
+      } while (
+        // Stop when no new vertex were added.
+        // It means that the maxGap constraint is fulfilled.
+        // Otherwise, iterate over the full path once more.
+        simplifiedVertices.length !== previousStepVertices.length
+      );
+      return simplifiedVertices;
+    };
+
+    /**
+     * Returns the distance squared from the point to the line segment.
+     *
+     * Behavior is undefined if the the closest distance is outside the
+     * line segment.
+     *
+     * @param px The X position of point (px, py).
+     * @param py The Y position of point (px, py)
+     * @param ax The X position of the line segment's vertex A.
+     * @param ay The Y position of the line segment's vertex A.
+     * @param bx The X position of the line segment's vertex B.
+     * @param by The Y position of the line segment's vertex B.
+     * @return The distance squared from the point (px, py) to line segment AB.
+     */
+    export const getPointSegmentDistanceSq = (
+      px: float,
+      py: float,
+      ax: float,
+      ay: float,
+      bx: float,
+      by: float
+    ): float => {
+      // This implementation is strongly inspired from CritterAI class "Geometry".
+      //
+      // Reference: http://local.wasp.uwa.edu.au/~pbourke/geometry/pointline/
+      //
+      // The goal of the algorithm is to find the point on line segment AB
+      // that is closest to P and then calculate the distance between P
+      // and that point.
+
+      const deltaABx = bx - ax;
+      const deltaABy = by - ay;
+      const deltaAPx = px - ax;
+      const deltaAPy = py - ay;
+
+      const segmentABLengthSq = deltaABx * deltaABx + deltaABy * deltaABy;
+      if (segmentABLengthSq === 0) {
+        // AB is not a line segment. So just return
+        // distanceSq from P to A
+        return deltaAPx * deltaAPx + deltaAPy * deltaAPy;
+      }
+
+      const u = (deltaAPx * deltaABx + deltaAPy * deltaABy) / segmentABLengthSq;
+      if (u < 0) {
+        // Closest point on line AB is outside outside segment AB and
+        // closer to A. So return distanceSq from P to A.
+        return deltaAPx * deltaAPx + deltaAPy * deltaAPy;
+      } else if (u > 1) {
+        // Closest point on line AB is outside segment AB and closer to B.
+        // So return distanceSq from P to B.
+        return (px - bx) * (px - bx) + (py - by) * (py - by);
+      }
+
+      // Closest point on lineAB is inside segment AB. So find the exact
+      // point on AB and calculate the distanceSq from it to P.
+
+      // The calculation in parenthesis is the location of the point on
+      // the line segment.
+      const deltaX = ax + u * deltaABx - px;
+      const deltaY = ay + u * deltaABy - py;
+
+      return deltaX * deltaX + deltaY * deltaY;
+    };
+  }
+}

Extensions/PathfindingBehavior/PathfindingBehavior.cpp

@@ -24,39 +24,92 @@ void PathfindingBehavior::InitializeContent(
   behaviorContent.SetAttribute("gridOffsetX", 0);
   behaviorContent.SetAttribute("gridOffsetY", 0);
   behaviorContent.SetAttribute("extraBorder", 0);
+  behaviorContent.SetAttribute("smoothingMaxCellGap", 1);
 }
 
 #if defined(GD_IDE_ONLY)
 std::map<gd::String, gd::PropertyDescriptor> PathfindingBehavior::GetProperties(
-    const gd::SerializerElement& behaviorContent) const {
+    const gd::SerializerElement &behaviorContent) const {
   std::map<gd::String, gd::PropertyDescriptor> properties;
 
-  properties[_("Allows diagonals")]
+  properties["AllowDiagonals"]
+      .SetLabel(_("Allows diagonals"))
       .SetValue(behaviorContent.GetBoolAttribute("allowDiagonals") ? "true"
                                                                    : "false")
+      .SetGroup(_("Path smoothing"))
       .SetType("Boolean");
-  properties[_("Acceleration")].SetValue(
+  properties["Acceleration"]
+      .SetLabel(_("Acceleration"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetPixelAcceleration()).SetValue(
       gd::String::From(behaviorContent.GetDoubleAttribute("acceleration")));
-  properties[_("Max. speed")].SetValue(
+  properties["MaxSpeed"]
+      .SetLabel(_("Max. speed"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetPixelSpeed()).SetValue(
       gd::String::From(behaviorContent.GetDoubleAttribute("maxSpeed")));
-  properties[_("Rotate speed")].SetGroup(_("Rotation")).SetValue(
-      gd::String::From(behaviorContent.GetDoubleAttribute("angularMaxSpeed")));
-  properties[_("Rotate object")].SetGroup(_("Rotation"))
+  properties["AngularMaxSpeed"]
+      .SetLabel(_("Rotation speed"))
+      .SetGroup(_("Rotation"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetAngularSpeed())
+      .SetValue(gd::String::From(
+          behaviorContent.GetDoubleAttribute("angularMaxSpeed")));
+  properties["RotateObject"]
+      .SetLabel(_("Rotate object"))
+      .SetGroup(_("Rotation"))
       .SetValue(behaviorContent.GetBoolAttribute("rotateObject") ? "true"
                                                                  : "false")
       .SetType("Boolean");
-  properties[_("Angle offset")].SetGroup(_("Rotation")).SetValue(
-      gd::String::From(behaviorContent.GetDoubleAttribute("angleOffset")));
-  properties[_("Virtual cell width")].SetGroup(_("Virtual Grid")).SetValue(
-      gd::String::From(behaviorContent.GetDoubleAttribute("cellWidth", 0)));
-  properties[_("Virtual cell height")].SetGroup(_("Virtual Grid")).SetValue(
-      gd::String::From(behaviorContent.GetDoubleAttribute("cellHeight", 0)));
-  properties[_("Virtual grid X offset")].SetGroup(_("Virtual Grid")).SetValue(
-      gd::String::From(behaviorContent.GetDoubleAttribute("gridOffsetX", 0)));
-  properties[_("Virtual grid Y offset")].SetGroup(_("Virtual Grid")).SetValue(
-      gd::String::From(behaviorContent.GetDoubleAttribute("gridOffsetY", 0)));
-  properties[_("Extra border size")].SetGroup(_("Collision")).SetValue(
-      gd::String::From(behaviorContent.GetDoubleAttribute("extraBorder")));
+  properties["AngleOffset"]
+      .SetLabel(_("Angle offset"))
+      .SetGroup(_("Rotation"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetDegreeAngle())
+      .SetValue(
+          gd::String::From(behaviorContent.GetDoubleAttribute("angleOffset")));
+  properties["CellWidth"]
+      .SetLabel(_("Virtual cell width"))
+      .SetGroup(_("Virtual Grid"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetPixel())
+      .SetValue(
+          gd::String::From(behaviorContent.GetDoubleAttribute("cellWidth", 0)));
+  properties["CellHeight"]
+      .SetLabel(_("Virtual cell height"))
+      .SetGroup(_("Virtual Grid"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetPixel())
+      .SetValue(gd::String::From(
+          behaviorContent.GetDoubleAttribute("cellHeight", 0)));
+  properties["GridOffsetX"]
+      .SetLabel(_("Virtual grid X offset"))
+      .SetGroup(_("Virtual Grid"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetPixel())
+      .SetValue(gd::String::From(
+          behaviorContent.GetDoubleAttribute("gridOffsetX", 0)));
+  properties["GridOffsetY"]
+      .SetLabel(_("Virtual grid Y offset"))
+      .SetGroup(_("Virtual Grid"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetPixel())
+      .SetValue(gd::String::From(
+          behaviorContent.GetDoubleAttribute("gridOffsetY", 0)));
+  properties["ExtraBorder"]
+      .SetDescription(_("Extra border size"))
+      .SetGroup(_("Collision"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetPixel())
+      .SetValue(
+          gd::String::From(behaviorContent.GetDoubleAttribute("extraBorder")));
+  properties["SmoothingMaxCellGap"]
+      .SetLabel(_("Smoothing max cell gap"))
+      .SetValue(gd::String::From(
+          behaviorContent.GetDoubleAttribute("smoothingMaxCellGap")))
+      .SetGroup(_("Path smoothing"))
+      .SetDescription(_("It's recommended to leave a max gap of 1 cell. "
+                        "Setting it to 0 disable the smoothing."));
 
   return properties;
 }
@@ -64,37 +117,39 @@ std::map<gd::String, gd::PropertyDescriptor> PathfindingBehavior::GetProperties(
 bool PathfindingBehavior::UpdateProperty(gd::SerializerElement& behaviorContent,
                                          const gd::String& name,
                                          const gd::String& value) {
-  if (name == _("Allows diagonals")) {
+  if (name == "AllowDiagonals") {
     behaviorContent.SetAttribute("allowDiagonals", (value != "0"));
     return true;
   }
-  if (name == _("Rotate object")) {
+  if (name == "RotateObject") {
     behaviorContent.SetAttribute("rotateObject", (value != "0"));
     return true;
   }
-  if (name == _("Extra border size")) {
+  if (name == "ExtraBorder") {
     behaviorContent.SetAttribute("extraBorder", value.To<float>());
     return true;
   }
 
   if (value.To<float>() < 0) return false;
 
-  if (name == _("Acceleration"))
+  if (name == "Acceleration")
     behaviorContent.SetAttribute("acceleration", value.To<float>());
-  else if (name == _("Max. speed"))
+  else if (name == "MaxSpeed")
     behaviorContent.SetAttribute("maxSpeed", value.To<float>());
-  else if (name == _("Rotate speed"))
+  else if (name == "AngularMaxSpeed")
     behaviorContent.SetAttribute("angularMaxSpeed", value.To<float>());
-  else if (name == _("Angle offset"))
+  else if (name == "AngleOffset")
     behaviorContent.SetAttribute("angleOffset", value.To<float>());
-  else if (name == _("Virtual cell width"))
+  else if (name == "CellWidth")
     behaviorContent.SetAttribute("cellWidth", value.To<float>());
-  else if (name == _("Virtual cell height"))
+  else if (name == "CellHeight")
     behaviorContent.SetAttribute("cellHeight", value.To<float>());
-  else if (name == _("Virtual grid X offset"))
+  else if (name == "GridOffsetX")
     behaviorContent.SetAttribute("gridOffsetX", value.To<float>());
-  else if (name == _("Virtual grid Y offset"))
+  else if (name == "GridOffsetY")
     behaviorContent.SetAttribute("gridOffsetY", value.To<float>());
+  else if (name == "SmoothingMaxCellGap")
+    behaviorContent.SetAttribute("smoothingMaxCellGap", value.To<float>());
   else
     return false;
 

Extensions/PathfindingBehavior/PathfindingObstacleBehavior.cpp

@@ -20,12 +20,14 @@ std::map<gd::String, gd::PropertyDescriptor>
 PathfindingObstacleBehavior::GetProperties(
     const gd::SerializerElement& behaviorContent) const {
   std::map<gd::String, gd::PropertyDescriptor> properties;
-  properties[_("Impassable obstacle")]
+  properties["Impassable"]
+      .SetLabel(_("Impassable obstacle"))
       .SetValue(behaviorContent.GetBoolAttribute("impassable") ? "true"
                                                                : "false")
       .SetType("Boolean");
-  properties[_("Cost (if not impassable)")].SetValue(
-      gd::String::From(behaviorContent.GetDoubleAttribute("cost")));
+  properties["Cost"]
+      .SetLabel(_("Cost (if not impassable)"))
+      .SetValue(gd::String::From(behaviorContent.GetDoubleAttribute("cost")));
 
   return properties;
 }
@@ -34,14 +36,14 @@ bool PathfindingObstacleBehavior::UpdateProperty(
     gd::SerializerElement& behaviorContent,
     const gd::String& name,
     const gd::String& value) {
-  if (name == _("Impassable obstacle")) {
+  if (name == "Impassable") {
     behaviorContent.SetAttribute("impassable", (value != "0"));
     return true;
   }
 
   if (value.To<float>() < 0) return false;
 
-  if (name == _("Cost (if not impassable)"))
+  if (name == "Cost")
     behaviorContent.SetAttribute("cost", value.To<float>());
   else
     return false;

Extensions/PathfindingBehavior/pathfindingruntimebehavior.ts

@@ -10,6 +10,10 @@ namespace gdjs {
    */
   export class PathfindingRuntimeBehavior extends gdjs.RuntimeBehavior {
     _path: Array<FloatPoint> = [];
+    /** Used by the path simplification algorithm */
+    static _smoothingResultVertices: Array<FloatPoint> = [];
+    /** Used by the path simplification algorithm */
+    static _smoothingWorkingVertices: Array<FloatPoint> = [];
 
     //Behavior configuration:
     _allowDiagonals: boolean;
@@ -23,6 +27,7 @@ namespace gdjs {
     _gridOffsetX: float;
     _gridOffsetY: float;
     _extraBorder: float;
+    _smoothingMaxCellGap: float;
 
     //Attributes used for traveling on the path:
     _pathFound: boolean = false;
@@ -60,6 +65,7 @@ namespace gdjs {
       this._gridOffsetX = behaviorData.gridOffsetX || 0;
       this._gridOffsetY = behaviorData.gridOffsetY || 0;
       this._extraBorder = behaviorData.extraBorder;
+      this._smoothingMaxCellGap = behaviorData.smoothingMaxCellGap || 0;
       this._manager = gdjs.PathfindingObstaclesManager.getManager(
         instanceContainer
       );
@@ -102,6 +108,12 @@ namespace gdjs {
       if (oldBehaviorData.extraBorder !== newBehaviorData.extraBorder) {
         this.setExtraBorder(newBehaviorData.extraBorder);
       }
+      if (
+        oldBehaviorData.smoothingMaxCellGap !==
+        newBehaviorData.smoothingMaxCellGap
+      ) {
+        this._smoothingMaxCellGap = newBehaviorData.smoothingMaxCellGap;
+      }
       return true;
     }
 
@@ -377,6 +389,20 @@ namespace gdjs {
         this._path.reverse();
         this._path[0][0] = owner.getX();
         this._path[0][1] = owner.getY();
+
+        if (this._allowDiagonals && this._smoothingMaxCellGap > 0) {
+          gdjs.pathfinding.simplifyPath(
+            this._path,
+            this._smoothingMaxCellGap *
+              Math.min(this._cellWidth, this._cellHeight),
+            gdjs.PathfindingRuntimeBehavior._smoothingResultVertices,
+            gdjs.PathfindingRuntimeBehavior._smoothingWorkingVertices
+          );
+          let swapArray = this._path;
+          this._path = gdjs.PathfindingRuntimeBehavior._smoothingResultVertices;
+          gdjs.PathfindingRuntimeBehavior._smoothingResultVertices = swapArray;
+        }
+
         this._enterSegment(0);
         this._pathFound = true;
         return;

Extensions/PathfindingBehavior/tests/FrameRatePathfindingRuntimeBehavior.spec.js

@@ -0,0 +1,239 @@
+// @ts-check
+describe('gdjs.PathfindingRuntimeBehavior', function () {
+  const epsilon = 1 / (2 << 16);
+  // tests cases where every collisionMethod has the same behavior.
+  let doCommonPathFindingTests = (collisionMethod) => {
+    const pathFindingName = 'auto1';
+
+    const createScene = (framePerSecond = 60) => {
+      const runtimeGame = new gdjs.RuntimeGame({
+        variables: [],
+        // @ts-ignore - missing properties.
+        properties: { windowWidth: 800, windowHeight: 600 },
+        resources: { resources: [] },
+      });
+      const runtimeScene = new gdjs.RuntimeScene(runtimeGame);
+      runtimeScene.loadFromScene({
+        layers: [
+          {
+            name: '',
+            visibility: true,
+            effects: [],
+            cameras: [],
+
+            ambientLightColorR: 0,
+            ambientLightColorG: 0,
+            ambientLightColorB: 0,
+            isLightingLayer: false,
+            followBaseLayerCamera: true,
+          },
+        ],
+        variables: [],
+        r: 0,
+        v: 0,
+        b: 0,
+        mangledName: 'Scene1',
+        name: 'Scene1',
+        stopSoundsOnStartup: false,
+        title: '',
+        behaviorsSharedData: [],
+        objects: [],
+        instances: [],
+      });
+      setFramePerSecond(runtimeScene, framePerSecond);
+      return runtimeScene;
+    };
+    const setFramePerSecond = (runtimeScene, framePerSecond) => {
+      runtimeScene._timeManager.getElapsedTime = function () {
+        return 1000 / framePerSecond;
+      };
+    };
+
+    const addPlayer = (runtimeScene, allowDiagonals) => {
+      const player = new gdjs.RuntimeObject(runtimeScene, {
+        name: 'player',
+        type: '',
+        behaviors: [
+          {
+            type: 'PathfindingBehavior::PathfindingBehavior',
+            name: 'auto1',
+            // @ts-ignore - properties are not typed
+            allowDiagonals: allowDiagonals,
+            acceleration: 400,
+            maxSpeed: 200,
+            angularMaxSpeed: 180,
+            rotateObject: false,
+            angleOffset: 0,
+            cellWidth: 20,
+            cellHeight: 20,
+            extraBorder: 0,
+            collisionMethod: true,
+          },
+        ],
+        effects: [],
+      });
+      player.getWidth = function () {
+        return 90;
+      };
+      player.getHeight = function () {
+        return 90;
+      };
+      runtimeScene.addObject(player);
+      return player;
+    };
+
+    const addObstacle = (runtimeScene) => {
+      const obstacle = new gdjs.RuntimeObject(runtimeScene, {
+        name: 'obstacle',
+        type: '',
+        behaviors: [
+          {
+            type: 'PathfindingBehavior::PathfindingObstacleBehavior',
+            // @ts-ignore - properties are not typed
+            impassable: true,
+            cost: 2,
+          },
+        ],
+        effects: [],
+      });
+      obstacle.getWidth = function () {
+        return 100;
+      };
+      obstacle.getHeight = function () {
+        return 100;
+      };
+      runtimeScene.addObject(obstacle);
+      return obstacle;
+    };
+
+    const getPathLength = (player) => {
+      /** @type gdjs.PathfindingRuntimeBehavior */
+      const behavior = player.getBehavior(pathFindingName);
+      if (behavior.getNodeCount() < 2) {
+        return 0;
+      }
+      let pathLength = 0;
+      let previousNodeX = behavior.getNodeX(0);
+      let previousNodeY = behavior.getNodeY(0);
+      for (let index = 1; index < behavior.getNodeCount(); index++) {
+        const nodeX = behavior.getNodeX(index);
+        const nodeY = behavior.getNodeY(index);
+        pathLength += Math.hypot(nodeX - previousNodeX, nodeY - previousNodeY);
+        previousNodeX = nodeX;
+        previousNodeY = nodeY;
+      }
+      return pathLength;
+    };
+
+    describe(`(allowDiagonals: true)`, function () {
+      let runtimeScene;
+      let player;
+
+      beforeEach(function () {
+        runtimeScene = createScene();
+        const allowDiagonals = true;
+        player = addPlayer(runtimeScene, allowDiagonals);
+      });
+
+      [20, 30, 60, 120].forEach((framePerSecond) => {
+        describe(`(${framePerSecond} fps)`, function () {
+          it('can move on the path at the right speed', function () {
+            setFramePerSecond(runtimeScene, framePerSecond);
+            const obstacle = addObstacle(runtimeScene);
+
+            obstacle.setPosition(600, 300);
+            // To ensure obstacles are registered.
+            runtimeScene.renderAndStep(1000 / framePerSecond);
+
+            player.setPosition(480, 300);
+            player.getBehavior(pathFindingName).moveTo(runtimeScene, 720, 300);
+            expect(player.getBehavior(pathFindingName).pathFound()).to.be(true);
+            expect(getPathLength(player)).to.be.above(720 - 480 + 50);
+
+            // Move on the path and stop before the last 1/10 of second.
+            for (let i = 0; i < (framePerSecond * 17) / 10; i++) {
+              runtimeScene.renderAndStep(1000 / framePerSecond);
+              expect(
+                player.getBehavior(pathFindingName).destinationReached()
+              ).to.be(false);
+            }
+            // The position is the same no matter the frame rate.
+            expect(player.getX()).to.be(720);
+            expect(player.getY()).to.be.within(
+              288.5786437626905 - epsilon,
+              288.5786437626905 + epsilon
+            );
+
+            // Let 1/10 of second pass,
+            // because the calculus interval is not the same for each case.
+            for (let i = 0; i < framePerSecond / 10; i++) {
+              runtimeScene.renderAndStep(1000 / framePerSecond);
+            }
+            // The destination is reached for every frame rate within 1/10 of second.
+            expect(player.getX()).to.be(720);
+            expect(player.getY()).to.be(300);
+            expect(
+              player.getBehavior(pathFindingName).destinationReached()
+            ).to.be(true);
+          });
+        });
+      });
+    });
+    describe(`(allowDiagonals: false)`, function () {
+      let runtimeScene;
+      let player;
+
+      beforeEach(function () {
+        runtimeScene = createScene();
+        const allowDiagonals = false;
+        player = addPlayer(runtimeScene, allowDiagonals);
+      });
+
+      [20, 30, 60, 120].forEach((framePerSecond) => {
+        describe(`(${framePerSecond} fps)`, function () {
+          it('can move on the path at the right speed', function () {
+            setFramePerSecond(runtimeScene, framePerSecond);
+            const obstacle = addObstacle(runtimeScene);
+
+            obstacle.setPosition(600, 300);
+            // To ensure obstacles are registered.
+            runtimeScene.renderAndStep(1000 / framePerSecond);
+
+            player.setPosition(480, 300);
+            player.getBehavior(pathFindingName).moveTo(runtimeScene, 720, 300);
+            expect(player.getBehavior(pathFindingName).pathFound()).to.be(true);
+            expect(getPathLength(player)).to.be.above(720 - 480 + 100);
+
+            // Move on the path and stop before the last 1/10 of second.
+            for (let i = 0; i < (framePerSecond * 20) / 10; i++) {
+              runtimeScene.renderAndStep(1000 / framePerSecond);
+              expect(
+                player.getBehavior(pathFindingName).destinationReached()
+              ).to.be(false);
+            }
+            expect(player.getX()).to.be(710);
+            expect(player.getY()).to.be.within(300 - epsilon, 300 + epsilon);
+
+            // Let 1/10 of second pass,
+            // because the calculus interval is not the same for each case.
+            for (let i = 0; i < (framePerSecond * 1) / 10; i++) {
+              runtimeScene.renderAndStep(1000 / framePerSecond);
+            }
+            // The destination is reached for every frame rate within 1/10 of second.
+            expect(player.getX()).to.be(720);
+            expect(player.getY()).to.be(300);
+            expect(
+              player.getBehavior(pathFindingName).destinationReached()
+            ).to.be(true);
+          });
+        });
+      });
+    });
+  };
+
+  ['Legacy'].forEach((collisionMethod) => {
+    describe(`(collisionMethod: ${collisionMethod}, `, function () {
+      doCommonPathFindingTests(collisionMethod);
+    });
+  });
+});

Extensions/PathfindingBehavior/tests/PathTools.spec.js

@@ -0,0 +1,115 @@
+// @ts-check
+describe('gdjs.pathfinding', function () {
+  it('can give back an empty path', function () {
+    expect(gdjs.pathfinding.simplifyPath([], 1)).to.eql([]);
+  });
+
+  it('can give back a path with only 1 vertex', function () {
+    expect(gdjs.pathfinding.simplifyPath([[2, 4]], 1)).to.eql([[2, 4]]);
+  });
+
+  it('can give back a path with only 2 vertex', function () {
+    expect(
+      gdjs.pathfinding.simplifyPath(
+        [
+          [2, 4],
+          [8, 1],
+        ],
+        1
+      )
+    ).to.eql([
+      [2, 4],
+      [8, 1],
+    ]);
+  });
+
+  it('can give back a path with 3 vertex', function () {
+    expect(
+      gdjs.pathfinding.simplifyPath(
+        [
+          [2, 4],
+          [8, 1],
+          [16, 32],
+        ],
+        1
+      )
+    ).to.eql([
+      [2, 4],
+      [8, 1],
+      [16, 32],
+    ]);
+  });
+
+  it('can simplify a line of vertices', function () {
+    expect(
+      gdjs.pathfinding.simplifyPath(
+        [
+          [2, 4],
+          [2, 5],
+          [2, 9],
+          [2, 9.5],
+        ],
+        1
+      )
+    ).to.eql([
+      [2, 4],
+      [2, 9.5],
+    ]);
+  });
+
+  it('can simplify a line of vertices with some tangential noise', function () {
+    expect(
+      gdjs.pathfinding.simplifyPath(
+        [
+          [2, 4],
+          [2.5, 5],
+          [1.1, 9],
+          [2, 9.5],
+        ],
+        1
+      )
+    ).to.eql([
+      [2, 4],
+      [2, 9.5],
+    ]);
+  });
+
+  it('can simplify an aliased oblique line', function () {
+    expect(
+      gdjs.pathfinding.simplifyPath(
+        [
+          [2, 4],
+          [3, 4],
+          [4, 3],
+          [5, 3],
+          [6, 3],
+          [7, 2],
+          [8, 2],
+        ],
+        1
+      )
+    ).to.eql([
+      [2, 4],
+      [8, 2],
+    ]);
+  });
+
+  it('can preserve a bend', function () {
+    expect(
+      gdjs.pathfinding.simplifyPath(
+        [
+          [2, 4],
+          [2.5, 5],
+          [2, 9],
+          [3, 9.9],
+          [5, 9],
+        ],
+        1
+      )
+    ).to.eql([
+      [2, 4],
+      [2, 9],
+      [5, 9],
+    ]);
+  });
+});

Extensions/PathfindingBehavior/tests/commonpathfindingruntimebehavior.spec.js

@@ -1,8 +1,11 @@
 // @ts-check
 describe('gdjs.PathfindingRuntimeBehavior', function () {
-  const epsilon = 1 / (2 << 16);
   // tests cases where every collisionMethod has the same behavior.
-  let doCommonPathFindingTests = (collisionMethod, allowDiagonals) => {
+  let doCommonPathFindingTests = (
+    collisionMethod,
+    allowDiagonals,
+    smoothingMaxCellGap
+  ) => {
     const pathFindingName = 'auto1';
 
     const createScene = (framePerSecond = 60) => {
@@ -67,6 +70,7 @@ describe('gdjs.PathfindingRuntimeBehavior', function () {
             cellWidth: 20,
             cellHeight: 20,
             extraBorder: 0,
+            smoothingMaxCellGap: smoothingMaxCellGap,
             collisionMethod: collisionMethod,
           },
         ],
@@ -106,6 +110,25 @@ describe('gdjs.PathfindingRuntimeBehavior', function () {
       return obstacle;
     };
 
+    const getPathLength = (player) => {
+      /** @type gdjs.PathfindingRuntimeBehavior */
+      const behavior = player.getBehavior(pathFindingName);
+      if (behavior.getNodeCount() < 2) {
+        return 0;
+      }
+      let pathLength = 0;
+      let previousNodeX = behavior.getNodeX(0);
+      let previousNodeY = behavior.getNodeY(0);
+      for (let index = 1; index < behavior.getNodeCount(); index++) {
+        const nodeX = behavior.getNodeX(index);
+        const nodeY = behavior.getNodeY(index);
+        pathLength += Math.hypot(nodeX - previousNodeX, nodeY - previousNodeY);
+        previousNodeX = nodeX;
+        previousNodeY = nodeY;
+      }
+      return pathLength;
+    };
+
     let runtimeScene;
     let player;
     beforeEach(function () {
@@ -117,7 +140,7 @@ describe('gdjs.PathfindingRuntimeBehavior', function () {
       player.setPosition(480, 300);
       player.getBehavior(pathFindingName).moveTo(runtimeScene, 720, 300);
       expect(player.getBehavior(pathFindingName).pathFound()).to.be(true);
-      expect(player.getBehavior(pathFindingName).getNodeCount()).to.be(13);
+      expect(getPathLength(player)).to.be(720 - 480);
     });
 
     it('can find a path without any obstacle in the way', function () {
@@ -130,7 +153,7 @@ describe('gdjs.PathfindingRuntimeBehavior', function () {
       player.setPosition(480, 300);
       player.getBehavior(pathFindingName).moveTo(runtimeScene, 720, 300);
       expect(player.getBehavior(pathFindingName).pathFound()).to.be(true);
-      expect(player.getBehavior(pathFindingName).getNodeCount()).to.be(13);
+      expect(getPathLength(player)).to.be(720 - 480);
     });
 
     it("mustn't find a path to the obstacle inside", function () {
@@ -155,101 +178,9 @@ describe('gdjs.PathfindingRuntimeBehavior', function () {
       player.setPosition(480, 300);
       player.getBehavior(pathFindingName).moveTo(runtimeScene, 720, 300);
       expect(player.getBehavior(pathFindingName).pathFound()).to.be(true);
-      expect(player.getBehavior(pathFindingName).getNodeCount()).to.be.above(
-        13
-      );
+      expect(getPathLength(player)).to.be.above(720 - 480 + 50);
     });
 
-    if (allowDiagonals) {
-      [20, 30, 60, 120].forEach((framePerSecond) => {
-        describe(`(${framePerSecond} fps)`, function () {
-          it('can move on the path at the right speed', function () {
-            setFramePerSecond(runtimeScene, framePerSecond);
-            const obstacle = addObstacle(runtimeScene);
-
-            obstacle.setPosition(600, 300);
-            // To ensure obstacles are registered.
-            runtimeScene.renderAndStep(1000 / framePerSecond);
-
-            player.setPosition(480, 300);
-            player.getBehavior(pathFindingName).moveTo(runtimeScene, 720, 300);
-            expect(player.getBehavior(pathFindingName).pathFound()).to.be(true);
-            expect(
-              player.getBehavior(pathFindingName).getNodeCount()
-            ).to.be.above(13);
-
-            // Move on the path and stop before the last 1/10 of second.
-            for (let i = 0; i < (framePerSecond * 17) / 10; i++) {
-              runtimeScene.renderAndStep(1000 / framePerSecond);
-              expect(
-                player.getBehavior(pathFindingName).destinationReached()
-              ).to.be(false);
-            }
-            // The position is the same no matter the frame rate.
-            expect(player.getX()).to.be(720);
-            expect(player.getY()).to.be.within(
-              288.5786437626905 - epsilon,
-              288.5786437626905 + epsilon
-            );
-
-            // Let 1/10 of second pass,
-            // because the calculus interval is not the same for each case.
-            for (let i = 0; i < framePerSecond / 10; i++) {
-              runtimeScene.renderAndStep(1000 / framePerSecond);
-            }
-            // The destination is reached for every frame rate within 1/10 of second.
-            expect(player.getX()).to.be(720);
-            expect(player.getY()).to.be(300);
-            expect(
-              player.getBehavior(pathFindingName).destinationReached()
-            ).to.be(true);
-          });
-        });
-      });
-    } else {
-      [20, 30, 60, 120].forEach((framePerSecond) => {
-        describe(`(${framePerSecond} fps)`, function () {
-          it('can move on the path at the right speed', function () {
-            setFramePerSecond(runtimeScene, framePerSecond);
-            const obstacle = addObstacle(runtimeScene);
-
-            obstacle.setPosition(600, 300);
-            // To ensure obstacles are registered.
-            runtimeScene.renderAndStep(1000 / framePerSecond);
-
-            player.setPosition(480, 300);
-            player.getBehavior(pathFindingName).moveTo(runtimeScene, 720, 300);
-            expect(player.getBehavior(pathFindingName).pathFound()).to.be(true);
-            expect(
-              player.getBehavior(pathFindingName).getNodeCount()
-            ).to.be.above(13);
-
-            // Move on the path and stop before the last 1/10 of second.
-            for (let i = 0; i < (framePerSecond * 20) / 10; i++) {
-              runtimeScene.renderAndStep(1000 / framePerSecond);
-              expect(
-                player.getBehavior(pathFindingName).destinationReached()
-              ).to.be(false);
-            }
-            expect(player.getX()).to.be(710);
-            expect(player.getY()).to.be.within(300 - epsilon, 300 + epsilon);
-
-            // Let 1/10 of second pass,
-            // because the calculus interval is not the same for each case.
-            for (let i = 0; i < (framePerSecond * 1) / 10; i++) {
-              runtimeScene.renderAndStep(1000 / framePerSecond);
-            }
-            // The destination is reached for every frame rate within 1/10 of second.
-            expect(player.getX()).to.be(720);
-            expect(player.getY()).to.be(300);
-            expect(
-              player.getBehavior(pathFindingName).destinationReached()
-            ).to.be(true);
-          });
-        });
-      });
-    }
-
     it('can find a path between 2 obstacles', function () {
       const obstacleTop = addObstacle(runtimeScene);
       const obstacleBottom = addObstacle(runtimeScene);
@@ -262,7 +193,7 @@ describe('gdjs.PathfindingRuntimeBehavior', function () {
       player.setPosition(480, 300);
       player.getBehavior(pathFindingName).moveTo(runtimeScene, 720, 300);
       expect(player.getBehavior(pathFindingName).pathFound()).to.be(true);
-      expect(player.getBehavior(pathFindingName).getNodeCount()).to.be(13);
+      expect(getPathLength(player)).to.be(720 - 480);
     });
 
     it("mustn't find a path to a closed room", function () {
@@ -288,7 +219,15 @@ describe('gdjs.PathfindingRuntimeBehavior', function () {
     describe(`(collisionMethod: ${collisionMethod}, `, function () {
       [false, true].forEach((allowDiagonals) => {
         describe(`(allowDiagonals: ${allowDiagonals})`, function () {
-          doCommonPathFindingTests(collisionMethod, allowDiagonals);
+          [0, 1].forEach((smoothingMaxCellGap) => {
+            describe(`(smoothingMaxCellGap: ${smoothingMaxCellGap})`, function () {
+              doCommonPathFindingTests(
+                collisionMethod,
+                allowDiagonals,
+                smoothingMaxCellGap
+              );
+            });
+          });
         });
       });
     });

Extensions/PathfindingBehavior/tests/legacypathfindingruntimebehavior.spec.js

@@ -1,6 +1,8 @@
 // @ts-check
 describe('gdjs.PathfindingRuntimeBehavior', function () {
   // limit tests cases on the legacy collision methods.
+  // Note that the legacy collision mode is still the only mode that exists
+  // because the new one were never merged.
   let doLegacyPathFindingTests = (
     cellSize,
     objectCenteredOnCells,

Extensions/Physics2Behavior/JsExtension.js

@@ -200,6 +200,7 @@ module.exports = {
             .toString(10)
         )
         .setType('Number')
+        .setMeasurementUnit(gd.MeasurementUnit.getPixel())
         .setLabel('Shape Dimension A');
       behaviorProperties
         .getOrCreate('shapeDimensionB')
@@ -210,6 +211,7 @@ module.exports = {
             .toString(10)
         )
         .setType('Number')
+        .setMeasurementUnit(gd.MeasurementUnit.getPixel())
         .setLabel('Shape Dimension B');
       behaviorProperties
         .getOrCreate('shapeOffsetX')
@@ -217,6 +219,7 @@ module.exports = {
           behaviorContent.getChild('shapeOffsetX').getDoubleValue().toString(10)
         )
         .setType('Number')
+        .setMeasurementUnit(gd.MeasurementUnit.getPixel())
         .setLabel('Shape Offset X');
       behaviorProperties
         .getOrCreate('shapeOffsetY')
@@ -224,6 +227,7 @@ module.exports = {
           behaviorContent.getChild('shapeOffsetY').getDoubleValue().toString(10)
         )
         .setType('Number')
+        .setMeasurementUnit(gd.MeasurementUnit.getPixel())
         .setLabel('Shape Offset Y');
       behaviorProperties
         .getOrCreate('polygonOrigin')
@@ -373,13 +377,15 @@ module.exports = {
         .setValue(
           sharedContent.getChild('gravityX').getDoubleValue().toString(10)
         )
-        .setType('Number');
+        .setType('Number')
+        .setMeasurementUnit(gd.MeasurementUnit.getNewton());
       sharedProperties
         .getOrCreate('gravityY')
         .setValue(
           sharedContent.getChild('gravityY').getDoubleValue().toString(10)
         )
-        .setType('Number');
+        .setType('Number')
+        .setMeasurementUnit(gd.MeasurementUnit.getNewton());
       sharedProperties
         .getOrCreate('scaleX')
         .setValue(

Extensions/Physics2Behavior/physics2runtimebehavior.ts

@@ -825,8 +825,12 @@ namespace gdjs {
     }
 
     doStepPreEvents(instanceContainer: gdjs.RuntimeInstanceContainer) {
-      // Step the world if not done this frame yet
-      if (!this._sharedData.stepped) {
+      // Step the world if not done this frame yet.
+      // Don't step at the first frame to allow events to handle overlapping objects.
+      if (
+        !this._sharedData.stepped &&
+        !instanceContainer.getScene().getTimeManager().isFirstFrame()
+      ) {
         // Reset started and ended contacts array for all physics instances.
         this._sharedData.resetStartedAndEndedCollisions();
         this._sharedData.updateBodiesFromObjects();

Extensions/Physics2Behavior/tests/physics2runtimebehavior.spec.js

@@ -64,7 +64,7 @@ describe('Physics2RuntimeBehavior', () => {
       resources: { resources: [] },
       properties: { windowWidth: 1000, windowHeight: 1000 },
     });
-    const runtimeScene = new gdjs.RuntimeScene(runtimeGame);
+    const runtimeScene = new gdjs.TestRuntimeScene(runtimeGame);
     runtimeScene.loadFromScene({
       layers: [
         {
@@ -236,6 +236,39 @@ describe('Physics2RuntimeBehavior', () => {
       expect(behavior.getRestitution()).to.be(0.5);
     });
 
+    it('should not resolve collision before the 1st frame events', () => {
+      const fps = 60;
+      runtimeScene._timeManager.getElapsedTime = function () {
+        return (1 / fps) * 1000;
+      };
+
+      // Create objects in contact
+      const {
+        object: object1,
+        behavior: object1Behavior,
+      } = createObjectWithPhysicsBehavior(runtimeScene, {
+        bodyType: 'Dynamic',
+      });
+      object1.setPosition(10, 0);
+      const {
+        object: object2,
+        behavior: object2Behavior,
+      } = createObjectWithPhysicsBehavior(runtimeScene, {
+        bodyType: 'Static',
+        restitution: 0,
+      });
+      object2.setPosition(20, 0);
+
+      // First frame
+      runtimeScene.renderAndStep(1000 / fps);
+
+      // The object has not moved.
+      expect(object1.getX()).to.be(10);
+      expect(object1.getY()).to.be(0);
+      expect(object2.getX()).to.be(20);
+      expect(object2.getY()).to.be(0);
+    });
+
     it('should clear contacts when deactivating the physics2 behavior', () => {
       const fps = 60;
       runtimeGame.setGameResolutionSize(1000, 1000);
@@ -243,6 +276,9 @@ describe('Physics2RuntimeBehavior', () => {
         return (1 / fps) * 1000;
       };
 
+      // The behavior doesn't call Box2D step at the 1st frame.
+      runtimeScene.renderAndStep(1000 / fps);
+
       // Create objects not in contact
       const {
         object: object1,
@@ -271,11 +307,10 @@ describe('Physics2RuntimeBehavior', () => {
       ).to.be(true);
 
       // Put objects in contact and assert collision started during the frame
-      runtimeScene.setEventsFunction(() => {
+      runtimeScene.renderAndStepWithEventsFunction(1000 / fps, () => {
         object1.setPosition(10, 0);
         object2.setPosition(20, 0);
       });
-      runtimeScene.renderAndStep(1000 / fps);
 
       // After post event, collision should be present
       assertCollision(object1, object2, {
@@ -284,9 +319,6 @@ describe('Physics2RuntimeBehavior', () => {
         stopped: false,
       });
 
-      // Reset scene events
-      runtimeScene.setEventsFunction(() => {});
-
       // Deactivate physics behavior and test that collisions are cleared.
       object1.activateBehavior('Physics2', false);
       assertCollision(object1, object2, {
@@ -424,33 +456,28 @@ describe('Physics2RuntimeBehavior', () => {
       movingObjectBehavior.setLinearVelocityY(40000);
 
       let hasBounced = false;
-      let stepIndex = 0;
-
-      runtimeScene.setEventsFunction(() => {
-        if (movingObjectBehavior.getLinearVelocityY() > 0) {
-          // If the moving object has a positive velocity, it hasn't bounced
-          // on the static object
-          assertCollision(movingObject, staticObject, {
-            started: false,
-            collision: false,
-            stopped: false,
-          });
-        } else {
-          hasBounced = true;
-          expect(movingObject.getY() < staticObject.getY()).to.be(true);
-          assertCollision(movingObject, staticObject, {
-            started: true,
-            collision: true,
-            stopped: true,
-          });
-        }
-      });
-      while (stepIndex < 10 && !hasBounced) {
-        runtimeScene.renderAndStep(1000 / fps);
-        stepIndex++;
+      for (let stepIndex = 0; stepIndex < 10 && !hasBounced; stepIndex++) {
+        runtimeScene.renderAndStepWithEventsFunction(1000 / fps, () => {
+          if (movingObjectBehavior.getLinearVelocityY() > 0) {
+            // If the moving object has a positive velocity, it hasn't bounced
+            // on the static object
+            assertCollision(movingObject, staticObject, {
+              started: false,
+              collision: false,
+              stopped: false,
+            });
+          } else {
+            hasBounced = true;
+            expect(movingObject.getY() < staticObject.getY()).to.be(true);
+            assertCollision(movingObject, staticObject, {
+              started: true,
+              collision: true,
+              stopped: true,
+            });
+          }
+        });
       }
 
-      runtimeScene.setEventsFunction(() => {});
       runtimeScene.renderAndStep(1000 / fps);
       assertCollision(movingObject, staticObject, {
         started: false,
@@ -486,32 +513,31 @@ describe('Physics2RuntimeBehavior', () => {
       movingObjectBehavior.setLinearVelocityY(40000);
 
       let hasBegunBouncing = false;
-      let stepIndex = 0;
-
-      runtimeScene.setEventsFunction(() => {
-        if (movingObjectBehavior.getLinearVelocityY() > 0) {
-          // If the moving object has a positive velocity, it hasn't bounced
-          // on the static object
-          assertCollision(movingObject, staticObject, {
-            started: false,
-            collision: false,
-            stopped: false,
-          });
-        } else {
-          hasBegunBouncing = true;
-          // At first frame, collision should have only started
-          expect(movingObject.getY() < staticObject.getY()).to.be(true);
-          assertCollision(movingObject, staticObject, {
-            started: true,
-            collision: true,
-            stopped: false,
-          });
-        }
-      });
-
-      while (stepIndex < 10 && !hasBegunBouncing) {
-        runtimeScene.renderAndStep(1000 / fps);
-        stepIndex++;
+      for (
+        let stepIndex = 0;
+        stepIndex < 10 && !hasBegunBouncing;
+        stepIndex++
+      ) {
+        runtimeScene.renderAndStepWithEventsFunction(1000 / fps, () => {
+          if (movingObjectBehavior.getLinearVelocityY() > 0) {
+            // If the moving object has a positive velocity, it hasn't bounced
+            // on the static object
+            assertCollision(movingObject, staticObject, {
+              started: false,
+              collision: false,
+              stopped: false,
+            });
+          } else {
+            hasBegunBouncing = true;
+            // At first frame, collision should have only started
+            expect(movingObject.getY() < staticObject.getY()).to.be(true);
+            assertCollision(movingObject, staticObject, {
+              started: true,
+              collision: true,
+              stopped: false,
+            });
+          }
+        });
       }
 
       if (!hasBegunBouncing) {
@@ -522,8 +548,7 @@ describe('Physics2RuntimeBehavior', () => {
 
       // At next frame, end of collision should be detected
       let hasFinishedBouncing = false;
-
-      runtimeScene.setEventsFunction(() => {
+      runtimeScene.renderAndStepWithEventsFunction(1000 / fps, () => {
         hasFinishedBouncing = true;
         assertCollision(movingObject, staticObject, {
           started: false,
@@ -532,8 +557,6 @@ describe('Physics2RuntimeBehavior', () => {
         });
       });
 
-      runtimeScene.renderAndStep(1000 / fps);
-
       if (!hasFinishedBouncing) {
         throw new Error('End of contact was not detected, nothing was tested.');
       }
@@ -546,6 +569,9 @@ describe('Physics2RuntimeBehavior', () => {
         return (1 / fps) * 1000;
       };
 
+      // The behavior doesn't call Box2D step at the 1st frame.
+      runtimeScene.renderAndStep(1000 / fps);
+
       const {
         behavior: movingObjectBehavior,
         object: movingObject,
@@ -567,7 +593,7 @@ describe('Physics2RuntimeBehavior', () => {
         stopped: false,
       });
 
-      runtimeScene.setEventsFunction(() => {
+      runtimeScene.renderAndStepWithEventsFunction(1000 / fps, () => {
         // Manually call onContactEnd and onContactBegin methods to simulate
         // a loss of contact followed by a contact beginning during the preEvent.
         movingObject
@@ -584,7 +610,6 @@ describe('Physics2RuntimeBehavior', () => {
           stopped: false,
         });
       });
-      runtimeScene.renderAndStep(1000 / fps);
     });
 
     it('should not detect a new contact if the contact ended and jittered.', () => {
@@ -594,6 +619,9 @@ describe('Physics2RuntimeBehavior', () => {
         return (1 / fps) * 1000;
       };
 
+      // The behavior doesn't call Box2D step at the 1st frame.
+      runtimeScene.renderAndStep(1000 / fps);
+
       const {
         behavior: movingObjectBehavior,
         object: movingObject,
@@ -615,7 +643,7 @@ describe('Physics2RuntimeBehavior', () => {
         stopped: false,
       });
 
-      runtimeScene.setEventsFunction(() => {
+      runtimeScene.renderAndStepWithEventsFunction(1000 / fps, () => {
         // Manually call onContactEnd and onContactBegin methods to simulate
         // a loss of contact followed by a contact beginning and another loss
         // of contact during the event.
@@ -637,7 +665,6 @@ describe('Physics2RuntimeBehavior', () => {
           stopped: true,
         });
       });
-      runtimeScene.renderAndStep(1000 / fps);
     });
 
     it('it should end collision on resize (body updated in pre-event).', () => {
@@ -647,6 +674,9 @@ describe('Physics2RuntimeBehavior', () => {
         return (1 / fps) * 1000;
       };
 
+      // The behavior doesn't call Box2D step at the 1st frame.
+      runtimeScene.renderAndStep(1000 / fps);
+
       const {
         behavior: movingObjectBehavior,
         object: movingObject,
@@ -668,18 +698,15 @@ describe('Physics2RuntimeBehavior', () => {
       });
 
       // Resize.
-      runtimeScene.setEventsFunction(() => {
+      runtimeScene.renderAndStepWithEventsFunction(1000 / fps, () => {
         movingObject.setCustomWidthAndHeight(5, 5);
       });
-
-      runtimeScene.renderAndStep(1000 / fps);
       assertCollision(movingObject, staticObject, {
         started: false,
         collision: true,
         stopped: false,
       });
 
-      runtimeScene.setEventsFunction(() => {});
       runtimeScene.renderAndStep(1000 / fps);
       assertCollision(movingObject, staticObject, {
         started: false,
@@ -695,6 +722,9 @@ describe('Physics2RuntimeBehavior', () => {
         return (1 / fps) * 1000;
       };
 
+      // The behavior doesn't call Box2D step at the 1st frame.
+      runtimeScene.renderAndStep(1000 / fps);
+
       const {
         behavior: movingObjectBehavior,
         object: movingObject,
@@ -716,13 +746,11 @@ describe('Physics2RuntimeBehavior', () => {
         stopped: false,
       });
 
-      // Destroy (postEvent operation).
-      runtimeScene.setEventsFunction(() => {
+      // Destroy (handled by postEvent).
+      runtimeScene.renderAndStepWithEventsFunction(1000 / fps, () => {
         movingObject.deleteFromScene(runtimeScene);
       });
 
-      runtimeScene.renderAndStep(1000 / fps);
-
       // Collision should be reset on destroyed object and
       // added to contactsEndedThisFrame array of the other object.
       assertCollision(movingObject, staticObject, {

Extensions/PlatformBehavior/PlatformBehavior.cpp

@@ -36,18 +36,24 @@ std::map<gd::String, gd::PropertyDescriptor> PlatformBehavior::GetProperties(
   else if (platformType == "Jumpthru")
     platformTypeStr = _("Jumpthru platform");
 
-  properties[_("Type")]
+  properties["PlatformType"]
+      .SetLabel(_("Type"))
       .SetValue(platformTypeStr)
       .SetType("Choice")
       .AddExtraInfo(_("Platform"))
       .AddExtraInfo(_("Jumpthru platform"))
       .AddExtraInfo(_("Ladder"));
-  properties[_("Ledges can be grabbed")].SetGroup(_("Ledge"))
+  properties["CanBeGrabbed"]
+      .SetLabel(_("Ledges can be grabbed"))
+      .SetGroup(_("Ledge"))
       .SetValue(behaviorContent.GetBoolAttribute("canBeGrabbed", true)
                     ? "true"
                     : "false")
       .SetType("Boolean");
-  properties[_("Grab offset on Y axis")].SetGroup(_("Ledge")).SetValue(
+  properties["YGrabOffset"]
+      .SetLabel(_("Grab offset on Y axis"))
+      .SetGroup(_("Ledge"))
+      .SetValue(
       gd::String::From(behaviorContent.GetDoubleAttribute("yGrabOffset")));
 
   return properties;
@@ -56,16 +62,16 @@ std::map<gd::String, gd::PropertyDescriptor> PlatformBehavior::GetProperties(
 bool PlatformBehavior::UpdateProperty(gd::SerializerElement& behaviorContent,
                                       const gd::String& name,
                                       const gd::String& value) {
-  if (name == _("Ledges can be grabbed"))
+  if (name == "CanBeGrabbed")
     behaviorContent.SetAttribute("canBeGrabbed", (value == "1"));
-  else if (name == _("Type")) {
+  else if (name == "PlatformType") {
     if (value == _("Jumpthru platform"))
       behaviorContent.SetAttribute("platformType", "Jumpthru");
     else if (value == _("Ladder"))
       behaviorContent.SetAttribute("platformType", "Ladder");
     else
       behaviorContent.SetAttribute("platformType", "NormalPlatform");
-  } else if (name == _("Grab offset on Y axis"))
+  } else if (name == "YGrabOffset")
     behaviorContent.SetAttribute("yGrabOffset", value.To<double>());
   else
     return false;

Extensions/PlatformBehavior/PlatformerObjectBehavior.cpp

@@ -13,6 +13,7 @@ This project is released under the MIT License.
 
 #include "GDCore/CommonTools.h"
 #include "GDCore/Project/Layout.h"
+#include "GDCore/Project/MeasurementUnit.h"
 #include "GDCore/Project/PropertyDescriptor.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Tools/Localization.h"
@@ -44,60 +45,109 @@ PlatformerObjectBehavior::GetProperties(
     const gd::SerializerElement& behaviorContent) const {
   std::map<gd::String, gd::PropertyDescriptor> properties;
 
-  properties[_("Gravity")].SetGroup(_("Jump")).SetValue(
-      gd::String::From(behaviorContent.GetDoubleAttribute("gravity")));
-  properties[_("Jump speed")].SetGroup(_("Jump")).SetValue(
-      gd::String::From(behaviorContent.GetDoubleAttribute("jumpSpeed")));
-  properties["jumpSustainTime"]
+  properties["Gravity"]
+      .SetLabel(_("Gravity"))
       .SetGroup(_("Jump"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetPixelAcceleration())
+      .SetValue(
+          gd::String::From(behaviorContent.GetDoubleAttribute("gravity")));
+  properties["JumpSpeed"]
+      .SetLabel(_("Jump speed"))
+      .SetGroup(_("Jump"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetPixelSpeed())
+      .SetValue(
+          gd::String::From(behaviorContent.GetDoubleAttribute("jumpSpeed")));
+  properties["JumpSustainTime"]
+      .SetLabel(_("Jump sustain time"))
+      .SetGroup(_("Jump"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetSecond())
       .SetValue(gd::String::From(
           behaviorContent.GetDoubleAttribute("jumpSustainTime", 0)))
-      .SetLabel(_("Jump sustain time"))
       .SetDescription(
           _("Maximum time (in seconds) during which the jump strength is "
             "sustained if the jump key is held - allowing variable height "
             "jumps."));
-  properties[_("Max. falling speed")].SetGroup(_("Jump")).SetValue(
-      gd::String::From(behaviorContent.GetDoubleAttribute("maxFallingSpeed")));
-  properties[_("Ladder climbing speed")]
+  properties["MaxFallingSpeed"]
+      .SetLabel(_("Max. falling speed"))
+      .SetGroup(_("Jump"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetPixelSpeed())
+      .SetValue(gd::String::From(
+          behaviorContent.GetDoubleAttribute("maxFallingSpeed")));
+  properties["LadderClimbingSpeed"]
+      .SetLabel(_("Ladder climbing speed"))
       .SetGroup(_("Ladder"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetPixelSpeed())
       .SetValue(gd::String::From(
           behaviorContent.GetDoubleAttribute("ladderClimbingSpeed", 150)));
-  properties[_("Acceleration")].SetGroup(_("Walk")).SetValue(
-      gd::String::From(behaviorContent.GetDoubleAttribute("acceleration")));
-  properties[_("Deceleration")].SetGroup(_("Walk")).SetValue(
-      gd::String::From(behaviorContent.GetDoubleAttribute("deceleration")));
-  properties[_("Max. speed")].SetGroup(_("Walk")).SetValue(
-      gd::String::From(behaviorContent.GetDoubleAttribute("maxSpeed")));
-  properties[_("Default controls")]
+  properties["Acceleration"]
+      .SetLabel(_("Acceleration"))
+      .SetGroup(_("Walk"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetPixelAcceleration())
+      .SetValue(
+          gd::String::From(behaviorContent.GetDoubleAttribute("acceleration")));
+  properties["Deceleration"]
+      .SetLabel(_("Deceleration"))
+      .SetGroup(_("Walk"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetPixelAcceleration())
+      .SetValue(
+          gd::String::From(behaviorContent.GetDoubleAttribute("deceleration")));
+  properties["MaxSpeed"]
+      .SetLabel(_("Max. speed"))
+      .SetGroup(_("Walk"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetPixelSpeed())
+      .SetValue(
+          gd::String::From(behaviorContent.GetDoubleAttribute("maxSpeed")));
+  properties["IgnoreDefaultControls"]
+      .SetLabel(_("Default controls"))
       .SetValue(behaviorContent.GetBoolAttribute("ignoreDefaultControls")
                     ? "false"
                     : "true")
       .SetType("Boolean");
-  properties[_("Slope max. angle")].SetGroup(_("Walk")).SetValue(
-      gd::String::From(behaviorContent.GetDoubleAttribute("slopeMaxAngle")));
-  properties[_("Can grab platform ledges")]
+  properties["SlopeMaxAngle"]
+      .SetLabel(_("Slope max. angle"))
+      .SetGroup(_("Walk"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetDegreeAngle())
+      .SetValue(gd::String::From(
+          behaviorContent.GetDoubleAttribute("slopeMaxAngle")));
+  properties["CanGrabPlatforms"]
+      .SetLabel(_("Can grab platform ledges"))
       .SetGroup(_("Ledge"))
       .SetValue(behaviorContent.GetBoolAttribute("canGrabPlatforms", false)
                     ? "true"
                     : "false")
       .SetType("Boolean");
-  properties[_("Automatically grab platform ledges without having to move "
-               "horizontally")]
+  properties["CanGrabWithoutMoving"]
+      .SetLabel(_("Automatically grab platform ledges without having to move "
+                  "horizontally"))
       .SetGroup(_("Ledge"))
       .SetValue(behaviorContent.GetBoolAttribute("canGrabWithoutMoving", false)
                     ? "true"
                     : "false")
       .SetType("Boolean");
-  properties[_("Grab offset on Y axis")]
+  properties["YGrabOffset"]
+      .SetLabel(_("Grab offset on Y axis"))
       .SetGroup(_("Ledge"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetPixel())
       .SetValue(
           gd::String::From(behaviorContent.GetDoubleAttribute("yGrabOffset")));
-  properties[_("Grab tolerance on X axis")]
+  properties["XGrabTolerance"]
+      .SetLabel(_("Grab tolerance on X axis"))
       .SetGroup(_("Ledge"))
+      .SetType("Number")
+      .SetMeasurementUnit(gd::MeasurementUnit::GetPixel())
       .SetValue(gd::String::From(
           behaviorContent.GetDoubleAttribute("xGrabTolerance", 10)));
-  properties["useLegacyTrajectory"]
+  properties["UseLegacyTrajectory"]
       .SetLabel(_("Use frame rate dependent trajectories (deprecated, it's "
                   "recommended to leave this unchecked)"))
       .SetGroup(_("Deprecated options (advanced)"))
@@ -105,7 +155,8 @@ PlatformerObjectBehavior::GetProperties(
                     ? "true"
                     : "false")
       .SetType("Boolean");
-  properties[_("Can go down from jumpthru platforms")]
+  properties["CanGoDownFromJumpthru"]
+      .SetLabel(_("Can go down from jumpthru platforms"))
       .SetGroup(_("Walk"))
       .SetValue(behaviorContent.GetBoolAttribute("canGoDownFromJumpthru", false)
                     ? "true"
@@ -118,44 +169,43 @@ bool PlatformerObjectBehavior::UpdateProperty(
     gd::SerializerElement& behaviorContent,
     const gd::String& name,
     const gd::String& value) {
-  if (name == _("Default controls"))
+  if (name == "IgnoreDefaultControls")
     behaviorContent.SetAttribute("ignoreDefaultControls", (value == "0"));
-  else if (name == _("Can grab platform ledges"))
+  else if (name == "CanGrabPlatforms")
     behaviorContent.SetAttribute("canGrabPlatforms", (value == "1"));
-  else if (name == _("Automatically grab platform ledges without having to "
-                     "move horizontally"))
+  else if (name == "CanGrabWithoutMoving")
     behaviorContent.SetAttribute("canGrabWithoutMoving", (value == "1"));
-  else if (name == "useLegacyTrajectory")
+  else if (name == "UseLegacyTrajectory")
     behaviorContent.SetAttribute("useLegacyTrajectory", (value == "1"));
-  else if (name == _("Can go down from jumpthru platforms"))
+  else if (name == "CanGoDownFromJumpthru")
     behaviorContent.SetAttribute("canGoDownFromJumpthru", (value == "1"));
-  else if (name == _("Grab offset on Y axis"))
+  else if (name == "YGrabOffset")
     behaviorContent.SetAttribute("yGrabOffset", value.To<double>());
   else {
     if (value.To<double>() < 0) return false;
 
-    if (name == _("Gravity"))
+    if (name == "Gravity")
       behaviorContent.SetAttribute("gravity", value.To<double>());
-    else if (name == _("Max. falling speed"))
+    else if (name == "MaxFallingSpeed")
       behaviorContent.SetAttribute("maxFallingSpeed", value.To<double>());
-    else if (name == _("Ladder climbing speed"))
+    else if (name == "LadderClimbingSpeed")
       behaviorContent.SetAttribute("ladderClimbingSpeed", value.To<double>());
-    else if (name == _("Acceleration"))
+    else if (name == "Acceleration")
       behaviorContent.SetAttribute("acceleration", value.To<double>());
-    else if (name == _("Deceleration"))
+    else if (name == "Deceleration")
       behaviorContent.SetAttribute("deceleration", value.To<double>());
-    else if (name == _("Max. speed"))
+    else if (name == "MaxSpeed")
       behaviorContent.SetAttribute("maxSpeed", value.To<double>());
-    else if (name == _("Jump speed"))
+    else if (name == "JumpSpeed")
       behaviorContent.SetAttribute("jumpSpeed", value.To<double>());
-    else if (name == "jumpSustainTime")
+    else if (name == "JumpSustainTime")
       behaviorContent.SetAttribute("jumpSustainTime", value.To<double>());
-    else if (name == _("Slope max. angle")) {
+    else if (name == "SlopeMaxAngle") {
       double newMaxAngle = value.To<double>();
       if (newMaxAngle < 0 || newMaxAngle >= 90) return false;
 
       behaviorContent.SetAttribute("slopeMaxAngle", newMaxAngle);
-    } else if (name == _("Grab tolerance on X axis"))
+    } else if (name == "XGrabTolerance")
       behaviorContent.SetAttribute("xGrabTolerance", value.To<double>());
     else
       return false;

Extensions/PlatformBehavior/platformerobjectruntimebehavior.ts

@@ -1143,6 +1143,14 @@ namespace gdjs {
       return this._gravity;
     }
 
+    /**
+     * Get maximum angle of a slope for the Platformer Object to run on it as a floor.
+     * @returns the slope maximum angle, in degrees.
+     */
+    getSlopeMaxAngle(): float {
+      return this._slopeMaxAngle;
+    }
+
     /**
      * Get the maximum falling speed of the Platformer Object.
      * @returns The maximum falling speed.

Extensions/PlatformBehavior/tests/FlatFloorPlatformer.spec.js

@@ -404,7 +404,9 @@ describe('gdjs.PlatformerObjectRuntimeBehavior', function () {
         expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
 
         // Make the platform under the character feet smaller.
-        object.setCustomWidthAndHeight(object.getWidth(), 9);
+        runtimeScene.renderAndStepWithEventsFunction(1000 / 60, () => {
+          object.setCustomWidthAndHeight(object.getWidth(), 9);
+        });
         runtimeScene.renderAndStep(1000 / 60);
         expect(object.getBehavior('auto1').isFalling()).to.be(false);
         expect(object.getBehavior('auto1').isFallingWithoutJumping()).to.be(
@@ -679,18 +681,11 @@ describe('gdjs.PlatformerObjectRuntimeBehavior', function () {
       expect(object.getY()).to.be.within(140.6297999, 140.6298001);
 
       // Move the platform by 6 pixels to the right.
-      platform.setX(platform.getX() + 1);
-      runtimeScene.renderAndStep(1000 / 60);
-      platform.setX(platform.getX() + 1);
-      runtimeScene.renderAndStep(1000 / 60);
-      platform.setX(platform.getX() + 1);
-      runtimeScene.renderAndStep(1000 / 60);
-      platform.setX(platform.getX() + 1);
-      runtimeScene.renderAndStep(1000 / 60);
-      platform.setX(platform.getX() + 1);
-      runtimeScene.renderAndStep(1000 / 60);
-      platform.setX(platform.getX() + 1);
-      runtimeScene.renderAndStep(1000 / 60);
+      for (let index = 0; index < 6; index++) {
+        runtimeScene.renderAndStepWithEventsFunction(1000 / 60, () => {
+          platform.setX(platform.getX() + 1);
+        });
+      }
 
       // Ensure the object followed the platform on the X axis.
       // If the floating point errors caused oscillations between two Y positions,
@@ -699,6 +694,9 @@ describe('gdjs.PlatformerObjectRuntimeBehavior', function () {
       expect(object.getBehavior('auto1').isFalling()).to.be(false);
       expect(object.getBehavior('auto1').isOnFloor()).to.be(true);
       expect(object.getY()).to.be.within(140.6297999, 140.6298001);
+      // TODO Remove the 1-frame delay
+      expect(object.getX()).to.be(5);
+      runtimeScene.renderAndStep(1000 / 60);
       expect(object.getX()).to.be(6);
     });
   });

Extensions/PlatformBehavior/tests/MovingPlatformPlatformer.spec.js

@@ -59,13 +59,18 @@ describe('gdjs.PlatformerObjectRuntimeBehavior', function () {
 
       // Check that the object follow the platform, even if the
       // movement is less than one pixel.
-      platform.setX(platform.getX() + 0.12);
+      runtimeScene.renderAndStepWithEventsFunction(1000 / 60, () => {
+        platform.setX(platform.getX() + 0.12);
+      });
+      runtimeScene.renderAndStepWithEventsFunction(1000 / 60, () => {
+        platform.setX(platform.getX() + 0.12);
+      });
+      runtimeScene.renderAndStepWithEventsFunction(1000 / 60, () => {
+        platform.setX(platform.getX() + 0.12);
+      });
+      // TODO Remove the 1-frame delay
+      expect(object.getX()).to.be(0.24);
       runtimeScene.renderAndStep(1000 / 60);
-      platform.setX(platform.getX() + 0.12);
-      runtimeScene.renderAndStep(1000 / 60);
-      platform.setX(platform.getX() + 0.12);
-      runtimeScene.renderAndStep(1000 / 60);
-
       expect(object.getX()).to.be(0.36);
     });
 
@@ -240,22 +245,28 @@ describe('gdjs.PlatformerObjectRuntimeBehavior', function () {
             // Check that the object follow the platform, even if the
             // movement is less than one pixel.
             for (let i = 0; i < 5; ++i) {
-              platform.setPosition(
-                platform.getX() + deltaX,
-                platform.getY() + deltaY
-              );
-              runtimeScene.renderAndStep(1000 / 60);
+              const previousPlatformY = platform.getY();
+              runtimeScene.renderAndStepWithEventsFunction(1000 / 60, () => {
+                platform.setPosition(
+                  platform.getX() + deltaX,
+                  platform.getY() + deltaY
+                );
+              });
               expect(object.getBehavior('auto1').isOnFloor()).to.be(true);
               expect(object.getBehavior('auto1').isFalling()).to.be(false);
               expect(object.getBehavior('auto1').isMoving()).to.be(false);
               // The object follow the platform
               // The rounding error is probably due to a separate call.
               // TODO Try to make it exact or find why
+              // TODO Remove the 1-frame delay
               expect(object.getY()).to.be.within(
-                platform.getY() - object.getHeight() - epsilon,
-                platform.getY() - object.getHeight() + epsilon
+                previousPlatformY - object.getHeight() - epsilon,
+                previousPlatformY - object.getHeight() + epsilon
               );
             }
+            // TODO Remove the 1-frame delay
+            expect(object.getX()).to.be(0 + 4 * deltaX);
+            runtimeScene.renderAndStep(1000 / 60);
             expect(object.getX()).to.be(0 + 5 * deltaX);
           });
         });
@@ -378,20 +389,26 @@ describe('gdjs.PlatformerObjectRuntimeBehavior', function () {
               // Check that the object follow the platform, even if the
               // movement is less than one pixel.
               for (let i = 0; i < 5; ++i) {
-                platform.setPosition(
-                  platform.getX() + deltaX,
-                  platform.getY() + deltaY
-                );
-                runtimeScene.renderAndStep(1000 / 60);
+                const previousPlatformY = platform.getY();
+                runtimeScene.renderAndStepWithEventsFunction(1000 / 60, () => {
+                  platform.setPosition(
+                    platform.getX() + deltaX,
+                    platform.getY() + deltaY
+                  );
+                });
                 expect(object.getBehavior('auto1').isOnFloor()).to.be(true);
                 expect(object.getBehavior('auto1').isFalling()).to.be(false);
                 expect(object.getBehavior('auto1').isMoving()).to.be(false);
                 // The object must not be inside the platform or it gets stuck
+                // TODO Remove the 1-frame delay
                 expect(object.getY()).to.be.within(
-                  platform.getY() - object.getHeight() - epsilon,
-                  platform.getY() - object.getHeight() + epsilon
+                  previousPlatformY - object.getHeight() - epsilon,
+                  previousPlatformY - object.getHeight() + epsilon
                 );
               }
+              // TODO Remove the 1-frame delay
+              expect(object.getX()).to.be(0 + 4 * deltaX);
+              runtimeScene.renderAndStep(1000 / 60);
               expect(object.getX()).to.be(0 + 5 * deltaX);
             });
           });

Extensions/PlatformBehavior/tests/PlatformerTestHelper.js

@@ -7,7 +7,7 @@
       },
       properties: { windowWidth: 800, windowHeight: 600 },
     });
-    const runtimeScene = new gdjs.RuntimeScene(runtimeGame);
+    const runtimeScene = new gdjs.TestRuntimeScene(runtimeGame);
     runtimeScene.loadFromScene({
       layers: [{ name: '', visibility: true, effects: [] }],
       variables: [],

Extensions/TextInput/tests/textinputruntimeobject.pixiruntimegamewithassets.spec.js

@@ -111,7 +111,6 @@ describe('gdjs.TextInputRuntimeObject (using a PixiJS RuntimeGame with DOM eleme
     const {
       runtimeScene,
       gameDomElementContainer,
-      object,
     } = await setupObjectAndGetDomElementContainer();
 
     expect(gameDomElementContainer.querySelector('input')).not.to.be(null);

Extensions/TextInput/textinputruntimeobject-pixi-renderer.ts

@@ -169,8 +169,8 @@ namespace gdjs {
 
       // Position the input on the container on top of the canvas.
       workingPoint[0] = canvasLeft;
-      workingPoint[1] = canvasRight;
-      const topLeftPageCoordinates = runtimeGameRenderer.convertCanvasToDomElementContainerCoords(
+      workingPoint[1] = canvasTop;
+      runtimeGameRenderer.convertCanvasToDomElementContainerCoords(
         workingPoint,
         workingPoint
       );
@@ -179,7 +179,7 @@ namespace gdjs {
 
       workingPoint[0] = canvasRight;
       workingPoint[1] = canvasBottom;
-      const bottomRightPageCoordinates = runtimeGameRenderer.convertCanvasToDomElementContainerCoords(
+      runtimeGameRenderer.convertCanvasToDomElementContainerCoords(
         workingPoint,
         workingPoint
       );