Build for macOS

.circleci/config.yml

@@ -64,11 +64,11 @@ jobs:
       # Note: Code signing is done using CSC_LINK (see https://www.electron.build/code-signing).
       - run:
           name: Build GDevelop IDE
-          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --mac --publish=never
+          command: export CSC_FOR_PULL_REQUEST=true && export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --mac --publish=never
 
       - run:
           name: Clean dist folder to keep only installers/binaries.
-          command: rm -rf "newIDE/electron-app/dist/mac/GDevelop 5.app" && rm -rf "newIDE/electron-app/dist/mac-arm64/GDevelop 5.app"
+          command: rm -rf "newIDE/electron-app/dist/mac/GDevelop 5.app"
 
       # Upload artifacts (CircleCI)
       - store_artifacts:
@@ -101,8 +101,8 @@ jobs:
           command: sudo apt-get update && sudo apt install cmake
 
       - run:
-         name: Install Python3 dependencies for Emscripten
-         command: sudo apt install python-is-python3 python3-distutils -y
+          name: Install Python3 dependencies for Emscripten
+          command: sudo apt install python-is-python3 python3-distutils -y
 
       - run:
           name: Install Emscripten (for GDevelop.js)
@@ -143,11 +143,11 @@ jobs:
       # Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
       - run:
           name: Build GDevelop IDE
-          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --linux --publish=never
+          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --linux AppImage zip deb --publish=never
 
       - run:
           name: Clean dist folder to keep only installers/binaries.
-          command: rm -rf newIDE/electron-app/dist/linux-unpacked && rm -rf newIDE/electron-app/dist/linux-arm64-unpacked
+          command: rm -rf newIDE/electron-app/dist/linux-unpacked
 
       # Upload artifacts (CircleCI)
       - store_artifacts:
@@ -178,8 +178,8 @@ jobs:
           command: sudo apt-get update && sudo apt install cmake
 
       - run:
-         name: Install Python3 dependencies for Emscripten
-         command: sudo apt install python-is-python3 python3-distutils -y
+          name: Install Python3 dependencies for Emscripten
+          command: sudo apt install python-is-python3 python3-distutils -y
 
       - run:
           name: Install Emscripten (for GDevelop.js)

.github/ISSUE_TEMPLATE/--asset-store-submission.md

@@ -1,19 +0,0 @@
----
-name: "📦 Asset Store submission"
-about: Submit a free asset pack for the GDevelop Asset Store.
-title: ''
-labels: "📦 Asset Store submission" 
-assignees: ''
-
----
-
-BEFORE opening a new submission, please make sure that you:
-
-- You have packaged the asset pack according [these rules](https://wiki.gdevelop.io/gdevelop5/community/contribute-to-the-assets-store). Otherwise, your package may be rejected or we will ask you to do the changes.
-
-## Description
-
-- License:
-- Author:
-- Link to the original website:
-- Zip file:

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].GetType() == "relationalOperator")
+    if (instrInfos.parameters[i].type == "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].GetType() == "operator") operatorIndex = i;
+    if (instrInfos.parameters[i].type == "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].GetType() == "operator") operatorIndex = i;
+    if (instrInfos.parameters[i].type == "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].GetType() == "operator") operatorIndex = i;
+    if (instrInfos.parameters[i].type == "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].GetType())) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].type)) {
       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].GetExtraInfo().empty() &&
+      } else if (!instrInfos.parameters[pNb].supplementaryInformation.empty() &&
                  gd::GetTypeOfObject(GetGlobalObjectsAndGroups(),
                                      GetObjectsAndGroups(),
                                      objectInParameter) !=
-                     instrInfos.parameters[pNb].GetExtraInfo()) {
+                     instrInfos.parameters[pNb].supplementaryInformation) {
         return "/* Mismatched object type - skipped. */";
       }
     }
@@ -468,14 +468,6 @@ gd::String EventsCodeGenerator::GenerateActionCode(
         action, *this, context);
   }
 
-  // Get the correct function name depending on whether it should be async or
-  // not.
-  const gd::String& functionCallName =
-      instrInfos.IsAsync() &&
-              (!instrInfos.IsOptionallyAsync() || action.IsAwaited())
-          ? instrInfos.codeExtraInformation.asyncFunctionCallName
-          : instrInfos.codeExtraInformation.functionCallName;
-
   // Be sure there is no lack of parameter.
   while (action.GetParameters().size() < instrInfos.parameters.size()) {
     vector<gd::Expression> parameters = action.GetParameters();
@@ -485,7 +477,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].GetType())) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].type)) {
       gd::String objectInParameter = action.GetParameter(pNb).GetPlainString();
       if (!GetObjectsAndGroups().HasObjectNamed(objectInParameter) &&
           !GetGlobalObjectsAndGroups().HasObjectNamed(objectInParameter) &&
@@ -493,11 +485,11 @@ gd::String EventsCodeGenerator::GenerateActionCode(
           !GetGlobalObjectsAndGroups().GetObjectGroups().Has(
               objectInParameter)) {
         return "/* Unknown object - skipped. */";
-      } else if (!instrInfos.parameters[pNb].GetExtraInfo().empty() &&
+      } else if (!instrInfos.parameters[pNb].supplementaryInformation.empty() &&
                  gd::GetTypeOfObject(GetGlobalObjectsAndGroups(),
                                      GetObjectsAndGroups(),
                                      objectInParameter) !=
-                     instrInfos.parameters[pNb].GetExtraInfo()) {
+                     instrInfos.parameters[pNb].supplementaryInformation) {
         return "/* Mismatched object type - skipped. */";
       }
     }
@@ -530,7 +522,6 @@ gd::String EventsCodeGenerator::GenerateActionCode(
               action.GetParameters(), instrInfos.parameters, context);
           actionCode += GenerateObjectAction(realObjects[i],
                                              objInfo,
-                                             functionCallName,
                                              arguments,
                                              instrInfos,
                                              context,
@@ -565,7 +556,6 @@ gd::String EventsCodeGenerator::GenerateActionCode(
             GenerateBehaviorAction(realObjects[i],
                                    action.GetParameter(1).GetPlainString(),
                                    autoInfo,
-                                   functionCallName,
                                    arguments,
                                    instrInfos,
                                    context,
@@ -577,11 +567,8 @@ gd::String EventsCodeGenerator::GenerateActionCode(
   } else {
     vector<gd::String> arguments = GenerateParametersCodes(
         action.GetParameters(), instrInfos.parameters, context);
-    actionCode += GenerateFreeAction(functionCallName,
-                                     arguments,
-                                     instrInfos,
-                                     context,
-                                     optionalAsyncCallbackName);
+    actionCode +=
+        GenerateFreeAction(arguments, instrInfos, context, optionalAsyncCallbackName);
   }
 
   return actionCode;
@@ -670,18 +657,6 @@ 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,
@@ -691,24 +666,30 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
         supplementaryParametersTypes) {
   gd::String argOutput;
 
-  if (ParameterMetadata::IsExpression("number", metadata.GetType())) {
+  if (ParameterMetadata::IsExpression("number", metadata.type)) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
         *this, context, "number", parameter, lastObjectName);
-  } else if (ParameterMetadata::IsExpression("string", metadata.GetType())) {
+  } else if (ParameterMetadata::IsExpression("string", metadata.type)) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
         *this, context, "string", parameter, lastObjectName);
-  } else if (ParameterMetadata::IsExpression("variable", metadata.GetType())) {
+  } else if (ParameterMetadata::IsExpression("variable", metadata.type)) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this, context, metadata.GetType(), parameter, lastObjectName);
-  } else if (ParameterMetadata::IsObject(metadata.GetType())) {
+        *this, context, metadata.type, parameter, lastObjectName);
+  } else if (ParameterMetadata::IsObject(metadata.type)) {
     // 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.GetType(), context);
-  } else if (metadata.GetType() == "relationalOperator") {
-    argOutput += GenerateRelationalOperatorCodes(parameter.GetPlainString());
+    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 = "==";
+    }
+
     argOutput = "\"" + argOutput + "\"";
-  } else if (metadata.GetType() == "operator") {
+  } else if (metadata.type == "operator") {
     argOutput += parameter.GetPlainString();
     if (argOutput != "=" && argOutput != "+" && argOutput != "-" &&
         argOutput != "/" && argOutput != "*") {
@@ -717,50 +698,48 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
     }
 
     argOutput = "\"" + argOutput + "\"";
-  } else if (ParameterMetadata::IsBehavior(metadata.GetType())) {
+  } else if (ParameterMetadata::IsBehavior(metadata.type)) {
     argOutput = GenerateGetBehaviorNameCode(parameter.GetPlainString());
-  } else if (metadata.GetType() == "key") {
+  } else if (metadata.type == "key") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
-  } else if (metadata.GetType() == "audioResource" ||
-             metadata.GetType() == "bitmapFontResource" ||
-             metadata.GetType() == "fontResource" ||
-             metadata.GetType() == "imageResource" ||
-             metadata.GetType() == "jsonResource" ||
-             metadata.GetType() == "videoResource" ||
+  } else if (metadata.type == "audioResource" ||
+             metadata.type == "bitmapFontResource" ||
+             metadata.type == "fontResource" ||
+             metadata.type == "imageResource" ||
+             metadata.type == "jsonResource" ||
+             metadata.type == "videoResource" ||
              // Deprecated, old parameter names:
-             metadata.GetType() == "password" || metadata.GetType() == "musicfile" ||
-             metadata.GetType() == "soundfile" || metadata.GetType() == "police") {
+             metadata.type == "password" || metadata.type == "musicfile" ||
+             metadata.type == "soundfile" || metadata.type == "police") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
-  } else if (metadata.GetType() == "mouse") {
+  } else if (metadata.type == "mouse") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
-  } else if (metadata.GetType() == "yesorno") {
+  } else if (metadata.type == "yesorno") {
     auto parameterString = parameter.GetPlainString();
-    argOutput += (parameterString == "yes" || parameterString == "oui")
-                     ? GenerateTrue()
-                     : GenerateFalse();
-  } else if (metadata.GetType() == "trueorfalse") {
+    argOutput += (parameterString == "yes" || parameterString == "oui") ? GenerateTrue()
+                                                            : GenerateFalse();
+  } else if (metadata.type == "trueorfalse") {
     auto parameterString = parameter.GetPlainString();
     // This is duplicated in AdvancedExtension.cpp for GDJS
-    argOutput += (parameterString == "True" || parameterString == "Vrai")
-                     ? GenerateTrue()
-                     : GenerateFalse();
+    argOutput += (parameterString == "True" || parameterString == "Vrai") ? GenerateTrue()
+                                                              : GenerateFalse();
   }
   // Code only parameter type
-  else if (metadata.GetType() == "inlineCode") {
-    argOutput += metadata.GetExtraInfo();
+  else if (metadata.type == "inlineCode") {
+    argOutput += metadata.supplementaryInformation;
   } else {
     // Try supplementary types if provided
     if (supplementaryParametersTypes) {
       for (std::size_t i = 0; i < supplementaryParametersTypes->size(); ++i) {
-        if ((*supplementaryParametersTypes)[i].first == metadata.GetType())
+        if ((*supplementaryParametersTypes)[i].first == metadata.type)
           argOutput += (*supplementaryParametersTypes)[i].second;
       }
     }
 
     // Type unknown
     if (argOutput.empty()) {
-      if (!metadata.GetType().empty())
-        cout << "Warning: Unknown type of parameter \"" << metadata.GetType()
+      if (!metadata.type.empty())
+        cout << "Warning: Unknown type of parameter \"" << metadata.type
              << "\"." << std::endl;
       argOutput += "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
     }
@@ -1035,7 +1014,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].GetType() == "conditionInverted")
+    if (instrInfos.parameters[i].type == "conditionInverted")
       conditionAlreadyTakeCareOfInversion = true;
   }
   if (!conditionAlreadyTakeCareOfInversion && conditionInverted)
@@ -1056,7 +1035,7 @@ gd::String EventsCodeGenerator::GenerateObjectCondition(
   // Prepare call
   // Add a static_cast if necessary
   gd::String objectFunctionCallNamePart =
-      (!instrInfos.parameters[0].GetExtraInfo().empty())
+      (!instrInfos.parameters[0].supplementaryInformation.empty())
           ? "static_cast<" + objInfo.className + "*>(" +
                 GetObjectListName(objectName, context) + "[i])->" +
                 instrInfos.codeExtraInformation.functionCallName
@@ -1103,7 +1082,6 @@ gd::String EventsCodeGenerator::GenerateBehaviorCondition(
 }
 
 gd::String EventsCodeGenerator::GenerateFreeAction(
-      const gd::String& functionCallName,
     const std::vector<gd::String>& arguments,
     const gd::InstructionMetadata& instrInfos,
     gd::EventsCodeGenerationContext& context,
@@ -1117,21 +1095,21 @@ gd::String EventsCodeGenerator::GenerateFreeAction(
       call = GenerateOperatorCall(
           instrInfos,
           arguments,
-          functionCallName,
+          instrInfos.codeExtraInformation.functionCallName,
           instrInfos.codeExtraInformation.optionalAssociatedInstruction);
     else if (instrInfos.codeExtraInformation.accessType ==
              gd::InstructionMetadata::ExtraInformation::Mutators)
       call =
           GenerateMutatorCall(instrInfos,
                               arguments,
-                              functionCallName);
+                              instrInfos.codeExtraInformation.functionCallName);
     else
       call = GenerateCompoundOperatorCall(
           instrInfos,
           arguments,
-          functionCallName);
+          instrInfos.codeExtraInformation.functionCallName);
   } else {
-    call = functionCallName + "(" +
+    call = instrInfos.codeExtraInformation.functionCallName + "(" +
            GenerateArgumentsList(arguments) + ")";
   }
 
@@ -1145,7 +1123,6 @@ gd::String EventsCodeGenerator::GenerateFreeAction(
 gd::String EventsCodeGenerator::GenerateObjectAction(
     const gd::String& objectName,
     const gd::ObjectMetadata& objInfo,
-    const gd::String& functionCallName,
     const std::vector<gd::String>& arguments,
     const gd::InstructionMetadata& instrInfos,
     gd::EventsCodeGenerationContext& context,
@@ -1159,25 +1136,27 @@ gd::String EventsCodeGenerator::GenerateObjectAction(
       call = GenerateOperatorCall(
           instrInfos,
           arguments,
-          functionCallName,
+          instrInfos.codeExtraInformation.functionCallName,
           instrInfos.codeExtraInformation.optionalAssociatedInstruction,
           2);
     else
       call = GenerateCompoundOperatorCall(
-          instrInfos, arguments, functionCallName, 2);
+          instrInfos,
+          arguments,
+          instrInfos.codeExtraInformation.functionCallName,
+          2);
 
     return "For each picked object \"" + objectName + "\", call " + call +
            ".\n";
   } else {
     gd::String argumentsStr = GenerateArgumentsList(arguments, 1);
 
-    call = functionCallName + "(" + argumentsStr + ")";
+    call = instrInfos.codeExtraInformation.functionCallName + "(" +
+           argumentsStr + ")";
 
     return "For each picked object \"" + objectName + "\", call " + call + "(" +
            argumentsStr + ")" +
-           (optionalAsyncCallbackName.empty()
-                ? ""
-                : (", then call" + optionalAsyncCallbackName)) +
+           (optionalAsyncCallbackName.empty() ? "" : (", then call" + optionalAsyncCallbackName)) +
            ".\n";
   }
 }
@@ -1186,7 +1165,6 @@ gd::String EventsCodeGenerator::GenerateBehaviorAction(
     const gd::String& objectName,
     const gd::String& behaviorName,
     const gd::BehaviorMetadata& autoInfo,
-    const gd::String& functionCallName,
     const std::vector<gd::String>& arguments,
     const gd::InstructionMetadata& instrInfos,
     gd::EventsCodeGenerationContext& context,
@@ -1200,28 +1178,26 @@ gd::String EventsCodeGenerator::GenerateBehaviorAction(
       call = GenerateOperatorCall(
           instrInfos,
           arguments,
-          functionCallName,
+          instrInfos.codeExtraInformation.functionCallName,
           instrInfos.codeExtraInformation.optionalAssociatedInstruction,
           2);
     else
       call = GenerateCompoundOperatorCall(
           instrInfos,
           arguments,
-          functionCallName,
+          instrInfos.codeExtraInformation.functionCallName,
           2);
     return "For each picked object \"" + objectName + "\", call " + call +
            " for behavior \"" + behaviorName + "\".\n";
   } else {
     gd::String argumentsStr = GenerateArgumentsList(arguments, 2);
 
-    call = functionCallName + "(" +
+    call = instrInfos.codeExtraInformation.functionCallName + "(" +
            argumentsStr + ")";
 
     return "For each picked object \"" + objectName + "\", call " + call + "(" +
            argumentsStr + ")" + " for behavior \"" + behaviorName + "\"" +
-           (optionalAsyncCallbackName.empty()
-                ? ""
-                : (", then call" + optionalAsyncCallbackName)) +
+           (optionalAsyncCallbackName.empty() ? "" : (", then call" + optionalAsyncCallbackName)) +
            ".\n";
   }
 }

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -154,10 +154,9 @@ class GD_CORE_API EventsCodeGenerator {
    * \param context Context used for generation
    * \return Code
    */
-  gd::String GenerateActionCode(
-      gd::Instruction& action,
-      EventsCodeGenerationContext& context,
-      const gd::String& optionalAsyncCallbackName = "");
+  gd::String GenerateActionCode(gd::Instruction& action,
+                                EventsCodeGenerationContext& context,
+                                const gd::String& optionalAsyncCallbackName = "");
 
   struct CallbackDescriptor {
     CallbackDescriptor(const gd::String functionName_,
@@ -175,8 +174,7 @@ class GD_CORE_API EventsCodeGenerator {
      */
     const gd::String argumentsList;
     /**
-     * A set of all objects that need to be backed up to be passed to the
-     * callback code.
+     * A set of all objects that need to be backed up to be passed to the callback code.
      */
     const std::set<gd::String> requiredObjects;
   };
@@ -481,9 +479,6 @@ 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.
@@ -512,10 +507,10 @@ class GD_CORE_API EventsCodeGenerator {
    * - currentScene: Reference to the current runtime scene.
    * - objectList : a map containing lists of objects which are specified by the
   object name in another parameter.
-   * - objectListOrEmptyIfJustDeclared : Same as `objectList` but do not pick
-  object if they are not already picked.
-   * - objectPtr: Return a reference to the object specified by the object name
-  in another parameter. Example:
+   * - objectListOrEmptyIfJustDeclared : Same as `objectList` but do not pick object if
+  they are not already picked.
+   * - objectPtr: Return a reference to the object specified by the object name in
+  another parameter. Example:
    * \code
   .AddParameter("object", _("Object"))
   .AddParameter("objectPtr", _("Target object"))
@@ -705,7 +700,6 @@ class GD_CORE_API EventsCodeGenerator {
       gd::EventsCodeGenerationContext& context);
 
   virtual gd::String GenerateFreeAction(
-      const gd::String& functionCallName,
       const std::vector<gd::String>& arguments,
       const gd::InstructionMetadata& instrInfos,
       gd::EventsCodeGenerationContext& context,
@@ -714,7 +708,6 @@ class GD_CORE_API EventsCodeGenerator {
   virtual gd::String GenerateObjectAction(
       const gd::String& objectName,
       const gd::ObjectMetadata& objInfo,
-      const gd::String& functionCallName,
       const std::vector<gd::String>& arguments,
       const gd::InstructionMetadata& instrInfos,
       gd::EventsCodeGenerationContext& context,
@@ -724,7 +717,6 @@ class GD_CORE_API EventsCodeGenerator {
       const gd::String& objectName,
       const gd::String& behaviorName,
       const gd::BehaviorMetadata& autoInfo,
-      const gd::String& functionCallName,
       const std::vector<gd::String>& arguments,
       const gd::InstructionMetadata& instrInfos,
       gd::EventsCodeGenerationContext& context,
@@ -783,8 +775,8 @@ class GD_CORE_API EventsCodeGenerator {
 
   bool hasProjectAndLayout;  ///< true only if project and layout are valid
                              ///< references. If false, they should not be used.
-  const gd::Project* project;  ///< The project being used.
-  const gd::Layout* scene;     ///< The scene being generated.
+  const gd::Project* project;      ///< The project being used.
+  const gd::Layout* scene;   ///< The scene being generated.
 
   bool errorOccurred;          ///< Must be set to true if an error occured.
   bool compilationForRuntime;  ///< Is set to true if the code generation is

Core/GDCore/Events/Event.cpp

@@ -75,8 +75,7 @@ void BaseEvent::PreprocessAsyncActions(const gd::Platform& platform) {
       const auto& action = actionsList->at(aId);
       const gd::InstructionMetadata& actionMetadata =
           gd::MetadataProvider::GetActionMetadata(platform, action.GetType());
-      if (actionMetadata.IsAsync() &&
-          (!actionMetadata.IsOptionallyAsync() || action.IsAwaited())) {
+      if (actionMetadata.IsAsync()) {
         gd::InstructionsList remainingActions;
         remainingActions.InsertInstructions(
             *actionsList, aId + 1, actionsList->size() - 1);

Core/GDCore/Events/Instruction.cpp

@@ -55,10 +55,6 @@ 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

@@ -72,22 +72,6 @@ class GD_CORE_API Instruction {
    */
   void SetInverted(bool inverted_) { inverted = inverted_; }
 
-  /**
-   * \brief Return true if the async instruction should be awaited.
-   * This is not relevant if the instruction is not optionally asynchronous.
-   *
-   * \return true if the instruction is to be awaited
-   */
-  bool IsAwaited() const { return awaitAsync; }
-
-  /**
-   * \brief Set if the async instruction is to be awaited or not.
-   * This is not relevant if the instruction is not optionally asynchronous.
-   *
-   * \param inverted true if the instruction must be awaited
-   */
-  void SetAwaited(bool awaited) { awaitAsync = awaited; }
-
   /**
    * \brief Return the number of parameters of the instruction.
    */
@@ -123,11 +107,6 @@ 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
    */
@@ -160,9 +139,7 @@ class GD_CORE_API Instruction {
    * Useful to get reference to the original instruction in memory during code
    * generation, to ensure stable unique identifiers.
    */
-  std::weak_ptr<Instruction> GetOriginalInstruction() {
-    return originalInstruction;
-  };
+  std::weak_ptr<Instruction> GetOriginalInstruction() { return originalInstruction; };
 
   friend std::shared_ptr<Instruction> CloneRememberingOriginalElement(
       std::shared_ptr<Instruction> instruction);
@@ -171,9 +148,6 @@ class GD_CORE_API Instruction {
   gd::String type;  ///< Instruction type
   bool inverted;  ///< True if the instruction if inverted. Only applicable for
                   ///< instruction used as conditions by events
-  bool awaitAsync =
-      false;  ///< Tells the code generator whether the optionally asynchronous
-              ///< instruction should be generated as asynchronous (awaited) or not.
   mutable std::vector<gd::Expression>
       parameters;                        ///< Vector containing the parameters
   gd::InstructionsList subInstructions;  ///< Sub instructions, if applicable.

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].GetType() == "relationalOperator" ||
-          metadata.parameters[j].GetType() == "operator") {
+      if (metadata.parameters[j].type == "relationalOperator" ||
+          metadata.parameters[j].type == "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";
@@ -269,9 +269,6 @@ void gd::EventsListSerialization::UnserializeInstructionsFrom(
         instrElement.GetChild("type", 0, "Type")
             .GetBoolAttribute("inverted", false, "Contraire"));
 
-    instruction.SetAwaited(
-        instrElement.GetChild("type", 0, "Type").GetBoolAttribute("await"));
-
     // Read parameters
     vector<gd::Expression> parameters;
 
@@ -349,8 +346,6 @@ void gd::EventsListSerialization::SerializeInstructionsTo(
 
     if (list[k].IsInverted())
       instruction.GetChild("type").SetAttribute("inverted", true);
-    if (list[k].IsAwaited())
-      instruction.GetChild("type").SetAttribute("await", true);
 
     // Parameters
     SerializerElement& parameters = instruction.AddChild("parameters");

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,34 +90,10 @@ 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/AudioExtension.cpp

@@ -14,14 +14,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
   extension
       .SetExtensionInformation(
           "BuiltinAudio",
-          _("Sounds and music"),
+          _("Sounds and musics"),
           _("GDevelop provides several conditions and actions to play audio "
-            "files. They can be either long music or short sound effects."),
+            "files. They can be either long musics or short sound effects."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/audio")
       .SetCategory("Audio");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Sounds and music"))
+  extension.AddInstructionOrExpressionGroupMetadata(_("Sounds and musics"))
       .SetIcon("res/actions/music24.png");
 
   extension
@@ -73,9 +73,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
 
   extension
       .AddAction("RePlaySoundCanal",
-                 _("Resume playing a sound on a channel"),
-                 _("Resume playing a sound on a channel that was paused."),
-                 _("Resume the sound of channel _PARAM1_"),
+                 _("Play the sound of a channel"),
+                 _("Play the sound of the channel."),
+                 _("Play the sound of channel _PARAM1_"),
                  _("Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
@@ -132,9 +132,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
 
   extension
       .AddAction("RePlayMusicCanal",
-                 _("Resume playing a music on a channel"),
-                 _("Resume playing a music on a channel that was paused."),
-                 _("Resume the music of channel _PARAM1_"),
+                 _("Play the music of a channel"),
+                 _("Play the music of the channel."),
+                 _("Play the music of channel _PARAM1_"),
                  _("Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -28,7 +28,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
   extension.AddInstructionOrExpressionGroupMetadata(_("Movement using forces"))
       .SetIcon("res/actions/force24.png");
 
-  gd::ObjectMetadata& obj = extension.AddObject<gd::ObjectConfiguration>(
+  gd::ObjectMetadata& obj = extension.AddObject<gd::Object>(
       "", _("Base object"), _("Base object"), "res/objeticon24.png");
 
   obj.AddCondition("PosX",
@@ -36,8 +36,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Compare the X position of the object."),
                    _("the X position"),
                    _("Position"),
-                   "res/conditions/position24_black.png",
-                   "res/conditions/position_black.png")
+                   "res/conditions/position24.png",
+                   "res/conditions/position.png")
 
       .AddParameter("object", _("Object"))
       .UseStandardRelationalOperatorParameters("number")
@@ -48,8 +48,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Change the X position of an object."),
                 _("the X position"),
                 _("Position"),
-                "res/actions/position24_black.png",
-                "res/actions/position_black.png")
+                "res/actions/position24.png",
+                "res/actions/position.png")
 
       .AddParameter("object", _("Object"))
       .UseStandardOperatorParameters("number")
@@ -60,8 +60,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Compare the Y position of an object."),
                    _("the Y position"),
                    _("Position"),
-                   "res/conditions/position24_black.png",
-                   "res/conditions/position_black.png")
+                   "res/conditions/position24.png",
+                   "res/conditions/position.png")
 
       .AddParameter("object", _("Object"))
       .UseStandardRelationalOperatorParameters("number")
@@ -72,8 +72,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Change the Y position of an object."),
                 _("the Y position"),
                 _("Position"),
-                "res/actions/position24_black.png",
-                "res/actions/position_black.png")
+                "res/actions/position24.png",
+                "res/actions/position.png")
 
       .AddParameter("object", _("Object"))
       .UseStandardOperatorParameters("number")
@@ -85,8 +85,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Change the position of _PARAM0_: _PARAM1_ _PARAM2_ (x "
                   "axis), _PARAM3_ _PARAM4_ (y axis)"),
                 _("Position"),
-                "res/actions/position24_black.png",
-                "res/actions/position_black.png")
+                "res/actions/position24.png",
+                "res/actions/position.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("operator", _("Modification's sign"), "number")
@@ -102,8 +102,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                   "_PARAM2_ (x "
                   "axis), _PARAM3_ _PARAM4_ (y axis)"),
                 _("Position/Center"),
-                "res/actions/position24_black.png",
-                "res/actions/position_black.png")
+                "res/actions/position24.png",
+                "res/actions/position.png")
       .AddParameter("object", _("Object"))
       .AddParameter("operator", _("Modification's sign"), "number")
       .AddParameter("expression", _("X position"))
@@ -118,7 +118,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("the X position of the center of rotation"),
          _("the X position of the center"),
          _("Position/Center"),
-         "res/actions/position24_black.png")
+         "res/actions/position24.png")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number");
 
@@ -129,7 +129,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("the Y position of the center of rotation"),
          _("the Y position of the center"),
          _("Position/Center"),
-         "res/actions/position24_black.png")
+         "res/actions/position24.png")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number");
 
@@ -140,7 +140,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                   "the object) left position"),
                                 _("the bounding box left position"),
                                 _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-left_black.svg")
+                                "res/conditions/bounding-box-left.svg")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number");
 
@@ -151,7 +151,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("the bounding box (the area encapsulating the object) top position"),
          _("the bounding box top position"),
          _("Position/Bounding Box"),
-         "res/conditions/bounding-box-top_black.svg")
+         "res/conditions/bounding-box-top.svg")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number");
 
@@ -162,7 +162,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                   "the object) right position"),
                                 _("the bounding box right position"),
                                 _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-right_black.svg")
+                                "res/conditions/bounding-box-right.svg")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number");
 
@@ -173,7 +173,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                   "the object) bottom position"),
                                 _("the bounding box bottom position"),
                                 _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-bottom_black.svg")
+                                "res/conditions/bounding-box-bottom.svg")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number");
 
@@ -184,7 +184,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                   "the object) center X position"),
                                 _("the bounding box center X position"),
                                 _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-center_black.svg")
+                                "res/conditions/bounding-box-center.svg")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number");
 
@@ -195,7 +195,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                   "the object) center Y position"),
                                 _("the bounding box center Y position"),
                                 _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-center_black.svg")
+                                "res/conditions/bounding-box-center.svg")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number");
 
@@ -219,11 +219,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddAction("SetAngle",
                 _("Angle"),
-                _("Change the angle of rotation of an object (in degrees)."),
+                _("Change the angle of rotation of an object."),
                 _("the angle"),
                 _("Angle"),
-                "res/actions/direction24_black.png",
-                "res/actions/direction_black.png")
+                "res/actions/direction24.png",
+                "res/actions/direction.png")
 
       .AddParameter("object", _("Object"))
       .UseStandardOperatorParameters("number");
@@ -234,8 +234,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                   "counterclockwise otherwise."),
                 _("Rotate _PARAM0_ at speed _PARAM1_ deg/second"),
                 _("Angle"),
-                "res/actions/rotate24_black.png",
-                "res/actions/rotate_black.png")
+                "res/actions/direction24.png",
+                "res/actions/direction.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angular speed (in degrees per second)"))
@@ -248,8 +248,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Rotate an object towards an angle with the specified speed."),
          _("Rotate _PARAM0_ towards _PARAM1_ at speed _PARAM2_ deg/second"),
          _("Angle"),
-         "res/actions/rotate24_black.png",
-         "res/actions/rotate_black.png")
+         "res/actions/direction24.png",
+         "res/actions/direction.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle to rotate towards (in degrees)"))
@@ -264,8 +264,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Rotate _PARAM0_ towards _PARAM1_;_PARAM2_ at speed "
            "_PARAM3_ deg/second"),
          _("Angle"),
-         "res/actions/rotate24_black.png",
-         "res/actions/rotate_black.png")
+         "res/actions/direction24.png",
+         "res/actions/direction.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("X position"))
@@ -289,8 +289,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Speed on X axis (in pixels per second)"))
       .AddParameter("expression", _("Speed on Y axis (in pixels per second)"))
-      .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
-      .SetDefaultValue("0");
+      .AddParameter("forceMultiplier", _("Force multiplier"));
 
   obj.AddAction("AddForceAL",
                 _("Add a force (angle)"),
@@ -306,8 +305,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle"))
       .AddParameter("expression", _("Speed (in pixels per second)"))
-      .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
-      .SetDefaultValue("0")
+      .AddParameter("forceMultiplier", _("Force multiplier"))
       .MarkAsAdvanced();
 
   obj.AddAction(
@@ -325,8 +323,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("expression", _("X position"))
       .AddParameter("expression", _("Y position"))
       .AddParameter("expression", _("Speed (in pixels per second)"))
-      .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
-      .SetDefaultValue("0")
+      .AddParameter("forceMultiplier", _("Force multiplier"))
       .MarkAsAdvanced();
 
   obj.AddAction(
@@ -393,7 +390,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/layer.png")
 
       .AddParameter("object", _("Object"))
-      .AddParameter("layer", _("Move it to this layer"))
+      .AddParameter("layer", _("Move it to this layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
@@ -512,8 +509,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Compare the angle of the specified object."),
                    _("the angle (in degrees)"),
                    _("Angle"),
-                   "res/conditions/direction24_black.png",
-                   "res/conditions/direction_black.png")
+                   "res/conditions/direction24.png",
+                   "res/conditions/direction.png")
 
       .AddParameter("object", _("Object"))
       .UseStandardRelationalOperatorParameters("number")
@@ -759,8 +756,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectPtr", _("Target Object"))
       .AddParameter("expression", _("Speed (in pixels per second)"))
-      .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
-      .SetDefaultValue("0")
+      .AddParameter("forceMultiplier", _("Force multiplier"))
       .MarkAsAdvanced();
 
   obj.AddAction(
@@ -780,8 +776,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectPtr", _("Rotate around this object"))
       .AddParameter("expression", _("Speed (in degrees per second)"))
       .AddParameter("expression", _("Distance (in pixels)"))
-      .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
-      .SetDefaultValue("0")
+      .AddParameter("forceMultiplier", _("Force multiplier"))
       .MarkAsAdvanced();
 
   obj.AddAction("MettreAutour",
@@ -886,7 +881,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "res/conditions/timer24.png",
          "res/conditions/timer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .AddParameter("string", _("Timer's name"))
       .AddParameter("expression", _("Time in seconds"))
       .SetHidden();
 
@@ -900,7 +895,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "res/conditions/timer24.png",
          "res/conditions/timer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .AddParameter("string", _("Timer's name"))
       .AddParameter("relationalOperator", _("Sign of the test"), "time")
       .AddParameter("expression", _("Time in seconds"))
       .SetManipulatedType("number");
@@ -913,7 +908,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/timerPaused24.png",
                    "res/conditions/timerPaused.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .AddParameter("string", _("Timer's name"))
       .MarkAsAdvanced();
 
   obj.AddAction(
@@ -926,7 +921,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "res/actions/timer24.png",
          "res/actions/timer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer");
+      .AddParameter("string", _("Timer's name"));
 
   obj.AddAction("PauseObjectTimer",
                 _("Pause an object timer"),
@@ -936,7 +931,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/pauseTimer24.png",
                 "res/actions/pauseTimer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .AddParameter("string", _("Timer's name"))
       .MarkAsAdvanced();
 
   obj.AddAction("UnPauseObjectTimer",
@@ -947,7 +942,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/unPauseTimer24.png",
                 "res/actions/unPauseTimer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .AddParameter("string", _("Timer's name"))
       .MarkAsAdvanced();
 
   obj.AddAction("RemoveObjectTimer",
@@ -958,28 +953,28 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/timer24.png",
                 "res/actions/timer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .AddParameter("string", _("Timer's name"))
       .MarkAsAdvanced();
 
   obj.AddExpression("X",
                     _("X position"),
                     _("X position of the object"),
                     _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
       .AddParameter("object", _("Object"));
 
   obj.AddExpression("Y",
                     _("Y position"),
                     _("Y position of the object"),
                     _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
       .AddParameter("object", _("Object"));
 
   obj.AddExpression("Angle",
                     _("Angle"),
                     _("Current angle, in degrees, of the object"),
                     _("Angle"),
-                    "res/actions/direction_black.png")
+                    "res/actions/direction.png")
       .AddParameter("object", _("Object"));
 
   obj.AddExpression("ForceX",
@@ -998,7 +993,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddExpression("ForceAngle",
                     _("Angle of the sum of forces"),
-                    _("Angle of the sum of forces (in degrees)"),
+                    _("Angle of the sum of forces"),
                     _("Movement using forces"),
                     "res/actions/force.png")
       .AddParameter("object", _("Object"));
@@ -1022,14 +1017,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     _("Width"),
                     _("Width of the object"),
                     _("Size"),
-                    "res/actions/scaleWidth_black.png")
+                    "res/actions/scaleWidth.png")
       .AddParameter("object", _("Object"));
 
   obj.AddExpression("Largeur",
                     _("Width"),
                     _("Width of the object"),
                     _("Size"),
-                    "res/actions/scaleWidth_black.png")
+                    "res/actions/scaleWidth.png")
       .AddParameter("object", _("Object"))
       .SetHidden();
 
@@ -1037,14 +1032,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     _("Height"),
                     _("Height of the object"),
                     _("Size"),
-                    "res/actions/scaleHeight_black.png")
+                    "res/actions/scaleHeight.png")
       .AddParameter("object", _("Object"));
 
   obj.AddExpression("Hauteur",
                     _("Height"),
                     _("Height of the object"),
                     _("Size"),
-                    "res/actions/scaleHeight_black.png")
+                    "res/actions/scaleHeight.png")
       .AddParameter("object", _("Object"))
       .SetHidden();
 
@@ -1098,7 +1093,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("expression", _("Target Y position"));
 
   obj.AddExpression("Variable",
-                    _("Value of an object variable"),
+                    _("Object variable"),
                     _("Value of an object variable"),
                     _("Variables"),
                     "res/actions/var.png")
@@ -1114,7 +1109,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"));
 
   obj.AddStrExpression("VariableString",
-                       _("Text of an object variable"),
+                       _("Object variable"),
                        _("Text of an object variable"),
                        _("Variables"),
                        "res/actions/var.png")
@@ -1127,15 +1122,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     _("Object timers"),
                     "res/actions/time.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer");
+      .AddParameter("string", _("Timer's name"));
 
   obj.AddExpression("AngleToObject",
                     _("Angle between two objects"),
-                    _("Compute the angle between two objects (in degrees). "
-                      "If you need the angle to an arbitrary position, "
-                      "use AngleToPosition."),
+                    _("Compute the angle between two objects. If you need the "
+                      "angle to an arbitrary position, use AngleToPosition."),
                     _("Angle"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectPtr", _("Object"));
 
@@ -1146,7 +1140,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "getting the cartesian coordinates of a 2D vector, using "
                       "its polar coordinates."),
                     _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Distance"));
@@ -1158,7 +1152,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "getting the cartesian coordinates of a 2D vector, using "
                       "its polar coordinates."),
                     _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Distance"));
@@ -1166,10 +1160,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
   obj.AddExpression("AngleToPosition",
                     _("Angle between an object and a position"),
                     _("Compute the angle between the object center and a "
-                      "\"target\" position (in degrees). If you need the angle "
-                      "between two objects, use AngleToObject."),
+                      "\"target\" position. If you need the angle between two "
+                      "objects, use AngleToObject."),
                     _("Angle"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Target X position"))
       .AddParameter("expression", _("Target Y position"));
@@ -1529,7 +1523,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
             "object will become the only one taken into account.\nIf "
             "the condition is inverted, the object to be intersected "
             "will be the farthest one within the ray radius."),
-          _("Cast a ray from _PARAM1_;_PARAM2_ to _PARAM3_;_PARAM4_ "
+          _("Cast a ray from from _PARAM1_;_PARAM2_ to _PARAM3_;_PARAM4_ "
             "against _PARAM0_, and save the "
             "result in _PARAM5_, _PARAM6_"),
           "",
@@ -1565,7 +1559,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                        _("Object name"),
                        _("Return the name of the object"),
                        "",
-                       "res/conditions/text_black.png")
+                       "res/conditions/text.png")
       .AddParameter("object", _("Object"));
 
   obj.AddStrExpression("Layer",

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -22,7 +22,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "object or a position.",
           "Florian Rival",
           "Open source (MIT License)")
-      .SetCategory("Camera")
       .SetExtensionHelpPath("/interface/scene-editor/layers-and-cameras");
   extension.AddInstructionOrExpressionGroupMetadata(_("Layers and cameras"))
       .SetIcon("res/conditions/camera24.png");
@@ -196,7 +195,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "number",
           "CameraAngle",
           _("Angle of a camera of a layer"),
-          _("the angle of rotation of a camera (in degrees)"),
+          _("the angle of rotation of a camera"),
           _("the angle of camera (layer: _PARAM3_, camera: _PARAM4_)"),
           "",
           "res/conditions/camera24.png")
@@ -222,7 +221,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Width"), "", true)
       .AddParameter("expression", _("Height"), "", true)
@@ -257,7 +256,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"))
       .MarkAsComplex();
@@ -273,7 +272,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"))
       .AddParameter("expression", _("Width"))
@@ -291,7 +290,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"))
       .AddParameter(
@@ -310,7 +309,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
 
   extension
       .AddAction("ZoomCamera",
-                 _("Camera zoom"),
+                 _("Change camera zoom"),
                  _("Change camera zoom."),
                  _("Change camera zoom to _PARAM1_ (layer: _PARAM2_, camera: "
                    "_PARAM3_)"),
@@ -414,7 +413,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  "res/actions/layer24.png",
                  "res/actions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
@@ -427,7 +426,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  "res/actions/layer24.png",
                  "res/actions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
@@ -440,7 +439,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     "res/conditions/layer24.png",
                     "res/conditions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
@@ -577,7 +576,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
 
   extension
       .AddAction("SetLayerDefaultZOrder",
-                 _("Layer default Z order"),
+                 _("Change layer default Z order"),
                  _("Change the default Z order set to objects when they are "
                    "created on a layer."),
                  _("Set the default Z order of objects created on _PARAM1_ to "

Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp

@@ -21,14 +21,14 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/common-conversions");
   extension.AddInstructionOrExpressionGroupMetadata(_("Conversion"))
-      .SetIcon("res/conditions/toujours24_black.png");
+      .SetIcon("res/conditions/toujours24.png");
 
   extension
       .AddExpression("ToNumber",
                      _("Text > Number"),
                      _("Convert the text to a number"),
                      "",
-                     "res/conditions/toujours24_black.png")
+                     "res/conditions/toujours24.png")
       .AddParameter("string", _("Text to convert to a number"));
 
   extension
@@ -36,7 +36,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                         _("Number > Text"),
                         _("Convert the result of the expression to text"),
                         "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
       .AddParameter("expression", _("Expression to be converted to text"));
 
   extension
@@ -45,7 +45,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                         _("Convert the result of the expression to text, "
                           "without using the scientific notation"),
                         "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
       .AddParameter("expression", _("Expression to be converted to text"));
 
   extension
@@ -54,7 +54,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
           _("Degrees > Radians"),
           _("Converts the angle, expressed in degrees, into radians"),
           "",
-          "res/conditions/toujours24_black.png")
+          "res/conditions/toujours24.png")
       .AddParameter("expression", _("Angle, in degrees"));
 
   extension
@@ -63,7 +63,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
           _("Radians > Degrees"),
           _("Converts the angle, expressed in radians, into degrees"),
           "",
-          "res/conditions/toujours24_black.png")
+          "res/conditions/toujours24.png")
       .AddParameter("expression", _("Angle, in radians"));
 
   extension
@@ -71,7 +71,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                         _("Convert scene variable to JSON"),
                         _("Convert a scene variable to JSON"),
                         _("JSON"),
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
       .AddParameter("scenevar", _("Scene variable to be stringified"));
 
   extension
@@ -79,7 +79,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                         _("Convert global variable to JSON"),
                         _("Convert a global variable to JSON"),
                         _("JSON"),
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
       .AddParameter("globalvar", _("The global variable to be stringified"));
 
   extension
@@ -87,7 +87,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                         _("Convert object variable to JSON"),
                         _("Convert an object variable to JSON"),
                         _("JSON"),
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
       .AddParameter("objectPtr", _("The object with the variable"))
       .AddParameter("objectvar", _("The object variable to be stringified"));
 
@@ -96,7 +96,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
           "JSONToVariableStructure",
           _("Convert JSON to a scene variable"),
           _("Parse a JSON object and store it into a scene variable"),
-          _("Convert JSON string _PARAM0_ and store it into variable _PARAM1_"),
+          _("Parse 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"),
-                 _("Convert JSON string _PARAM0_ and store it into global "
+                 _("Parse JSON string _PARAM0_ and store it into global "
                    "variable _PARAM1_"),
                  "",
                  "res/actions/net24.png",

Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp

@@ -33,7 +33,7 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
       .SetExtensionHelpPath("/all-features/advanced-conditions");
   extension
       .AddInstructionOrExpressionGroupMetadata(_("Events and control flow"))
-      .SetIcon("res/conditions/toujours24_black.png");
+      .SetIcon("res/conditions/toujours24.png");
 
   extension
       .AddCondition("Always",
@@ -42,8 +42,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                       "the condition is inverted)."),
                     _("Always"),
                     "",
-                    "res/conditions/toujours24_black.png",
-                    "res/conditions/toujours_black.png")
+                    "res/conditions/toujours24.png",
+                    "res/conditions/toujours.png")
       .SetHelpPath("/all-features/advanced-conditions")
       .AddCodeOnlyParameter("conditionInverted", "")
       .MarkAsAdvanced();
@@ -61,8 +61,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                     _("Check if one of the sub conditions is true"),
                     _("If one of these conditions is true:"),
                     "",
-                    "res/conditions/or24_black.png",
-                    "res/conditions/or_black.png")
+                    "res/conditions/or24.png",
+                    "res/conditions/or.png")
       .SetCanHaveSubInstructions()
       .MarkAsAdvanced();
 
@@ -72,8 +72,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                     _("Check if all sub conditions are true"),
                     _("If all of these conditions are true:"),
                     "",
-                    "res/conditions/and24_black.png",
-                    "res/conditions/and_black.png")
+                    "res/conditions/and24.png",
+                    "res/conditions/and.png")
       .SetCanHaveSubInstructions()
       .MarkAsAdvanced();
 
@@ -84,8 +84,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
           _("Return the contrary of the result of the sub conditions"),
           _("Invert the logical result of these conditions:"),
           "",
-          "res/conditions/not24_black.png",
-          "res/conditions/not_black.png")
+          "res/conditions/not24.png",
+          "res/conditions/not.png")
       .SetCanHaveSubInstructions()
       .MarkAsAdvanced();
 
@@ -104,8 +104,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                     _("Compare the two numbers."),
                     _("_PARAM0_ _PARAM1_ _PARAM2_"),
                     "",
-                    "res/conditions/egal24_black.png",
-                    "res/conditions/egal_black.png")
+                    "res/conditions/egal24.png",
+                    "res/conditions/egal.png")
       .SetHelpPath("/all-features/advanced-conditions")
       .AddParameter("expression", _("First expression"))
       .AddParameter("relationalOperator", _("Sign of the test"), "number")
@@ -125,8 +125,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                     _("Compare the two strings."),
                     _("_PARAM0_ _PARAM1_ _PARAM2_"),
                     "",
-                    "res/conditions/egal24_black.png",
-                    "res/conditions/egal_black.png")
+                    "res/conditions/egal24.png",
+                    "res/conditions/egal.png")
       .SetHelpPath("/all-features/advanced-conditions")
       .AddParameter("string", _("First string expression"))
       .AddParameter("relationalOperator", _("Sign of the test"), "string")

Core/GDCore/Extensions/Builtin/FileExtension.cpp

@@ -21,7 +21,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/storage")
-      .SetCategory("Advanced");
+      .SetCategory("Device");
   extension.AddInstructionOrExpressionGroupMetadata(_("Storage"))
       .SetIcon("res/conditions/fichier24.png");
 

Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp

@@ -96,13 +96,13 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
                      _("Difference between two angles"),
                      "",
                      "res/mathfunction.png")
-      .AddParameter("expression", _("First angle, in degrees"))
-      .AddParameter("expression", _("Second angle, in degrees"));
+      .AddParameter("expression", _("First angle"))
+      .AddParameter("expression", _("Second angle"));
 
   extension
       .AddExpression("AngleBetweenPositions",
                      _("Angle between two positions"),
-                     _("Compute the angle between two positions (in degrees)."),
+                     _("Compute the angle between two positions."),
                      "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("First point X position"))
@@ -159,8 +159,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension
       .AddExpression("acos",
                      _("Arccosine"),
-                     _("Arccosine, return an angle (in radian). "
-                       "`ToDeg` allows to convert it to degrees."),
+                     _("Arccosine"),
                      "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
@@ -176,8 +175,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension
       .AddExpression("asin",
                      _("Arcsine"),
-                     _("Arcsine, return an angle (in radian). "
-                       "`ToDeg` allows to convert it to degrees."),
+                     _("Arcsine"),
                      "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
@@ -193,8 +191,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension
       .AddExpression("atan",
                      _("Arctangent"),
-                     _("Arctangent, return an angle (in radian). "
-                       "`ToDeg` allows to convert it to degrees."),
+                     _("Arctangent"),
                      "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
@@ -261,8 +258,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension
       .AddExpression("cos",
                      _("Cosine"),
-                     _("Cosine of an angle (in radian). "
-                       "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
+                     _("Cosine of a number"),
                      "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
@@ -404,8 +400,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension
       .AddExpression("sin",
                      _("Sine"),
-                     _("Sine of an angle (in radian). "
-                       "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
+                     _("Sine of a number"),
                      "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
@@ -429,8 +424,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension
       .AddExpression("tan",
                      _("Tangent"),
-                     _("Tangent of an angle (in radian). "
-                       "If you want to use degrees, use`ToRad`: `tan(ToRad(45))`."),
+                     _("Tangent of a number"),
                      "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
@@ -485,13 +479,6 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Distance"));
 
-  extension
-      .AddExpression("Pi",
-                     _("Number Pi (3.1415...)"),
-                     _("The number Pi (3.1415...)"),
-                     "",
-                     "res/mathfunction.png")
-      .SetHelpPath("/all-features/expressions");
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -112,7 +112,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
 
   extension
       .AddAction("SceneBackground",
-                 _("Background color"),
+                 _("Change background color"),
                  _("Change the background color of the scene."),
                  _("Set background color to _PARAM1_"),
                  "",

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

@@ -22,8 +22,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects/sprite");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Sprite"))
-      .SetIcon("CppPlatform/Extensions/spriteicon.png");
 
   gd::ObjectMetadata& obj =
       extension
@@ -35,7 +33,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
           .SetCategoryFullName(_("General"));
 
   obj.AddAction("Opacity",
-                _("Sprite opacity"),
+                _("Change sprite opacity"),
                 _("Change the opacity of a Sprite. 0 is fully transparent, 255 "
                   "is opaque (default)."),
                 _("the opacity"),
@@ -81,8 +79,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
            "is in 8 directions mode, the valid directions are 0..7"),
          _("the direction"),
          _("Direction"),
-         "res/actions/direction24_black.png",
-         "res/actions/direction_black.png")
+         "res/actions/direction24.png",
+         "res/actions/direction.png")
       .SetHidden()  // Hide as 8 direction is not supported officially in the
                     // interface.
       .AddParameter("object", _("Object"), "Sprite")
@@ -142,8 +140,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "Rotate an object towards a position.",
                 "Rotate _PARAM0_ towards _PARAM1_;_PARAM2_",
                 _("Direction"),
-                "res/actions/rotate24_black.png",
-                "res/actions/rotate_black.png")
+                "res/actions/direction24.png",
+                "res/actions/direction.png")
 
       .AddParameter("object", _("Object to be rotated"), "Sprite")
       .AddParameter("expression", _("X position"))
@@ -158,8 +156,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 _("Modify the scale of the specified object."),
                 _("the scale"),
                 _("Size"),
-                "res/actions/scale24_black.png",
-                "res/actions/scale_black.png")
+                "res/actions/scale24.png",
+                "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
       .UseStandardOperatorParameters("number")
@@ -170,8 +168,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 _("Modify the scale of the width of an object."),
                 _("the width's scale"),
                 _("Size"),
-                "res/actions/scaleWidth24_black.png",
-                "res/actions/scaleWidth_black.png")
+                "res/actions/scale24.png",
+                "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
       .UseStandardOperatorParameters("number")
@@ -182,8 +180,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 _("Modify the scale of the height of an object."),
                 _("the height's scale"),
                 _("Size"),
-                "res/actions/scaleHeight24_black.png",
-                "res/actions/scaleHeight_black.png")
+                "res/actions/scale24.png",
+                "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
       .UseStandardOperatorParameters("number")
@@ -194,8 +192,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 _("Change the width of a Sprite object."),
                 _("the width"),
                 _("Size"),
-                "res/actions/scaleWidth24_black.png",
-                "res/actions/scaleWidth_black.png")
+                "res/actions/scale24.png",
+                "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
       .UseStandardOperatorParameters("number")
@@ -206,8 +204,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Compare the width of a Sprite object."),
                    _("the width"),
                    _("Size"),
-                   "res/conditions/scaleWidth24_black.png",
-                   "res/conditions/scaleWidth_black.png")
+                   "res/conditions/scaleWidth24.png",
+                   "res/conditions/scaleWidth.png")
 
       .AddParameter("object", _("Object"), "Sprite")
       .UseStandardRelationalOperatorParameters("number")
@@ -218,8 +216,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 _("Change the height of a Sprite object."),
                 _("the height"),
                 _("Size"),
-                "res/actions/scaleHeight24_black.png",
-                "res/actions/scaleHeight_black.png")
+                "res/actions/scale24.png",
+                "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
       .UseStandardOperatorParameters("number")
@@ -230,8 +228,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Compare the height of a Sprite object."),
                    _("the height"),
                    _("Size"),
-                   "res/conditions/scaleHeight24_black.png",
-                   "res/conditions/scaleHeight_black.png")
+                   "res/conditions/scaleHeight24.png",
+                   "res/conditions/scaleHeight.png")
 
       .AddParameter("object", _("Object"), "Sprite")
       .UseStandardRelationalOperatorParameters("number")
@@ -242,8 +240,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 _("Change the size of an object."),
                 _("Change the size of _PARAM0_: set to _PARAM1_x_PARAM2_"),
                 _("Size"),
-                "res/actions/scale24_black.png",
-                "res/actions/scale_black.png")
+                "res/actions/scale24.png",
+                "res/actions/scale.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Width"))
@@ -283,8 +281,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
            "from 0 to 7. Otherwise, the direction is in degrees."),
          _("the direction"),
          _("Direction"),
-         "res/conditions/direction24_black.png",
-         "res/conditions/direction_black.png")
+         "res/conditions/direction24.png",
+         "res/conditions/direction.png")
       .SetHidden()  // Hide as 8 direction is not supported officially in the
                     // interface.
       .AddParameter("object", _("Object"), "Sprite")
@@ -324,19 +322,6 @@ 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();
 
@@ -345,8 +330,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Compare the scale of the width of an object."),
                    _("the width's scale"),
                    _("Size"),
-                   "res/conditions/scaleWidth24_black.png",
-                   "res/conditions/scaleWidth_black.png")
+                   "res/conditions/scaleWidth24.png",
+                   "res/conditions/scaleWidth.png")
 
       .AddParameter("object", _("Object"), "Sprite")
       .UseStandardRelationalOperatorParameters("number")
@@ -357,8 +342,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Compare the scale of the height of an object."),
                    _("the height's scale"),
                    _("Size"),
-                   "res/conditions/scaleHeight24_black.png",
-                   "res/conditions/scaleHeight_black.png")
+                   "res/conditions/scaleHeight24.png",
+                   "res/conditions/scaleHeight.png")
 
       .AddParameter("object", _("Object"), "Sprite")
       .UseStandardRelationalOperatorParameters("number")
@@ -464,8 +449,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "Rotate an object towards another.",
                 "Rotate _PARAM0_ towards _PARAM1_",
                 _("Direction"),
-                "res/actions/rotate24_black.png",
-                "res/actions/rotate_black.png")
+                "res/actions/direction24.png",
+                "res/actions/direction.png")
 
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("objectPtr", "Rotate toward this object")
@@ -476,7 +461,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("X position of a point"),
                     _("X position of a point"),
                     _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
       .SetHidden()
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("objectPointName", _("Name of the point"), "", true);
@@ -485,7 +470,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("Y position of a point"),
                     _("Y position of a point"),
                     _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
       .SetHidden()
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("objectPointName", _("Name of the point"), "", true);
@@ -494,7 +479,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("X position of a point"),
                     _("X position of a point"),
                     _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
 
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("objectPointName", _("Name of the point"));
@@ -503,7 +488,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("Y position of a point"),
                     _("Y position of a point"),
                     _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
 
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("objectPointName", _("Name of the point"));
@@ -512,7 +497,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("Direction"),
                     _("Direction of the object"),
                     _("Direction"),
-                    "res/actions/direction_black.png")
+                    "res/actions/direction.png")
       .SetHidden()
       .AddParameter("object", _("Object"), "Sprite");
 
@@ -520,7 +505,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("Direction"),
                     _("Direction of the object"),
                     _("Direction"),
-                    "res/actions/direction_black.png")
+                    "res/actions/direction.png")
       .SetHidden()  // Hide as 8 direction is not supported officially in the
                     // interface.
       .AddParameter("object", _("Object"), "Sprite");
@@ -565,14 +550,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("Scale of the width of an object"),
                     _("Scale of the width of an object"),
                     _("Size"),
-                    "res/actions/scaleWidth_black.png")
+                    "res/actions/scaleWidth.png")
       .AddParameter("object", _("Object"), "Sprite");
 
   obj.AddExpression("ScaleY",
                     _("Scale of the height of an object"),
                     _("Scale of the height of an object"),
                     _("Size"),
-                    "res/actions/scaleHeight_black.png")
+                    "res/actions/scaleHeight.png")
       .AddParameter("object", _("Object"), "Sprite");
 
   obj.AddExpression("Opacity",

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

@@ -25,7 +25,8 @@ namespace gd {
 
 Animation SpriteObject::badAnimation;
 
-SpriteObject::SpriteObject() : updateIfNotVisible(false) {}
+SpriteObject::SpriteObject(gd::String name_)
+    : Object(name_), updateIfNotVisible(false) {}
 
 SpriteObject::~SpriteObject(){};
 

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h

@@ -36,11 +36,11 @@ namespace gd {
  * \see gd::BuiltinExtensionsImplementer::ImplementsSpriteExtension
  * \ingroup SpriteObjectExtension
  */
-class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
+class GD_CORE_API SpriteObject : public gd::Object {
  public:
-  SpriteObject();
+  SpriteObject(gd::String name_);
   virtual ~SpriteObject();
-  std::unique_ptr<gd::ObjectConfiguration> Clone() const override {
+  std::unique_ptr<gd::Object> Clone() const override {
     return gd::make_unique<SpriteObject>(*this);
   }
 

Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp

@@ -21,20 +21,20 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
           "Open source (MIT License)")
       .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
   extension.AddInstructionOrExpressionGroupMetadata(_("Text manipulation"))
-      .SetIcon("res/actions/text24_black.png");
+      .SetIcon("res/actions/text24.png");
 
   extension.AddStrExpression("NewLine",
                              _("Insert a new line"),
                              _("Insert a new line"),
                              "",
-                             "res/conditions/toujours24_black.png");
+                             "res/conditions/toujours24.png");
 
   extension
       .AddStrExpression("FromCodePoint",
                         _("Get character from code point"),
                         _("Get character from code point"),
                         "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
 
       .AddParameter("expression", _("Code point"));
 
@@ -43,7 +43,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                         _("Uppercase a text"),
                         _("Uppercase a text"),
                         "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"));
 
@@ -52,7 +52,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                         _("Lowercase a text"),
                         _("Lowercase a text"),
                         "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"));
 
@@ -61,7 +61,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                         _("Get a portion of a text"),
                         _("Get a portion of a text"),
                         "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter("expression",
@@ -74,7 +74,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                         _("Get a character from a text"),
                         _("Get a character from a text"),
                         "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter(
@@ -86,7 +86,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                         _("Repeat a text"),
                         _("Repeat a text"),
                         "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text to repeat"))
       .AddParameter("expression", _("Repetition count"));
@@ -96,7 +96,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                      _("Length of a text"),
                      _("Length of a text"),
                      "",
-                     "res/conditions/toujours24_black.png")
+                     "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"));
 
@@ -106,7 +106,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                      _("Search in a text (return the position of the result or "
                        "-1 if not found)"),
                      "",
-                     "res/conditions/toujours24_black.png")
+                     "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"));
@@ -117,7 +117,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                      "Search in a text from the end (return the position of "
                      "the result or -1 if not found)",
                      "",
-                     "res/conditions/toujours24_black.png")
+                     "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"))
@@ -131,7 +131,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
             "the result, from the beginning of the string, or -1 if not "
             "found)"),
           "",
-          "res/conditions/toujours24_black.png")
+          "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"));
@@ -142,7 +142,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                      _("Search in a text, starting from a position (return the "
                        "position of the result or -1 if not found)"),
                      "",
-                     "res/conditions/toujours24_black.png")
+                     "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"))
@@ -157,7 +157,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
           "Search in a text from the end, starting from a position (return "
           "the position of the result or -1 if not found)",
           "",
-          "res/conditions/toujours24_black.png")
+          "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"))
@@ -175,7 +175,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
             " the position of the result, from the beginning of the string, or "
             "-1 if not found)"),
           "",
-          "res/conditions/toujours24_black.png")
+          "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"))

Core/GDCore/Extensions/Builtin/TimeExtension.cpp

@@ -21,7 +21,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/timers-and-time");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Timers and time"))
+  extension.AddInstructionOrExpressionGroupMetadata(
+      _("Timers and time")
+  )
       .SetIcon("res/conditions/timer24.png");
 
   // Deprecated and replaced by CompareTimer
@@ -36,7 +38,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                     "res/conditions/timer.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Time in seconds"))
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
+      .AddParameter("string", _("Timer's name"))
       .SetHidden();
 
   extension
@@ -50,7 +52,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                     "res/conditions/timer24.png",
                     "res/conditions/timer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
+      .AddParameter("string", _("Timer's name"))
       .AddParameter("relationalOperator", _("Sign of the test"), "time")
       .AddParameter("expression", _("Time in seconds"))
       .SetManipulatedType("number");
@@ -78,7 +80,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                     "res/conditions/timerPaused24.png",
                     "res/conditions/timerPaused.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
+      .AddParameter("string", _("Timer's name"))
       .MarkAsAdvanced();
 
   extension
@@ -93,7 +95,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
           "res/actions/timer24.png",
           "res/actions/timer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer");
+      .AddParameter("string", _("Timer's name"));
 
   extension
       .AddAction("PauseTimer",
@@ -105,7 +107,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                  "res/actions/pauseTimer24.png",
                  "res/actions/pauseTimer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
+      .AddParameter("string", _("Timer's name"))
       .MarkAsAdvanced();
 
   extension
@@ -118,7 +120,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                  "res/actions/unPauseTimer24.png",
                  "res/actions/unPauseTimer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
+      .AddParameter("string", _("Timer's name"))
       .MarkAsAdvanced();
 
   extension
@@ -131,12 +133,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                  "res/actions/timer24.png",
                  "res/actions/timer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
+      .AddParameter("string", _("Timer's name"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("ChangeTimeScale",
-                 _("Time scale"),
+                 _("Change time scale"),
                  _("Change the time scale of the scene."),
                  _("Set the time scale of the scene to _PARAM1_"),
                  "",
@@ -153,10 +155,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                    "the next actions (and sub-events)."),
                  _("Wait _PARAM0_ seconds"),
                  "",
-                 "res/timer_black.svg",
-                 "res/timer_black.svg")
-      .AddParameter("expression", _("Time to wait in seconds"))
-      .SetHelpPath("/all-features/timers-and-time/wait-action");
+                 "res/timer.svg",
+                 "res/timer.svg")
+      .AddParameter("expression", "Time to wait in seconds")
+      .SetHelpPath("/all-features/timers-and-time/wait-action")
+      .SetAsync();
 
   extension
       .AddExpression("TimeDelta",
@@ -191,7 +194,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                      "",
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer");
+      .AddParameter("string", _("Timer's name"));
 
   extension
       .AddExpression("TimeFromStart",

Core/GDCore/Extensions/Builtin/WindowExtension.cpp

@@ -20,7 +20,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
           "these features can be applied.",
           "Florian Rival",
           "Open source (MIT License)")
-      .SetCategory("User interface")
       .SetExtensionHelpPath("/all-features/window");
   extension
       .AddInstructionOrExpressionGroupMetadata(
@@ -56,7 +55,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
 
   extension
       .AddAction("SetWindowMargins",
-                 _("Window's margins"),
+                 _("Change the window's margins"),
                  _("This action changes the margins, in pixels, between the "
                    "game frame and the window borders."),
                  _("Set margins of game window to "
@@ -72,7 +71,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
 
   extension
       .AddAction("SetGameResolutionSize",
-                 _("Game resolution"),
+                 _("Change the resolution of the game"),
                  _("Changes the resolution of the game, effectively changing "
                    "the game area size. This won't change the size of the "
                    "window in which the game is running."),
@@ -118,7 +117,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
 
   extension
       .AddAction("SetGameResolutionResizeMode",
-                 _("Game resolution resize mode"),
+                 _("Change the game resolution resize mode"),
                  _("Set if the width or the height of the game resolution "
                    "should be changed to fit the game window - or if the game "
                    "resolution should not be updated automatically."),
@@ -154,7 +153,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
 
   extension
       .AddAction("SetWindowIcon",
-                 _("Window's icon"),
+                 _("Change the window's icon"),
                  _("This action changes the icon of the game's window."),
                  _("Use _PARAM1_ as the icon for the game's window."),
                  "",
@@ -165,7 +164,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
 
   extension
       .AddAction("SetWindowTitle",
-                 _("Window's title"),
+                 _("Change the window's title"),
                  _("This action changes the title of the game's window."),
                  _("Change window title to _PARAM1_"),
                  "",

Core/GDCore/Extensions/Metadata/BehaviorMetadata.cpp

@@ -14,14 +14,12 @@
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/BehaviorsSharedData.h"
 #include "GDCore/Tools/Localization.h"
-#include "GDCore/Tools/MakeUnique.h"
-#include "GDCore/Tools/Log.h"
 
 namespace gd {
 
 BehaviorMetadata::BehaviorMetadata(
     const gd::String& extensionNamespace_,
-    const gd::String& nameWithNamespace,
+    const gd::String& name_,
     const gd::String& fullname_,
     const gd::String& defaultName_,
     const gd::String& description_,
@@ -31,50 +29,21 @@ BehaviorMetadata::BehaviorMetadata(
     std::shared_ptr<gd::Behavior> instance_,
     std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance_)
     : extensionNamespace(extensionNamespace_),
-      className(className_),
-      iconFilename(icon24x24),
       instance(instance_),
-      sharedDatasInstance(sharedDatasInstance_),
-      isEventBased(false) {
+      sharedDatasInstance(sharedDatasInstance_) {
+#if defined(GD_IDE_ONLY)
   SetFullName(gd::String(fullname_));
   SetDescription(gd::String(description_));
   SetDefaultName(gd::String(defaultName_));
   SetGroup(group_);
+  className = className_;
+  iconFilename = icon24x24;
+#endif
 
-  if (!instance) {
-    gd::LogFatalError(
-        "Trying to create a BehaviorMetadata that has no "
-        "behavior. This will crash - please double check that the "
-        "BehaviorMetadata is valid for: " + nameWithNamespace);
-  }
-
-  if (instance) instance->SetTypeName(nameWithNamespace);
-  if (sharedDatasInstance) sharedDatasInstance->SetTypeName(nameWithNamespace);
+  if (instance) instance->SetTypeName(name_);
+  if (sharedDatasInstance) sharedDatasInstance->SetTypeName(name_);
 }
 
-BehaviorMetadata::BehaviorMetadata(
-    const gd::String& extensionNamespace,
-    const gd::String& nameWithNamespace,
-    const gd::String& fullname_,
-    const gd::String& defaultName_,
-    const gd::String& description_,
-    const gd::String& group_,
-    const gd::String& icon24x24_): BehaviorMetadata(
-        extensionNamespace,
-        nameWithNamespace,
-        fullname_,
-        defaultName_,
-        description_,
-        group_,
-        icon24x24_,
-        // Class name is the name, actually unused
-        defaultName_,
-        // It is only used to get the name for GetName.
-        gd::make_unique<gd::Behavior>("", nameWithNamespace),
-        nullptr){
-  isEventBased = true;
-};
-
 gd::InstructionMetadata& BehaviorMetadata::AddCondition(
     const gd::String& name,
     const gd::String& fullname,
@@ -83,6 +52,7 @@ gd::InstructionMetadata& BehaviorMetadata::AddCondition(
     const gd::String& group,
     const gd::String& icon,
     const gd::String& smallicon) {
+#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace =
       extensionNamespace.empty() ? name : extensionNamespace + name;
   conditionsInfos[nameWithNamespace] = InstructionMetadata(extensionNamespace,
@@ -96,6 +66,7 @@ gd::InstructionMetadata& BehaviorMetadata::AddCondition(
                                            .SetHelpPath(GetHelpPath())
                                            .SetIsBehaviorInstruction();
   return conditionsInfos[nameWithNamespace];
+#endif
 }
 
 gd::InstructionMetadata& BehaviorMetadata::AddAction(
@@ -106,6 +77,7 @@ gd::InstructionMetadata& BehaviorMetadata::AddAction(
     const gd::String& group,
     const gd::String& icon,
     const gd::String& smallicon) {
+#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace =
       extensionNamespace.empty() ? name : extensionNamespace + name;
   actionsInfos[nameWithNamespace] = InstructionMetadata(extensionNamespace,
@@ -119,6 +91,7 @@ gd::InstructionMetadata& BehaviorMetadata::AddAction(
                                         .SetHelpPath(GetHelpPath())
                                         .SetIsBehaviorInstruction();
   return actionsInfos[nameWithNamespace];
+#endif
 }
 
 gd::InstructionMetadata& BehaviorMetadata::AddScopedCondition(
@@ -129,6 +102,7 @@ gd::InstructionMetadata& BehaviorMetadata::AddScopedCondition(
     const gd::String& group,
     const gd::String& icon,
     const gd::String& smallicon) {
+#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace =
       GetName() + gd::PlatformExtension::GetNamespaceSeparator() + name;
   conditionsInfos[nameWithNamespace] = InstructionMetadata(extensionNamespace,
@@ -142,6 +116,7 @@ gd::InstructionMetadata& BehaviorMetadata::AddScopedCondition(
                                            .SetHelpPath(GetHelpPath())
                                            .SetIsBehaviorInstruction();
   return conditionsInfos[nameWithNamespace];
+#endif
 }
 
 gd::InstructionMetadata& BehaviorMetadata::AddScopedAction(
@@ -152,6 +127,7 @@ gd::InstructionMetadata& BehaviorMetadata::AddScopedAction(
     const gd::String& group,
     const gd::String& icon,
     const gd::String& smallicon) {
+#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace =
       GetName() + gd::PlatformExtension::GetNamespaceSeparator() + name;
   actionsInfos[nameWithNamespace] = InstructionMetadata(extensionNamespace,
@@ -165,6 +141,7 @@ gd::InstructionMetadata& BehaviorMetadata::AddScopedAction(
                                         .SetHelpPath(GetHelpPath())
                                         .SetIsBehaviorInstruction();
   return actionsInfos[nameWithNamespace];
+#endif
 }
 
 gd::ExpressionMetadata& BehaviorMetadata::AddExpression(
@@ -173,6 +150,7 @@ gd::ExpressionMetadata& BehaviorMetadata::AddExpression(
     const gd::String& description,
     const gd::String& group,
     const gd::String& smallicon) {
+#if defined(GD_IDE_ONLY)
   // Be careful, behaviors expression do not have namespace (not necessary as
   // we refer to the behavior name in the expression).
   expressionsInfos[name] = ExpressionMetadata("number",
@@ -184,6 +162,7 @@ gd::ExpressionMetadata& BehaviorMetadata::AddExpression(
                                               smallicon)
                                .SetHelpPath(GetHelpPath());
   return expressionsInfos[name];
+#endif
 }
 
 gd::ExpressionMetadata& BehaviorMetadata::AddStrExpression(
@@ -192,6 +171,7 @@ gd::ExpressionMetadata& BehaviorMetadata::AddStrExpression(
     const gd::String& description,
     const gd::String& group,
     const gd::String& smallicon) {
+#if defined(GD_IDE_ONLY)
   // Be careful, behaviors expression do not have namespace (not necessary as
   // we refer to the behavior name in the expression).
   strExpressionsInfos[name] = ExpressionMetadata("string",
@@ -203,6 +183,7 @@ gd::ExpressionMetadata& BehaviorMetadata::AddStrExpression(
                                                  smallicon)
                                   .SetHelpPath(GetHelpPath());
   return strExpressionsInfos[name];
+#endif
 }
 
 gd::MultipleInstructionMetadata BehaviorMetadata::AddExpressionAndCondition(
@@ -307,6 +288,7 @@ BehaviorMetadata::AddExpressionAndConditionAndAction(
       expression, condition, action);
 }
 
+#if defined(GD_IDE_ONLY)
 gd::InstructionMetadata& BehaviorMetadata::AddDuplicatedAction(
     const gd::String& newActionName, const gd::String& copiedActionName) {
   gd::String newNameWithNamespace = extensionNamespace + newActionName;
@@ -374,44 +356,49 @@ gd::ExpressionMetadata& BehaviorMetadata::AddDuplicatedStrExpression(
 
   return strExpressionsInfos[newNameWithNamespace];
 }
+#endif
 
 BehaviorMetadata& BehaviorMetadata::SetFullName(const gd::String& fullname_) {
+#if defined(GD_IDE_ONLY)
   fullname = fullname_;
+#endif
   return *this;
 }
 BehaviorMetadata& BehaviorMetadata::SetDefaultName(
     const gd::String& defaultName_) {
+#if defined(GD_IDE_ONLY)
   defaultName = defaultName_;
+#endif
   return *this;
 }
 BehaviorMetadata& BehaviorMetadata::SetDescription(
     const gd::String& description_) {
+#if defined(GD_IDE_ONLY)
   description = description_;
+#endif
   return *this;
 }
 BehaviorMetadata& BehaviorMetadata::SetGroup(const gd::String& group_) {
+#if defined(GD_IDE_ONLY)
   group = group_;
+#endif
   return *this;
 }
 BehaviorMetadata& BehaviorMetadata::SetIncludeFile(
     const gd::String& includeFile) {
+#if defined(GD_IDE_ONLY)
   includeFiles.clear();
   includeFiles.push_back(includeFile);
+#endif
   return *this;
 }
 BehaviorMetadata& BehaviorMetadata::AddIncludeFile(
     const gd::String& includeFile) {
+#if defined(GD_IDE_ONLY)
   if (std::find(includeFiles.begin(), includeFiles.end(), includeFile) ==
       includeFiles.end())
     includeFiles.push_back(includeFile);
-  return *this;
-}
-
-BehaviorMetadata& BehaviorMetadata::AddRequiredFile(
-    const gd::String& requiredFile) {
-  if (std::find(requiredFiles.begin(), requiredFiles.end(), requiredFile) ==
-      requiredFiles.end())
-    requiredFiles.push_back(requiredFile);
+#endif
   return *this;
 }
 
@@ -420,25 +407,13 @@ const gd::String& BehaviorMetadata::GetName() const {
 }
 
 gd::Behavior& BehaviorMetadata::Get() const {
-  if (isEventBased) {
-    gd::LogFatalError("Error: Event-based behaviors don't have blueprint. "
-                      "This method should not never be called.");
-  }
-  if (!instance) {
+  if (!instance)
     gd::LogFatalError(
         "Trying to get a behavior from a BehaviorMetadata that has no "
         "behavior. This will crash - please double check that the "
-        "BehaviorMetadata is valid for: " + className);
-  }
+        "BehaviorMetadata is valid.");
+
   return *instance;
 }
 
-gd::BehaviorsSharedData* BehaviorMetadata::GetSharedDataInstance() const { 
-  if (isEventBased) {
-    gd::LogFatalError("Error: Event-based behaviors don't have blueprint. "
-                      "This method should not never be called.");
-  }
-  return sharedDatasInstance.get();
-}
-
 }  // namespace gd

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -29,7 +29,7 @@ class GD_CORE_API BehaviorMetadata {
  public:
   BehaviorMetadata(
       const gd::String& extensionNamespace,
-      const gd::String& nameWithNamespace,
+      const gd::String& name_,
       const gd::String& fullname_,
       const gd::String& defaultName_,
       const gd::String& description_,
@@ -38,21 +38,6 @@ class GD_CORE_API BehaviorMetadata {
       const gd::String& className_,
       std::shared_ptr<gd::Behavior> instance,
       std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance);
-      
-  /**
-   * \brief Construct a behavior metadata, without "blueprint" behavior.
-   * 
-   * \note This is used by events based behaviors.
-   */
-  BehaviorMetadata(
-      const gd::String& extensionNamespace,
-      const gd::String& nameWithNamespace,
-      const gd::String& fullname_,
-      const gd::String& defaultName_,
-      const gd::String& description_,
-      const gd::String& group_,
-      const gd::String& icon24x24_);
-
   BehaviorMetadata(){};
   virtual ~BehaviorMetadata(){};
 
@@ -210,13 +195,6 @@ class GD_CORE_API BehaviorMetadata {
    */
   BehaviorMetadata& AddIncludeFile(const gd::String& includeFile);
 
-  /**
-   * \brief Add a file to the already existing required files.
-   * \note These files are required for the behavior to work,
-   * but they are not executable.
-   */
-  BehaviorMetadata& AddRequiredFile(const gd::String& requiredFile);
-
   /**
    * Get the help path of the behavior, relative to the GDevelop documentation
    * root.
@@ -236,6 +214,7 @@ 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; }
@@ -256,38 +235,20 @@ class GD_CORE_API BehaviorMetadata {
    * \note An empty string means the base object, so any object.
    */
   const gd::String& GetObjectType() const { return objectType; }
-
-  /**
-   * 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;
-  }
+#endif
 
   /**
    * \brief Return the associated gd::Behavior, handling behavior contents.
-   * 
-   * \note Returns a dumb Behavior for events based behaviors as CustomBehavior
-   * are using EventBasedBehavior.
    */
   gd::Behavior& Get() const;
 
   /**
    * \brief Return the associated gd::BehaviorsSharedData, handling behavior
    * shared data, if any (nullptr if none).
-   * 
-   * \note Returns nullptr for events based behaviors as they don't declare
-   * shared data yet.
    */
-  gd::BehaviorsSharedData* GetSharedDataInstance() const;
+  gd::BehaviorsSharedData* GetSharedDataInstance() const {
+    return sharedDatasInstance.get();
+  }
 
   /**
    * \brief Return a reference to a map containing the names of the actions
@@ -310,30 +271,30 @@ class GD_CORE_API BehaviorMetadata {
    */
   std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() { return strExpressionsInfos; };
 
+#if defined(GD_IDE_ONLY)
   std::map<gd::String, gd::InstructionMetadata> conditionsInfos;
   std::map<gd::String, gd::InstructionMetadata> actionsInfos;
   std::map<gd::String, gd::ExpressionMetadata> expressionsInfos;
   std::map<gd::String, gd::ExpressionMetadata> strExpressionsInfos;
 
   std::vector<gd::String> includeFiles;
-  std::vector<gd::String> requiredFiles;
   gd::String className;
-
+#endif
  private:
   gd::String extensionNamespace;
   gd::String helpPath;
+#if defined(GD_IDE_ONLY)
   gd::String fullname;
   gd::String defaultName;
   gd::String description;
   gd::String group;
   gd::String iconFilename;
   gd::String objectType;
-  bool isPrivate = false;
+#endif
 
   // TODO: Nitpicking: convert these to std::unique_ptr to clarify ownership.
   std::shared_ptr<gd::Behavior> instance;
   std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance;
-  bool isEventBased;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/ExpressionMetadata.cpp

@@ -37,24 +37,22 @@ gd::ExpressionMetadata& ExpressionMetadata::AddParameter(
     const gd::String& supplementaryInformation,
     bool parameterIsOptional) {
   gd::ParameterMetadata info;
-  info.SetType(type);
+  info.type = type;
   info.description = description;
   info.codeOnly = false;
-  info.SetOptional(parameterIsOptional);
-  info.SetExtraInfo(
+  info.optional = parameterIsOptional;
+  info.supplementaryInformation =
       // 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.
@@ -66,9 +64,9 @@ gd::ExpressionMetadata& ExpressionMetadata::AddParameter(
 gd::ExpressionMetadata& ExpressionMetadata::AddCodeOnlyParameter(
     const gd::String& type, const gd::String& supplementaryInformation) {
   gd::ParameterMetadata info;
-  info.SetType(type);
+  info.type = type;
   info.codeOnly = true;
-  info.SetExtraInfo(supplementaryInformation);
+  info.supplementaryInformation = supplementaryInformation;
 
   parameters.push_back(info);
   return *this;

Core/GDCore/Extensions/Metadata/ExpressionMetadata.h

@@ -222,18 +222,6 @@ 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.
@@ -268,30 +256,7 @@ 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

@@ -22,6 +22,7 @@ InstructionMetadata::InstructionMetadata()
       canHaveSubInstructions(false),
       hidden(true),
       usageComplexity(5),
+      isAsync(false),
       isPrivate(false),
       isObjectInstruction(false),
       isBehaviorInstruction(false) {}
@@ -45,6 +46,7 @@ InstructionMetadata::InstructionMetadata(const gd::String& extensionNamespace_,
       extensionNamespace(extensionNamespace_),
       hidden(false),
       usageComplexity(5),
+      isAsync(false),
       isPrivate(false),
       isObjectInstruction(false),
       isBehaviorInstruction(false) {}
@@ -55,17 +57,15 @@ InstructionMetadata& InstructionMetadata::AddParameter(
     const gd::String& supplementaryInformation,
     bool parameterIsOptional) {
   ParameterMetadata info;
-  info.SetType(type);
+  info.type = type;
   info.description = description;
   info.codeOnly = false;
-  info.SetOptional(parameterIsOptional);
-  info.SetExtraInfo(
+  info.optional = parameterIsOptional;
+  info.supplementaryInformation =
       // 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 +
@@ -73,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.
@@ -85,19 +85,17 @@ InstructionMetadata& InstructionMetadata::AddParameter(
 InstructionMetadata& InstructionMetadata::AddCodeOnlyParameter(
     const gd::String& type, const gd::String& supplementaryInformation) {
   ParameterMetadata info;
-  info.SetType(type);
+  info.type = type;
   info.codeOnly = true;
-  info.SetExtraInfo(supplementaryInformation);
+  info.supplementaryInformation = supplementaryInformation;
 
   parameters.push_back(info);
   return *this;
 }
 
 InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
-    const gd::String& type, const gd::String& typeExtraInfo) {
-  const gd::String& expressionValueType =
-      gd::ValueTypeMetadata::GetPrimitiveValueType(type);
-  SetManipulatedType(expressionValueType);
+    const gd::String& type) {
+  SetManipulatedType(type);
 
   if (type == "boolean") {
     AddParameter("yesorno", _("New value"));
@@ -121,8 +119,8 @@ InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
                               "_PARAM" + gd::String::From(valueParamIndex) + "_");
     }
   } else {
-    AddParameter("operator", _("Modification's sign"), expressionValueType);
-    AddParameter(type, _("Value"), typeExtraInfo);
+    AddParameter("operator", _("Modification's sign"), type);
+    AddParameter(type == "number" ? "expression" : type, _("Value"));
 
     size_t operatorParamIndex = parameters.size() - 2;
     size_t valueParamIndex = parameters.size() - 1;
@@ -155,10 +153,8 @@ InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
 
 InstructionMetadata&
 InstructionMetadata::UseStandardRelationalOperatorParameters(
-    const gd::String& type, const gd::String& typeExtraInfo) {
-  const gd::String& expressionValueType =
-      gd::ValueTypeMetadata::GetPrimitiveValueType(type);
-  SetManipulatedType(expressionValueType);
+    const gd::String& type) {
+  SetManipulatedType(type);
 
   if (type == "boolean") {
     if (isObjectInstruction || isBehaviorInstruction) {
@@ -174,8 +170,8 @@ InstructionMetadata::UseStandardRelationalOperatorParameters(
           templateSentence.FindAndReplace("<subject>", sentence);
     }
   } else {
-    AddParameter("relationalOperator", _("Sign of the test"), expressionValueType);
-    AddParameter(type, _("Value to compare"), typeExtraInfo);
+    AddParameter("relationalOperator", _("Sign of the test"), type);
+    AddParameter(type == "number" ? "expression" : type, _("Value to compare"));
     size_t operatorParamIndex = parameters.size() - 2;
     size_t valueParamIndex = parameters.size() - 1;
 

Core/GDCore/Extensions/Metadata/InstructionMetadata.h

@@ -6,10 +6,10 @@
 
 #ifndef INSTRUCTIONMETADATA_H
 #define INSTRUCTIONMETADATA_H
-#include <algorithm>
 #include <functional>
 #include <map>
 #include <memory>
+#include <algorithm>
 
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/String.h"
@@ -104,16 +104,16 @@ class GD_CORE_API InstructionMetadata {
    * background, executing the instructions following it before the frame after
    * it resolved.
    */
-  bool IsAsync() const {
-    return !codeExtraInformation.asyncFunctionCallName.empty();
-  }
+  bool IsAsync() const { return isAsync; }
 
   /**
-   * Check if the instruction asynchronicity is optional. If it is, it can either
-   * be used synchronously or asynchronously, with one function for each.
+   * Set that the instruction is asynchronous - it will be running in the
+   * background, executing the instructions following it before the frame after
+   * it resolved.
    */
-  bool IsOptionallyAsync() const {
-    return IsAsync() && !codeExtraInformation.functionCallName.empty();
+  InstructionMetadata &SetAsync() {
+    isAsync = true;
+    return *this;
   }
 
   /**
@@ -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,26 +218,20 @@ 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, const gd::String& typeExtraInfo = "");
+  InstructionMetadata &UseStandardOperatorParameters(const gd::String &type);
 
   /**
    * \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& typeExtraInfo = "");
+      const gd::String &type);
 
   /**
    * \brief Mark the instruction as an object instruction. Automatically called
@@ -282,7 +276,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.
@@ -325,26 +319,14 @@ class GD_CORE_API InstructionMetadata {
     virtual ~ExtraInformation(){};
 
     /**
-     * Set the name of the function which will be called in the generated code.
-     * \param functionName the name of the function to call.
+     * Set the function name which will be used when generating the code.
+     * \param functionName the name of the function to call
      */
     ExtraInformation &SetFunctionName(const gd::String &functionName_) {
       functionCallName = functionName_;
       return *this;
     }
 
-    /**
-     * Set the name of the function, doing asynchronous work, which will be called in
-     * the generated code. This function should return an asynchronous task
-     * (i.e: `gdjs.AsyncTask` in the JavaScript runtime).
-     *
-     * \param functionName the name of the function doing asynchronous work to call.
-     */
-    ExtraInformation &SetAsyncFunctionName(const gd::String &functionName_) {
-      asyncFunctionCallName = functionName_;
-      return *this;
-    }
-
     /**
      * Declare if the instruction being declared is somewhat manipulating in a
      * standard way.
@@ -367,12 +349,12 @@ class GD_CORE_API InstructionMetadata {
      *                 _("the string"),
      *                 _("Text"),
      *                 "CppPlatform/Extensions/text24.png",
-     *                 "CppPlatform/Extensions/text_black.png");
+     *                 "CppPlatform/Extensions/text.png");
      *
      *      .AddParameter("object", _("Object"), "Text", false)
      *      .AddParameter("operator", _("Modification operator"), "string")
      *      .AddParameter("string", _("String"))
-     *      .SetFunctionName("SetString").SetManipulatedType("string").SetGetter("GetString");
+     *      .SetFunctionName("SetString").SetManipulatedType("string").SetGetter("GetString").SetIncludeFile("MyExtension/TextObject.h");
      *
      *  DECLARE_END_OBJECT_ACTION()
      * \endcode
@@ -440,7 +422,6 @@ class GD_CORE_API InstructionMetadata {
     bool HasCustomCodeGenerator() const { return hasCustomCodeGenerator; }
 
     gd::String functionCallName;
-    gd::String asyncFunctionCallName;
     gd::String type;
     AccessType accessType;
     gd::String optionalAssociatedInstruction;
@@ -473,49 +454,15 @@ class GD_CORE_API InstructionMetadata {
   }
 
   /**
-   * Set the name of the function which will be called in the generated code.
-   * \param functionName the name of the function to call.
+   * \brief Set the function that should be called when generating the source
+   * code from events.
+   * \param functionName the name of the function to call
    * \note Shortcut for `codeExtraInformation.SetFunctionName`.
    */
   ExtraInformation &SetFunctionName(const gd::String &functionName) {
     return codeExtraInformation.SetFunctionName(functionName);
   }
 
-  /**
-   * Set the name of the function, doing asynchronous work, which will be called in
-   * the generated code. This function should return an asynchronous task
-   * (i.e: `gdjs.AsyncTask` in the JavaScript runtime).
-   *
-   * \param functionName the name of the function doing asynchronous work to call.
-   * \note Shortcut for `codeExtraInformation.SetAsyncFunctionName`.
-   */
-  ExtraInformation &SetAsyncFunctionName(const gd::String &functionName) {
-    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:
@@ -532,6 +479,7 @@ class GD_CORE_API InstructionMetadata {
   int usageComplexity;  ///< Evaluate the instruction from 0 (simple&easy to
                         ///< use) to 10 (complex to understand)
   bool isPrivate;
+  bool isAsync;
   bool isObjectInstruction;
   bool isBehaviorInstruction;
   gd::String requiredBaseObjectCapability;

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.h

@@ -80,16 +80,6 @@ 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
    */
@@ -126,9 +116,9 @@ class GD_CORE_API MultipleInstructionMetadata {
    * \see gd::InstructionMetadata::UseStandardOperatorParameters
    * \see gd::InstructionMetadata::UseStandardRelationalOperatorParameters
    */
-  MultipleInstructionMetadata &UseStandardParameters(const gd::String &type, const gd::String& typeExtraInfo = "") {
-    if (condition) condition->UseStandardRelationalOperatorParameters(type, typeExtraInfo);
-    if (action) action->UseStandardOperatorParameters(type, typeExtraInfo);
+  MultipleInstructionMetadata &UseStandardParameters(const gd::String &type) {
+    if (condition) condition->UseStandardRelationalOperatorParameters(type);
+    if (action) action->UseStandardOperatorParameters(type);
     return *this;
   }
 
@@ -164,33 +154,6 @@ 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/ObjectMetadata.cpp

@@ -14,7 +14,6 @@
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Tools/Localization.h"
-#include "GDCore/Tools/Log.h"
 
 namespace gd {
 
@@ -23,40 +22,30 @@ ObjectMetadata::ObjectMetadata(const gd::String& extensionNamespace_,
                                const gd::String& fullname_,
                                const gd::String& description_,
                                const gd::String& icon24x24,
-                               std::shared_ptr<gd::ObjectConfiguration> blueprintObject_)
-    : ObjectMetadata(extensionNamespace_,
-                     name_,
-                     fullname_,
-                     description_,
-                     icon24x24,
-                     [blueprintObject_]() -> std::unique_ptr<gd::ObjectConfiguration> {
-    if (blueprintObject_ == std::shared_ptr<gd::ObjectConfiguration>()) {
-      gd::LogFatalError(
-          "Error: Unable to create object. Have you declared an extension "
-          "(or ObjectMetadata) without specifying an object as blueprint?");
+                               std::shared_ptr<gd::Object> blueprintObject_)
+    : extensionNamespace(extensionNamespace_),
+      blueprintObject(blueprintObject_) {
+  name = name_;
+#if defined(GD_IDE_ONLY)
+  SetFullName(gd::String(fullname_));
+  SetDescription(gd::String(description_));
+  iconFilename = icon24x24;
+#endif
+  createFunPtr =
+      [blueprintObject_](gd::String name) -> std::unique_ptr<gd::Object> {
+    if (blueprintObject_ == std::shared_ptr<gd::Object>()) {
+      std::cout
+          << "Error: Unable to create object. Have you declared an extension "
+             "(or ObjectMetadata) without specifying an object as blueprint?"
+          << std::endl;
       return nullptr;
     }
-    return blueprintObject_->Clone();
-  }) {
-  blueprintObject = blueprintObject_;
-}
 
-ObjectMetadata::ObjectMetadata(const gd::String& extensionNamespace_,
-                               const gd::String& name_,
-                               const gd::String& fullname_,
-                               const gd::String& description_,
-                               const gd::String& icon24x24)
-    : ObjectMetadata(extensionNamespace_,
-                     name_,
-                     fullname_,
-                     description_,
-                     icon24x24,
-                     []() -> std::unique_ptr<gd::ObjectConfiguration> {
-      gd::LogFatalError(
-          "Error: Event-based objects don't have blueprint. "
-          "This method should not never be called.");
-      return nullptr;
-    }) {}
+    std::unique_ptr<gd::Object> newObject = blueprintObject_->Clone();
+    newObject->SetName(name);
+    return newObject;
+  };
+}
 
 ObjectMetadata::ObjectMetadata(const gd::String& extensionNamespace_,
                                const gd::String& name_,
@@ -64,12 +53,14 @@ ObjectMetadata::ObjectMetadata(const gd::String& extensionNamespace_,
                                const gd::String& description_,
                                const gd::String& icon24x24,
                                CreateFunPtr createFunPtrP)
-    : name(name_),
-      iconFilename(icon24x24),
-      createFunPtr(createFunPtrP),
-      extensionNamespace(extensionNamespace_) {
+    : extensionNamespace(extensionNamespace_) {
+  name = name_;
+#if defined(GD_IDE_ONLY)
   SetFullName(gd::String(fullname_));
   SetDescription(gd::String(description_));
+  iconFilename = icon24x24;
+#endif
+  createFunPtr = createFunPtrP;
 }
 
 gd::InstructionMetadata& ObjectMetadata::AddCondition(

Core/GDCore/Extensions/Metadata/ObjectMetadata.h

@@ -13,7 +13,6 @@
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/Project/Object.h"
-#include "GDCore/Project/ObjectConfiguration.h"
 #include "GDCore/String.h"
 namespace gd {
 class InstructionMetadata;
@@ -21,7 +20,7 @@ class MultipleInstructionMetadata;
 class ExpressionMetadata;
 }  // namespace gd
 
-typedef std::function<std::unique_ptr<gd::ObjectConfiguration>()>
+typedef std::function<std::unique_ptr<gd::Object>(gd::String name)>
     CreateFunPtr;
 
 namespace gd {
@@ -43,17 +42,7 @@ class GD_CORE_API ObjectMetadata {
                  const gd::String& fullname_,
                  const gd::String& description_,
                  const gd::String& icon24x24_,
-                 std::shared_ptr<gd::ObjectConfiguration> blueprintObject_);
-  /**
-   * \brief Construct an object metadata, without "blueprint" object
-   * 
-   * \note This is used by events based objects.
-   */
-  ObjectMetadata(const gd::String& extensionNamespace_,
-                 const gd::String& name_,
-                 const gd::String& fullname_,
-                 const gd::String& description_,
-                 const gd::String& icon24x24_);
+                 std::shared_ptr<gd::Object> blueprintObject_);
 
   /**
    * \brief Construct an object metadata, with a function that will be called
@@ -315,12 +304,10 @@ class GD_CORE_API ObjectMetadata {
   gd::String categoryFullName;
   std::set<gd::String> unsupportedBaseObjectCapabilities;
 
-  std::shared_ptr<gd::ObjectConfiguration>
+  std::shared_ptr<gd::Object>
       blueprintObject;  ///< The "blueprint" object to be copied when a new
                         ///< object is asked. Can be null in case a creation
-                        ///< function is passed or for events based objects
-                        ///< (CustomObject are using EventBasedObject, they
-                        ///< don't need blueprints).
+                        ///< function is passed.
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/ParameterMetadata.cpp

@@ -10,26 +10,43 @@
 
 namespace gd {
 
-ParameterMetadata::ParameterMetadata() : codeOnly(false) {}
+ParameterMetadata::ParameterMetadata() : optional(false), codeOnly(false) {}
 
 void ParameterMetadata::SerializeTo(SerializerElement& element) const {
-  valueTypeMetadata.SerializeTo(element);
+  element.SetAttribute("type", type);
+  element.SetAttribute("supplementaryInformation", supplementaryInformation);
+  element.SetAttribute("optional", optional);
   element.SetAttribute("description", description);
-  if (!longDescription.empty()) {
-    element.SetAttribute("longDescription", longDescription);
-  }
-  if (codeOnly) {
-   element.SetAttribute("codeOnly", codeOnly);
-  }
+  element.SetAttribute("longDescription", longDescription);
+  element.SetAttribute("codeOnly", codeOnly);
+  element.SetAttribute("defaultValue", defaultValue);
   element.SetAttribute("name", name);
 }
 
 void ParameterMetadata::UnserializeFrom(const SerializerElement& element) {
-  valueTypeMetadata.UnserializeFrom(element);
+  type = element.GetStringAttribute("type");
+  supplementaryInformation =
+      element.GetStringAttribute("supplementaryInformation");
+  optional = element.GetBoolAttribute("optional");
   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,13 +6,16 @@
 
 #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
 
@@ -29,32 +32,17 @@ 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 valueTypeMetadata.GetName(); }
+  const gd::String &GetType() const { return type; }
 
   /**
    * \brief Set the type of the parameter.
-   * \deprecated Use gd::ValueTypeMetadata instead.
    */
   ParameterMetadata &SetType(const gd::String &type_) {
-    valueTypeMetadata.SetName(type_);
+    type = type_;
     return *this;
   }
 
@@ -83,33 +71,29 @@ 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 valueTypeMetadata.GetExtraInfo(); }
+  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).
-   * \deprecated Use gd::ValueTypeMetadata instead.
    */
   ParameterMetadata &SetExtraInfo(const gd::String &supplementaryInformation_) {
-    valueTypeMetadata.SetExtraInfo(supplementaryInformation_);
+    supplementaryInformation = supplementaryInformation_;
     return *this;
   }
 
   /**
    * \brief Return true if the parameter is optional.
-   * \deprecated Use gd::ValueTypeMetadata instead.
    */
-  bool IsOptional() const { return valueTypeMetadata.IsOptional(); }
+  bool IsOptional() const { return optional; }
 
   /**
    * \brief Set if the parameter is optional.
-   * \deprecated Use gd::ValueTypeMetadata instead.
    */
   ParameterMetadata &SetOptional(bool optional_ = true) {
-    valueTypeMetadata.SetOptional(optional_);
+    optional = optional_;
     return *this;
   }
 
@@ -144,15 +128,13 @@ class GD_CORE_API ParameterMetadata {
   /**
    * \brief Get the default value for the parameter.
    */
-  const gd::String &GetDefaultValue() const {
-    return valueTypeMetadata.GetDefaultValue();
-  }
+  const gd::String &GetDefaultValue() const { return defaultValue; }
 
   /**
    * \brief Set the default value, if the parameter is optional.
    */
   ParameterMetadata &SetDefaultValue(const gd::String &defaultValue_) {
-    valueTypeMetadata.SetDefaultValue(defaultValue_);
+    defaultValue = defaultValue_;
     return *this;
   }
 
@@ -169,27 +151,26 @@ 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 gd::ValueTypeMetadata::IsTypeObject(parameterType);
+    return parameterType == "object" || parameterType == "objectPtr" ||
+           parameterType == "objectList" ||
+           parameterType == "objectListOrEmptyIfJustDeclared" ||
+           parameterType == "objectListOrEmptyWithoutPicking";
   }
 
   /**
    * \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 gd::ValueTypeMetadata::IsTypeBehavior(parameterType);
+    return parameterType == "behavior";
   }
 
   /**
@@ -198,22 +179,42 @@ 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) {
-    return gd::ValueTypeMetadata::IsTypeExpression(type, 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";
+    } 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".
-   * \deprecated Use gd::ValueTypeMetadata instead.
    */
-  static const gd::String &GetExpressionValueType(const gd::String &parameterType) {
-    return gd::ValueTypeMetadata::GetPrimitiveValueType(parameterType);
-  }
+  static const gd::String &GetExpressionValueType(const gd::String &parameterType);
+  static const gd::String numberType;
+  static const gd::String stringType;
 
   /** \name Serialization
    */
@@ -231,17 +232,22 @@ 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.IsOptional()
+        parameterValue.GetPlainString().empty() && parameterMetadata.optional
             ? Expression(parameterMetadata.GetDefaultValue())
             : parameterValue;
 

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp

@@ -1,70 +0,0 @@
-/*
- * 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

@@ -1,231 +0,0 @@
-/*
- * 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/Platform.cpp

@@ -7,9 +7,7 @@
 
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Object.h"
-#include "GDCore/Project/ObjectConfiguration.h"
 #include "GDCore/String.h"
-#include "GDCore/Tools/Log.h"
 
 using namespace std;
 
@@ -93,22 +91,24 @@ std::shared_ptr<gd::PlatformExtension> Platform::GetExtension(
   return std::shared_ptr<gd::PlatformExtension>();
 }
 
-std::unique_ptr<gd::ObjectConfiguration> Platform::CreateObjectConfiguration(
-    gd::String type) const {
+std::unique_ptr<gd::Object> Platform::CreateObject(
+    gd::String type, const gd::String& name) const {
   if (creationFunctionTable.find(type) == creationFunctionTable.end()) {
-    gd::LogWarning("Tried to create an object with an unknown type: " + type
-              + " for platform " + GetName() + "!");
+    std::cout << "Tried to create an object with an unknown type: " << type
+              << " for platform " << GetName() << "!" << std::endl;
     type = "";
     if (creationFunctionTable.find("") == creationFunctionTable.end()) {
-      gd::LogError("Unable to create a Base object!");
+      std::cout << "Unable to create a Base object!" << std::endl;
       return nullptr;
     }
   }
 
   // Create a new object with the type we want.
-  auto objectConfiguration = (creationFunctionTable.find(type)->second)();
-  objectConfiguration->SetType(type);
-  return objectConfiguration;
+  std::unique_ptr<gd::Object> object =
+      (creationFunctionTable.find(type)->second)(name);
+  object->SetType(type);
+
+  return std::unique_ptr<gd::Object>(std::move(object));
 }
 
 #if defined(GD_IDE_ONLY)

Core/GDCore/Extensions/Platform.h

@@ -16,7 +16,6 @@ namespace gd {
 class InstructionsMetadataHolder;
 class Project;
 class Object;
-class ObjectConfiguration;
 class Behavior;
 class BehaviorMetadata;
 class ObjectMetadata;
@@ -27,7 +26,7 @@ class LayoutEditorCanvas;
 class ProjectExporter;
 }  // namespace gd
 
-typedef std::function<std::unique_ptr<gd::ObjectConfiguration>()>
+typedef std::function<std::unique_ptr<gd::Object>(gd::String name)>
     CreateFunPtr;
 
 #undef CreateEvent
@@ -147,8 +146,8 @@ class GD_CORE_API Platform {
   /**
    * \brief Create an object of given type with the specified name.
    */
-  std::unique_ptr<gd::ObjectConfiguration> CreateObjectConfiguration(
-      gd::String type) const;
+  std::unique_ptr<gd::Object> CreateObject(gd::String type,
+                                           const gd::String& name) const;
 
   /**
    * \brief Create an event of given type

Core/GDCore/Extensions/PlatformExtension.cpp

@@ -18,18 +18,19 @@
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/IDE/PlatformManager.h"
 #include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/ObjectConfiguration.h"
 #include "GDCore/Project/BehaviorsSharedData.h"
 #include "GDCore/Tools/Localization.h"
 
 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,
@@ -39,6 +40,7 @@ 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,
@@ -50,6 +52,7 @@ gd::InstructionMetadata& PlatformExtension::AddCondition(
                                                            smallicon)
                                            .SetHelpPath(GetHelpPath());
   return conditionsInfos[nameWithNamespace];
+#endif
 }
 
 gd::InstructionMetadata& PlatformExtension::AddAction(
@@ -60,6 +63,7 @@ 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,
@@ -71,6 +75,7 @@ gd::InstructionMetadata& PlatformExtension::AddAction(
                                                         smallicon)
                                         .SetHelpPath(GetHelpPath());
   return actionsInfos[nameWithNamespace];
+#endif
 }
 
 gd::ExpressionMetadata& PlatformExtension::AddExpression(
@@ -79,6 +84,7 @@ 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(),
@@ -89,6 +95,7 @@ gd::ExpressionMetadata& PlatformExtension::AddExpression(
                                                            smallicon)
                                             .SetHelpPath(GetHelpPath());
   return expressionsInfos[nameWithNamespace];
+#endif
 }
 
 gd::ExpressionMetadata& PlatformExtension::AddStrExpression(
@@ -97,6 +104,7 @@ 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(),
@@ -107,6 +115,7 @@ gd::ExpressionMetadata& PlatformExtension::AddStrExpression(
                                                               smallicon)
                                                .SetHelpPath(GetHelpPath());
   return strExpressionsInfos[nameWithNamespace];
+#endif
 }
 
 gd::MultipleInstructionMetadata PlatformExtension::AddExpressionAndCondition(
@@ -210,17 +219,19 @@ 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,
     const gd::String& fullname,
     const gd::String& description,
     const gd::String& icon24x24,
-    std::shared_ptr<gd::ObjectConfiguration> instance) {
+    std::shared_ptr<gd::Object> instance) {
   gd::String nameWithNamespace = GetNameSpace() + name;
   objectsInfos[nameWithNamespace] = ObjectMetadata(GetNameSpace(),
                                                    nameWithNamespace,
@@ -233,21 +244,6 @@ gd::ObjectMetadata& PlatformExtension::AddObject(
   return objectsInfos[nameWithNamespace];
 }
 
-gd::ObjectMetadata& PlatformExtension::AddEventsBasedObject(
-    const gd::String& name,
-    const gd::String& fullname,
-    const gd::String& description,
-    const gd::String& icon24x24) {
-  gd::String nameWithNamespace = GetNameSpace() + name;
-  objectsInfos[nameWithNamespace] = ObjectMetadata(GetNameSpace(),
-                                                   nameWithNamespace,
-                                                   fullname,
-                                                   description,
-                                                   icon24x24)
-                                        .SetHelpPath(GetHelpPath());
-  return objectsInfos[nameWithNamespace];
-}
-
 gd::BehaviorMetadata& PlatformExtension::AddBehavior(
     const gd::String& name,
     const gd::String& fullname,
@@ -273,25 +269,6 @@ gd::BehaviorMetadata& PlatformExtension::AddBehavior(
   return behaviorsInfo[nameWithNamespace];
 }
 
-gd::BehaviorMetadata& PlatformExtension::AddEventsBasedBehavior(
-    const gd::String& name,
-    const gd::String& fullname,
-    const gd::String& description,
-    const gd::String& group,
-    const gd::String& icon24x24) {
-  gd::String nameWithNamespace = GetNameSpace() + name;
-  behaviorsInfo[nameWithNamespace] = BehaviorMetadata(GetNameSpace(),
-                                                      nameWithNamespace,
-                                                      fullname,
-                                                      // Default name is the name
-                                                      name,
-                                                      description,
-                                                      group,
-                                                      icon24x24)
-                                         .SetHelpPath(GetHelpPath());
-  return behaviorsInfo[nameWithNamespace];
-}
-
 gd::EffectMetadata& PlatformExtension::AddEffect(const gd::String& name) {
   gd::String nameWithNamespace = GetNameSpace() + name;
   effectsMetadata[nameWithNamespace] = EffectMetadata(nameWithNamespace);
@@ -305,6 +282,7 @@ 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_,
@@ -313,6 +291,7 @@ gd::EventMetadata& PlatformExtension::AddEvent(
                                                      smallicon_,
                                                      instance_);
   return eventsInfos[nameWithNamespace];
+#endif
 }
 
 PlatformExtension& PlatformExtension::SetExtensionInformation(
@@ -392,6 +371,8 @@ 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;
@@ -570,6 +551,7 @@ gd::BaseEventSPtr PlatformExtension::CreateEvent(
 
   return std::shared_ptr<gd::BaseEvent>();
 }
+#endif
 
 CreateFunPtr PlatformExtension::GetObjectCreationFunctionPtr(
     const gd::String& objectType) const {
@@ -648,6 +630,7 @@ 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();
@@ -792,40 +775,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
       ++it;
   }
 }
-
-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;
-}
+#endif
 
 PlatformExtension::PlatformExtension()
     : deprecated(false), category(_("General")) {}

Core/GDCore/Extensions/PlatformExtension.h

@@ -37,10 +37,9 @@ class ArbitraryResourceWorker;
 class BehaviorsSharedData;
 class Behavior;
 class Object;
-class ObjectConfiguration;
 }  // namespace gd
 
-typedef std::function<std::unique_ptr<gd::ObjectConfiguration>()>
+typedef std::function<std::unique_ptr<gd::Object>(gd::String name)>
     CreateFunPtr;
 
 namespace gd {
@@ -243,21 +242,7 @@ class GD_CORE_API PlatformExtension {
                                 const gd::String& fullname_,
                                 const gd::String& description_,
                                 const gd::String& icon_,
-                                std::shared_ptr<gd::ObjectConfiguration> instance);
-
-  /**
-   * \brief Declare a new events based object as being part of the extension.
-   *
-   * \param name The name of the object
-   * \param fullname The user friendly name of the object
-   * \param description The user friendly description of the object
-   * \param icon The icon of the object.
-   */
-  gd::ObjectMetadata& AddEventsBasedObject(
-      const gd::String& name_,
-      const gd::String& fullname_,
-      const gd::String& description_,
-      const gd::String& icon_);
+                                std::shared_ptr<gd::Object> instance);
 
   /**
    * \brief Declare a new behavior as being part of the extension.
@@ -282,21 +267,6 @@ class GD_CORE_API PlatformExtension {
       std::shared_ptr<gd::Behavior> instance,
       std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance);
 
-  /**
-   * \brief Declare a new events based behavior as being part of the extension.
-   *
-   * \param name The name of the behavior
-   * \param fullname The user friendly name of the behavior
-   * \param description The user friendly description of the behavior
-   * \param icon The icon of the behavior.
-   */
-  gd::BehaviorMetadata& AddEventsBasedBehavior(
-      const gd::String& name_,
-      const gd::String& fullname_,
-      const gd::String& description_,
-      const gd::String& group_,
-      const gd::String& icon_);
-
   /**
    * \brief Declare a new effect as being part of the extension.
    * \param name The internal name of the effect (also called effect type).
@@ -620,26 +590,7 @@ class GD_CORE_API PlatformExtension {
    */
   static gd::String GetNamespaceSeparator() { return "::"; }
 
-  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:
+ private:
   /**
    * Set the namespace (the string all actions/conditions/expressions start
    * with).

Core/GDCore/Extensions/PlatformExtension.inl

@@ -25,8 +25,8 @@ gd::ObjectMetadata& PlatformExtension::AddObject(const gd::String& name,
                      fullname,
                      description,
                      icon24x24,
-                     []() -> std::unique_ptr<gd::ObjectConfiguration> {
-                       return gd::make_unique<T>();
+                     [](gd::String name) -> std::unique_ptr<gd::Object> {
+                       return gd::make_unique<T>(name);
                      })
           .SetHelpPath(GetHelpPath());
 

Core/GDCore/IDE/Events/ArbitraryEventsWorker.cpp

@@ -73,54 +73,4 @@ bool ArbitraryEventsWorker::VisitInstruction(gd::Instruction& instruction,
 
 ArbitraryEventsWorkerWithContext::~ArbitraryEventsWorkerWithContext() {}
 
-
-ReadOnlyArbitraryEventsWorker::~ReadOnlyArbitraryEventsWorker() {}
-
-void ReadOnlyArbitraryEventsWorker::VisitEventList(const gd::EventsList& events) {
-  DoVisitEventList(events);
-
-  for (std::size_t i = 0; i < events.size(); ++i) {
-    VisitEvent(events[i]);
-
-    if (events[i].CanHaveSubEvents()) {
-      VisitEventList(events[i].GetSubEvents());
-    }
-  }
-}
-
-void ReadOnlyArbitraryEventsWorker::VisitEvent(const gd::BaseEvent& event) {
-  DoVisitEvent(event);
-
-  const vector<const gd::InstructionsList*> conditionsVectors =
-      event.GetAllConditionsVectors();
-  for (std::size_t j = 0; j < conditionsVectors.size(); ++j) {
-    VisitInstructionList(*conditionsVectors[j], true);
-  }
-
-  const vector<const gd::InstructionsList*> actionsVectors = event.GetAllActionsVectors();
-  for (std::size_t j = 0; j < actionsVectors.size(); ++j) {
-    VisitInstructionList(*actionsVectors[j], false);
-  }
-}
-
-void ReadOnlyArbitraryEventsWorker::VisitInstructionList(
-    const gd::InstructionsList& instructions, bool areConditions) {
-  DoVisitInstructionList(instructions, areConditions);
-
-  for (std::size_t i = 0; i < instructions.size(); ++i) {
-    VisitInstruction(instructions[i], areConditions);
-    if (!instructions[i].GetSubInstructions().empty()) {
-      VisitInstructionList(instructions[i].GetSubInstructions(),
-                            areConditions);
-    }
-  }
-}
-
-void ReadOnlyArbitraryEventsWorker::VisitInstruction(const gd::Instruction& instruction,
-                                             bool isCondition) {
-  DoVisitInstruction(instruction, isCondition);
-}
-
-ReadOnlyArbitraryEventsWorkerWithContext::~ReadOnlyArbitraryEventsWorkerWithContext() {}
-
 }  // namespace gd

Core/GDCore/IDE/Events/ArbitraryEventsWorker.h

@@ -121,101 +121,6 @@ class GD_CORE_API ArbitraryEventsWorkerWithContext
   const gd::ObjectsContainer* currentObjectsContainer;
 };
 
-/**
- * \brief ReadOnlyArbitraryEventsWorker is an abstract class used to browse events (and
- * instructions). It can be used to implement autocompletion for example.
- *
- * \see gd::ReadOnlyArbitraryEventsWorkerWithContext
- *
- * \ingroup IDE
- */
-class GD_CORE_API ReadOnlyArbitraryEventsWorker {
- public:
-  ReadOnlyArbitraryEventsWorker(){};
-  virtual ~ReadOnlyArbitraryEventsWorker();
-
-  /**
-   * \brief Launch the worker on the specified events list.
-   */
-  void Launch(const gd::EventsList& events) { VisitEventList(events); };
-
- private:
-  void VisitEventList(const gd::EventsList& events);
-  void VisitEvent(const gd::BaseEvent& event);
-  void VisitInstructionList(const gd::InstructionsList& instructions,
-                            bool areConditions);
-  void VisitInstruction(const gd::Instruction& instruction, bool isCondition);
-
-  /**
-   * Called to do some work on an event list.
-   */
-  virtual void DoVisitEventList(const gd::EventsList& events){};
-
-  /**
-   * Called to do some work on an event
-   */
-  virtual void DoVisitEvent(const gd::BaseEvent& event) {};
-
-  /**
-   * Called to do some work on an instruction list
-   */
-  virtual void DoVisitInstructionList(const gd::InstructionsList& instructions,
-                                      bool areConditions){};
-
-  /**
-   * Called to do some work on an instruction.
-   */
-  virtual void DoVisitInstruction(const gd::Instruction& instruction,
-                                  bool isCondition) {};
-};
-
-/**
- * \brief An events worker that will know about the context (the objects
- * container). Useful for workers working on expressions notably.
- *
- * \see gd::ReadOnlyArbitraryEventsWorker
- *
- * \ingroup IDE
- */
-class GD_CORE_API ReadOnlyArbitraryEventsWorkerWithContext
-    : public ReadOnlyArbitraryEventsWorker {
- public:
-  ReadOnlyArbitraryEventsWorkerWithContext()
-      : currentGlobalObjectsContainer(nullptr),
-        currentObjectsContainer(nullptr){};
-  virtual ~ReadOnlyArbitraryEventsWorkerWithContext();
-
-  /**
-   * \brief Launch the worker on the specified events list,
-   * giving the objects container on which the events are applying to.
-   */
-  void Launch(const gd::EventsList& events,
-              const gd::ObjectsContainer& globalObjectsContainer_,
-              const gd::ObjectsContainer& objectsContainer_) {
-    currentGlobalObjectsContainer = &globalObjectsContainer_;
-    currentObjectsContainer = &objectsContainer_;
-    ReadOnlyArbitraryEventsWorker::Launch(events);
-  };
-
-  void Launch(gd::EventsList& events) = delete;
-
- protected:
-  const gd::ObjectsContainer& GetGlobalObjectsContainer() {
-    // Pointers are guaranteed to be not nullptr after
-    // Launch was called.
-    return *currentGlobalObjectsContainer;
-  };
-  const gd::ObjectsContainer& GetObjectsContainer() {
-    // Pointers are guaranteed to be not nullptr after
-    // Launch was called.
-    return *currentObjectsContainer;
-  };
-
- private:
-  const gd::ObjectsContainer* currentGlobalObjectsContainer;
-  const gd::ObjectsContainer* currentObjectsContainer;
-};
-
 }  // namespace gd
 
 #endif  // GDCORE_ARBITRARYEVENTSWORKER_H

Core/GDCore/IDE/Events/BehaviorTypeRenamer.cpp

@@ -1,25 +0,0 @@
-#include "BehaviorTypeRenamer.h"
-
-#include "GDCore/Events/Instruction.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/IDE/WholeProjectRefactorer.h"
-#include "GDCore/IDE/Events/ExpressionTypeFinder.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-
-namespace gd {
-
-void BehaviorTypeRenamer::DoVisitObject(gd::Object& object) {
-};
-
-void BehaviorTypeRenamer::DoVisitBehavior(gd::Behavior& behavior) {
-  if (behavior.GetTypeName() == oldType) {
-    behavior.SetTypeName(newType);
-  }
-};
-
-BehaviorTypeRenamer::~BehaviorTypeRenamer() {}
-
-}  // namespace gd

Core/GDCore/IDE/Events/BehaviorTypeRenamer.h

@@ -1,43 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#ifndef GDCORE_BEHAVIORTYPERENAMER_H
-#define GDCORE_BEHAVIORTYPERENAMER_H
-#include <set>
-
-#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
-#include "GDCore/String.h"
-
-namespace gd {
-class Project;
-class Object;
-class Behavior;
-}  // namespace gd
-
-namespace gd {
-
-class GD_CORE_API BehaviorTypeRenamer : public ArbitraryObjectsWorker {
- public:
-  BehaviorTypeRenamer(const gd::Project& project_,
-                          const gd::String& oldType_,
-                          const gd::String& newType_)
-      : project(project_), oldType(oldType_), newType(newType_){};
-  virtual ~BehaviorTypeRenamer();
-
- private:
-  void DoVisitObject(gd::Object& object) override;
-  void DoVisitBehavior(gd::Behavior& behavior) override;
-
-  const gd::Project& project;
-  gd::String oldType;
-  gd::String newType;
-};
-
-};  // namespace gd
-
-#endif // GDCORE_BEHAVIORTYPERENAMER_H

Core/GDCore/IDE/Events/CustomObjectTypeRenamer.cpp

@@ -1,24 +0,0 @@
-#include "CustomObjectTypeRenamer.h"
-
-#include "GDCore/Events/Instruction.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/IDE/WholeProjectRefactorer.h"
-#include "GDCore/IDE/Events/ExpressionTypeFinder.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-
-namespace gd {
-
-void CustomObjectTypeRenamer::DoVisitObject(gd::Object& object) {
-  if (object.GetType() == oldType) {
-    object.SetType(newType);
-  }
-};
-
-void CustomObjectTypeRenamer::DoVisitBehavior(gd::Behavior& behavior) {};
-
-CustomObjectTypeRenamer::~CustomObjectTypeRenamer() {}
-
-}  // namespace gd

Core/GDCore/IDE/Events/CustomObjectTypeRenamer.h

@@ -1,43 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#ifndef GDCORE_CUSTOMOBJECTTYPERENAMER_H
-#define GDCORE_CUSTOMOBJECTTYPERENAMER_H
-#include <set>
-
-#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
-#include "GDCore/String.h"
-
-namespace gd {
-class Project;
-class Object;
-class Behavior;
-}  // namespace gd
-
-namespace gd {
-
-class GD_CORE_API CustomObjectTypeRenamer : public ArbitraryObjectsWorker {
- public:
-  CustomObjectTypeRenamer(const gd::Project& project_,
-                          const gd::String& oldType_,
-                          const gd::String& newType_)
-      : project(project_), oldType(oldType_), newType(newType_){};
-  virtual ~CustomObjectTypeRenamer();
-
- private:
-  void DoVisitObject(gd::Object& object) override;
-  void DoVisitBehavior(gd::Behavior& behavior) override;
-
-  const gd::Project& project;
-  gd::String oldType;
-  gd::String newType;
-};
-
-};  // namespace gd
-
-#endif // GDCORE_CUSTOMOBJECTTYPERENAMER_H

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.GetType();
+        const gd::String& type = parameterMetadata.type;
 
         if (gd::ParameterMetadata::IsBehavior(type)) {
           if (lastObjectName == objectName) {

Core/GDCore/IDE/Events/EventsIdentifiersFinder.cpp

@@ -1,254 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#include "EventsIdentifiersFinder.h"
-#include "GDCore/Events/Event.h"
-#include "GDCore/Events/Instruction.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
-#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Platform.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/ExternalEvents.h"
-#include "GDCore/IDE/DependenciesAnalyzer.h"
-
-using namespace std;
-
-namespace gd {
-namespace {
-/**
- * \brief Go through the nodes to search for identifier occurrences.
- *
- * \see gd::ExpressionParser2
- */
-class GD_CORE_API IdentifierFinderExpressionNodeWorker
-    : public ExpressionParser2NodeWorker {
- public:
-  IdentifierFinderExpressionNodeWorker(std::set<gd::String>& results_,
-                              const gd::Platform &platform_,
-                              const gd::ObjectsContainer &globalObjectsContainer_,
-                              const gd::ObjectsContainer &objectsContainer_,
-                              const gd::String& identifierType_,
-                              const gd::String& objectName_ = "")
-      : results(results_),
-        platform(platform_),
-        globalObjectsContainer(globalObjectsContainer_),
-        objectsContainer(objectsContainer_),
-        identifierType(identifierType_),
-        objectName(objectName_){};
-  virtual ~IdentifierFinderExpressionNodeWorker(){};
-
- protected:
-  void OnVisitSubExpressionNode(SubExpressionNode& node) override {
-    node.expression->Visit(*this);
-  }
-  void OnVisitOperatorNode(OperatorNode& node) override {
-    node.leftHandSide->Visit(*this);
-    node.rightHandSide->Visit(*this);
-  }
-  void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {
-    node.factor->Visit(*this);
-  }
-  void OnVisitNumberNode(NumberNode& node) override {}
-  void OnVisitTextNode(TextNode& node) override {}
-  void OnVisitVariableNode(VariableNode& node) override {
-    if (node.child) node.child->Visit(*this);
-  }
-  void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
-    if (node.child) node.child->Visit(*this);
-  }
-  void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode& node) override {
-    node.expression->Visit(*this);
-    if (node.child) node.child->Visit(*this);
-  }
-  void OnVisitIdentifierNode(IdentifierNode& node) override {}
-  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
-  void OnVisitFunctionCallNode(FunctionCallNode& node) override {
-    bool considerFunction = objectName.empty() || node.objectName == objectName;
-
-    const bool isObjectFunction = !node.objectName.empty();
-    const gd::ExpressionMetadata &metadata = isObjectFunction ?
-            MetadataProvider::GetObjectAnyExpressionMetadata(
-                platform,
-                GetTypeOfObject(globalObjectsContainer, objectsContainer, objectName),
-                node.functionName):
-          MetadataProvider::GetAnyExpressionMetadata(platform, node.functionName);
-
-    if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
-      return;
-    }
-    
-    size_t parameterIndex = 0;
-    for (size_t metadataIndex = (isObjectFunction ? 1 : 0); metadataIndex < metadata.parameters.size()
-      && parameterIndex < node.parameters.size(); ++metadataIndex) {
-      auto& parameterMetadata = metadata.parameters[metadataIndex];
-      if (parameterMetadata.IsCodeOnly()) {
-        continue;
-      }
-      auto& parameterNode = node.parameters[parameterIndex];
-      ++parameterIndex;
-
-      if (considerFunction && parameterMetadata.GetType() == "identifier"
-       && parameterMetadata.GetExtraInfo() == identifierType) {
-        // Store the value of the parameter
-        results.insert(
-            gd::ExpressionParser2NodePrinter::PrintNode(*parameterNode));
-      } else {
-        parameterNode->Visit(*this);
-      }
-    }
-  }
-  void OnVisitEmptyNode(EmptyNode& node) override {}
-
- private:
-  const gd::Platform &platform;
-  const gd::ObjectsContainer &globalObjectsContainer;
-  const gd::ObjectsContainer &objectsContainer;
-
-  std::set<gd::String>& results;  ///< Reference to the std::set where argument
-                                  ///< values must be stored.
-  gd::String identifierType;  ///< The type of the parameters to be searched for.
-  gd::String objectName;     ///< If not empty, parameters will be taken into
-                             ///< account only if related to this object.
-};
-
-/**
- * \brief Go through the events to search for identifier occurrences.
- */
-class GD_CORE_API IdentifierFinderEventWorker
-    : public ReadOnlyArbitraryEventsWorkerWithContext {
- public:
-  IdentifierFinderEventWorker(std::set<gd::String>& results_,
-                              const gd::Platform &platform_,
-                              const gd::String& identifierType_,
-                              const gd::String& objectName_ = "")
-      : results(results_),
-        platform(platform_),
-        identifierType(identifierType_),
-        objectName(objectName_){};
-  virtual ~IdentifierFinderEventWorker(){};
-
-  void DoVisitInstructionList(const gd::InstructionsList& instructions,
-                                      bool areConditions) override {
-    for (std::size_t aId = 0; aId < instructions.size(); ++aId) {
-      auto& instruction = instructions[aId];
-      gd::String lastObjectParameter = "";
-      const gd::InstructionMetadata& instrInfos =
-          areConditions ? MetadataProvider::GetConditionMetadata(
-                              platform, instruction.GetType())
-                        : MetadataProvider::GetActionMetadata(
-                              platform, instruction.GetType());
-      for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
-        // The parameter has the searched type...
-      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());
-          }
-        }
-        // Search in expressions
-        else if (ParameterMetadata::IsExpression(
-                    "number", instrInfos.parameters[pNb].GetType()) ||
-                ParameterMetadata::IsExpression(
-                    "string", instrInfos.parameters[pNb].GetType())) {
-          auto node = instruction.GetParameter(pNb).GetRootNode();
-
-          IdentifierFinderExpressionNodeWorker searcher(
-              results,
-              platform,
-              GetGlobalObjectsContainer(),
-              GetObjectsContainer(),
-              identifierType,
-              objectName);
-          node->Visit(searcher);
-        }
-        // Remember the value of the last "object" parameter.
-        else if (gd::ParameterMetadata::IsObject(
-                    instrInfos.parameters[pNb].GetType())) {
-          lastObjectParameter =
-              instruction.GetParameter(pNb).GetPlainString();
-        }
-      }
-    }
-  };
-
- private:
-  const gd::Platform &platform;
-
-  std::set<gd::String>& results;  ///< Reference to the std::set where argument
-                                  ///< values must be stored.
-  gd::String identifierType;  ///< The type of the parameters to be searched for.
-  gd::String objectName;     ///< If not empty, parameters will be taken into
-                             ///< account only if related to this object.
-};
-} // namespace
-
-std::set<gd::String> EventsIdentifiersFinder::FindAllIdentifierExpressions(
-    const gd::Platform& platform,
-    const gd::Project& project,
-    const gd::Layout& layout,
-    const gd::String& identifierType,
-    const gd::String& contextObjectName) {
-  std::set<gd::String> results;
-
-  const bool isObjectIdentifier = identifierType.find("object") == 0;
-  // The object from the context is only relevent for object identifiers.
-  auto& actualObjectName = isObjectIdentifier ? contextObjectName : "";
-
-  FindArgumentsInEventsAndDependencies(
-      results,
-      platform,
-      project,
-      layout,
-      identifierType,
-      actualObjectName);
-
-  return results;
-}
-
-void EventsIdentifiersFinder::FindArgumentsInEventsAndDependencies(
-    std::set<gd::String>& results,
-    const gd::Platform& platform,
-    const gd::Project& project,
-    const gd::Layout& layout,
-    const gd::String& identifierType,
-    const gd::String& objectName) {
-  IdentifierFinderEventWorker eventWorker(results,
-                                        platform,
-                                        identifierType,
-                                        objectName);
-  eventWorker.Launch(layout.GetEvents(), project, layout);
-
-  DependenciesAnalyzer dependenciesAnalyzer = DependenciesAnalyzer(project, layout);
-  dependenciesAnalyzer.Analyze();
-  for (const gd::String& externalEventName : dependenciesAnalyzer.GetExternalEventsDependencies()) {
-    const gd::ExternalEvents& externalEvents = project.GetExternalEvents(externalEventName);
-
-    IdentifierFinderEventWorker eventWorker(results,
-                                          platform,
-                                          identifierType,
-                                          objectName);
-    eventWorker.Launch(externalEvents.GetEvents(), project, layout);
-  }
-  for (const gd::String& sceneName : dependenciesAnalyzer.GetScenesDependencies()) {
-    const gd::Layout& dependencyLayout = project.GetLayout(sceneName);
-
-    IdentifierFinderEventWorker eventWorker(results,
-                                          platform,
-                                          identifierType,
-                                          objectName);
-    eventWorker.Launch(dependencyLayout.GetEvents(), project, dependencyLayout);
-  }
-}
-
-}  // namespace gd

Core/GDCore/IDE/Events/EventsIdentifiersFinder.h

@@ -1,81 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef EVENTSIDENTIFIERSFINDER_H
-#define EVENTSIDENTIFIERSFINDER_H
-#include <set>
-#include <vector>
-#include "GDCore/Events/Event.h"
-#include "GDCore/String.h"
-namespace gd {
-class Instruction;
-class Platform;
-class Object;
-class Project;
-class Layout;
-}  // namespace gd
-
-namespace gd {
-
-/**
- * \brief Perform a search over a layout, searching for layout or object custom
- * identifiers.
- *
- * \todo Refactor this class using ArbitraryEventsWorker
- *
- * \ingroup IDE
- */
-class EventsIdentifiersFinder {
- public:
-  EventsIdentifiersFinder(){};
-  virtual ~EventsIdentifiersFinder(){};
-
-  /**
-   * Construct a list containing all the expressions for a given identifier used
-   * in the layout.
-   *
-   * \param project The project to use.
-   * \param layout The layout to use.
-   * \param  identifierType The identifier type to be analyzed.
-   * \param  objectName If not empty, parameters will be taken into account
-   * only if the last object parameter is filled with
-   * this value.
-   * \return A std::set containing the names of all identifiers used.
-   */
-  static std::set<gd::String> FindAllIdentifierExpressions(
-      const gd::Platform& platform,
-      const gd::Project& project,
-      const gd::Layout& layout,
-      const gd::String& identifierType,
-      const gd::String& objectName = "");
-
- private:
-  /**
-   * Construct a list containing all the expressions for a given identifier used
-   * in the layout. It searches in events dependencies.
-   *
-   * \param results A std::set to fill with the expressions used for all parameters of the
-   * specified identifier type
-   * \param platform The platform of the project
-   * \param project The project to use.
-   * \param layout The layout to use.
-   * \param events The events to be analyzed
-   * \param identifierType The identifier type to be analyzed
-   * \param objectName If not empty, parameters will be taken into account
-   * only if the last object parameter is filled with
-   * this value.
-   */
-  static void FindArgumentsInEventsAndDependencies(
-      std::set<gd::String>& results,
-      const gd::Platform& platform,
-      const gd::Project& project,
-      const gd::Layout& layout,
-      const gd::String& identifierType,
-      const gd::String& objectName = "");
-};
-
-}  // namespace gd
-
-#endif  // EVENTSIDENTIFIERSFINDER_H

Core/GDCore/IDE/Events/EventsLeaderboardsLister.cpp

@@ -1,41 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "GDCore/IDE/Events/EventsLeaderboardsLister.h"
-
-#include <map>
-#include <memory>
-#include <vector>
-
-#include "GDCore/Events/Event.h"
-#include "GDCore/Events/EventsList.h"
-#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/String.h"
-
-namespace gd {
-
-bool EventsLeaderboardsLister::DoVisitInstruction(gd::Instruction& instruction,
-                                                  bool isCondition) {
-  const gd::InstructionMetadata& instrInfo =
-      isCondition ? MetadataProvider::GetConditionMetadata(
-                        project.GetCurrentPlatform(), instruction.GetType())
-                  : MetadataProvider::GetActionMetadata(
-                        project.GetCurrentPlatform(), instruction.GetType());
-
-  for (int i = 0; i < instruction.GetParametersCount() &&
-                  i < instrInfo.GetParametersCount();
-       ++i)
-    if (instrInfo.GetParameter(i).GetType() == "leaderboardId") {
-      leaderboardIds.insert(instruction.GetParameter(i).GetPlainString());
-    }
-  return false;
-}
-
-EventsLeaderboardsLister::~EventsLeaderboardsLister() {}
-
-}  // namespace gd

Core/GDCore/IDE/Events/EventsLeaderboardsLister.h

@@ -1,48 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef EventsLeaderboardsLister_H
-#define EventsLeaderboardsLister_H
-#include <map>
-#include <memory>
-#include <set>
-#include <vector>
-
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/String.h"
-namespace gd {
-class BaseEvent;
-class Project;
-class EventsList;
-}
-
-namespace gd {
-
-/**
- * \brief List the leaderboard ids in the instructions.
- *
- * \ingroup IDE
- */
-class GD_CORE_API EventsLeaderboardsLister : public ArbitraryEventsWorker {
- public:
-  EventsLeaderboardsLister(gd::Project& project_) : project(project_){};
-  virtual ~EventsLeaderboardsLister();
-
-  /**
-   * Return the values of all leaderboardIds found in the events.
-   */
-  const std::set<gd::String>& GetLeaderboardIds() { return leaderboardIds; }
-
- private:
-  virtual bool DoVisitInstruction(gd::Instruction& instruction,
-                                  bool isCondition);
-
-  std::set<gd::String> leaderboardIds;
-  gd::Project& project;
-};
-
-}  // namespace gd
-
-#endif  // EventsLeaderboardsLister_H

Core/GDCore/IDE/Events/EventsLeaderboardsRenamer.cpp

@@ -1,49 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "GDCore/IDE/Events/EventsLeaderboardsRenamer.h"
-
-#include <map>
-#include <memory>
-#include <vector>
-
-#include "GDCore/Events/Event.h"
-#include "GDCore/Events/EventsList.h"
-#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/String.h"
-
-namespace gd {
-
-bool EventsLeaderboardsRenamer::DoVisitInstruction(gd::Instruction& instruction,
-                                                   bool isCondition) {
-  const gd::InstructionMetadata& instrInfo =
-      isCondition ? MetadataProvider::GetConditionMetadata(
-                        project.GetCurrentPlatform(), instruction.GetType())
-                  : MetadataProvider::GetActionMetadata(
-                        project.GetCurrentPlatform(), instruction.GetType());
-
-  for (int i = 0; i < instruction.GetParametersCount() &&
-                  i < instrInfo.GetParametersCount();
-       ++i) {
-    const gd::ParameterMetadata parameter = instrInfo.GetParameter(i);
-
-    if (parameter.GetType() == "leaderboardId") {
-      const gd::String leaderboardId =
-          instruction.GetParameter(i).GetPlainString();
-
-      if (leaderboardIdMap.find(leaderboardId) != leaderboardIdMap.end()) {
-        instruction.SetParameter(i, leaderboardIdMap[leaderboardId]);
-      }
-    }
-  }
-  return false;
-}
-
-EventsLeaderboardsRenamer::~EventsLeaderboardsRenamer() {}
-
-}  // namespace gd

Core/GDCore/IDE/Events/EventsLeaderboardsRenamer.h

@@ -1,46 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef EventsLeaderboardsRenamer_H
-#define EventsLeaderboardsRenamer_H
-#include <map>
-#include <memory>
-#include <set>
-#include <vector>
-
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/String.h"
-namespace gd {
-class BaseEvent;
-class Project;
-class EventsList;
-}
-
-namespace gd {
-
-/**
- * \brief Replace the leaderboard ids in the instructions.
- *
- * \ingroup IDE
- */
-class GD_CORE_API EventsLeaderboardsRenamer : public ArbitraryEventsWorker {
- public:
-  EventsLeaderboardsRenamer(
-      gd::Project& project_,
-      const std::map<gd::String, gd::String>& leaderboardIdMap_)
-      : project(project_), leaderboardIdMap(leaderboardIdMap_){};
-  virtual ~EventsLeaderboardsRenamer();
-
- private:
-  virtual bool DoVisitInstruction(gd::Instruction& instruction,
-                                  bool isCondition);
-
-  std::map<gd::String, gd::String> leaderboardIdMap;
-  gd::Project& project;
-};
-
-}  // namespace gd
-
-#endif  // EventsLeaderboardsRenamer_H

Core/GDCore/IDE/Events/EventsRefactorer.cpp

@@ -19,7 +19,6 @@
 #include "GDCore/IDE/Events/ExpressionValidator.h"
 #include "GDCore/IDE/Events/InstructionSentenceFormatter.h"
 #include "GDCore/Project/ObjectsContainer.h"
-#include "GDCore/Project/EventsBasedObject.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
 
 using namespace std;
@@ -122,7 +121,7 @@ class GD_CORE_API ExpressionObjectRenamer : public ExpressionParser2NodeWorker {
   bool hasDoneRenaming;
   const gd::String& objectName;
   const gd::String& objectNewName;
-
+  
   const gd::Platform &platform;
   const gd::ObjectsContainer &globalObjectsContainer;
   const gd::ObjectsContainer &objectsContainer;
@@ -217,7 +216,7 @@ class GD_CORE_API ExpressionObjectFinder : public ExpressionParser2NodeWorker {
  private:
   bool hasObject;
   const gd::String& objectName;
-
+  
   const gd::Platform &platform;
   const gd::ObjectsContainer &globalObjectsContainer;
   const gd::ObjectsContainer &objectsContainer;
@@ -237,12 +236,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].GetType()) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].type) &&
           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].GetType())) {
+                   "number", instrInfos.parameters[pNb].type)) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, project, layout, "number", *node, oldName, newName)) {
@@ -252,7 +251,7 @@ bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
       }
       // Replace object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].GetType())) {
+                   "string", instrInfos.parameters[pNb].type)) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, project, layout, "string", *node, oldName, newName)) {
@@ -291,12 +290,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].GetType()) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].type) &&
           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].GetType())) {
+                   "number", instrInfos.parameters[pNb].type)) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, project, layout, "number", *node, oldName, newName)) {
@@ -306,7 +305,7 @@ bool EventsRefactorer::RenameObjectInConditions(
       }
       // Replace object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].GetType())) {
+                   "string", instrInfos.parameters[pNb].type)) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, project, layout, "string", *node, oldName, newName)) {
@@ -412,8 +411,8 @@ void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
 }
 
 bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
-                                             gd::ObjectsContainer& globalObjectsContainer,
-                                             gd::ObjectsContainer& objectsContainer,
+                                             gd::ObjectsContainer& project,
+                                             gd::ObjectsContainer& layout,
                                              gd::InstructionsList& actions,
                                              gd::String name) {
   bool somethingModified = false;
@@ -425,27 +424,27 @@ 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].GetType()) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].type) &&
           actions[aId].GetParameter(pNb).GetPlainString() == name) {
         deleteMe = true;
         break;
       }
       // Find object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].GetType())) {
+                   "number", instrInfos.parameters[pNb].type)) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
-        if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "number", *node, name)) {
+        if (ExpressionObjectFinder::CheckIfHasObject(platform, project, layout, "number", *node, name)) {
           deleteMe = true;
           break;
         }
       }
       // Find object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].GetType())) {
+                   "string", instrInfos.parameters[pNb].type)) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
-        if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "string", *node, name)) {
+        if (ExpressionObjectFinder::CheckIfHasObject(platform, project, layout, "string", *node, name)) {
           deleteMe = true;
           break;
         }
@@ -459,8 +458,8 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
     } else if (!actions[aId].GetSubInstructions().empty())
       somethingModified =
           RemoveObjectInActions(platform,
-                                globalObjectsContainer,
-                                objectsContainer,
+                                project,
+                                layout,
                                 actions[aId].GetSubInstructions(),
                                 name) ||
           somethingModified;
@@ -471,8 +470,8 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
 
 bool EventsRefactorer::RemoveObjectInConditions(
     const gd::Platform& platform,
-    gd::ObjectsContainer& globalObjectsContainer,
-    gd::ObjectsContainer& objectsContainer,
+    gd::ObjectsContainer& project,
+    gd::ObjectsContainer& layout,
     gd::InstructionsList& conditions,
     gd::String name) {
   bool somethingModified = false;
@@ -485,27 +484,27 @@ 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].GetType()) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].type) &&
           conditions[cId].GetParameter(pNb).GetPlainString() == name) {
         deleteMe = true;
         break;
       }
       // Find object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].GetType())) {
+                   "number", instrInfos.parameters[pNb].type)) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
-        if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "number", *node, name)) {
+        if (ExpressionObjectFinder::CheckIfHasObject(platform, project, layout, "number", *node, name)) {
           deleteMe = true;
           break;
         }
       }
       // Find object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].GetType())) {
+                   "string", instrInfos.parameters[pNb].type)) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
-        if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "string", *node, name)) {
+        if (ExpressionObjectFinder::CheckIfHasObject(platform, project, layout, "string", *node, name)) {
           deleteMe = true;
           break;
         }
@@ -519,8 +518,8 @@ bool EventsRefactorer::RemoveObjectInConditions(
     } else if (!conditions[cId].GetSubInstructions().empty())
       somethingModified =
           RemoveObjectInConditions(platform,
-                                   globalObjectsContainer,
-                                   objectsContainer,
+                                   project,
+                                   layout,
                                    conditions[cId].GetSubInstructions(),
                                    name) ||
           somethingModified;
@@ -530,8 +529,8 @@ bool EventsRefactorer::RemoveObjectInConditions(
 }
 
 void EventsRefactorer::RemoveObjectInEvents(const gd::Platform& platform,
-                                            gd::ObjectsContainer& globalObjectsContainer,
-                                            gd::ObjectsContainer& objectsContainer,
+                                            gd::ObjectsContainer& project,
+                                            gd::ObjectsContainer& layout,
                                             gd::EventsList& events,
                                             gd::String name) {
   for (std::size_t i = 0; i < events.size(); ++i) {
@@ -539,19 +538,19 @@ void EventsRefactorer::RemoveObjectInEvents(const gd::Platform& platform,
         events[i].GetAllConditionsVectors();
     for (std::size_t j = 0; j < conditionsVectors.size(); ++j) {
       bool conditionsModified = RemoveObjectInConditions(
-          platform, globalObjectsContainer, objectsContainer, *conditionsVectors[j], name);
+          platform, project, layout, *conditionsVectors[j], name);
     }
 
     vector<gd::InstructionsList*> actionsVectors =
         events[i].GetAllActionsVectors();
     for (std::size_t j = 0; j < actionsVectors.size(); ++j) {
       bool actionsModified = RemoveObjectInActions(
-          platform, globalObjectsContainer, objectsContainer, *actionsVectors[j], name);
+          platform, project, layout, *actionsVectors[j], name);
     }
 
     if (events[i].CanHaveSubEvents())
       RemoveObjectInEvents(
-          platform, globalObjectsContainer, objectsContainer, events[i].GetSubEvents(), name);
+          platform, project, layout, events[i].GetSubEvents(), name);
   }
 }
 
@@ -566,8 +565,6 @@ std::vector<EventsSearchResult> EventsRefactorer::ReplaceStringInEvents(
     bool inActions,
     bool inEventStrings) {
   vector<EventsSearchResult> modifiedEvents;
-  if (toReplace.empty()) return modifiedEvents;
-
   for (std::size_t i = 0; i < events.size(); ++i) {
     bool eventModified = false;
     if (inConditions) {
@@ -773,18 +770,15 @@ vector<EventsSearchResult> EventsRefactorer::SearchInEvents(
   const gd::String& ignored_characters =
       EventsRefactorer::searchIgnoredCharacters;
 
-  if (inEventSentences) {
-    // Remove ignored characters only when searching in event sentences.
-    search.replace_if(
-        search.begin(),
-        search.end(),
-        [ignored_characters](const char& c) {
-          return ignored_characters.find(c) != gd::String::npos;
-        },
-        "");
-    search = search.LeftTrim().RightTrim();
-    search.RemoveConsecutiveOccurrences(search.begin(), search.end(), ' ');
-  }
+  search.replace_if(
+      search.begin(),
+      search.end(),
+      [ignored_characters](const char& c) {
+        return ignored_characters.find(c) != gd::String::npos;
+      },
+      "");
+  search = search.LeftTrim().RightTrim();
+  search.RemoveConsecutiveOccurrences(search.begin(), search.end(), ' ');
 
   for (std::size_t i = 0; i < events.size(); ++i) {
     bool eventAddedInResults = false;

Core/GDCore/IDE/Events/EventsVariablesFinder.cpp

@@ -13,7 +13,6 @@
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/Platform.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
@@ -23,28 +22,28 @@
 using namespace std;
 
 namespace gd {
-namespace {
+
 /**
- * \brief Go through the nodes to search for variable occurrences.
+ * \brief Go through the nodes and change the given object name to a new one.
  *
  * \see gd::ExpressionParser2
  */
-class GD_CORE_API VariableFinderExpressionNodeWorker
+class GD_CORE_API ExpressionParameterSearcher
     : public ExpressionParser2NodeWorker {
  public:
-  VariableFinderExpressionNodeWorker(std::set<gd::String>& results_,
-                              const gd::Platform &platform_,
+  ExpressionParameterSearcher(const gd::Platform &platform_,
                               const gd::ObjectsContainer &globalObjectsContainer_,
                               const gd::ObjectsContainer &objectsContainer_,
+                              std::set<gd::String>& results_,
                               const gd::String& parameterType_,
                               const gd::String& objectName_ = "")
-      : results(results_),
-        platform(platform_),
+      : platform(platform_),
         globalObjectsContainer(globalObjectsContainer_),
         objectsContainer(objectsContainer_),
+        results(results_),
         parameterType(parameterType_),
         objectName(objectName_){};
-  virtual ~VariableFinderExpressionNodeWorker(){};
+  virtual ~ExpressionParameterSearcher(){};
 
  protected:
   void OnVisitSubExpressionNode(SubExpressionNode& node) override {
@@ -75,34 +74,27 @@ class GD_CORE_API VariableFinderExpressionNodeWorker
   void OnVisitFunctionCallNode(FunctionCallNode& node) override {
     bool considerFunction = objectName.empty() || node.objectName == objectName;
 
-    const bool isObjectFunction = !node.objectName.empty();
-    const gd::ExpressionMetadata &metadata = isObjectFunction ?
+    const gd::ExpressionMetadata &metadata = node.objectName.empty() ?
+          MetadataProvider::GetAnyExpressionMetadata(platform, node.functionName) :
             MetadataProvider::GetObjectAnyExpressionMetadata(
                 platform,
                 GetTypeOfObject(globalObjectsContainer, objectsContainer, objectName),
-                node.functionName):
-            MetadataProvider::GetAnyExpressionMetadata(platform, node.functionName);
+                node.functionName);
 
     if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
       return;
     }
-
-    size_t parameterIndex = 0;
-    for (size_t metadataIndex = (isObjectFunction ? 1 : 0); metadataIndex < metadata.parameters.size()
-      && parameterIndex < node.parameters.size(); ++metadataIndex) {
-      auto& parameterMetadata = metadata.parameters[metadataIndex];
-      if (parameterMetadata.IsCodeOnly()) {
-        continue;
-      }
-      auto& parameterNode = node.parameters[parameterIndex];
-      ++parameterIndex;
-
+    
+    for (size_t i = 0; i < node.parameters.size() &&
+                       i < metadata.parameters.size();
+         ++i) {
+      auto& parameterMetadata = metadata.parameters[i];
       if (considerFunction && parameterMetadata.GetType() == parameterType) {
         // Store the value of the parameter
         results.insert(
-            gd::ExpressionParser2NodePrinter::PrintNode(*parameterNode));
+            gd::ExpressionParser2NodePrinter::PrintNode(*node.parameters[i]));
       } else {
-        parameterNode->Visit(*this);
+        node.parameters[i]->Visit(*this);
       }
     }
   }
@@ -120,87 +112,18 @@ class GD_CORE_API VariableFinderExpressionNodeWorker
                              ///< account only if related to this object.
 };
 
-/**
- * \brief Go through the events to search for variable occurrences.
- */
-class GD_CORE_API VariableFinderEventWorker
-    : public ReadOnlyArbitraryEventsWorkerWithContext {
- public:
-  VariableFinderEventWorker(std::set<gd::String>& results_,
-                              const gd::Platform &platform_,
-                              const gd::String& parameterType_,
-                              const gd::String& objectName_ = "")
-      : results(results_),
-        platform(platform_),
-        parameterType(parameterType_),
-        objectName(objectName_){};
-  virtual ~VariableFinderEventWorker(){};
-
-  void DoVisitInstructionList(const gd::InstructionsList& instructions,
-                                      bool areConditions) override {
-    for (std::size_t aId = 0; aId < instructions.size(); ++aId) {
-      auto& instruction = instructions[aId];
-      gd::String lastObjectParameter = "";
-      const gd::InstructionMetadata& instrInfos =
-          areConditions ? MetadataProvider::GetConditionMetadata(
-                              platform, instruction.GetType())
-                        : MetadataProvider::GetActionMetadata(
-                              platform, instruction.GetType());
-      for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
-        // The parameter has the searched type...
-        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].GetType()) ||
-                ParameterMetadata::IsExpression(
-                    "string", instrInfos.parameters[pNb].GetType())) {
-          auto node = instruction.GetParameter(pNb).GetRootNode();
-
-          VariableFinderExpressionNodeWorker searcher(
-              results,
-              platform,
-              GetGlobalObjectsContainer(),
-              GetObjectsContainer(),
-              parameterType,
-              objectName);
-          node->Visit(searcher);
-        }
-        // Remember the value of the last "object" parameter.
-        else if (gd::ParameterMetadata::IsObject(
-                    instrInfos.parameters[pNb].GetType())) {
-          lastObjectParameter =
-              instruction.GetParameter(pNb).GetPlainString();
-        }
-      }
-    }
-  };
-
- private:
-  const gd::Platform &platform;
-
-  std::set<gd::String>& results;  ///< Reference to the std::set where argument
-                                  ///< values must be stored.
-  gd::String parameterType;  ///< The type of the parameters to be searched for.
-  gd::String objectName;     ///< If not empty, parameters will be taken into
-                             ///< account only if related to this object.
-};
-} // namespace
-
 std::set<gd::String> EventsVariablesFinder::FindAllGlobalVariables(
     const gd::Platform& platform, const gd::Project& project) {
   std::set<gd::String> results;
 
   for (std::size_t i = 0; i < project.GetLayoutsCount(); ++i) {
-    FindArgumentsInEventsAndDependencies(
-            results,
+    std::set<gd::String> results2 =
+        FindArgumentsInEventsAndDependencies(
             platform,
             project,
             project.GetLayout(i),
             "globalvar");
+    results.insert(results2.begin(), results2.end());
   }
 
   return results;
@@ -212,12 +135,9 @@ std::set<gd::String> EventsVariablesFinder::FindAllLayoutVariables(
     const gd::Layout& layout) {
   std::set<gd::String> results;
 
-  FindArgumentsInEventsAndDependencies(
-      results,
-      platform,
-      project,
-      layout,
-      "scenevar");
+  std::set<gd::String> results2 = FindArgumentsInEventsAndDependencies(
+      platform, project, layout, "scenevar");
+  results.insert(results2.begin(), results2.end());
 
   return results;
 }
@@ -229,51 +149,159 @@ std::set<gd::String> EventsVariablesFinder::FindAllObjectVariables(
     const gd::Object& object) {
   std::set<gd::String> results;
 
-  FindArgumentsInEventsAndDependencies(
-      results,
+  std::set<gd::String> results2 = FindArgumentsInEventsAndDependencies(
       platform,
       project,
       layout,
       "objectvar",
       object.GetName());
+  results.insert(results2.begin(), results2.end());
 
   return results;
 }
 
-void EventsVariablesFinder::FindArgumentsInEventsAndDependencies(
-    std::set<gd::String>& results,
+std::set<gd::String> EventsVariablesFinder::FindArgumentsInInstructions(
+    const gd::Platform& platform,
+    const gd::Project& project,
+    const gd::Layout& layout,
+    const gd::InstructionsList& instructions,
+    bool instructionsAreConditions,
+    const gd::String& parameterType,
+    const gd::String& objectName) {
+  std::set<gd::String> results;
+
+  for (std::size_t aId = 0; aId < instructions.size(); ++aId) {
+    gd::String lastObjectParameter = "";
+    const gd::InstructionMetadata& instrInfos =
+        instructionsAreConditions ? MetadataProvider::GetConditionMetadata(
+                                        platform, instructions[aId].GetType())
+                                  : MetadataProvider::GetActionMetadata(
+                                        platform, instructions[aId].GetType());
+    for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
+      // The parameter has the searched type...
+      if (instrInfos.parameters[pNb].type == parameterType) {
+        //...remember the value of the parameter.
+        if (objectName.empty() || lastObjectParameter == objectName)
+          results.insert(instructions[aId].GetParameter(pNb).GetPlainString());
+      }
+      // Search in expressions
+      else if (ParameterMetadata::IsExpression(
+                   "number", instrInfos.parameters[pNb].type) ||
+               ParameterMetadata::IsExpression(
+                   "string", instrInfos.parameters[pNb].type)) {
+        auto node = instructions[aId].GetParameter(pNb).GetRootNode();
+
+        ExpressionParameterSearcher searcher(
+            platform,
+            project,
+            layout,
+            results,
+            parameterType,
+            objectName);
+        node->Visit(searcher);
+      }
+      // Remember the value of the last "object" parameter.
+      else if (gd::ParameterMetadata::IsObject(
+                   instrInfos.parameters[pNb].type)) {
+        lastObjectParameter =
+            instructions[aId].GetParameter(pNb).GetPlainString();
+      }
+    }
+
+    if (!instructions[aId].GetSubInstructions().empty())
+      FindArgumentsInInstructions(platform,
+                                  project,
+                                  layout,
+                                  instructions[aId].GetSubInstructions(),
+                                  instructionsAreConditions,
+                                  parameterType);
+  }
+
+  return results;
+}
+
+std::set<gd::String> EventsVariablesFinder::FindArgumentsInEventsAndDependencies(
     const gd::Platform& platform,
     const gd::Project& project,
     const gd::Layout& layout,
     const gd::String& parameterType,
     const gd::String& objectName) {
+  std::set<gd::String> results;
 
-  VariableFinderEventWorker eventWorker(results,
-                                        platform,
-                                        parameterType,
-                                        objectName);
-  eventWorker.Launch(layout.GetEvents(), project, layout);
+  std::set<gd::String> results2 = FindArgumentsInEvents(
+      platform, project, layout, layout.GetEvents(), parameterType, objectName);
+  results.insert(results2.begin(), results2.end());
 
   DependenciesAnalyzer dependenciesAnalyzer = DependenciesAnalyzer(project, layout);
   dependenciesAnalyzer.Analyze();
   for (const gd::String& externalEventName : dependenciesAnalyzer.GetExternalEventsDependencies()) {
     const gd::ExternalEvents& externalEvents = project.GetExternalEvents(externalEventName);
 
-    VariableFinderEventWorker eventWorker(results,
-                                          platform,
-                                          parameterType,
-                                          objectName);
-    eventWorker.Launch(externalEvents.GetEvents(), project, layout);
+    std::set<gd::String> results3 = FindArgumentsInEvents(
+        platform, project, layout, externalEvents.GetEvents(), parameterType, objectName);
+    results.insert(results3.begin(), results3.end());
   }
   for (const gd::String& sceneName : dependenciesAnalyzer.GetScenesDependencies()) {
     const gd::Layout& dependencyLayout = project.GetLayout(sceneName);
 
-    VariableFinderEventWorker eventWorker(results,
-                                          platform,
-                                          parameterType,
-                                          objectName);
-    eventWorker.Launch(dependencyLayout.GetEvents(), project, dependencyLayout);
+    std::set<gd::String> results3 = FindArgumentsInEvents(
+        platform, project, dependencyLayout, dependencyLayout.GetEvents(), parameterType, objectName);
+    results.insert(results3.begin(), results3.end());
   }
+
+  return results;
+}
+
+std::set<gd::String> EventsVariablesFinder::FindArgumentsInEvents(
+    const gd::Platform& platform,
+    const gd::Project& project,
+    const gd::Layout& layout,
+    const gd::EventsList& events,
+    const gd::String& parameterType,
+    const gd::String& objectName) {
+  std::set<gd::String> results;
+  for (std::size_t i = 0; i < events.size(); ++i) {
+    vector<const gd::InstructionsList*> conditionsVectors =
+        events[i].GetAllConditionsVectors();
+    for (std::size_t j = 0; j < conditionsVectors.size(); ++j) {
+      std::set<gd::String> results2 =
+          FindArgumentsInInstructions(platform,
+                                      project,
+                                      layout,
+                                      *conditionsVectors[j],
+                                      /*conditions=*/true,
+                                      parameterType,
+                                      objectName);
+      results.insert(results2.begin(), results2.end());
+    }
+
+    vector<const gd::InstructionsList*> actionsVectors =
+        events[i].GetAllActionsVectors();
+    for (std::size_t j = 0; j < actionsVectors.size(); ++j) {
+      std::set<gd::String> results2 =
+          FindArgumentsInInstructions(platform,
+                                      project,
+                                      layout,
+                                      *actionsVectors[j],
+                                      /*conditions=*/false,
+                                      parameterType,
+                                      objectName);
+      results.insert(results2.begin(), results2.end());
+    }
+
+    if (events[i].CanHaveSubEvents()) {
+      std::set<gd::String> results2 =
+          FindArgumentsInEvents(platform,
+                                project,
+                                layout,
+                                events[i].GetSubEvents(),
+                                parameterType,
+                                objectName);
+      results.insert(results2.begin(), results2.end());
+    }
+  }
+
+  return results;
 }
 
 }  // namespace gd

Core/GDCore/IDE/Events/EventsVariablesFinder.h

@@ -23,6 +23,7 @@ namespace gd {
  * \brief Perform a search over a project or a layout, searching for layout,
  * global or object variables.
  *
+ * \todo Refactor this class using ArbitraryEventsWorker
  * \todo Rework this class to return the shapes (maybe even types?) of the
  * variables (in particular for structures and arrays), so we can use this
  * for better autocompletions in the variables dialogs in the IDE.
@@ -73,13 +74,34 @@ class EventsVariablesFinder {
       const gd::Object& object);
 
  private:
+  /**
+   * Construct a list of the value of the arguments for parameters of type @
+   * parameterType
+   *
+   * \param project The project used
+   * \param project The layout used
+   * \param instructions The instructions to be analyzed
+   * \param instructionsAreConditions True if the instructions are conditions.
+   * \param parameterType The parameters type to be analyzed
+   * \param objectName If not empty, parameters will be taken into account only
+   * if the last object parameter is filled with this value.
+   *
+   * \return A std::set filled with the values used for all parameters of the
+   * specified type
+   */
+  static std::set<gd::String> FindArgumentsInInstructions(
+      const gd::Platform& platform,
+      const gd::Project& project,
+      const gd::Layout& layout,
+      const gd::InstructionsList& instructions,
+      bool instructionsAreConditions,
+      const gd::String& parameterType,
+      const gd::String& objectName = "");
 
   /**
    * Construct a list of the value of the arguments for parameters of type @
-   * parameterType. It searches in events dependencies.
+   * parameterType. It searchs in events dependencies.
    *
-   * \param results A std::set to fill with the values used for all parameters of the
-   * specified type
    * \param platform The platform of the project
    * \param project The project used
    * \param layout The layout used
@@ -88,14 +110,40 @@ class EventsVariablesFinder {
    * \param objectName If not empty, parameters will be taken into account
    * only if the last object parameter is filled with
    * this value.
+   *
+   * \return A std::set filled with the values used for all parameters of the
+   * specified type
    */
-  static void FindArgumentsInEventsAndDependencies(
-      std::set<gd::String>& results,
+  static std::set<gd::String> FindArgumentsInEventsAndDependencies(
       const gd::Platform& platform,
       const gd::Project& project,
       const gd::Layout& layout,
       const gd::String& parameterType,
       const gd::String& objectName = "");
+
+  /**
+   * Construct a list of the value of the arguments for parameters of type @
+   * parameterType. It doesn't search in events dependencies.
+   *
+   * \param platform The platform of the project
+   * \param project The project used
+   * \param layout The layout used
+   * \param events The events to be analyzed
+   * \param parameterType The parameters type to be analyzed
+   * \param objectName If not empty, parameters will be taken into account
+   * only if the last object parameter is filled with
+   * this value.
+   *
+   * \return A std::set filled with the values used for all parameters of the
+   * specified type
+   */
+  static std::set<gd::String> FindArgumentsInEvents(
+      const gd::Platform& platform,
+      const gd::Project& project,
+      const gd::Layout& layout,
+      const gd::EventsList& events,
+      const gd::String& parameterType,
+      const gd::String& objectName);
 };
 
 }  // namespace gd

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].IsOptional() && !parameters[i].codeOnly) nb++;
+    if (!parameters[i].optional && !parameters[i].codeOnly) nb++;
   }
 
   return nb;

Core/GDCore/IDE/Events/ExpressionsParameterMover.cpp

@@ -78,16 +78,13 @@ class GD_CORE_API ExpressionParameterMover
   void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
   void OnVisitFunctionCallNode(FunctionCallNode& node) override {
     auto moveParameter =
-        [this](std::vector<std::unique_ptr<gd::ExpressionNode>>& parameters, int firstWrittenParameterIndex) {
-          size_t newExpressionIndex = newIndex - firstWrittenParameterIndex;
-          size_t oldExpressionIndex = oldIndex - firstWrittenParameterIndex;
-
-          if (oldExpressionIndex >= parameters.size() || newExpressionIndex >= parameters.size())
+        [this](std::vector<std::unique_ptr<gd::ExpressionNode>>& parameters) {
+          if (oldIndex >= parameters.size() || newIndex >= parameters.size())
             return;
 
-          auto movedParameterNode = std::move(parameters[oldExpressionIndex]);
-          parameters.erase(parameters.begin() + oldExpressionIndex);
-          parameters.insert(parameters.begin() + newExpressionIndex,
+          auto movedParameterNode = std::move(parameters[oldIndex]);
+          parameters.erase(parameters.begin() + oldIndex);
+          parameters.insert(parameters.begin() + newIndex,
                             std::move(movedParameterNode));
         };
 
@@ -95,13 +92,10 @@ class GD_CORE_API ExpressionParameterMover
       if (behaviorType.empty() && !objectType.empty() &&
           !node.objectName.empty()) {
         // Move parameter of an object function
-        // This refactor only applies on events object functions
-        // and events object functions doesn't exist yet.
-        // This is a dead code.
         const gd::String& thisObjectType = gd::GetTypeOfObject(
             globalObjectsContainer, objectsContainer, node.objectName);
         if (thisObjectType == objectType) {
-          moveParameter(node.parameters, 1);
+          moveParameter(node.parameters);
           hasDoneMoving = true;
         }
       } else if (!behaviorType.empty() && !node.behaviorName.empty()) {
@@ -109,12 +103,12 @@ class GD_CORE_API ExpressionParameterMover
         const gd::String& thisBehaviorType = gd::GetTypeOfBehavior(
             globalObjectsContainer, objectsContainer, node.behaviorName);
         if (thisBehaviorType == behaviorType) {
-          moveParameter(node.parameters, 2);
+          moveParameter(node.parameters);
           hasDoneMoving = true;
         }
       } else if (behaviorType.empty() && objectType.empty()) {
         // Move parameter of a free function
-        moveParameter(node.parameters, 1);
+        moveParameter(node.parameters);
         hasDoneMoving = true;
       }
     }
@@ -150,7 +144,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].GetType();
+    const gd::String& type = metadata.parameters[pNb].type;
     const gd::Expression& expression = instruction.GetParameter(pNb);
 
     auto node = expression.GetRootNode();

Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp

@@ -5,7 +5,7 @@
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/IDE/WholeProjectRefactorer.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
-#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/BehaviorContent.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
 
@@ -29,7 +29,7 @@ void UsedExtensionsFinder::DoVisitObject(gd::Object& object) {
 
 // Behaviors scanner
 
-void UsedExtensionsFinder::DoVisitBehavior(gd::Behavior& behavior) {
+void UsedExtensionsFinder::DoVisitBehavior(gd::BehaviorContent& behavior) {
   usedExtensions.insert(
       gd::MetadataProvider::GetExtensionAndBehaviorMetadata(
           project.GetCurrentPlatform(), behavior.GetTypeName())

Core/GDCore/IDE/Events/UsedExtensionsFinder.h

@@ -16,7 +16,7 @@
 namespace gd {
 class Project;
 class Object;
-class Behavior;
+class BehaviorContent;
 }  // namespace gd
 
 namespace gd {
@@ -38,7 +38,7 @@ class GD_CORE_API UsedExtensionsFinder
   void DoVisitObject(gd::Object& object) override;
 
   // Behavior Visitor
-  void DoVisitBehavior(gd::Behavior& behavior) override;
+  void DoVisitBehavior(gd::BehaviorContent& behavior) override;
 
   // Instructions Visitor
   bool DoVisitInstruction(gd::Instruction& instruction,

Core/GDCore/IDE/EventsFunctionTools.cpp

@@ -8,10 +8,9 @@
 #include "GDCore/Events/Expression.h"
 #include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
 #include "GDCore/Project/EventsBasedBehavior.h"
-#include "GDCore/Project/EventsBasedObject.h"
-//#include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/EventsFunction.h"
 #include "GDCore/Project/Object.h"
+#include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/String.h"
 #include "GDCore/Tools/Log.h"
@@ -20,7 +19,6 @@ namespace gd {
 
 void EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
     const gd::Project& project,
-    const gd::EventsFunctionsContainer functionContainer,
     const gd::EventsFunction& eventsFunction,
     gd::ObjectsContainer& outputGlobalObjectsContainer,
     gd::ObjectsContainer& outputObjectsContainer) {
@@ -32,12 +30,8 @@ void EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
   // to parameters
   outputObjectsContainer.GetObjects().clear();
   outputObjectsContainer.GetObjectGroups().Clear();
-
-  auto &parameters = eventsFunction.GetParametersForEvents(functionContainer);
   gd::ParameterMetadataTools::ParametersToObjectsContainer(
-      project,
-      parameters,
-      outputObjectsContainer);
+      project, eventsFunction.GetParameters(), outputObjectsContainer);
   outputObjectsContainer.GetObjectGroups() = eventsFunction.GetObjectGroups();
 }
 
@@ -49,7 +43,6 @@ void EventsFunctionTools::BehaviorEventsFunctionToObjectsContainer(
     gd::ObjectsContainer& outputObjectsContainer) {
   // The context is build the same way as free function...
   FreeEventsFunctionToObjectsContainer(project,
-                                       eventsBasedBehavior.GetEventsFunctions(),
                                        eventsFunction,
                                        outputGlobalObjectsContainer,
                                        outputObjectsContainer);
@@ -79,40 +72,4 @@ void EventsFunctionTools::BehaviorEventsFunctionToObjectsContainer(
   }
 }
 
-void EventsFunctionTools::ObjectEventsFunctionToObjectsContainer(
-    const gd::Project& project,
-    const gd::EventsBasedObject& eventsBasedObject,
-    const gd::EventsFunction& eventsFunction,
-    gd::ObjectsContainer& outputGlobalObjectsContainer,
-    gd::ObjectsContainer& outputObjectsContainer) {
-  // The context is build the same way as free function...
-  FreeEventsFunctionToObjectsContainer(project,
-                                       eventsBasedObject.GetEventsFunctions(),
-                                       eventsFunction,
-                                       outputGlobalObjectsContainer,
-                                       outputObjectsContainer);
-
-  // TODO EBO Use a constant instead a hard coded value "Object".
-  // ...and has an "Object" by convention...
-  if (!outputObjectsContainer.HasObjectNamed("Object")) {
-    gd::LogWarning("No \"Object\" in a function of an events based object: " +
-                   eventsFunction.GetName() +
-                   ". This means this function is likely misconfigured (check "
-                   "its parameters).");
-    return;
-  }
-  if (eventsBasedObject.HasObjectNamed("Object")) {
-    gd::LogWarning("Child-objects can't be named Object because it's reserved"
-                  "for the parent. ");
-    return;
-  }
-
-  // ...and its children.
-  auto &children = eventsBasedObject.GetObjects();
-  for (auto &childObject : children) {
-    auto child = childObject.get();
-    outputObjectsContainer.InsertObject(*child, children.size());
-  }
-}
-
 }  // namespace gd

Core/GDCore/IDE/EventsFunctionTools.h

@@ -10,12 +10,10 @@
 #include "GDCore/String.h"
 namespace gd {
 class Project;
-class EventsFunctionsContainer;
 class ObjectsContainer;
 class ParameterMetadata;
 class EventsFunction;
 class EventsBasedBehavior;
-class EventsBasedObject;
 class Expression;
 }  // namespace gd
 
@@ -35,7 +33,6 @@ 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);
@@ -54,21 +51,6 @@ class GD_CORE_API EventsFunctionTools {
       const gd::EventsFunction& eventsFunction,
       gd::ObjectsContainer& outputGlobalObjectsContainer,
       gd::ObjectsContainer& outputObjectsContainer);
-  /**
-   * \brief Given a parent-object events function, initialize the given objects container
-   * with objects described in the events function parameters, in
-   * the events function groups and in the parent-object properties for
-   * child-objects.
-   *
-   * This is useful to create the "context" of a function, before code
-   * generation for example.
-   */
-  static void ObjectEventsFunctionToObjectsContainer(
-      const gd::Project& project,
-      const gd::EventsBasedObject& eventsBasedObject,
-      const gd::EventsFunction& eventsFunction,
-      gd::ObjectsContainer& outputGlobalObjectsContainer,
-      gd::ObjectsContainer& outputObjectsContainer);
 };
 }  // namespace gd
 

Core/GDCore/IDE/Project/ArbitraryObjectsWorker.cpp

@@ -10,7 +10,7 @@
 #include <memory>
 #include <vector>
 
-#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/BehaviorContent.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/String.h"
@@ -36,7 +36,7 @@ void ArbitraryObjectsWorker::VisitObject(gd::Object& object) {
     VisitBehavior(object.GetBehavior(behaviorName));
 }
 
-void ArbitraryObjectsWorker::VisitBehavior(gd::Behavior& behavior) {
+void ArbitraryObjectsWorker::VisitBehavior(gd::BehaviorContent& behavior) {
   DoVisitBehavior(behavior);
 }
 

Core/GDCore/IDE/Project/ArbitraryObjectsWorker.h

@@ -15,7 +15,7 @@
 namespace gd {
 class Object;
 class ObjectsContainer;
-class Behavior;
+class BehaviorContent;
 }  // namespace gd
 
 namespace gd {
@@ -40,7 +40,7 @@ class GD_CORE_API ArbitraryObjectsWorker {
  private:
   void VisitObjectContainer(gd::ObjectsContainer& objects);
   void VisitObject(gd::Object& object);
-  void VisitBehavior(gd::Behavior& behavior);
+  void VisitBehavior(gd::BehaviorContent& instruction);
 
   /**
    * Called to do some work on an object container.
@@ -55,7 +55,7 @@ class GD_CORE_API ArbitraryObjectsWorker {
   /**
    * Called to do some work on a behavior.
    */
-  virtual void DoVisitBehavior(gd::Behavior& behavior){};
+  virtual void DoVisitBehavior(gd::BehaviorContent& instruction){};
 };
 
 }  // namespace gd

Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp

@@ -111,7 +111,7 @@ class ResourceWorkerInEventsWorker : public ArbitraryEventsWorker {
   ResourceWorkerInEventsWorker(const gd::Project& project_,
                                gd::ArbitraryResourceWorker& worker_)
       : project(project_), worker(worker_){};
-  virtual ~ResourceWorkerInEventsWorker(){};
+  virtual ~ResourceWorkerInEventsWorker() {};
 
  private:
   bool DoVisitInstruction(gd::Instruction& instruction, bool isCondition) {
@@ -131,8 +131,7 @@ class ResourceWorkerInEventsWorker : public ArbitraryEventsWorker {
                              const gd::String& lastObjectName) {
           const String& parameterValue = parameterExpression.GetPlainString();
           if (parameterMetadata.GetType() ==
-                  "police" ||  // Should be renamed fontResource
-              parameterMetadata.GetType() == "fontResource") {
+              "police") {  // Should be renamed fontResource
             gd::String updatedParameterValue = parameterValue;
             worker.ExposeFont(updatedParameterValue);
             instruction.SetParameter(parameterIndex, updatedParameterValue);
@@ -150,10 +149,6 @@ class ResourceWorkerInEventsWorker : public ArbitraryEventsWorker {
             gd::String updatedParameterValue = parameterValue;
             worker.ExposeImage(updatedParameterValue);
             instruction.SetParameter(parameterIndex, updatedParameterValue);
-          } else if (parameterMetadata.GetType() == "jsonResource") {
-            gd::String updatedParameterValue = parameterValue;
-            worker.ExposeJson(updatedParameterValue);
-            instruction.SetParameter(parameterIndex, updatedParameterValue);
           }
         });
 

Core/GDCore/IDE/ProjectStripper.cpp

@@ -5,8 +5,6 @@
  */
 #include "ProjectStripper.h"
 
-#include "GDCore/Project/EventsFunctionsContainer.h"
-#include "GDCore/Project/EventsFunctionsExtension.h"
 #include "GDCore/Project/ExternalEvents.h"
 #include "GDCore/Project/ExternalLayout.h"
 #include "GDCore/Project/Layout.h"
@@ -14,7 +12,7 @@
 
 namespace gd {
 
-void GD_CORE_API ProjectStripper::StripProjectForExport(gd::Project &project) {
+void GD_CORE_API ProjectStripper::StripProjectForExport(gd::Project& project) {
   project.GetObjectGroups().Clear();
   while (project.GetExternalEventsCount() > 0)
     project.RemoveExternalEvents(project.GetExternalEvents(0).GetName());
@@ -24,28 +22,7 @@ void GD_CORE_API ProjectStripper::StripProjectForExport(gd::Project &project) {
     project.GetLayout(i).GetEvents().Clear();
   }
 
-  // Keep the EventsBasedObject object list because it's useful for the Runtime
-  // to create the child-object.
-  for (unsigned int extensionIndex = 0;
-       extensionIndex < project.GetEventsFunctionsExtensionsCount();
-       ++extensionIndex) {
-    auto &extension = project.GetEventsFunctionsExtension(extensionIndex);
-    auto &eventsBasedObjects = extension.GetEventsBasedObjects();
-    if (eventsBasedObjects.size() == 0) {
-      project.RemoveEventsFunctionsExtension(extension.GetName());
-      extensionIndex--;
-      continue;
-    }
-    for (unsigned int objectIndex = 0; objectIndex < eventsBasedObjects.size();
-         ++objectIndex) {
-      auto &eventsBasedObject = eventsBasedObjects.at(objectIndex);
-      eventsBasedObject.SetFullName("");
-      eventsBasedObject.SetDescription("");
-      eventsBasedObject.GetEventsFunctions().GetInternalVector().clear();
-      eventsBasedObject.GetPropertyDescriptors().GetInternalVector().clear();
-    }
-    extension.GetEventsBasedBehaviors().Clear();
-  }
+  project.ClearEventsFunctionsExtensions();
 }
 
-} // namespace gd
+}  // namespace gd

Core/GDCore/IDE/PropertyFunctionGenerator.cpp

@@ -1,301 +0,0 @@
-/*
- * 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

@@ -1,65 +0,0 @@
-/*
- * 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/UnfilledRequiredBehaviorPropertyProblem.h

@@ -11,7 +11,7 @@
 namespace gd {
 class Project;
 class Object;
-class Behavior;
+class BehaviorContent;
 }  // namespace gd
 
 namespace gd {
@@ -24,12 +24,12 @@ class GD_CORE_API UnfilledRequiredBehaviorPropertyProblem {
   UnfilledRequiredBehaviorPropertyProblem(
       const gd::Project& sourceProject_,
       gd::Object& sourceObject_,
-      gd::Behavior& sourceBehavior_,
+      gd::BehaviorContent& sourceBehaviorContent_,
       const gd::String& sourcePropertyName_,
       const gd::String& expectedBehaviorTypeName_)
       : sourceProject(sourceProject_),
       sourceObject(sourceObject_),
-      sourceBehavior(sourceBehavior_),
+      sourceBehaviorContent(sourceBehaviorContent_),
       sourcePropertyName(sourcePropertyName_),
       expectedBehaviorTypeName(expectedBehaviorTypeName_){};
   virtual ~UnfilledRequiredBehaviorPropertyProblem();
@@ -47,8 +47,8 @@ class GD_CORE_API UnfilledRequiredBehaviorPropertyProblem {
   /**
    * \brief Return the behavior where the problem appears.
    */
-  virtual gd::Behavior& GetSourceBehaviorContent() const {
-    return sourceBehavior;
+  virtual gd::BehaviorContent& GetSourceBehaviorContent() const {
+    return sourceBehaviorContent;
   }
 
   /**
@@ -69,7 +69,7 @@ class GD_CORE_API UnfilledRequiredBehaviorPropertyProblem {
  private:
   const gd::Project& sourceProject;
   gd::Object& sourceObject;
-  gd::Behavior& sourceBehavior;
+  gd::BehaviorContent& sourceBehaviorContent;
   const gd::String sourcePropertyName;
 
   const gd::String expectedBehaviorTypeName;

Core/GDCore/IDE/WholeProjectRefactorer.h

@@ -18,11 +18,11 @@ class EventsFunctionsExtension;
 class EventsFunction;
 class ObjectsContainer;
 class EventsBasedBehavior;
-class EventsBasedObject;
 class ArbitraryEventsWorker;
 class ArbitraryObjectsWorker;
 class ArbitraryEventsWorkerWithContext;
 class Behavior;
+class BehaviorContent;
 class BehaviorMetadata;
 class UnfilledRequiredBehaviorPropertyProblem;
 }  // namespace gd
@@ -61,24 +61,13 @@ class GD_CORE_API WholeProjectRefactorer {
    * \brief Call the specified worker on all events of the events based behavior
    *
    * This should be the preferred way to traverse all the events of an events
-   * based behavior.
+   * based behavior
    */
   static void ExposeEventsBasedBehaviorEvents(
       gd::Project& project,
       const gd::EventsBasedBehavior& eventsBasedBehavior,
       gd::ArbitraryEventsWorkerWithContext& worker);
 
-  /**
-   * \brief Call the specified worker on all events of the events based object
-   *
-   * This should be the preferred way to traverse all the events of an events
-   * based object.
-   */
-  static void ExposeEventsBasedObjectEvents(
-      gd::Project& project,
-      const gd::EventsBasedObject& eventsBasedObject,
-      gd::ArbitraryEventsWorkerWithContext& worker);
-
   /**
    * \brief Call the specified worker on all ObjectContainers of the project
    * (global, layouts...)
@@ -130,21 +119,6 @@ class GD_CORE_API WholeProjectRefactorer {
       const gd::String& oldFunctionName,
       const gd::String& newFunctionName);
 
-  /**
-   * \brief Refactor the project **before** an events function of an object is
-   * renamed.
-   *
-   * \warning Do the renaming of the specified function after calling this.
-   * This is because the function is expected to have its old name for the
-   * refactoring.
-   */
-  static void RenameObjectEventsFunction(
-      gd::Project& project,
-      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
-      const gd::EventsBasedObject& eventsBasedObject,
-      const gd::String& oldFunctionName,
-      const gd::String& newFunctionName);
-
   /**
    * \brief Refactor the project **before** an events function parameter
    * is moved.
@@ -176,22 +150,6 @@ class GD_CORE_API WholeProjectRefactorer {
       std::size_t oldIndex,
       std::size_t newIndex);
 
-  /**
-   * \brief Refactor the project **before** the parameter of an events function
-   * of an object is moved.
-   *
-   * \warning Do the move of the specified function parameters after calling
-   * this. This is because the function is expected to be in its old state for
-   * the refactoring.
-   */
-  static void MoveObjectEventsFunctionParameter(
-      gd::Project& project,
-      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
-      const gd::EventsBasedObject& eventsBasedObject,
-      const gd::String& functionName,
-      std::size_t oldIndex,
-      std::size_t newIndex);
-
   /**
    * \brief Refactor the project **before** a property of a behavior is
    * renamed.
@@ -207,36 +165,6 @@ 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.
-   *
-   * \warning Do the renaming of the specified property after calling this.
-   * This is because the property is expected to have its old name for the
-   * refactoring.
-   */
-  static void RenameEventsBasedObjectProperty(
-      gd::Project& project,
-      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
-      const gd::EventsBasedObject& eventsBasedObject,
-      const gd::String& oldPropertyName,
-      const gd::String& newPropertyName);
-
   /**
    * \brief Add a behavior to an object and add required behaviors if necessary
    * to fill every behavior properties of the added behaviors.
@@ -289,19 +217,6 @@ class GD_CORE_API WholeProjectRefactorer {
       const gd::String& oldBehaviorName,
       const gd::String& newBehaviorName);
 
-  /**
-   * \brief Refactor the project **before** an object is renamed.
-   *
-   * \warning Do the renaming of the specified object after calling this.
-   * This is because the object is expected to have its old name for the
-   * refactoring.
-   */
-  static void RenameEventsBasedObject(
-      gd::Project& project,
-      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
-      const gd::String& oldObjectName,
-      const gd::String& newObjectName);
-
   /**
    * \brief Refactor the project after an object is renamed in a layout
    *
@@ -326,34 +241,6 @@ class GD_CORE_API WholeProjectRefactorer {
                                            bool isObjectGroup,
                                            bool removeEventsAndGroups = true);
 
-  /**
-   * \brief Refactor the project after an object is removed in an events-based
-   * object.
-   *
-   * This will update the events of the function and groups.
-   */
-  static void ObjectOrGroupRemovedInEventsBasedObject(
-      gd::Project& project,
-      gd::EventsBasedObject& eventsBasedObject,
-      gd::ObjectsContainer& globalObjectsContainer,
-      gd::ObjectsContainer& objectsContainer,
-      const gd::String& objectName,
-      bool isObjectGroup,
-      bool removeEventsAndGroups);
-
-  /**
-   * \brief Refactor the events function after an object or group is renamed
-   *
-   * This will update the events of the function and groups.
-   */
-  static void ObjectOrGroupRenamedInEventsBasedObject(
-      gd::Project& project,
-      gd::ObjectsContainer& globalObjectsContainer,
-      gd::EventsBasedObject& eventsBasedObject,
-      const gd::String& oldName,
-      const gd::String& newName,
-      bool isObjectGroup);
-
   /**
    * \brief Refactor the events function after an object or group is renamed
    *
@@ -422,14 +309,6 @@ class GD_CORE_API WholeProjectRefactorer {
       const gd::EventsFunctionsExtension& eventsFunctionsExtension,
       const gd::EventsBasedBehavior& eventsBasedBehavior);
 
-  /**
-   * \brief Ensure (adding if necessary) that the functions of the given
-   * object have the proper mandatory parameters (the "Object").
-   */
-  static void EnsureObjectEventsFunctionsProperParameters(
-      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
-      const gd::EventsBasedObject& eventsBasedObject);
-
   virtual ~WholeProjectRefactorer(){};
 
  private:
@@ -445,10 +324,6 @@ class GD_CORE_API WholeProjectRefactorer {
                                const gd::String& oldBehaviorType,
                                const gd::String& newBehaviorType);
 
-  static void DoRenameObject(gd::Project& project,
-                             const gd::String& oldObjectType,
-                             const gd::String& newObjectType);
-
   static void FindDependentBehaviorNames(
       const gd::Project& project,
       const gd::Object& object,
@@ -456,7 +331,6 @@ class GD_CORE_API WholeProjectRefactorer {
       std::unordered_set<gd::String>& dependentBehaviorNames);
 
   static const gd::String behaviorObjectParameterName;
-  static const gd::String parentObjectParameterName;
 
   WholeProjectRefactorer(){};
 };

Core/GDCore/Project/AbstractEventsBasedEntity.cpp

@@ -1,44 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "AbstractEventsBasedEntity.h"
-#include "EventsFunctionsContainer.h"
-#include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/Tools/MakeUnique.h"
-
-namespace gd {
-
-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);
-  element.SetAttribute("name", name);
-  element.SetAttribute("fullName", fullName);
-
-  gd::SerializerElement& eventsFunctionsElement =
-      element.AddChild("eventsFunctions");
-  eventsFunctionsContainer.SerializeEventsFunctionsTo(eventsFunctionsElement);
-  propertyDescriptors.SerializeElementsTo(
-      "propertyDescriptor", element.AddChild("propertyDescriptors"));
-}
-
-void AbstractEventsBasedEntity::UnserializeFrom(gd::Project& project,
-                                          const SerializerElement& element) {
-  description = element.GetStringAttribute("description");
-  name = element.GetStringAttribute("name");
-  fullName = element.GetStringAttribute("fullName");
-
-  const gd::SerializerElement& eventsFunctionsElement =
-      element.GetChild("eventsFunctions");
-  eventsFunctionsContainer.UnserializeEventsFunctionsFrom(
-      project, eventsFunctionsElement);
-  propertyDescriptors.UnserializeElementsFrom(
-      "propertyDescriptor", element.GetChild("propertyDescriptors"));
-}
-
-}  // namespace gd

Core/GDCore/Project/AbstractEventsBasedEntity.h

@@ -1,153 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef GDCORE_ABSTRACTEVENTSBASEDENTITY_H
-#define GDCORE_ABSTRACTEVENTSBASEDENTITY_H
-
-#include <vector>
-#include "GDCore/Project/NamedPropertyDescriptor.h"
-#include "GDCore/Tools/SerializableWithNameList.h"
-#include "GDCore/Project/EventsFunctionsContainer.h"
-#include "GDCore/String.h"
-namespace gd {
-class SerializerElement;
-class Project;
-}  // namespace gd
-
-namespace gd {
-
-/**
- * \brief Represents a behavior or an object that is implemented with events.
- *
- * It's the responsibility of the IDE to run the logic to transform this into a
- * real behavior or object, by declaring an extension and running code generation.
- * See `EventsFunctionsExtensionsLoader`.
- *
- * \ingroup PlatformDefinition
- */
-class GD_CORE_API AbstractEventsBasedEntity {
- public:
-  AbstractEventsBasedEntity(
-      const gd::String& _name,
-      gd::EventsFunctionsContainer::FunctionOwner functionContainerSource);
-  virtual ~AbstractEventsBasedEntity(){};
-
-  /**
-   * \brief Return a pointer to a new AbstractEventsBasedEntity constructed from
-   * this one.
-   */
-  AbstractEventsBasedEntity* Clone() const { return new AbstractEventsBasedEntity(*this); };
-
-  /**
-   * \brief Get the description of the behavior or object, that is displayed in the
-   * editor.
-   */
-  const gd::String& GetDescription() const { return description; };
-
-  /**
-   * \brief Set the description of the behavior or object, to be displayed in the editor.
-   */
-  virtual AbstractEventsBasedEntity& SetDescription(const gd::String& description_) {
-    description = description_;
-    return *this;
-  }
-
-  /**
-   * \brief Get the internal name of the behavior or object.
-   */
-  const gd::String& GetName() const { return name; };
-
-  /**
-   * \brief Set the internal name of the behavior or object.
-   */
-  AbstractEventsBasedEntity& SetName(const gd::String& name_) {
-    name = name_;
-    return *this;
-  }
-
-  /**
-   * \brief Get the name of the behavior or object, that is displayed in the editor.
-   */
-  const gd::String& GetFullName() const { return fullName; };
-
-  /**
-   * \brief Set the name of the behavior or object, to be displayed in the editor.
-   */
-  AbstractEventsBasedEntity& SetFullName(const gd::String& fullName_) {
-    fullName = fullName_;
-    return *this;
-  }
-
-  /**
-   * \brief Return a reference to the functions of the events based behavior or object.
-   */
-  EventsFunctionsContainer& GetEventsFunctions() {
-    return eventsFunctionsContainer;
-  }
-
-  /**
-   * \brief Return a const reference to the functions of the events based
-   * behavior or object.
-   */
-  const EventsFunctionsContainer& GetEventsFunctions() const {
-    return eventsFunctionsContainer;
-  }
-
-  /**
-   * \brief Return a reference to the list of the properties.
-   */
-  SerializableWithNameList<NamedPropertyDescriptor>& GetPropertyDescriptors() {
-    return propertyDescriptors;
-  }
-
-  /**
-   * \brief Return a const reference to the list of the properties.
-   */
-  const SerializableWithNameList<NamedPropertyDescriptor>& GetPropertyDescriptors()
-      const {
-    return propertyDescriptors;
-  }
-
-  /**
-   * \brief Get the name of the action to change a property.
-   */
-  static gd::String GetPropertyActionName(const gd::String& propertyName) { return "SetProperty" + propertyName; };
-
-  /**
-   * \brief Get the name of the condition to compare a property.
-   */
-  static gd::String GetPropertyConditionName(const gd::String& propertyName) { return "Property" + propertyName; };
-
-  /**
-   * \brief Get the name of the expression to get a property.
-   */
-  static gd::String GetPropertyExpressionName(const gd::String& propertyName) { return "Property" + propertyName; };
-
-  /** \name Serialization
-   */
-  ///@{
-  /**
-   * \brief Serialize the AbstractEventsBasedEntity to the specified element
-   */
-  virtual void SerializeTo(gd::SerializerElement& element) const;
-
-  /**
-   * \brief Load the AbstractEventsBasedEntity from the specified element
-   */
-  virtual void UnserializeFrom(gd::Project& project,
-                       const gd::SerializerElement& element);
-  ///@}
-
- private:
-  gd::String name;
-  gd::String fullName;
-  gd::String description;
-  gd::EventsFunctionsContainer eventsFunctionsContainer;
-  SerializableWithNameList<NamedPropertyDescriptor> propertyDescriptors;
-};
-
-}  // namespace gd
-
-#endif  // GDCORE_ABSTRACTEVENTSBASEDENTITY_H

Core/GDCore/Project/Behavior.cpp

@@ -5,10 +5,20 @@
  */
 #include "GDCore/Project/Behavior.h"
 #include <iostream>
+#if defined(GD_IDE_ONLY)
 #include "GDCore/Project/PropertyDescriptor.h"
+#endif
 
 namespace gd {
 
 Behavior::~Behavior(){};
 
+#if defined(GD_IDE_ONLY)
+std::map<gd::String, gd::PropertyDescriptor> Behavior::GetProperties(
+    const gd::SerializerElement& behaviorContent) const {
+  std::map<gd::String, gd::PropertyDescriptor> nothing;
+  return nothing;
+}
+#endif
+
 }  // namespace gd

Core/GDCore/Project/Behavior.h

@@ -5,29 +5,86 @@
  */
 #ifndef GDCORE_BEHAVIOR_H
 #define GDCORE_BEHAVIOR_H
-
+#include <map>
 #include "GDCore/String.h"
-#include "GDCore/Project/BehaviorConfigurationContainer.h"
+#if defined(GD_IDE_ONLY)
+namespace gd {
+class PropertyDescriptor;
+}
+#endif
+namespace gd {
+class SerializerElement;
+class Project;
+class Layout;
+}  // namespace gd
 
 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
- * and forward the properties related functions to Javascript with Emscripten.
+ * object
  *
+ * \see gd::BehaviorContent
  * \see gd::BehaviorsSharedData
- * \see gd::Object
  * \ingroup PlatformDefinition
  */
-class GD_CORE_API Behavior: public BehaviorConfigurationContainer {
+class GD_CORE_API Behavior {
  public:
-
-  Behavior(): BehaviorConfigurationContainer() {};
-  Behavior(const gd::String& name_, const gd::String& type_)
-      : BehaviorConfigurationContainer(name_, type_) {};
+  Behavior(){};
   virtual ~Behavior();
-  virtual Behavior* Clone() const override { return new Behavior(*this); }
+  virtual Behavior* Clone() const { return new Behavior(*this); }
+
+  /**
+   * \brief Return the type of the behavior
+   */
+  const gd::String& GetTypeName() const { return type; }
+
+  /**
+   * \brief Set the type of the behavior.
+   */
+  void SetTypeName(const gd::String& type_) { type = type_; };
+
+#if defined(GD_IDE_ONLY)
+  /**
+   * \brief Called when the IDE wants to know about the custom properties of the
+   * behavior.
+   *
+   * Implementation example:
+   \code
+      std::map<gd::String, gd::PropertyDescriptor> properties;
+      properties[_("Initial speed")].SetValue(gd::String::From(initialSpeed));
+
+      return properties;
+   \endcode
+   *
+   * \return a std::map with properties names as key.
+   * \see gd::PropertyDescriptor
+   */
+  virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties(
+      const gd::SerializerElement& behaviorContent) const;
+
+  /**
+   * \brief Called when the IDE wants to update a custom property of the
+   * behavior
+   *
+   * \return false if the new value cannot be set
+   * \see gd::InitialInstance
+   */
+  virtual bool UpdateProperty(gd::SerializerElement& behaviorContent,
+                              const gd::String& name,
+                              const gd::String& value) {
+    return false;
+  };
+#endif
+
+  /**
+   * \brief Called to initialize the content with the default properties
+   * for the behavior.
+   */
+  virtual void InitializeContent(gd::SerializerElement& behaviorContent){};
+
+ private:
+  gd::String type;
 };
 
 }  // namespace gd

Core/GDCore/Project/BehaviorConfigurationContainer.cpp

@@ -1,25 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "GDCore/Project/BehaviorConfigurationContainer.h"
-#include <iostream>
-#include "GDCore/Project/PropertyDescriptor.h"
-
-namespace gd {
-
-BehaviorConfigurationContainer::~BehaviorConfigurationContainer(){};
-
-
-std::map<gd::String, gd::PropertyDescriptor> BehaviorConfigurationContainer::GetProperties() const {
-    return GetProperties(content);
-  };
-
-std::map<gd::String, gd::PropertyDescriptor> BehaviorConfigurationContainer::GetProperties(
-    const gd::SerializerElement& behaviorContent) const {
-  std::map<gd::String, gd::PropertyDescriptor> nothing;
-  return nothing;
-}
-
-}  // namespace gd

Core/GDCore/Project/BehaviorConfigurationContainer.h

@@ -1,155 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef GDCORE_BEHAVIORCONFIGURATIONCONTAINER_H
-#define GDCORE_BEHAVIORCONFIGURATIONCONTAINER_H
-
-#include <map>
-#include <memory>
-#include "GDCore/Serialization/Serializer.h"
-#include "GDCore/String.h"
-
-namespace gd {
-class PropertyDescriptor;
-class SerializerElement;
-class Project;
-class Layout;
-}  // namespace gd
-
-namespace gd {
-
-/**
- * \brief Base class for containers of behavior configuration.
- * They can be attached to objects (Behavior) or layouts (BehaviorsSharedData).
- * It stores the content (i.e: the properties) of a behavior of an object.
- *
- * \see gd::Behavior
- * \see gd::BehaviorsSharedData
- * \ingroup PlatformDefinition
- */
-class GD_CORE_API BehaviorConfigurationContainer {
- public:
-
-  BehaviorConfigurationContainer(){};
-  BehaviorConfigurationContainer(const gd::String& name_, const gd::String& type_)
-      : name(name_), type(type_){};
-  virtual ~BehaviorConfigurationContainer();
-  virtual BehaviorConfigurationContainer* Clone() const { return new BehaviorConfigurationContainer(*this); }
-
-  /**
-   * \brief Return the name identifying the behavior
-   */
-  const gd::String& GetName() const { return name; }
-
-  /**
-   * \brief Change the name identifying the behavior
-   */
-  void SetName(const gd::String& name_) { name = name_; }
-
-  /**
-   * \brief Return the type of the behavior
-   */
-  const gd::String& GetTypeName() const { return type; }
-
-  /**
-   * \brief Set the type of the behavior.
-   */
-  void SetTypeName(const gd::String& type_) { type = type_; };
-
-  /**
-   * \brief Called when the IDE wants to know about the custom properties of the
-   * behavior.
-   * 
-   * \return a std::map with properties names as key.
-   * \see gd::PropertyDescriptor
-   */
-  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const;
-
-
-  /**
-   * \brief Called when the IDE wants to update a custom property of the
-   * behavior
-   *
-   * \return false if the new value cannot be set
-   * \see gd::InitialInstance
-   */
-  bool UpdateProperty(const gd::String& name, const gd::String& value) {
-    return UpdateProperty(content, name, value);
-  };
-
-  /**
-   * \brief Called to initialize the content with the default properties
-   * for the behavior.
-   */
-  virtual void InitializeContent() {
-    InitializeContent(content);
-  };
-
-  /**
-   * \brief Serialize the behavior content.
-   */
-  virtual void SerializeTo(gd::SerializerElement& element) const {
-    element = content;
-  };
-
-  /**
-   * \brief Unserialize the behavior content.
-   */
-  virtual void UnserializeFrom(const gd::SerializerElement& element) {
-    content = element;
-  };
-
-  const gd::SerializerElement& GetContent() const { return content; };
-  gd::SerializerElement& GetContent() { return content; };
-
-protected:
-  /**
-   * \brief Called when the IDE wants to know about the custom properties of the
-   * behavior.
-   *
-   * Implementation example:
-   \code
-      std::map<gd::String, gd::PropertyDescriptor> properties;
-      properties[_("Initial speed")].SetValue(gd::String::From(initialSpeed));
-
-      return properties;
-   \endcode
-   *
-   * \return a std::map with properties names as key.
-   * \see gd::PropertyDescriptor
-   */
-  virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties(
-      const gd::SerializerElement& behaviorContent) const;
-
-  /**
-   * \brief Called when the IDE wants to update a custom property of the
-   * behavior
-   *
-   * \return false if the new value cannot be set
-   * \see gd::InitialInstance
-   */
-  virtual bool UpdateProperty(gd::SerializerElement& behaviorContent,
-                              const gd::String& name,
-                              const gd::String& value) {
-    return false;
-  };
-
-  /**
-   * \brief Called to initialize the content with the default properties
-   * for the behavior.
-   */
-  virtual void InitializeContent(gd::SerializerElement& behaviorContent){};
-
- private:
-  gd::String name;  ///< Name of the behavior
-  gd::String type;  ///< The type of the behavior that is represented. Usually
-                    ///< in the form "ExtensionName::BehaviorTypeName"
-
-  gd::SerializerElement content;  // Storage for the behavior properties
-};
-
-}  // namespace gd
-
-#endif  // GDCORE_BEHAVIORCONFIGURATIONCONTAINER_H

Core/GDCore/Project/BehaviorContent.cpp

@@ -0,0 +1,12 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "GDCore/Project/BehaviorContent.h"
+
+namespace gd {
+
+BehaviorContent::~BehaviorContent(){};
+
+}  // namespace gd

Core/GDCore/Project/BehaviorContent.h

@@ -0,0 +1,88 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_BEHAVIORCONTENT_H
+#define GDCORE_BEHAVIORCONTENT_H
+#include <map>
+#include "GDCore/Serialization/Serializer.h"
+#include "GDCore/String.h"
+#if defined(GD_IDE_ONLY)
+namespace gd {
+class PropertyDescriptor;
+}
+#endif
+namespace gd {
+class SerializerElement;
+class Project;
+class Layout;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Store the content (i.e: the properties) of a behavior of an object.
+ *
+ * \see gd::Behavior
+ * \see gd::BehaviorsSharedData
+ * \see gd::Object
+ * \ingroup PlatformDefinition
+ */
+class GD_CORE_API BehaviorContent {
+ public:
+  BehaviorContent(const gd::String& name_, const gd::String& type_)
+      : name(name_), type(type_){};
+  virtual ~BehaviorContent();
+  virtual BehaviorContent* Clone() const { return new BehaviorContent(*this); }
+
+  /**
+   * \brief Return the name identifying the behavior
+   */
+  virtual const gd::String& GetName() const { return name; }
+
+  /**
+   * \brief Change the name identifying the behavior
+   */
+  virtual void SetName(const gd::String& name_) { name = name_; }
+
+  /**
+   * \brief Get the type of the behavior.
+   */
+  virtual const gd::String& GetTypeName() const { return type; }
+
+  /**
+   * \brief Change the type of the behavior
+   */
+  virtual void SetTypeName(const gd::String& type_) { type = type_; }
+
+#if defined(GD_IDE_ONLY)
+  /**
+   * \brief Serialize the behavior content.
+   */
+  virtual void SerializeTo(gd::SerializerElement& element) const {
+    element = content;
+  };
+#endif
+
+  /**
+   * \brief Unserialize the behavior content.
+   */
+  virtual void UnserializeFrom(const gd::SerializerElement& element) {
+    content = element;
+  };
+
+  const gd::SerializerElement& GetContent() const { return content; };
+  gd::SerializerElement& GetContent() { return content; };
+
+ protected:
+  gd::String name;  ///< Name of the behavior
+  gd::String type;  ///< The type of the behavior that is represented. Usually
+                    ///< in the form "ExtensionName::BehaviorTypeName"
+
+  gd::SerializerElement content;  // Storage for the behavior properties
+};
+
+}  // namespace gd
+
+#endif  // GDCORE_BEHAVIORCONTENT_H

Core/GDCore/Project/BehaviorsSharedData.cpp

@@ -5,11 +5,21 @@
  */
 
 #include "GDCore/Project/BehaviorsSharedData.h"
+#if defined(GD_IDE_ONLY)
 #include <map>
 #include "GDCore/Project/PropertyDescriptor.h"
+#endif
 
 namespace gd {
 
 BehaviorsSharedData::~BehaviorsSharedData(){};
 
+#if defined(GD_IDE_ONLY)
+std::map<gd::String, gd::PropertyDescriptor> BehaviorsSharedData::GetProperties(
+    const gd::SerializerElement& behaviorSharedDataContent) const {
+  std::map<gd::String, gd::PropertyDescriptor> nothing;
+  return nothing;
+}
+#endif
+
 }  // namespace gd

Core/GDCore/Project/BehaviorsSharedData.h

@@ -4,11 +4,19 @@
  * reserved. This project is released under the MIT License.
  */
 
-#ifndef GDCORE_BEHAVIORSSHAREDDATA_H
-#define GDCORE_BEHAVIORSSHAREDDATA_H
+#ifndef BEHAVIORSSHAREDDATA_H
+#define BEHAVIORSSHAREDDATA_H
 
+#include <map>
+#include <memory>
 #include "GDCore/String.h"
-#include "GDCore/Project/BehaviorConfigurationContainer.h"
+class BehaviorsRuntimeSharedData;
+namespace gd {
+class SerializerElement;
+class PropertyDescriptor;
+class Project;
+class Layout;
+}  // namespace gd
 
 namespace gd {
 
@@ -21,15 +29,63 @@ namespace gd {
  *
  * \ingroup GameEngine
  */
-class GD_CORE_API BehaviorsSharedData: public BehaviorConfigurationContainer {
+class GD_CORE_API BehaviorsSharedData {
  public:
-  BehaviorsSharedData(): BehaviorConfigurationContainer() {};
-  BehaviorsSharedData(const gd::String& name_, const gd::String& type_)
-      : BehaviorConfigurationContainer(name_, type_) {};
+  BehaviorsSharedData(){};
   virtual ~BehaviorsSharedData();
-  virtual BehaviorsSharedData* Clone() const override { return new BehaviorsSharedData(*this); }
+  virtual gd::BehaviorsSharedData* Clone() const {
+    return new BehaviorsSharedData(*this);
+  }
+
+  /**
+   * \brief Return the name identifying the type of the behavior
+   */
+  gd::String GetTypeName() { return type; }
+
+  /**
+   * \brief Change name identifying the type of the behavior.
+   */
+  void SetTypeName(const gd::String& type_) { type = type_; };
+
+#if defined(GD_IDE_ONLY)
+  /**
+   * \brief Called when the IDE wants to know about the properties of the shared
+   data.
+   *
+   * Usage example:
+   \code
+      std::map<gd::String, gd::PropertyDescriptor> properties;
+      properties[_("Initial speed")].SetValue(gd::String::From(initialSpeed));
+
+      return properties;
+   \endcode
+   *
+   * \return a std::map with properties names as key.
+   * \see gd::PropertyDescriptor
+   */
+  virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties(
+      const gd::SerializerElement& behaviorSharedDataContent) const;
+
+  /**
+   * \brief Called when the IDE wants to update a property of the shared data
+   *
+   * \return false if the new value cannot be set
+   * \see gd::InitialInstance
+   */
+  virtual bool UpdateProperty(gd::SerializerElement& behaviorSharedDataContent,
+                              const gd::String& name,
+                              const gd::String& value) {
+    return false;
+  };
+#endif
+
+  virtual void InitializeContent(
+      gd::SerializerElement& behaviorSharedDataContent){};
+
+ private:
+  gd::String type;  ///< The type indicate of which type is the behavior.
 };
 
 }  // namespace gd
 
-#endif  // GDCORE_BEHAVIORSSHAREDDATA_H
+#endif  // BEHAVIORSSHAREDDATA_H

Core/GDCore/Project/CustomBehavior.cpp

@@ -1,61 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "CustomBehavior.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;
-
-CustomBehavior *CustomBehavior::Clone() const {
-  CustomBehavior *clone = new CustomBehavior(*this);
-  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 {
-  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();
-
-  return gd::CustomConfigurationHelper::GetProperties(properties, behaviorContent);
-}
-
-bool CustomBehavior::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.GetPropertyDescriptors();
-
-  return gd::CustomConfigurationHelper::UpdateProperty(
-      properties,
-      behaviorContent,
-      propertyName,
-      newValue);
-}

Core/GDCore/Project/CustomBehavior.h

@@ -1,48 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef GDCORE_CUSTOMBEHAVIOR_H
-#define GDCORE_CUSTOMBEHAVIOR_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 A gd::Behavior that stores its content in JSON.
- */
-class CustomBehavior : public gd::Behavior {
-public:
-  CustomBehavior(const gd::String &name,
-                 const Project &project_,
-                 const gd::String &fullType)
-      : Behavior(name, fullType),
-        project(project_) {}
-  CustomBehavior *Clone() const override;
-
-  using Behavior::GetProperties;
-  using Behavior::InitializeContent;
-  using Behavior::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_CUSTOMBEHAVIOR_H

Core/GDCore/Project/CustomBehaviorsSharedData.cpp

@@ -1,61 +0,0 @@
-/*
- * 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

@@ -1,46 +0,0 @@
-/*
- * 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

@@ -1,104 +0,0 @@
-/*
- * 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

@@ -1,43 +0,0 @@
-/*
- * 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

@@ -1,171 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "CustomObjectConfiguration.h"
-
-#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/Serialization/Serializer.h"
-#include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/Tools/Log.h"
-#include "GDCore/Project/CustomConfigurationHelper.h"
-
-using namespace gd;
-
-void CustomObjectConfiguration::Init(const gd::CustomObjectConfiguration& objectConfiguration) {
-  project = objectConfiguration.project;
-  objectContent = objectConfiguration.objectContent;
-
-  // There is no default copy for a map of unique_ptr like childObjectConfigurations.
-  childObjectConfigurations.clear();
-  for (auto& it : objectConfiguration.childObjectConfigurations) {
-    childObjectConfigurations[it.first] = it.second->Clone();
-  }
-}
-
-gd::ObjectConfiguration CustomObjectConfiguration::badObjectConfiguration;
-
-std::unique_ptr<gd::ObjectConfiguration> CustomObjectConfiguration::Clone() const {
-  return gd::make_unique<gd::CustomObjectConfiguration>(*this);
-}
-
-gd::ObjectConfiguration &CustomObjectConfiguration::GetChildObjectConfiguration(const gd::String &objectName) {
-  if (!project->HasEventsBasedObject(GetType())) {
-    return badObjectConfiguration;
-  }
-  const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
-  
-  if (!eventsBasedObject.HasObjectNamed(objectName)) {
-    gd::LogError("Tried to get the configuration of a child-object:" + objectName
-                + " that doesn't exist in the event-based object: " + GetType());
-    return badObjectConfiguration;
-  }
-
-  auto &childObject = eventsBasedObject.GetObject(objectName);
-  auto configurationPosition = childObjectConfigurations.find(objectName);
-  if (configurationPosition == childObjectConfigurations.end()) {
-    childObjectConfigurations.insert(std::make_pair(
-        objectName,
-        childObject.GetConfiguration().Clone()));
-    return *(childObjectConfigurations[objectName]);
-  }
-  else {
-    auto &pair = *configurationPosition;
-    auto &configuration = pair.second;
-    return *configuration;
-  }
- }
-
-std::map<gd::String, gd::PropertyDescriptor> CustomObjectConfiguration::GetProperties() const {
-    auto objectProperties = std::map<gd::String, gd::PropertyDescriptor>();
-    if (!project->HasEventsBasedObject(GetType())) {
-      return objectProperties;
-    }
-    const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
-    const auto &properties = eventsBasedObject.GetPropertyDescriptors();
-
-    return gd::CustomConfigurationHelper::GetProperties(properties, objectContent);
-}
-
-bool CustomObjectConfiguration::UpdateProperty(const gd::String& propertyName,
-                                  const gd::String& newValue) {
-    if (!project->HasEventsBasedObject(GetType())) {
-      return false;
-    }
-    const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
-    const auto &properties = eventsBasedObject.GetPropertyDescriptors();
-    
-    return gd::CustomConfigurationHelper::UpdateProperty(
-        properties,
-        objectContent,
-        propertyName,
-        newValue);
-}
-
-std::map<gd::String, gd::PropertyDescriptor>
-CustomObjectConfiguration::GetInitialInstanceProperties(
-    const gd::InitialInstance& instance,
-    gd::Project& project,
-    gd::Layout& scene) {
-  return std::map<gd::String, gd::PropertyDescriptor>();
-}
-
-bool CustomObjectConfiguration::UpdateInitialInstanceProperty(
-    gd::InitialInstance& instance,
-    const gd::String& name,
-    const gd::String& value,
-    gd::Project& project,
-    gd::Layout& scene) {
-  return false;
-}
-
-void CustomObjectConfiguration::DoSerializeTo(SerializerElement& element) const {
-  element.AddChild("content") = objectContent;
-  auto &childrenContentElement = element.AddChild("childrenContent");
-  for (auto &pair : childObjectConfigurations) {
-    auto &childName = pair.first;
-    auto &childConfiguration = pair.second;
-    auto &childElement = childrenContentElement.AddChild(childName);
-    childConfiguration->SerializeTo(childElement);
-  }
-}
-void CustomObjectConfiguration::DoUnserializeFrom(Project& project,
-                                               const SerializerElement& element) {
-  objectContent = element.GetChild("content");
-  auto &childrenContentElement = element.GetChild("childrenContent");
-  for (auto &pair : childrenContentElement.GetAllChildren()) {
-    auto &childName = pair.first;
-    auto &childElement = pair.second;
-    auto &childConfiguration = GetChildObjectConfiguration(childName);
-    childConfiguration.UnserializeFrom(project, *childElement);
-  }
-}
-
-void CustomObjectConfiguration::ExposeResources(
-    gd::ArbitraryResourceWorker& worker) {
-  std::map<gd::String, gd::PropertyDescriptor> properties = GetProperties();
-
-  for (auto& property : properties) {
-    const String& propertyName = property.first;
-    const gd::PropertyDescriptor& propertyDescriptor = property.second;
-    if (propertyDescriptor.GetType() == "resource") {
-      auto& extraInfo = propertyDescriptor.GetExtraInfo();
-      const gd::String& resourceType = extraInfo.empty() ? "" : extraInfo[0];
-      const gd::String& oldPropertyValue = propertyDescriptor.GetValue();
-
-      gd::String newPropertyValue = oldPropertyValue;
-      if (resourceType == "image") {
-        worker.ExposeImage(newPropertyValue);
-      } else if (resourceType == "audio") {
-        worker.ExposeAudio(newPropertyValue);
-      } else if (resourceType == "font") {
-        worker.ExposeFont(newPropertyValue);
-      } else if (resourceType == "video") {
-        worker.ExposeVideo(newPropertyValue);
-      } else if (resourceType == "json") {
-        worker.ExposeJson(newPropertyValue);
-      } else if (resourceType == "bitmapFont") {
-        worker.ExposeBitmapFont(newPropertyValue);
-      }
-
-      if (newPropertyValue != oldPropertyValue) {
-        UpdateProperty(propertyName, newPropertyValue);
-      }
-    }
-  }
-
-  auto objectProperties = std::map<gd::String, gd::PropertyDescriptor>();
-  if (!project->HasEventsBasedObject(GetType())) {
-    return;
-  }
-  const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
-
-  for (auto& childObject : eventsBasedObject.GetObjects()) {
-    auto &configuration = GetChildObjectConfiguration(childObject->GetName());
-    configuration.ExposeResources(worker);
-  }
-}

Core/GDCore/Project/CustomObjectConfiguration.h

@@ -1,100 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef GDCORE_CUSTOMOBJECTCONFIGURATION_H
-#define GDCORE_CUSTOMOBJECTCONFIGURATION_H
-
-#include "GDCore/Project/ObjectConfiguration.h"
-
-#include <map>
-#include <memory>
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/EventsBasedObject.h"
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/Serialization/Serializer.h"
-#include "GDCore/Serialization/SerializerElement.h"
-
-
-using namespace gd;
-
-namespace gd {
-/**
- * \brief A gd::ObjectConfiguration that stores its content in JSON and is
- * composed of other configuration according to it's object children.
- *
- * It also implements "ExposeResources" to expose the properties of type
- * "resource".
- */
-class CustomObjectConfiguration : public gd::ObjectConfiguration {
- public:
-  CustomObjectConfiguration(const Project& project_, const String& type_)
-      : project(&project_) {
-    SetType(type_);
-  }
-  std::unique_ptr<gd::ObjectConfiguration> Clone() const override;
-
-  /**
-   * Copy constructor. Calls Init().
-   */
-  CustomObjectConfiguration(const gd::CustomObjectConfiguration& object)
-      : ObjectConfiguration(object) {
-    Init(object);
-  };
-
-  /**
-   * Assignment operator. Calls Init().
-   */
-  CustomObjectConfiguration& operator=(const gd::CustomObjectConfiguration& object){
-    if ((this) != &object) {
-        ObjectConfiguration::operator=(object);
-        Init(object);
-    }
-    return *this;
-  }
-
-  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
-  bool UpdateProperty(const gd::String& name, const gd::String& value) override;
-
-  std::map<gd::String, gd::PropertyDescriptor> GetInitialInstanceProperties(
-      const gd::InitialInstance& instance,
-      gd::Project& project,
-      gd::Layout& scene) override;
-  bool UpdateInitialInstanceProperty(gd::InitialInstance& instance,
-                                     const gd::String& name,
-                                     const gd::String& value,
-                                     gd::Project& project,
-                                     gd::Layout& scene) override;
-
-  void ExposeResources(gd::ArbitraryResourceWorker& worker) override;
-
-  gd::ObjectConfiguration &GetChildObjectConfiguration(const gd::String& objectName);
-
- protected:
-  void DoSerializeTo(SerializerElement& element) const override;
-  void DoUnserializeFrom(Project& project, const SerializerElement& element) override;
-
- private:
-  const Project* project; ///< The project is used to get the
-                          ///< EventBasedObject from the fullType.
-  gd::SerializerElement objectContent;
-  std::map<gd::String, std::unique_ptr<gd::ObjectConfiguration>> childObjectConfigurations;
-
-  static gd::ObjectConfiguration badObjectConfiguration;
-
-  /**
-   * Initialize configuration using another configuration. Used by copy-ctor
-   * and assign-op.
-   * 
-   * Don't forget to update me if members were changed!
-   * 
-   * It's needed because there is no default copy for childObjectConfigurations
-   * and it must be a deep copy.
-   */
-  void Init(const gd::CustomObjectConfiguration& object);
-};
-}  // namespace gd
-
-#endif  // GDCORE_CUSTOMOBJECTCONFIGURATION_H

Core/GDCore/Project/EffectsContainer.h

@@ -110,11 +110,6 @@ class GD_CORE_API EffectsContainer {
    */
   void UnserializeFrom(const SerializerElement& element);
 
-  /**
-   * \brief Clear all effects of the container.
-   */
-  inline void Clear() { effects.clear(); }
-
  private:
   std::vector<std::shared_ptr<gd::Effect>> effects;
   static Effect badEffect;

Core/GDCore/Project/EventsBasedBehavior.cpp

@@ -3,6 +3,7 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
+#if defined(GD_IDE_ONLY)
 #include "EventsBasedBehavior.h"
 #include "EventsFunctionsContainer.h"
 #include "GDCore/Serialization/SerializerElement.h"
@@ -11,27 +12,36 @@
 namespace gd {
 
 EventsBasedBehavior::EventsBasedBehavior()
-    : AbstractEventsBasedEntity(
-        "MyBehavior",
-        gd::EventsFunctionsContainer::FunctionOwner::Behavior) {}
+    : name("MyBehavior"), fullName("") {}
 
 void EventsBasedBehavior::SerializeTo(SerializerElement& element) const {
-  AbstractEventsBasedEntity::SerializeTo(element);
+  element.SetAttribute("description", description);
+  element.SetAttribute("name", name);
+  element.SetAttribute("fullName", fullName);
   element.SetAttribute("objectType", objectType);
-  if (isPrivate) {
-    element.SetBoolAttribute("private", isPrivate);
-  }
-  sharedPropertyDescriptors.SerializeElementsTo(
-      "propertyDescriptor", element.AddChild("sharedPropertyDescriptors"));
+
+  gd::SerializerElement& eventsFunctionsElement =
+      element.AddChild("eventsFunctions");
+  eventsFunctionsContainer.SerializeEventsFunctionsTo(eventsFunctionsElement);
+  propertyDescriptors.SerializeElementsTo(
+      "propertyDescriptor", element.AddChild("propertyDescriptors"));
 }
 
 void EventsBasedBehavior::UnserializeFrom(gd::Project& project,
                                           const SerializerElement& element) {
-  AbstractEventsBasedEntity::UnserializeFrom(project, element);
+  description = element.GetStringAttribute("description");
+  name = element.GetStringAttribute("name");
+  fullName = element.GetStringAttribute("fullName");
   objectType = element.GetStringAttribute("objectType");
-  isPrivate = element.GetBoolAttribute("private");
-  sharedPropertyDescriptors.UnserializeElementsFrom(
-      "propertyDescriptor", element.GetChild("sharedPropertyDescriptors"));
+
+  const gd::SerializerElement& eventsFunctionsElement =
+      element.GetChild("eventsFunctions");
+  eventsFunctionsContainer.UnserializeEventsFunctionsFrom(
+      project, eventsFunctionsElement);
+  propertyDescriptors.UnserializeElementsFrom(
+      "propertyDescriptor", element.GetChild("propertyDescriptors"));
 }
 
 }  // namespace gd
+
+#endif

Core/GDCore/Project/EventsBasedBehavior.h

@@ -3,11 +3,11 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
+#if defined(GD_IDE_ONLY)
 #ifndef GDCORE_EVENTSBASEDBEHAVIOR_H
 #define GDCORE_EVENTSBASEDBEHAVIOR_H
 
 #include <vector>
-#include "GDCore/Project/AbstractEventsBasedEntity.h"
 #include "GDCore/Project/NamedPropertyDescriptor.h"
 #include "GDCore/Tools/SerializableWithNameList.h"
 #include "GDCore/Project/EventsFunctionsContainer.h"
@@ -28,7 +28,7 @@ namespace gd {
  *
  * \ingroup PlatformDefinition
  */
-class GD_CORE_API EventsBasedBehavior: public AbstractEventsBasedEntity {
+class GD_CORE_API EventsBasedBehavior {
  public:
   EventsBasedBehavior();
   virtual ~EventsBasedBehavior(){};
@@ -39,24 +39,43 @@ class GD_CORE_API EventsBasedBehavior: public AbstractEventsBasedEntity {
    */
   EventsBasedBehavior* Clone() const { return new EventsBasedBehavior(*this); };
 
-  EventsBasedBehavior& SetDescription(const gd::String& description_) override {
-    AbstractEventsBasedEntity::SetDescription(description_);
+  /**
+   * \brief Get the description of the behavior, that is displayed in the
+   * editor.
+   */
+  const gd::String& GetDescription() const { return description; };
+
+  /**
+   * \brief Set the description of the behavior, to be displayed in the editor.
+   */
+  EventsBasedBehavior& SetDescription(const gd::String& description_) {
+    description = description_;
     return *this;
   }
 
+  /**
+   * \brief Get the internal name of the behavior.
+   */
+  const gd::String& GetName() const { return name; };
+
   /**
    * \brief Set the internal name of the behavior.
    */
   EventsBasedBehavior& SetName(const gd::String& name_) {
-    AbstractEventsBasedEntity::SetName(name_);
+    name = name_;
     return *this;
   }
 
+  /**
+   * \brief Get the name of the behavior, that is displayed in the editor.
+   */
+  const gd::String& GetFullName() const { return fullName; };
+
   /**
    * \brief Set the name of the behavior, to be displayed in the editor.
    */
   EventsBasedBehavior& SetFullName(const gd::String& fullName_) {
-    AbstractEventsBasedEntity::SetFullName(fullName_);
+    fullName = fullName_;
     return *this;
   }
 
@@ -74,68 +93,75 @@ class GD_CORE_API EventsBasedBehavior: public AbstractEventsBasedEntity {
   }
 
   /**
-   * \brief Check if the behavior is private - it can't be used outside of its
-   * extension.
+   * \brief Return a reference to the functions of the events based behavior.
    */
-  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;
+  EventsFunctionsContainer& GetEventsFunctions() {
+    return eventsFunctionsContainer;
   }
 
   /**
-   * \brief Return a reference to the list of shared properties.
+   * \brief Return a const reference to the functions of the events based
+   * behavior.
    */
-  SerializableWithNameList<NamedPropertyDescriptor>& GetSharedPropertyDescriptors() {
-    return sharedPropertyDescriptors;
+  const EventsFunctionsContainer& GetEventsFunctions() const {
+    return eventsFunctionsContainer;
   }
 
   /**
-   * \brief Return a const reference to the list of shared properties.
+   * \brief Return a reference to the list of the properties.
    */
-  const SerializableWithNameList<NamedPropertyDescriptor>& GetSharedPropertyDescriptors()
+  SerializableWithNameList<NamedPropertyDescriptor>& GetPropertyDescriptors() {
+    return propertyDescriptors;
+  }
+
+  /**
+   * \brief Return a const reference to the list of the properties.
+   */
+  const SerializableWithNameList<NamedPropertyDescriptor>& GetPropertyDescriptors()
       const {
-    return sharedPropertyDescriptors;
+    return propertyDescriptors;
   }
 
   /**
-   * \brief Get the name of the action to change a shared property.
+   * \brief Get the name of the action to change a property.
    */
-  static gd::String GetSharedPropertyActionName(const gd::String &propertyName) {
-    return "SetSharedProperty" + propertyName;
-  };
+  static gd::String GetPropertyActionName(const gd::String& propertyName) { return "SetProperty" + propertyName; };
 
   /**
-   * \brief Get the name of the condition to compare a shared property.
+   * \brief Get the name of the condition to compare a property.
    */
-  static gd::String GetSharedPropertyConditionName(const gd::String &propertyName) {
-    return "SharedProperty" + propertyName;
-  };
+  static gd::String GetPropertyConditionName(const gd::String& propertyName) { return "Property" + propertyName; };
 
   /**
-   * \brief Get the name of the expression to get a shared property.
+   * \brief Get the name of the expression to get a property.
    */
-  static gd::String
-  GetSharedPropertyExpressionName(const gd::String &propertyName) {
-    return "SharedProperty" + propertyName;
-  };
+  static gd::String GetPropertyExpressionName(const gd::String& propertyName) { return "Property" + propertyName; };
 
-  void SerializeTo(SerializerElement& element) const override;
+  /** \name Serialization
+   */
+  ///@{
+  /**
+   * \brief Serialize the EventsBasedBehavior to the specified element
+   */
+  void SerializeTo(gd::SerializerElement& element) const;
 
+  /**
+   * \brief Load the EventsBasedBehavior from the specified element
+   */
   void UnserializeFrom(gd::Project& project,
-                       const SerializerElement& element) override;
+                       const gd::SerializerElement& element);
+  ///@}
 
  private:
+  gd::String name;
+  gd::String fullName;
+  gd::String description;
   gd::String objectType;
-  bool isPrivate = false;
-  SerializableWithNameList<NamedPropertyDescriptor> sharedPropertyDescriptors;
+  gd::EventsFunctionsContainer eventsFunctionsContainer;
+  SerializableWithNameList<NamedPropertyDescriptor> propertyDescriptors;
 };
 
 }  // namespace gd
 
 #endif  // GDCORE_EVENTSBASEDBEHAVIOR_H
+#endif

Core/GDCore/Project/EventsBasedObject.cpp

@@ -1,43 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "EventsBasedObject.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Serialization/SerializerElement.h"
-
-namespace gd {
-
-EventsBasedObject::EventsBasedObject()
-    : AbstractEventsBasedEntity(
-        "MyObject",
-        gd::EventsFunctionsContainer::FunctionOwner::Object),
-    ObjectsContainer() {
-}
-
-EventsBasedObject::~EventsBasedObject() {}
-    
-EventsBasedObject::EventsBasedObject(const gd::EventsBasedObject &_eventBasedObject)
-        : AbstractEventsBasedEntity(_eventBasedObject) {
-  // TODO Add a copy constructor in ObjectsContainer.
-  initialObjects = gd::Clone(_eventBasedObject.initialObjects);
-  objectGroups = _eventBasedObject.objectGroups;
-}
-
-void EventsBasedObject::SerializeTo(SerializerElement& element) const {
-  element.SetAttribute("defaultName", defaultName);
-
-  AbstractEventsBasedEntity::SerializeTo(element);
-  SerializeObjectsTo(element.AddChild("objects"));
-}
-
-void EventsBasedObject::UnserializeFrom(gd::Project& project,
-                                          const SerializerElement& element) {
-  defaultName = element.GetStringAttribute("defaultName");
-
-  AbstractEventsBasedEntity::UnserializeFrom(project, element);
-  UnserializeObjectsFrom(project, element.GetChild("objects"));
-}
-
-}  // namespace gd

Core/GDCore/Project/EventsBasedObject.h

@@ -1,86 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef GDCORE_EVENTSBASEDOBJECT_H
-#define GDCORE_EVENTSBASEDOBJECT_H
-
-#include <vector>
-#include "GDCore/Project/AbstractEventsBasedEntity.h"
-#include "GDCore/Project/ObjectsContainer.h"
-#include "GDCore/String.h"
-namespace gd {
-class SerializerElement;
-class Project;
-}  // namespace gd
-
-namespace gd {
-// TODO EBO Add a way to mark some parts of children configuration as readonly.
-/**
- * \brief Represents an object that is implemented with events.
- *
- * It's the responsibility of the IDE to run the logic to transform this into a
- * real object, by declaring an extension and running code generation.
- * See `EventsFunctionsExtensionsLoader`.
- *
- * \ingroup PlatformDefinition
- */
-class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity, public ObjectsContainer {
- public:
-  EventsBasedObject();
-  virtual ~EventsBasedObject();
-  EventsBasedObject(const gd::EventsBasedObject &_eventBasedObject);
-
-  /**
-   * \brief Return a pointer to a new EventsBasedObject constructed from
-   * this one.
-   */
-  EventsBasedObject* Clone() const { return new EventsBasedObject(*this); };
-
-  /**
-   * \brief Get the default name for created objects.
-   */
-  const gd::String& GetDefaultName() const { return defaultName; };
-
-  /**
-   * \brief Set the default name for created objects.
-   */
-  EventsBasedObject& SetDefaultName(const gd::String& defaultName_) {
-    defaultName = defaultName_;
-    return *this;
-  }
-
-  EventsBasedObject& SetDescription(const gd::String& description_) override {
-    AbstractEventsBasedEntity::SetDescription(description_);
-    return *this;
-  }
-
-  /**
-   * \brief Set the internal name of the object.
-   */
-  EventsBasedObject& SetName(const gd::String& name_) {
-    AbstractEventsBasedEntity::SetName(name_);
-    return *this;
-  }
-
-  /**
-   * \brief Set the name of the object, to be displayed in the editor.
-   */
-  EventsBasedObject& SetFullName(const gd::String& fullName_) {
-    AbstractEventsBasedEntity::SetFullName(fullName_);
-    return *this;
-  }
-
-  void SerializeTo(SerializerElement& element) const override;
-
-  void UnserializeFrom(gd::Project& project,
-                       const SerializerElement& element) override;
-
- private:
-  gd::String defaultName;
-};
-
-}  // namespace gd
-
-#endif  // GDCORE_EVENTSBASEDOBJECT_H

Core/GDCore/Project/EventsFunction.cpp

@@ -7,96 +7,29 @@
 #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) {
-  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;
-}
+EventsFunction::EventsFunction() : functionType(Action) {}
 
 void EventsFunction::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", name);
   element.SetAttribute("fullName", fullName);
-  if (!description.empty()) {
-    element.SetAttribute("description", description);
-  }
+  element.SetAttribute("description", description);
   element.SetAttribute("sentence", sentence);
-  if (!group.empty()) {
-    element.SetAttribute("group", group);
-  }
-  if (!getterName.empty()) {
-    element.SetAttribute("getterName", getterName);
-  }
-  if (isPrivate) {
-    element.SetBoolAttribute("private", isPrivate);
-  }
+  element.SetAttribute("group", group);
+  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";
-
-    // 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";
+  else if (functionType == StringExpression)
+    functionTypeStr = "StringExpression";
   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) {
@@ -113,32 +46,16 @@ 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" || functionTypeStr == "StringExpression") {
+  else if (functionTypeStr == "Expression")
     functionType = Expression;
-    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 if (functionTypeStr == "StringExpression")
+    functionType = StringExpression;
   else
     functionType = Action;
 

Core/GDCore/Project/EventsFunction.h

@@ -12,7 +12,6 @@
 #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.
@@ -20,7 +19,6 @@
 namespace gd {
 class SerializerElement;
 class Project;
-class EventsFunctionsContainer;
 }  // namespace gd
 
 namespace gd {
@@ -117,45 +115,7 @@ class GD_CORE_API EventsFunction {
     return *this;
   }
 
-  /**
-   * \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 };
+  enum FunctionType { Action, Condition, Expression, StringExpression };
 
   /**
    * \brief Set the type of the function
@@ -163,40 +123,12 @@ 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; }
-
-  /**
-   * \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;
- }
+  FunctionType GetFunctionType() const { return functionType; };
 
   /**
    * \brief Returns true if the function is private.
@@ -222,20 +154,7 @@ class GD_CORE_API EventsFunction {
   gd::EventsList& GetEvents() { return events; };
 
   /**
-   * \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.
+   * \brief Return the parameters of the function.
    *
    * \note During code/extension generation, new parameters are added
    * to the generated function, like "runtimeScene" and "eventsFunctionContext".
@@ -283,12 +202,9 @@ 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,24 +25,7 @@ namespace gd {
  */
 class GD_CORE_API EventsFunctionsContainer
     : private SerializableWithNameList<gd::EventsFunction> {
-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;
-  }
-
+ public:
   /** \name Events Functions management
    */
   ///@{
@@ -156,9 +139,6 @@ public:
   void Init(const gd::EventsFunctionsContainer& other) {
     return SerializableWithNameList<gd::EventsFunction>::Init(other);
   };
-
-private:
-  FunctionOwner owner;
 };
 
 }  // namespace gd

Core/GDCore/Project/EventsFunctionsExtension.cpp

@@ -6,21 +6,16 @@
 #include "EventsFunctionsExtension.h"
 
 #include "EventsBasedBehavior.h"
-#include "EventsBasedObject.h"
 #include "EventsFunction.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Tools/MakeUnique.h"
 
 namespace gd {
 
-EventsFunctionsExtension::EventsFunctionsExtension() :
-    gd::EventsFunctionsContainer(
-        gd::EventsFunctionsContainer::FunctionOwner::Extension) {}
+EventsFunctionsExtension::EventsFunctionsExtension() {}
 
 EventsFunctionsExtension::EventsFunctionsExtension(
-    const EventsFunctionsExtension& other) :
-    gd::EventsFunctionsContainer(
-        gd::EventsFunctionsContainer::FunctionOwner::Extension) {
+    const EventsFunctionsExtension& other) {
   Init(other);
 }
 
@@ -47,14 +42,13 @@ void EventsFunctionsExtension::Init(const gd::EventsFunctionsExtension& other) {
   helpPath = other.helpPath;
   EventsFunctionsContainer::Init(other);
   eventsBasedBehaviors = other.eventsBasedBehaviors;
-  eventsBasedObjects = other.eventsBasedObjects;
 }
 
 void EventsFunctionsExtension::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("version", version);
   element.SetAttribute("extensionNamespace", extensionNamespace);
   element.SetAttribute("shortDescription", shortDescription);
-  element.AddChild("description").SetMultilineStringValue(description);
+  element.SetAttribute("description", description);
   element.SetAttribute("name", name);
   element.SetAttribute("fullName", fullName);
   element.SetAttribute("category", category);
@@ -85,22 +79,14 @@ void EventsFunctionsExtension::SerializeTo(SerializerElement& element) const {
   SerializeEventsFunctionsTo(element.AddChild("eventsFunctions"));
   eventsBasedBehaviors.SerializeElementsTo(
       "eventsBasedBehavior", element.AddChild("eventsBasedBehaviors"));
-  eventsBasedObjects.SerializeElementsTo(
-      "eventsBasedObject", element.AddChild("eventsBasedObjects"));
 }
 
 void EventsFunctionsExtension::UnserializeFrom(
-    gd::Project& project, const SerializerElement& element) {
-      UnserializeExtensionDeclarationFrom(project, element);
-      UnserializeExtensionImplementationFrom(project, element);
-}
-
-void EventsFunctionsExtension::UnserializeExtensionDeclarationFrom(
     gd::Project& project, const SerializerElement& element) {
   version = element.GetStringAttribute("version");
   extensionNamespace = element.GetStringAttribute("extensionNamespace");
   shortDescription = element.GetStringAttribute("shortDescription");
-  description = element.GetChild("description").GetMultilineStringValue();
+  description = element.GetStringAttribute("description");
   name = element.GetStringAttribute("name");
   fullName = element.GetStringAttribute("fullName");
   category = element.GetStringAttribute("category");
@@ -148,34 +134,9 @@ void EventsFunctionsExtension::UnserializeExtensionDeclarationFrom(
     dependencies.push_back(
         UnserializeDependencyFrom(dependenciesElement.GetChild(i)));
 
-  // Only unserialize behaviors and objects names.
-  // As event based objects can contains objects using CustomBehavior and/or
-  // CustomObject, this allows them to reference EventBasedBehavior and
-  // EventBasedObject respectively.
-  auto &behaviorsElement = element.GetChild("eventsBasedBehaviors");
-  behaviorsElement.ConsiderAsArrayOf("eventsBasedBehavior");
-  for (std::size_t i = 0; i < behaviorsElement.GetChildrenCount(); ++i) {
-    const gd::String &behaviorName =
-        behaviorsElement.GetChild(i).GetStringAttribute("name");
-    eventsBasedBehaviors.InsertNew(behaviorName, eventsBasedBehaviors.GetCount());
-  }
-  auto &objectsElement = element.GetChild("eventsBasedObjects");
-  objectsElement.ConsiderAsArrayOf("eventsBasedObject");
-  for (std::size_t i = 0; i < objectsElement.GetChildrenCount(); ++i) {
-    const gd::String &objectName =
-        objectsElement.GetChild(i).GetStringAttribute("name");
-    eventsBasedObjects.InsertNew(objectName, eventsBasedObjects.GetCount());
-  }
-}
-
-void EventsFunctionsExtension::UnserializeExtensionImplementationFrom(
-    gd::Project& project,
-    const SerializerElement& element) {
   UnserializeEventsFunctionsFrom(project, element.GetChild("eventsFunctions"));
   eventsBasedBehaviors.UnserializeElementsFrom(
       "eventsBasedBehavior", project, element.GetChild("eventsBasedBehaviors"));
-  eventsBasedObjects.UnserializeElementsFrom(
-      "eventsBasedObject", project, element.GetChild("eventsBasedObjects"));
 }
 
 bool EventsFunctionsExtension::IsExtensionLifecycleEventsFunction(