Fix the isCameraRotatedIn3D condition. (#5311)

Do not show in changelog

.circleci/config.yml

@@ -68,7 +68,7 @@ jobs:
 
       - run:
           name: Clean dist folder to keep only installers/binaries.
-          command: rm -rf "newIDE/electron-app/dist/mac/GDevelop 5.app"
+          command: rm -rf "newIDE/electron-app/dist/mac/GDevelop 5.app" && rm -rf "newIDE/electron-app/dist/mac-arm64/GDevelop 5.app"
 
       # Upload artifacts (CircleCI)
       - store_artifacts:
@@ -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 AppImage zip deb --publish=never
+          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --linux --publish=never
 
       - run:
           name: Clean dist folder to keep only installers/binaries.
-          command: rm -rf newIDE/electron-app/dist/linux-unpacked
+          command: rm -rf newIDE/electron-app/dist/linux-unpacked && rm -rf newIDE/electron-app/dist/linux-arm64-unpacked
 
       # Upload artifacts (CircleCI)
       - store_artifacts:

.devcontainer/Dockerfile

@@ -1,6 +0,0 @@
-# This is the Dockerfile to create a "devcontainer". 
-# This is a way to quickly create a development environment,
-# that can be used with GitHub workspaces.
-
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.162.0/containers/codespaces-linux/.devcontainer/base.Dockerfile
-FROM mcr.microsoft.com/vscode/devcontainers/universal:1-focal

.devcontainer/README.md

@@ -1,16 +0,0 @@
-# Devcontainer (development environment in the cloud) for GDevelop (beta)
-
-A devcontainer is the configuration to run a cloud development environment, available remotely.
-This is notably used to run a **[GitHub Codespace](https://docs.github.com/en/github/developing-online-with-codespaces/about-codespaces)**. The advantage is that you can quickly experiment and do changes without installing anything on your computer.
-
-> ⚠️ This development environment is in beta, and not everything is supported. This is useful for playing a bit with GDevelop codebase or to make quick changes. **In particular, it's not possible to test your changes on GDJS** because only the web-app can be launched.
-
-It's recommended that you follow the usual [README](../newIDE/README.md) to get started, with development tools installed on your computer.
-
-## Start a GitHub workspace to work on GDevelop (beta)
-
-- Subscribe to the [beta edition of GitHub workspace](https://docs.github.com/en/github/developing-online-with-codespaces/about-codespaces#joining-the-beta).
-- In the repository GitHub page, click **Code** and then choose **Open with Codespaces**.
-- Wait for the Codespace to load and Visual Studio Code to open.
-- When it's ready, open a terminal in Visual Studio Code.
-- Follow the usual [README in `newIDE`](../newIDE/README.md) to get started, like you would do on your own computer.

.devcontainer/devcontainer.json

@@ -1,51 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.162.0/containers/codespaces-linux
-{
-	"name": "GitHub Codespaces for GDevelop",
-	"build": {
-		"dockerfile": "Dockerfile"
-	},
-	"settings": {
-		"terminal.integrated.shell.linux": "/bin/zsh",
-		"go.toolsManagement.checkForUpdates": "off",
-		"go.useLanguageServer": true,
-		"go.gopath": "/go",
-		"go.goroot": "/usr/local/go",
-		"python.pythonPath": "/opt/python/latest/bin/python",
-		"python.linting.enabled": true,
-		"python.linting.pylintEnabled": true,
-		"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
-		"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-		"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-		"python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
-		"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
-		"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
-		"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
-		"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
-		"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint",
-		"lldb.executable": "/usr/bin/lldb",
-		"files.watcherExclude": {
-			"**/target/**": true
-		}
-	},
-	"remoteUser": "codespace",
-	"overrideCommand": false,
-	"workspaceMount": "source=${localWorkspaceFolder},target=/home/codespace/workspace,type=bind,consistency=cached",
-	"workspaceFolder": "/home/codespace/workspace",
-	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined", "--privileged", "--init" ],
-
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"GitHub.vscode-pull-request-github",
-		"esbenp.prettier-vscode",
-		"ms-vscode.cpptools",
-		"xaver.clang-format",
-		"flowtype.flow-for-vscode"
-	],
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	// "oryx build" will automatically install your dependencies and attempt to build your project
-	"postCreateCommand": "oryx build -p virtualenv_name=.venv || echo 'Could not auto-build. Skipping.'"
-}

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

@@ -0,0 +1,19 @@
+---
+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:

.github/ISSUE_TEMPLATE/--bug-report.md

@@ -1,28 +0,0 @@
----
-name: "\U0001F41BBug report"
-about: Create a bug report about GDevelop or the game engine
-title: ''
-labels: ''
-assignees: ''
-
----
-
-## Describe the bug
-A clear and concise description of what the bug is.
-
-Please double check that the bug is not already reported in the issues list.
-
-## To Reproduce
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-* Please include a link to a game if possible!
-* If applicable, add screenshots to help explain your problem.
-
-## Other details
-* Include any OS/browser version/smartphone that you're using
-* Which version of GDevelop are you using? The desktop app or the web-app?
-* Add any other context about the problem here.

.github/ISSUE_TEMPLATE/--bug-report.yml

@@ -0,0 +1,71 @@
+name: 🐛Bug report
+description: Create a bug report about GDevelop or the game engine
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      options:
+      - label: I have searched the [existing issues](https://github.com/4ian/GDevelop/issues)
+        required: true
+  - type: textarea
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: |
+        * Please include a link to a game if possible!
+        * If applicable, add screenshots to help explain your problem.
+      placeholder: |
+        1. Go to '...'
+        2. Click on '...'
+        3. Scroll down to '...'
+        4. See error
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: GDevelop platform
+      description: Which platform of GDevelop are you using?
+      multiple: true
+      options:
+        - Desktop
+        - Web
+        - Mobile
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: GDevelop version
+      description: |
+        Which version of GDevelop are you using?
+        Take a look here: [Editor Home - About GDevelop - "This version of GDevelop is: ~~~"]
+      placeholder: 5.1.159? 5.1.160?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Platform info
+      value: |
+        <details>
+
+        *OS (e.g. Windows, Linux, macOS, Android, iOS)*
+        >
+
+        *OS Version (e.g. Windows 10, macOS 10.15)*
+        >
+
+        *Browser(For Web) (e.g. Chrome, Firefox, Safari)*
+        >
+
+        *Device(For Mobile) (e.g. iPhone 12, Samsung Galaxy S21)*
+        >
+
+        </details>
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here.

.github/workflows/build-storybook.yml

@@ -17,6 +17,10 @@ jobs:
   build-storybook:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
         with:
@@ -57,8 +61,8 @@ jobs:
 
       - name: Log urls to the Storybook
         run: |
-          echo "Find the latest Storybook for this branch on http://gdevelop-storybook.s3-website-us-east-1.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/latest/index.html"
-          echo "Find the Storybook for this commit on http://gdevelop-storybook.s3-website-us-east-1.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/index.html"
+          echo "Find the latest Storybook for this branch on https://gdevelop-storybook.s3.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/latest/index.html"
+          echo "Find the Storybook for this commit on https://gdevelop-storybook.s3.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/index.html"
 
       # Publish on Chromatic, only when manually launched (too costly to run on every commit).
       - name: Publish Storybook to Chromatic

.github/workflows/extract-translations.yml

@@ -11,6 +11,9 @@ jobs:
   extract-translations:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
       - uses: actions/checkout@v2
 
       # Cache npm dependencies to speed up the workflow
@@ -38,7 +41,7 @@ jobs:
       - name: Install Crowdin CLI
         if: github.ref == 'refs/heads/master'
         run: npm i -g @crowdin/cli
-        
+
       - name: Upload translations to Crowdin
         run: crowdin upload sources
         if: github.ref == 'refs/heads/master'

.github/workflows/update-translations.yml

@@ -14,6 +14,9 @@ jobs:
   update-translations:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
       - uses: actions/checkout@v2
 
       # Cache npm dependencies to speed up the workflow
@@ -44,7 +47,7 @@ jobs:
       # (Build and) download the most recent translations (PO files) from Crowdin.
       - name: Install Crowdin CLI
         run: npm i -g @crowdin/cli
-        
+
       - name: Download new translations from Crowdin
         run: crowdin download
         env:
@@ -66,8 +69,8 @@ jobs:
           commit-message: Update translations [skip ci]
           branch: chore/update-translations
           delete-branch: true
-          title: '[Auto PR] Update translations'
+          title: "[Auto PR] Update translations"
           body: |
             This updates the translations by downloading them from Crowdin and compiling them for usage by the app.
-            
+
             Please double check the values in `newIDE/app/src/locales/LocalesMetadata.js` to ensure the changes are sensible.

Binaries/README.md

@@ -1,3 +1,3 @@
 This is the directory where native or WebAssembly binaries of the C++ code of GDCore and GDJS are produced.
 
-See GDevelop.js README for the instructions to compile after a change in the C++ source code.
+See GDevelop.js README for the instructions to compile after a change in the C++ source code.

CMakeLists.txt

@@ -1,5 +1,5 @@
 #This is the CMake file used to build GDevelop.
-#For more information, see the Readme.md file.
+#For more information, see the README.md file.
 
 cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0011 NEW)

Core/GDCore/Events/Builtin/CommentEvent.cpp

@@ -38,7 +38,7 @@ void CommentEvent::SerializeTo(SerializerElement &element) const {
       .SetAttribute("textB", textB);
 
   element.AddChild("comment").SetValue(com1);
-  element.AddChild("comment2").SetValue(com2);
+  if (!com2.empty()) element.AddChild("comment2").SetValue(com2);
 }
 
 void CommentEvent::UnserializeFrom(gd::Project &project,
@@ -53,7 +53,9 @@ void CommentEvent::UnserializeFrom(gd::Project &project,
   textB = colorElement.GetIntAttribute("textB");
 
   com1 = element.GetChild("comment", 0, "Com1").GetValue().GetString();
-  com2 = element.GetChild("comment2", 0, "Com2").GetValue().GetString();
+  if (element.HasChild("comment2")) {
+    com2 = element.GetChild("comment2", 0, "Com2").GetValue().GetString();
+  }
 }
 
 }  // namespace gd

Core/GDCore/Events/Builtin/GroupEvent.h

@@ -13,6 +13,7 @@
 namespace gd {
 class Instruction;
 class Project;
+class EventVisitor;
 }
 class EventsCodeGenerationContext;
 

Core/GDCore/Events/Builtin/LinkEvent.cpp

@@ -16,6 +16,7 @@
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/Events/EventVisitor.h"
 
 using namespace std;
 
@@ -156,4 +157,14 @@ void LinkEvent::UnserializeFrom(gd::Project& project,
   }
 }
 
+bool LinkEvent::AcceptVisitor(gd::EventVisitor &eventVisitor) {
+  return BaseEvent::AcceptVisitor(eventVisitor) |
+         eventVisitor.VisitLinkEvent(*this);
+}
+
+void LinkEvent::AcceptVisitor(gd::ReadOnlyEventVisitor &eventVisitor) const {
+  BaseEvent::AcceptVisitor(eventVisitor);
+  eventVisitor.VisitLinkEvent(*this);
+}
+
 }  // namespace gd

Core/GDCore/Events/Builtin/LinkEvent.h

@@ -30,7 +30,7 @@ class GD_CORE_API LinkEvent : public gd::BaseEvent {
         includeEnd(gd::String::npos),
         linkWasInvalid(false){};
   virtual ~LinkEvent();
-  virtual gd::LinkEvent* Clone() const { return new LinkEvent(*this); }
+  virtual gd::LinkEvent* Clone() const override { return new LinkEvent(*this); }
 
   /**
    * Get the link target (i.e. the scene or external events the link refers to).
@@ -86,7 +86,7 @@ class GD_CORE_API LinkEvent : public gd::BaseEvent {
   /**
    * The link event must always be preprocessed.
    */
-  virtual bool MustBePreprocessed() { return true; }
+  virtual bool MustBePreprocessed() override { return true; }
 
   /**
    * \brief Get a pointer to the list of events that are targeted by the link.
@@ -107,11 +107,14 @@ class GD_CORE_API LinkEvent : public gd::BaseEvent {
                                  EventsList& eventList,
                                  std::size_t indexOfTheEventInThisList);
 
-  virtual bool IsExecutable() const { return true; };
+  virtual bool IsExecutable() const override { return true; };
 
-  virtual void SerializeTo(SerializerElement& element) const;
+  virtual void SerializeTo(SerializerElement& element) const override;
   virtual void UnserializeFrom(gd::Project& project,
-                               const SerializerElement& element);
+                               const SerializerElement& element) override;
+
+  bool AcceptVisitor(gd::EventVisitor& eventVisitor) override;
+  void AcceptVisitor(gd::ReadOnlyEventVisitor& eventVisitor) const override;
 
  private:
   gd::String

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -43,7 +43,7 @@ gd::String EventsCodeGenerator::GenerateRelationalOperatorCall(
   std::size_t relationalOperatorIndex = instrInfos.parameters.size();
   for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters[i].type == "relationalOperator")
+    if (instrInfos.parameters[i].GetType() == "relationalOperator")
       relationalOperatorIndex = i;
   }
   // Ensure that there is at least one parameter after the relational operator
@@ -95,7 +95,7 @@ gd::String EventsCodeGenerator::GenerateOperatorCall(
   std::size_t operatorIndex = instrInfos.parameters.size();
   for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters[i].type == "operator") operatorIndex = i;
+    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
   }
 
   // Ensure that there is at least one parameter after the operator
@@ -164,7 +164,7 @@ gd::String EventsCodeGenerator::GenerateCompoundOperatorCall(
   std::size_t operatorIndex = instrInfos.parameters.size();
   for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters[i].type == "operator") operatorIndex = i;
+    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
   }
 
   // Ensure that there is at least one parameter after the operator
@@ -215,7 +215,7 @@ gd::String EventsCodeGenerator::GenerateMutatorCall(
   std::size_t operatorIndex = instrInfos.parameters.size();
   for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters[i].type == "operator") operatorIndex = i;
+    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
   }
 
   // Ensure that there is at least one parameter after the operator
@@ -273,8 +273,6 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
 
   if (instrInfos.codeExtraInformation.HasCustomCodeGenerator()) {
     context.EnterCustomCondition();
-    conditionCode += GenerateReferenceToUpperScopeBoolean(
-        "conditionTrue", returnBoolean, context);
     conditionCode += instrInfos.codeExtraInformation.customCodeGenerator(
         condition, *this, context);
     maxCustomConditionsDepth =
@@ -291,9 +289,9 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
     condition.SetParameters(parameters);
   }
 
-  // Verify that there are no mismatchs between object type in parameters.
+  // Verify that there are no mismatches between object type in parameters.
   for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
-    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].type)) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType())) {
       gd::String objectInParameter =
           condition.GetParameter(pNb).GetPlainString();
 
@@ -303,11 +301,11 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
           !GetGlobalObjectsAndGroups().GetObjectGroups().Has(
               objectInParameter)) {
         return "/* Unknown object - skipped. */";
-      } else if (!instrInfos.parameters[pNb].supplementaryInformation.empty() &&
+      } else if (!instrInfos.parameters[pNb].GetExtraInfo().empty() &&
                  gd::GetTypeOfObject(GetGlobalObjectsAndGroups(),
                                      GetObjectsAndGroups(),
                                      objectInParameter) !=
-                     instrInfos.parameters[pNb].supplementaryInformation) {
+                     instrInfos.parameters[pNb].GetExtraInfo()) {
         return "/* Mismatched object type - skipped. */";
       }
     }
@@ -483,9 +481,9 @@ gd::String EventsCodeGenerator::GenerateActionCode(
     action.SetParameters(parameters);
   }
 
-  // Verify that there are no mismatchs between object type in parameters.
+  // Verify that there are no mismatches between object type in parameters.
   for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
-    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].type)) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType())) {
       gd::String objectInParameter = action.GetParameter(pNb).GetPlainString();
       if (!GetObjectsAndGroups().HasObjectNamed(objectInParameter) &&
           !GetGlobalObjectsAndGroups().HasObjectNamed(objectInParameter) &&
@@ -493,11 +491,11 @@ gd::String EventsCodeGenerator::GenerateActionCode(
           !GetGlobalObjectsAndGroups().GetObjectGroups().Has(
               objectInParameter)) {
         return "/* Unknown object - skipped. */";
-      } else if (!instrInfos.parameters[pNb].supplementaryInformation.empty() &&
+      } else if (!instrInfos.parameters[pNb].GetExtraInfo().empty() &&
                  gd::GetTypeOfObject(GetGlobalObjectsAndGroups(),
                                      GetObjectsAndGroups(),
                                      objectInParameter) !=
-                     instrInfos.parameters[pNb].supplementaryInformation) {
+                     instrInfos.parameters[pNb].GetExtraInfo()) {
         return "/* Mismatched object type - skipped. */";
       }
     }
@@ -670,6 +668,18 @@ gd::String EventsCodeGenerator::GenerateActionsListCode(
   return outputCode;
 }
 
+const gd::String EventsCodeGenerator::GenerateRelationalOperatorCodes(const gd::String &operatorString) {
+    if (operatorString == "=") {
+        return "==";
+    }
+    if (operatorString != "<" && operatorString != ">" &&
+        operatorString != "<=" && operatorString != ">=" && operatorString != "!=") {
+      cout << "Warning: Bad relational operator: Set to == by default." << endl;
+      return "==";
+    }
+    return operatorString;
+}
+
 gd::String EventsCodeGenerator::GenerateParameterCodes(
     const gd::Expression& parameter,
     const gd::ParameterMetadata& metadata,
@@ -679,31 +689,24 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
         supplementaryParametersTypes) {
   gd::String argOutput;
 
-  if (ParameterMetadata::IsExpression("number", metadata.type)) {
+  if (ParameterMetadata::IsExpression("number", metadata.GetType())) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
         *this, context, "number", parameter, lastObjectName);
-  } else if (ParameterMetadata::IsExpression("string", metadata.type)) {
+  } else if (ParameterMetadata::IsExpression("string", metadata.GetType())) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
         *this, context, "string", parameter, lastObjectName);
-  } else if (ParameterMetadata::IsExpression("variable", metadata.type)) {
+  } else if (ParameterMetadata::IsExpression("variable", metadata.GetType())) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this, context, metadata.type, parameter, lastObjectName);
-  } else if (ParameterMetadata::IsObject(metadata.type)) {
+        *this, context, metadata.GetType(), parameter, lastObjectName);
+  } else if (ParameterMetadata::IsObject(metadata.GetType())) {
     // It would be possible to run a gd::ExpressionCodeGenerator if later
     // objects can have nested objects, or function returning objects.
     argOutput =
-        GenerateObject(parameter.GetPlainString(), metadata.type, context);
-  } else if (metadata.type == "relationalOperator") {
-    auto parameterString = parameter.GetPlainString();
-    argOutput += parameterString == "=" ? "==" : parameterString;
-    if (argOutput != "==" && argOutput != "<" && argOutput != ">" &&
-        argOutput != "<=" && argOutput != ">=" && argOutput != "!=") {
-      cout << "Warning: Bad relational operator: Set to == by default." << endl;
-      argOutput = "==";
-    }
-
+        GenerateObject(parameter.GetPlainString(), metadata.GetType(), context);
+  } else if (metadata.GetType() == "relationalOperator") {
+    argOutput += GenerateRelationalOperatorCodes(parameter.GetPlainString());
     argOutput = "\"" + argOutput + "\"";
-  } else if (metadata.type == "operator") {
+  } else if (metadata.GetType() == "operator") {
     argOutput += parameter.GetPlainString();
     if (argOutput != "=" && argOutput != "+" && argOutput != "-" &&
         argOutput != "/" && argOutput != "*") {
@@ -712,28 +715,31 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
     }
 
     argOutput = "\"" + argOutput + "\"";
-  } else if (ParameterMetadata::IsBehavior(metadata.type)) {
+  } else if (ParameterMetadata::IsBehavior(metadata.GetType())) {
     argOutput = GenerateGetBehaviorNameCode(parameter.GetPlainString());
-  } else if (metadata.type == "key") {
+  } else if (metadata.GetType() == "key") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
-  } else if (metadata.type == "audioResource" ||
-             metadata.type == "bitmapFontResource" ||
-             metadata.type == "fontResource" ||
-             metadata.type == "imageResource" ||
-             metadata.type == "jsonResource" ||
-             metadata.type == "videoResource" ||
+  } else if (metadata.GetType() == "audioResource" ||
+             metadata.GetType() == "bitmapFontResource" ||
+             metadata.GetType() == "fontResource" ||
+             metadata.GetType() == "imageResource" ||
+             metadata.GetType() == "jsonResource" ||
+             metadata.GetType() == "tilemapResource" ||
+             metadata.GetType() == "tilesetResource" ||
+             metadata.GetType() == "videoResource" ||
+             metadata.GetType() == "model3DResource" ||
              // Deprecated, old parameter names:
-             metadata.type == "password" || metadata.type == "musicfile" ||
-             metadata.type == "soundfile" || metadata.type == "police") {
+             metadata.GetType() == "password" || metadata.GetType() == "musicfile" ||
+             metadata.GetType() == "soundfile" || metadata.GetType() == "police") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
-  } else if (metadata.type == "mouse") {
+  } else if (metadata.GetType() == "mouse") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
-  } else if (metadata.type == "yesorno") {
+  } else if (metadata.GetType() == "yesorno") {
     auto parameterString = parameter.GetPlainString();
     argOutput += (parameterString == "yes" || parameterString == "oui")
                      ? GenerateTrue()
                      : GenerateFalse();
-  } else if (metadata.type == "trueorfalse") {
+  } else if (metadata.GetType() == "trueorfalse") {
     auto parameterString = parameter.GetPlainString();
     // This is duplicated in AdvancedExtension.cpp for GDJS
     argOutput += (parameterString == "True" || parameterString == "Vrai")
@@ -741,21 +747,21 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
                      : GenerateFalse();
   }
   // Code only parameter type
-  else if (metadata.type == "inlineCode") {
-    argOutput += metadata.supplementaryInformation;
+  else if (metadata.GetType() == "inlineCode") {
+    argOutput += metadata.GetExtraInfo();
   } else {
     // Try supplementary types if provided
     if (supplementaryParametersTypes) {
       for (std::size_t i = 0; i < supplementaryParametersTypes->size(); ++i) {
-        if ((*supplementaryParametersTypes)[i].first == metadata.type)
+        if ((*supplementaryParametersTypes)[i].first == metadata.GetType())
           argOutput += (*supplementaryParametersTypes)[i].second;
       }
     }
 
     // Type unknown
     if (argOutput.empty()) {
-      if (!metadata.type.empty())
-        cout << "Warning: Unknown type of parameter \"" << metadata.type
+      if (!metadata.GetType().empty())
+        cout << "Warning: Unknown type of parameter \"" << metadata.GetType()
              << "\"." << std::endl;
       argOutput += "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
     }
@@ -1030,7 +1036,7 @@ gd::String EventsCodeGenerator::GenerateFreeCondition(
   for (std::size_t i = 0; i < instrInfos.parameters.size();
        ++i)  // Some conditions already have a "conditionInverted" parameter
   {
-    if (instrInfos.parameters[i].type == "conditionInverted")
+    if (instrInfos.parameters[i].GetType() == "conditionInverted")
       conditionAlreadyTakeCareOfInversion = true;
   }
   if (!conditionAlreadyTakeCareOfInversion && conditionInverted)
@@ -1051,7 +1057,7 @@ gd::String EventsCodeGenerator::GenerateObjectCondition(
   // Prepare call
   // Add a static_cast if necessary
   gd::String objectFunctionCallNamePart =
-      (!instrInfos.parameters[0].supplementaryInformation.empty())
+      (!instrInfos.parameters[0].GetExtraInfo().empty())
           ? "static_cast<" + objInfo.className + "*>(" +
                 GetObjectListName(objectName, context) + "[i])->" +
                 instrInfos.codeExtraInformation.functionCallName
@@ -1233,7 +1239,7 @@ size_t EventsCodeGenerator::GenerateSingleUsageUniqueIdFor(
               << std::endl;
   }
 
-  // Base the unique id on the adress in memory so that the same instruction
+  // Base the unique id on the address in memory so that the same instruction
   // in memory will get the same id across different code generations.
   size_t uniqueId = (size_t)instruction;
 

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -404,6 +404,18 @@ class GD_CORE_API EventsCodeGenerator {
     return boolName;
   }
 
+  /**
+   * \brief Generate the full name for accessing to a boolean variable used for
+   * conditions.
+   *
+   * Default implementation just returns the boolean name passed as argument.
+   */
+  virtual gd::String GenerateUpperScopeBooleanFullName(
+      const gd::String& boolName,
+      const gd::EventsCodeGenerationContext& context) {
+    return boolName;
+  }
+
   /**
    * \brief Must create a boolean. Its value must be false.
    *
@@ -481,6 +493,9 @@ class GD_CORE_API EventsCodeGenerator {
    */
   size_t GenerateSingleUsageUniqueIdForEventsList();
 
+  virtual const gd::String GenerateRelationalOperatorCodes(
+      const gd::String& operatorString);
+
  protected:
   /**
    * \brief Generate the code for a single parameter.
@@ -490,9 +505,9 @@ class GD_CORE_API EventsCodeGenerator {
    * - object : Object name -> string
    * - expression : Mathematical expression -> number (double)
    * - string : %Text expression -> string
-   * - layer, color, file, joyaxis : Same as string
+   * - layer, color, file, stringWithSelector : Same as string
    * - relationalOperator : Used to make a comparison between the function
-  resturn value and value of the parameter preceding the relationOperator
+  return value and value of the parameter preceding the relationOperator
   parameter -> string
    * - operator : Used to update a value using a setter and a getter -> string
    * - key, mouse, objectvar, scenevar, globalvar, password, musicfile,
@@ -662,19 +677,6 @@ class GD_CORE_API EventsCodeGenerator {
     return "!(" + predicat + ")";
   };
 
-  /**
-   * \brief Must create a boolean which is a reference to a boolean declared in
-   * the parent scope.
-   *
-   * The default implementation generates C-style code.
-   */
-  virtual gd::String GenerateReferenceToUpperScopeBoolean(
-      const gd::String& referenceName,
-      const gd::String& referencedBoolean,
-      gd::EventsCodeGenerationContext& context) {
-    return "bool & " + referenceName + " = " + referencedBoolean + ";\n";
-  }
-
   virtual gd::String GenerateFreeCondition(
       const std::vector<gd::String>& arguments,
       const gd::InstructionMetadata& instrInfos,
@@ -783,7 +785,7 @@ class GD_CORE_API EventsCodeGenerator {
   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 errorOccurred;          ///< Must be set to true if an error occurred.
   bool compilationForRuntime;  ///< Is set to true if the code generation is
                                ///< made for runtime only.
 

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp

@@ -51,8 +51,8 @@ gd::String ExpressionCodeGenerator::GenerateExpressionCode(
                                     codeGenerator.GetObjectsAndGroups(),
                                     rootType);
   node->Visit(validator);
-  if (!validator.GetErrors().empty()) {
-    std::cout << "Error: \"" << validator.GetErrors()[0]->GetMessage()
+  if (!validator.GetFatalErrors().empty()) {
+    std::cout << "Error: \"" << validator.GetFatalErrors()[0]->GetMessage()
               << "\" in: \"" << expression.GetPlainString() << "\" ("
               << rootType << ")" << std::endl;
 
@@ -170,7 +170,7 @@ void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
   }
   else {
     // This is for function names that are put in IdentifierNode
-    // because the type is needed to tell them appart from variables.
+    // because the type is needed to tell them apart from variables.
     output += GenerateDefaultValue(type);
   }
 }

Core/GDCore/Events/Event.cpp

@@ -9,6 +9,7 @@
 #include "GDCore/Events/Builtin/AsyncEvent.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
 #include "GDCore/Events/EventsList.h"
+#include "GDCore/Events/EventVisitor.h"
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Extensions/PlatformExtension.h"
@@ -140,6 +141,14 @@ void BaseEvent::Preprocess(gd::EventsCodeGenerator& codeGenerator,
   }
 }
 
+bool BaseEvent::AcceptVisitor(gd::EventVisitor& eventVisitor) {
+  return eventVisitor.VisitEvent(*this);
+}
+
+void BaseEvent::AcceptVisitor(gd::ReadOnlyEventVisitor& eventVisitor) const {
+  eventVisitor.VisitEvent(*this);
+}
+
 BaseEventSPtr GD_CORE_API CloneRememberingOriginalEvent(BaseEventSPtr event) {
   gd::BaseEventSPtr copy(event->Clone());
   // Original event is either the original event of the copied event, or the

Core/GDCore/Events/Event.h

@@ -24,6 +24,8 @@ class EventsCodeGenerationContext;
 class Platform;
 class SerializerElement;
 class Instruction;
+class EventVisitor;
+class ReadOnlyEventVisitor;
 }  // namespace gd
 
 namespace gd {
@@ -238,6 +240,9 @@ class GD_CORE_API BaseEvent {
    */
   virtual void UnserializeFrom(gd::Project& project,
                                const SerializerElement& element){};
+  
+  virtual bool AcceptVisitor(gd::EventVisitor& eventVisitor);
+  virtual void AcceptVisitor(gd::ReadOnlyEventVisitor& eventVisitor) const;
   ///@}
 
   /** \name Common properties

Core/GDCore/Events/EventVisitor.h

@@ -0,0 +1,71 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+#include <iostream>
+#include <memory>
+#include <vector>
+
+#include "GDCore/String.h"
+
+namespace gd {
+class BaseEvent;
+class LinkEvent;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Visitor of any kind of event.
+ *
+ * \ingroup Events
+ */
+class GD_CORE_API EventVisitor {
+ public:
+  virtual ~EventVisitor(){};
+
+  /**
+   * Called to do some work on an event.
+   * 
+   * \return true if the event must be deleted from the events list, false
+   * otherwise.
+   */
+  virtual bool VisitEvent(gd::BaseEvent& linkEvent) = 0;
+  
+  /**
+   * Called to do some work on a link event.
+   * 
+   * Note that VisitEvent is also called with this event.
+   * 
+   * \return true if the event must be deleted from the events list, false
+   * otherwise.
+   */
+  virtual bool VisitLinkEvent(gd::LinkEvent& linkEvent) = 0;
+};
+
+/**
+ * \brief Visitor of any kind of event.
+ *
+ * \ingroup Events
+ */
+class GD_CORE_API ReadOnlyEventVisitor {
+ public:
+  virtual ~ReadOnlyEventVisitor(){};
+
+  /**
+   * Called to do some work on an event.
+   */
+  virtual void VisitEvent(const gd::BaseEvent& linkEvent) = 0;
+
+  /**
+   * Called to do some work on a link event.
+   * 
+   * Note that VisitEvent is also called with this event.
+   */
+  virtual void VisitLinkEvent(const gd::LinkEvent& linkEvent) = 0;
+};
+
+}

Core/GDCore/Events/Instruction.cpp

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

Core/GDCore/Events/Instruction.h

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

Core/GDCore/Events/Serialization.cpp

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

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -33,7 +33,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           "res/function32.png",
           "res/function32.png")
       .SetHelpPath("/events/functions/return")
-      .AddParameter("expression", "The number to be returned")
+      .AddParameter("expression", _("The number to be returned"))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -47,7 +48,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           "res/function32.png",
           "res/function32.png")
       .SetHelpPath("/events/functions/return")
-      .AddParameter("string", "The text to be returned")
+      .AddParameter("string", _("The text to be returned"))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -60,7 +62,38 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                  "res/function32.png",
                  "res/function32.png")
       .SetHelpPath("/events/functions/return")
-      .AddParameter("trueorfalse", "Should the condition be true or false?")
+      .AddParameter("trueorfalse", _("Should the condition be true or false?"))
+      .SetRelevantForFunctionEventsOnly()
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("CopyArgumentToVariable",
+                 _("Copy function parameter to variable"),
+                 _("Copy a function parameter (also called \"argument\") to a variable. "
+                 "The parameter type must be a variable."),
+                 _("Copy the parameter _PARAM0_ into the variable _PARAM1_"),
+                 "",
+                 "res/function32.png",
+                 "res/function32.png")
+      .SetHelpPath("/events/functions/return")
+      .AddParameter("functionParameterName", _("Parameter name"), "variable")
+      .AddParameter("scenevar", _("Scene variable"))
+      .SetRelevantForFunctionEventsOnly()
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("CopyVariableToArgument",
+                 _("Copy variable to function parameter"),
+                 _("Copy a variable to function parameter (also called \"argument\"). "
+                 "The parameter type must be a variable."),
+                 _("Copy the variable _PARAM1_ into the parameter _PARAM0_"),
+                 "",
+                 "res/function32.png",
+                 "res/function32.png")
+      .SetHelpPath("/events/functions/return")
+      .AddParameter("functionParameterName", _("Parameter name"), "variable")
+      .AddParameter("scenevar", _("Scene variable"))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -74,26 +107,57 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                     "",
                     "res/function32.png",
                     "res/function32.png")
-      .AddParameter("functionParameterName", "Parameter name")
+      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
       .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");
+      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .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");
+      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
+      .SetRelevantForFunctionEventsOnly();
+
+  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"), "number,string,boolean")
+      .UseStandardRelationalOperatorParameters(
+          "number", gd::ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly();
+
+  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"), "number,string,boolean")
+      .UseStandardRelationalOperatorParameters(
+          "string", gd::ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/AsyncExtension.cpp

@@ -15,11 +15,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAsyncExtension(
   extension
       .SetExtensionInformation(
           "BuiltinAsync",
-          _("Async functions"),
+          _("Asynchronous functions"),
           _("Functions that defer the execution of the events after it."),
           "Arthur Pacaud (arthuro555)",
           "Open source (MIT License)")
       .SetCategory("Advanced");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Asynchronous functions"))
+      .SetIcon("res/function32.png");
 
   extension.AddEvent("Async",
                      _("Async event"),
@@ -27,6 +29,19 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAsyncExtension(
                      "",
                      "res/eventaddicon.png",
                      std::make_shared<gd::AsyncEvent>());
+
+  extension
+      .AddAction(
+          "ResolveAsyncEventsFunction",
+          _("End asynchronous function"),
+          _("Mark an asynchronous function as finished. This will allow the "
+            "actions and subevents following it to be run."),
+          "Mark asynchronous function as ended",
+          "",
+          "res/actions/quit24.png",
+          "res/actions/quit.png")
+      .AddCodeOnlyParameter("eventsFunctionContext", "")
+      .SetRelevantForAsynchronousFunctionEventsOnly();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/AudioExtension.cpp

@@ -23,6 +23,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
       .SetCategory("Audio");
   extension.AddInstructionOrExpressionGroupMetadata(_("Sounds and music"))
       .SetIcon("res/actions/music24.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Sounds on channels"))
+      .SetIcon("res/actions/son24.png");
 
   extension
       .AddAction("PlaySoundCanal",
@@ -73,9 +75,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
 
   extension
       .AddAction("RePlaySoundCanal",
-                 _("Play the sound of a channel"),
-                 _("Play the sound of the channel."),
-                 _("Play the sound of channel _PARAM1_"),
+                 _("Resume playing a sound on a channel"),
+                 _("Resume playing a sound on a channel that was paused."),
+                 _("Resume the sound of channel _PARAM1_"),
                  _("Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
@@ -132,9 +134,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
 
   extension
       .AddAction("RePlayMusicCanal",
-                 _("Play the music of a channel"),
-                 _("Play the music of the channel."),
-                 _("Play the music of channel _PARAM1_"),
+                 _("Resume playing a music on a channel"),
+                 _("Resume playing a music on a channel that was paused."),
+                 _("Resume the music of channel _PARAM1_"),
                  _("Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
@@ -146,69 +148,83 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
       .AddAction("ModVolumeSoundCanal",
                  _("Volume of the sound on a channel"),
                  _("This action modifies the volume of the sound on the "
-                   "specified channel. The volume is between 0 and 100."),
+                   "specified channel."),
                  _("the volume of the sound on channel _PARAM1_"),
                  _("Sounds on channels"),
                  "res/actions/sonVolume24.png",
                  "res/actions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Volume (0-100)")))
       .MarkAsAdvanced();
 
   extension
       .AddAction("ModVolumeMusicCanal",
                  _("Volume of the music on a channel"),
                  _("This action modifies the volume of the music on the "
-                   "specified channel. The volume is between 0 and 100."),
+                   "specified channel."),
                  _("the volume of the music on channel _PARAM1_"),
                  _("Music on channels"),
                  "res/actions/musicVolume24.png",
                  "res/actions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Volume (0-100)")))
       .MarkAsAdvanced();
 
   extension
       .AddAction("ModGlobalVolume",
                  _("Game global volume"),
-                 _("This action modifies the global volume of the game. The "
-                   "volume is between 0 and 100."),
+                 _("This action modifies the global volume of the game."),
                  _("the global sound level"),
                  "",
                  "res/actions/volume24.png",
                  "res/actions/volume.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Volume (0-100)")))
       .MarkAsSimple();
 
   extension
       .AddAction("ModPitchSoundChannel",
                  _("Pitch of the sound of a channel"),
                  _("This action modifies the pitch (speed) of the sound on a "
-                   "channel.\n1 is the default pitch."),
+                   "channel."),
                  _("the pitch of the sound on channel _PARAM1_"),
                  _("Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Pitch (1 by default)")))
       .MarkAsAdvanced();
 
   extension
       .AddAction("ModPitchMusicChannel",
                  _("Pitch of the music on a channel"),
                  _("This action modifies the pitch of the music on the "
-                   "specified channel. 1 is the default pitch"),
+                   "specified channel."),
                  _("the pitch of the music on channel _PARAM1_"),
                  _("Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Pitch (1 by default)")))
       .MarkAsAdvanced();
 
   extension
@@ -222,7 +238,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Position (in seconds)")))
       .MarkAsAdvanced();
 
   extension
@@ -236,7 +255,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Position (in seconds)")))
       .MarkAsAdvanced();
 
   extension
@@ -448,15 +470,17 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
       .AddCondition(
           "SoundCanalVolume",
           _("Volume of the sound on a channel"),
-          _("Test the volume of the sound on the specified channel. The volume "
-            "is between 0 and 100."),
+          _("Test the volume of the sound on the specified channel."),
           _("the volume of the sound on channel _PARAM1_"),
           _("Sounds on channels"),
           "res/conditions/sonVolume24.png",
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Volume to compare to (0-100)")))
       .MarkAsAdvanced();
 
   extension
@@ -471,7 +495,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Volume to compare to (0-100)")))
       .MarkAsAdvanced();
 
   extension
@@ -484,7 +511,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           "res/conditions/volume24.png",
           "res/conditions/volume.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters("number");
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Volume to compare to (0-100)")));
 
   extension
       .AddCondition(
@@ -498,22 +528,27 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Pitch to compare to (1 by default)")))
       .MarkAsAdvanced();
 
   extension
       .AddCondition(
           "MusicChannelPitch",
           _("Pitch of the music on a channel"),
-          _("Test the pitch (speed) of the music on a specified channel. 1 is "
-            "the default pitch."),
+          _("Test the pitch (speed) of the music on a specified channel."),
           _("the pitch of the music on channel _PARAM1_"),
           _("Music on channels"),
           "res/conditions/musicVolume24.png",
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Pitch to compare to (1 by default)")))
       .MarkAsAdvanced();
 
   extension
@@ -527,7 +562,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Position to compare to (in seconds)")))
       .MarkAsAdvanced();
 
   extension
@@ -541,7 +579,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Position to compare to (in seconds)")))
       .MarkAsAdvanced();
 
   extension

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -27,8 +27,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .SetIcon("res/actions/create24.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Movement using forces"))
       .SetIcon("res/actions/force24.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Variables"))
+      .SetIcon("res/conditions/var24.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Position"))
+      .SetIcon("res/actions/position24_black.png");
 
-  gd::ObjectMetadata& obj = extension.AddObject<gd::Object>(
+  gd::ObjectMetadata& obj = extension.AddObject<gd::ObjectConfiguration>(
       "", _("Base object"), _("Base object"), "res/objeticon24.png");
 
   obj.AddCondition("PosX",
@@ -36,11 +40,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Compare the X position of the object."),
                    _("the X position"),
                    _("Position"),
-                   "res/conditions/position24.png",
-                   "res/conditions/position.png")
+                   "res/conditions/position24_black.png",
+                   "res/conditions/position_black.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
       .MarkAsSimple();
 
   obj.AddAction("MettreX",
@@ -48,11 +53,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Change the X position of an object."),
                 _("the X position"),
                 _("Position"),
-                "res/actions/position24.png",
-                "res/actions/position.png")
+                "res/actions/position24_black.png",
+                "res/actions/position_black.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters("number",
+                                     ParameterOptions::MakeNewOptions())
       .MarkAsSimple();
 
   obj.AddCondition("PosY",
@@ -60,11 +66,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Compare the Y position of an object."),
                    _("the Y position"),
                    _("Position"),
-                   "res/conditions/position24.png",
-                   "res/conditions/position.png")
+                   "res/conditions/position24_black.png",
+                   "res/conditions/position_black.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
       .MarkAsSimple();
 
   obj.AddAction("MettreY",
@@ -72,11 +79,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Change the Y position of an object."),
                 _("the Y position"),
                 _("Position"),
-                "res/actions/position24.png",
-                "res/actions/position.png")
+                "res/actions/position24_black.png",
+                "res/actions/position_black.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters("number",
+                                     ParameterOptions::MakeNewOptions())
       .MarkAsSimple();
 
   obj.AddAction("MettreXY",
@@ -85,8 +93,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Change the position of _PARAM0_: _PARAM1_ _PARAM2_ (x "
                   "axis), _PARAM3_ _PARAM4_ (y axis)"),
                 _("Position"),
-                "res/actions/position24.png",
-                "res/actions/position.png")
+                "res/actions/position24_black.png",
+                "res/actions/position_black.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("operator", _("Modification's sign"), "number")
@@ -102,8 +110,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                   "_PARAM2_ (x "
                   "axis), _PARAM3_ _PARAM4_ (y axis)"),
                 _("Position/Center"),
-                "res/actions/position24.png",
-                "res/actions/position.png")
+                "res/actions/position24_black.png",
+                "res/actions/position_black.png")
       .AddParameter("object", _("Object"))
       .AddParameter("operator", _("Modification's sign"), "number")
       .AddParameter("expression", _("X position"))
@@ -118,9 +126,9 @@ 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.png")
+         "res/actions/position24_black.png")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
 
   obj.AddExpressionAndConditionAndAction(
          "number",
@@ -129,9 +137,9 @@ 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.png")
+         "res/actions/position24_black.png")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxLeft",
@@ -140,9 +148,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                   "the object) left position"),
                                 _("the bounding box left position"),
                                 _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-left.svg")
+                                "res/conditions/bounding-box-left_black.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
 
   obj.AddExpressionAndCondition(
          "number",
@@ -151,9 +159,9 @@ 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.svg")
+         "res/conditions/bounding-box-top_black.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxRight",
@@ -162,9 +170,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                   "the object) right position"),
                                 _("the bounding box right position"),
                                 _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-right.svg")
+                                "res/conditions/bounding-box-right_black.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxBottom",
@@ -173,9 +181,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                   "the object) bottom position"),
                                 _("the bounding box bottom position"),
                                 _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-bottom.svg")
+                                "res/conditions/bounding-box-bottom_black.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxCenterX",
@@ -184,9 +192,9 @@ 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.svg")
+                                "res/conditions/bounding-box-center_black.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxCenterY",
@@ -195,9 +203,9 @@ 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.svg")
+                                "res/conditions/bounding-box-center_black.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
 
   obj.AddAction("MettreAutourPos",
                 _("Put around a position"),
@@ -222,11 +230,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Change the angle of rotation of an object (in degrees)."),
                 _("the angle"),
                 _("Angle"),
-                "res/actions/direction24.png",
-                "res/actions/direction.png")
+                "res/actions/direction24_black.png",
+                "res/actions/direction_black.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardOperatorParameters("number");
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Angle (in degrees)")));
 
   obj.AddAction("Rotate",
                 _("Rotate"),
@@ -234,8 +245,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                   "counterclockwise otherwise."),
                 _("Rotate _PARAM0_ at speed _PARAM1_ deg/second"),
                 _("Angle"),
-                "res/actions/direction24.png",
-                "res/actions/direction.png")
+                "res/actions/rotate24_black.png",
+                "res/actions/rotate_black.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angular speed (in degrees per second)"))
@@ -248,8 +259,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/direction24.png",
-         "res/actions/direction.png")
+         "res/actions/rotate24_black.png",
+         "res/actions/rotate_black.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle to rotate towards (in degrees)"))
@@ -264,8 +275,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Rotate _PARAM0_ towards _PARAM1_;_PARAM2_ at speed "
            "_PARAM3_ deg/second"),
          _("Angle"),
-         "res/actions/direction24.png",
-         "res/actions/direction.png")
+         "res/actions/rotate24_black.png",
+         "res/actions/rotate_black.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("X position"))
@@ -382,7 +393,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/planicon.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardOperatorParameters("number");
+      .UseStandardOperatorParameters("number",
+                                     ParameterOptions::MakeNewOptions());
 
   obj.AddAction("ChangeLayer",
                 _("Layer"),
@@ -393,13 +405,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/layer.png")
 
       .AddParameter("object", _("Object"))
-      .AddParameter("layer", _("Move it to this layer (base layer if empty)"))
+      .AddParameter("layer", _("Move it to this layer"))
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
   obj.AddAction("ModVarObjet",
-                _("Value of an object variable"),
-                _("Change the value of an object variable."),
+                _("Change number variable"),
+                _("Modify the number value of an object variable."),
                 _("the variable _PARAM1_"),
                 _("Variables"),
                 "res/actions/var24.png",
@@ -407,11 +419,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .UseStandardOperatorParameters("number");
+      .UseStandardOperatorParameters("number",
+                                     ParameterOptions::MakeNewOptions());
 
   obj.AddAction("ModVarObjetTxt",
-                _("Text of an object variable"),
-                _("Change the text of an object variable."),
+                _("Change text variable"),
+                _("Modify the text of an object variable."),
                 _("the text of variable _PARAM1_"),
                 _("Variables"),
                 "res/actions/var24.png",
@@ -419,11 +432,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .UseStandardOperatorParameters("string");
+      .UseStandardOperatorParameters("string",
+                                     ParameterOptions::MakeNewOptions());
 
   obj.AddAction("SetObjectVariableAsBoolean",
-                _("Boolean value of an object variable"),
-                _("Change the boolean value of an object variable."),
+                _("Change boolean variable"),
+                _("Modify the boolean value of an object variable."),
                 _("Set the boolean value of variable _PARAM1_ of "
                   "_PARAM0_ to _PARAM2_"),
                 _("Variables"),
@@ -436,7 +450,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddAction(
          "ToggleObjectVariableAsBoolean",
-         _("Toggle the boolean value of an object variable"),
+         _("Toggle boolean variable"),
          _("Toggles the boolean value of an object variable.") + "\n" +
              _("If it was true, it will become false, and if it was false "
                "it will become true."),
@@ -451,37 +465,39 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddCondition("ObjectVariableChildExists",
                    _("Child existence"),
-                   _("Check if the specified child of the variable exists."),
+                   _("Check if the specified child of the object "
+                     "structure variable exists."),
                    _("Child _PARAM2_ of variable _PARAM1_ of _PARAM0_ exists"),
-                   _("Variables/Collections/Structures"),
+                   _("Variables/Arrays and structures"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("objectvar", _("Structure variable"))
       .AddParameter("string", _("Name of the child"))
       .MarkAsAdvanced();
 
   obj.AddAction("ObjectVariableRemoveChild",
                 _("Remove a child"),
-                _("Remove a child from an object variable."),
+                _("Remove a child from an object structure variable."),
                 _("Remove child _PARAM2_ from variable _PARAM1_ of _PARAM0_"),
-                _("Variables/Collections/Structures"),
+                _("Variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("objectvar", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
       .MarkAsAdvanced();
 
   obj.AddAction("ObjectVariableClearChildren",
-                _("Clear variable"),
-                _("Remove all the children from the object variable."),
+                _("Clear children"),
+                _("Remove all the children from the object array or structure "
+                  "variable."),
                 _("Clear children from variable _PARAM1_ of _PARAM0_"),
-                _("Variables/Collections"),
+                _("Variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("objectvar", _("Array or structure variable"))
       .MarkAsAdvanced();
 
   obj.AddAction("Cache",
@@ -512,11 +528,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Compare the angle of the specified object."),
                    _("the angle (in degrees)"),
                    _("Angle"),
-                   "res/conditions/direction24.png",
-                   "res/conditions/direction.png")
+                   "res/conditions/direction24_black.png",
+                   "res/conditions/direction_black.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Angle to compare to (in degrees)")))
       .MarkAsAdvanced();
 
   obj.AddCondition("Plan",
@@ -528,7 +547,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/planicon.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   obj.AddCondition("Layer",
@@ -585,7 +605,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/vitesse.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   obj.AddCondition("AngleOfDisplacement",
@@ -604,8 +625,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddCondition("VarObjet",
-                   _("Value of an object variable"),
-                   _("Compare the value of an object variable."),
+                   _("Number variable"),
+                   _("Compare the number value of an object variable."),
                    _("the variable _PARAM1_"),
                    _("Variables"),
                    "res/conditions/var24.png",
@@ -613,10 +634,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters("number");
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions());
 
   obj.AddCondition("VarObjetTxt",
-                   _("Text of an object variable"),
+                   _("Text variable"),
                    _("Compare the text of an object variable."),
                    _("the text of variable _PARAM1_"),
                    _("Variables"),
@@ -625,10 +647,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters("string");
+      .UseStandardRelationalOperatorParameters(
+          "string", ParameterOptions::MakeNewOptions());
 
   obj.AddCondition("ObjectVariableAsBoolean",
-                   _("Boolean value of an object variable"),
+                   _("Boolean variable"),
                    _("Compare the boolean value of an object variable."),
                    _("The boolean value of variable _PARAM1_ of object "
                      "_PARAM0_ is _PARAM2_"),
@@ -642,7 +665,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddCondition("VarObjetDef",
                    "Variable defined",
-                   "Check if the variable is defined.",
+                   "Check if the object variable is defined.",
                    "Variable _PARAM1 of _PARAM0_ is defined",
                    _("Variables"),
                    "res/conditions/var24.png",
@@ -650,78 +673,131 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("string", _("Variable"))
-      .SetHidden();
+      .SetHidden();  // Deprecated.
 
   obj.AddAction(
          "ObjectVariablePush",
-         _("Append variable to an object array"),
-         _("Appends a variable to the end of an object array variable."),
-         _("Append variable _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Collections/Arrays"),
+         _("Add existing variable"),
+         _("Adds an existing variable to the end of an object array variable."),
+         _("Add variable _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("scenevar", _("Scene variable with the content to append"))
-      .SetParameterLongDescription(
-          _("The content of the variable will *be copied* and appended at the "
-            "end of the array."))
+      .AddParameter("scenevar", _("Scene variable with the content to add"))
+      .SetParameterLongDescription(_("The content of the object variable will "
+                                     "*be copied* and added at the "
+                                     "end of the array."))
       .MarkAsAdvanced();
 
   obj.AddAction(
          "ObjectVariablePushString",
-         _("Append a string to an object array"),
-         _("Appends a string to the end of an object array variable."),
-         _("Append string _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Collections/Arrays"),
+         _("Add text variable"),
+         _("Adds a text (string) to the end of an object array variable."),
+         _("Add text _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("string", _("String to append"))
+      .AddParameter("string", _("Text to add"))
       .MarkAsAdvanced();
 
-  obj.AddAction(
-         "ObjectVariablePushNumber",
-         _("Append a number to an object array"),
-         _("Appends a number to the end of an object array variable."),
-         _("Append number _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Collections/Arrays"),
-         "res/actions/var24.png",
-         "res/actions/var.png")
+  obj.AddAction("ObjectVariablePushNumber",
+                _("Add number variable"),
+                _("Adds a number to the end of an object array variable."),
+                _("Add number _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+                _("Variables/Arrays and structures"),
+                "res/actions/var24.png",
+                "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("expression", _("Number to append"))
+      .AddParameter("expression", _("Number to add"))
       .MarkAsAdvanced();
 
   obj.AddAction(
          "ObjectVariablePushBool",
-         _("Append a boolean to an object array"),
-         _("Appends a boolean to the end of an object array variable."),
-         _("Append boolean _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Collections/Arrays"),
+         _("Add boolean variable"),
+         _("Adds a boolean to the end of an object array variable."),
+         _("Add boolean _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("trueorfalse", _("Boolean to append"))
+      .AddParameter("trueorfalse", _("Boolean to add"))
       .MarkAsAdvanced();
 
   obj.AddAction(
          "ObjectVariableRemoveAt",
-         _("Remove variable from an object array (by index)"),
+         _("Remove variable by index"),
          _("Removes a variable at the specified index of an object array "
            "variable."),
          _("Remove variable at index _PARAM2_ from array variable _PARAM1_ of "
            "_PARAM0_"),
-         _("Variables/Collections/Arrays"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("objectvar", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
       .MarkAsAdvanced();
 
+  obj.AddCondition(
+         "ObjectVariableChildCount",
+         _("Number of children"),
+         _("Compare the number of children in an object array variable."),
+         _("The number of children in the array variable _PARAM1_"),
+         _("Variables/Arrays and structures"),
+         "res/conditions/var24.png",
+         "res/conditions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Variable"))
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
+      .MarkAsAdvanced();
+
+  obj.AddStrExpression(
+         "ArrayVariableFirstString",
+         _("First text child"),
+         _("Get the value of the first element of an object array variable, if "
+           "it is a text (string) variable."),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"));
+
+  obj.AddExpression(
+         "ArrayVariableFirstNumber",
+         _("First number child"),
+         _("Get the value of the first element of an object array variable, if "
+           "it is a number variable."),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"));
+
+  obj.AddStrExpression(
+         "ArrayVariableLastString",
+         _("Last text child"),
+         _("Get the value of the last element of an object array variable, if "
+           "it is a text (string) variable."),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"));
+
+  obj.AddExpression(
+         "ArrayVariableLastNumber",
+         _("Last number child"),
+         _("Get the value of the last element of an object array variable, if "
+           "it is a number variable."),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"));
+
   obj.AddCondition("BehaviorActivated",
                    _("Behavior activated"),
                    _("Check if the behavior is activated for the object."),
@@ -886,7 +962,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "res/conditions/timer24.png",
          "res/conditions/timer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "objectTimer")
       .AddParameter("expression", _("Time in seconds"))
       .SetHidden();
 
@@ -900,7 +976,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "res/conditions/timer24.png",
          "res/conditions/timer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "objectTimer")
       .AddParameter("relationalOperator", _("Sign of the test"), "time")
       .AddParameter("expression", _("Time in seconds"))
       .SetManipulatedType("number");
@@ -913,7 +989,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/timerPaused24.png",
                    "res/conditions/timerPaused.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "objectTimer")
       .MarkAsAdvanced();
 
   obj.AddAction(
@@ -926,7 +1002,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "res/actions/timer24.png",
          "res/actions/timer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("string", _("Timer's name"));
+      .AddParameter("identifier", _("Timer's name"), "objectTimer");
 
   obj.AddAction("PauseObjectTimer",
                 _("Pause an object timer"),
@@ -936,7 +1012,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/pauseTimer24.png",
                 "res/actions/pauseTimer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "objectTimer")
       .MarkAsAdvanced();
 
   obj.AddAction("UnPauseObjectTimer",
@@ -947,7 +1023,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/unPauseTimer24.png",
                 "res/actions/unPauseTimer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "objectTimer")
       .MarkAsAdvanced();
 
   obj.AddAction("RemoveObjectTimer",
@@ -958,28 +1034,28 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/timer24.png",
                 "res/actions/timer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "objectTimer")
       .MarkAsAdvanced();
 
   obj.AddExpression("X",
                     _("X position"),
                     _("X position of the object"),
                     _("Position"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")
       .AddParameter("object", _("Object"));
 
   obj.AddExpression("Y",
                     _("Y position"),
                     _("Y position of the object"),
                     _("Position"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")
       .AddParameter("object", _("Object"));
 
   obj.AddExpression("Angle",
                     _("Angle"),
                     _("Current angle, in degrees, of the object"),
                     _("Angle"),
-                    "res/actions/direction.png")
+                    "res/actions/direction_black.png")
       .AddParameter("object", _("Object"));
 
   obj.AddExpression("ForceX",
@@ -1022,14 +1098,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     _("Width"),
                     _("Width of the object"),
                     _("Size"),
-                    "res/actions/scaleWidth.png")
+                    "res/actions/scaleWidth_black.png")
       .AddParameter("object", _("Object"));
 
   obj.AddExpression("Largeur",
                     _("Width"),
                     _("Width of the object"),
                     _("Size"),
-                    "res/actions/scaleWidth.png")
+                    "res/actions/scaleWidth_black.png")
       .AddParameter("object", _("Object"))
       .SetHidden();
 
@@ -1037,14 +1113,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     _("Height"),
                     _("Height of the object"),
                     _("Size"),
-                    "res/actions/scaleHeight.png")
+                    "res/actions/scaleHeight_black.png")
       .AddParameter("object", _("Object"));
 
   obj.AddExpression("Hauteur",
                     _("Height"),
                     _("Height of the object"),
                     _("Size"),
-                    "res/actions/scaleHeight.png")
+                    "res/actions/scaleHeight_black.png")
       .AddParameter("object", _("Object"))
       .SetHidden();
 
@@ -1098,23 +1174,24 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("expression", _("Target Y position"));
 
   obj.AddExpression("Variable",
-                    _("Object variable"),
-                    _("Value of an object variable"),
+                    _("Number variable"),
+                    _("Number value of an object variable"),
                     _("Variables"),
                     "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"));
 
-  obj.AddExpression("VariableChildCount",
-                    _("Number of children of an object variable"),
-                    _("Number of children of an object variable"),
-                    _("Variables"),
-                    "res/actions/var.png")
+  obj.AddExpression(
+         "VariableChildCount",
+         _("Number of children"),
+         _("Number of children in an object array or structure variable"),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"));
+      .AddParameter("objectvar", _("Array or structure variable"));
 
   obj.AddStrExpression("VariableString",
-                       _("Object variable"),
+                       _("Text variable"),
                        _("Text of an object variable"),
                        _("Variables"),
                        "res/actions/var.png")
@@ -1127,7 +1204,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     _("Object timers"),
                     "res/actions/time.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("string", _("Timer's name"));
+      .AddParameter("identifier", _("Timer's name"), "objectTimer");
 
   obj.AddExpression("AngleToObject",
                     _("Angle between two objects"),
@@ -1135,7 +1212,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "If you need the angle to an arbitrary position, "
                       "use AngleToPosition."),
                     _("Angle"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectPtr", _("Object"));
 
@@ -1146,7 +1223,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "getting the cartesian coordinates of a 2D vector, using "
                       "its polar coordinates."),
                     _("Position"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Distance"));
@@ -1158,7 +1235,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "getting the cartesian coordinates of a 2D vector, using "
                       "its polar coordinates."),
                     _("Position"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Distance"));
@@ -1169,7 +1246,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "\"target\" position (in degrees). If you need the angle "
                       "between two objects, use AngleToObject."),
                     _("Angle"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Target X position"))
       .AddParameter("expression", _("Target Y position"));
@@ -1248,6 +1325,17 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsSimple()
       .SetRequiresBaseObjectCapability("effect");
 
+  obj.AddAction("SetIncludedInParentCollisionMask",
+                _("Include in parent collision mask"),
+                _("Include or exclude a child from its parent collision mask."),
+                _("Include _PARAM0_ in parent object collision mask: _PARAM1_"),
+                _("Collision"),
+                "res/function32.png",
+                "res/function32.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("yesorno", "Include in parent collision mask")
+      .SetRelevantForCustomObjectEventsOnly();
+
   extension
       .AddAction("Create",
                  _("Create an object"),
@@ -1261,7 +1349,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectListOrEmptyIfJustDeclared", _("Object to create"))
       .AddParameter("expression", _("X position"))
       .AddParameter("expression", _("Y position"))
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .MarkAsSimple();
 
@@ -1276,7 +1364,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                  "res/actions/create24.png",
                  "res/actions/create24.png")
       .AddCodeOnlyParameter("objectsContext", "")
-      .AddParameter("objectListOrEmptyIfJustDeclared", _("Group of potential objects"))
+      .AddParameter("objectListOrEmptyIfJustDeclared",
+                    _("Group of potential objects"))
       .SetParameterLongDescription(
           _("Group containing objects that can be created by the action."))
       .AddParameter("string", _("Name of the object to create"))
@@ -1285,7 +1374,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "with this name are found in the group, no object will be created."))
       .AddParameter("expression", _("X position"))
       .AddParameter("expression", _("Y position"))
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
@@ -1315,7 +1404,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Objects"),
           "res/actions/ajouthasard24.png",
           "res/actions/ajouthasard.png")
-      .AddCodeOnlyParameter("currentScene", "")
+      .AddCodeOnlyParameter("objectsContext", "")
       .AddParameter("objectList", _("Object"))
       .MarkAsSimple();
 
@@ -1374,7 +1463,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Objects"),
           "res/conditions/add24.png",
           "res/conditions/add.png")
-      .AddCodeOnlyParameter("currentScene", "")
+      .AddCodeOnlyParameter("objectsContext", "")
       .AddParameter("objectList", _("Object"))
       .MarkAsAdvanced();
 
@@ -1389,7 +1478,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Objects"),
           "res/conditions/ajouthasard24.png",
           "res/conditions/ajouthasard.png")
-      .AddCodeOnlyParameter("currentScene", "")
+      .AddCodeOnlyParameter("objectsContext", "")
       .AddParameter("objectList", _("Object"))
       .MarkAsSimple();
 
@@ -1423,34 +1512,39 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "res/conditions/nbObjet24.png",
           "res/conditions/nbObjet.png")
       .AddParameter("objectList", _("Object"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
       .MarkAsSimple()
       .SetHidden();
 
-  extension.AddExpressionAndCondition(
-      "number",
-      "SceneInstancesCount",
-      _("Number of object instances on the scene"),
-      _("the number of instances of the specified objects living on the scene"),
-      _("the number of _PARAM1_ living on the scene"),
-      _("Objects"),
-      "res/conditions/nbObjet24.png")
-    .AddCodeOnlyParameter("objectsContext", "")
-    .AddParameter("objectListOrEmptyWithoutPicking", _("Object"))
-    .UseStandardParameters("number")
-    .MarkAsSimple();
+  extension
+      .AddExpressionAndCondition(
+          "number",
+          "SceneInstancesCount",
+          _("Number of object instances on the scene"),
+          _("the number of instances of the specified objects living on the "
+            "scene"),
+          _("the number of _PARAM1_ living on the scene"),
+          _("Objects"),
+          "res/conditions/nbObjet24.png")
+      .AddCodeOnlyParameter("objectsContext", "")
+      .AddParameter("objectListOrEmptyWithoutPicking", _("Object"))
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .MarkAsSimple();
 
-  extension.AddExpressionAndCondition(
-      "number",
-      "PickedInstancesCount",
-      _("Number of object instances currently picked"),
-      _("the number of instances picked by the previous conditions (or actions)"),
-      _("the number of _PARAM0_ currently picked"),
-      _("Objects"),
-      "res/conditions/nbObjet24.png")
-    .AddParameter("objectListOrEmptyWithoutPicking", _("Object"))
-    .UseStandardParameters("number")
-    .MarkAsSimple();
+  extension
+      .AddExpressionAndCondition(
+          "number",
+          "PickedInstancesCount",
+          _("Number of object instances currently picked"),
+          _("the number of instances picked by the previous conditions (or "
+            "actions)"),
+          _("the number of _PARAM0_ currently picked"),
+          _("Objects"),
+          "res/conditions/nbObjet24.png")
+      .AddParameter("objectListOrEmptyWithoutPicking", _("Object"))
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .MarkAsSimple();
 
   extension
       .AddCondition(
@@ -1494,7 +1588,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "Raycast",
           _("Raycast"),
           _("Sends a ray from the given source position and angle, "
-            "intersecting the closest object.\nThe instersected "
+            "intersecting the closest object.\nThe intersected "
             "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."),
@@ -1525,11 +1619,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "RaycastToPosition",
           _("Raycast to position"),
           _("Sends a ray from the given source position to the final point, "
-            "intersecting the closest object.\nThe instersected "
+            "intersecting the closest object.\nThe intersected "
             "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 from _PARAM1_;_PARAM2_ to _PARAM3_;_PARAM4_ "
+          _("Cast a ray from _PARAM1_;_PARAM2_ to _PARAM3_;_PARAM4_ "
             "against _PARAM0_, and save the "
             "result in _PARAM5_, _PARAM6_"),
           "",
@@ -1559,13 +1653,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                      "",
                      "res/conditions/nbObjet.png")
       .AddParameter("objectList", _("Object"))
-      .SetHidden(); // Deprecated
+      .SetHidden();  // Deprecated
 
   obj.AddStrExpression("ObjectName",
                        _("Object name"),
                        _("Return the name of the object"),
                        "",
-                       "res/conditions/text.png")
+                       "res/conditions/text_black.png")
       .AddParameter("object", _("Object"));
 
   obj.AddStrExpression("Layer",

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -22,9 +22,12 @@ 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");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
+      .SetIcon("res/actions/effect24.png");
 
   extension
       .AddExpressionAndConditionAndAction(
@@ -36,8 +39,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
@@ -68,8 +71,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
@@ -100,10 +103,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
@@ -116,10 +119,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
@@ -133,10 +136,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
@@ -150,10 +153,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
@@ -167,10 +170,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
@@ -184,10 +187,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
@@ -200,8 +203,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
@@ -221,7 +224,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Width"), "", true)
       .AddParameter("expression", _("Height"), "", true)
@@ -256,7 +259,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"))
       .MarkAsComplex();
@@ -272,7 +275,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"))
       .AddParameter("expression", _("Width"))
@@ -290,7 +293,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"))
       .AddParameter(
@@ -309,7 +312,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
 
   extension
       .AddAction("ZoomCamera",
-                 _("Change camera zoom"),
+                 _("Camera zoom"),
                  _("Change camera zoom."),
                  _("Change camera zoom to _PARAM1_ (layer: _PARAM2_, camera: "
                    "_PARAM3_)"),
@@ -319,7 +322,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression",
                     _("Value (1:Initial zoom, 2:Zoom x2, 0.5:Unzoom x2...)"))
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
@@ -351,46 +354,41 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     "",
                     true)
       .SetDefaultValue("yes")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
       .MarkAsAdvanced();
 
   extension
-      .AddAction(
-          "ClampCamera",
-          _("Enforce camera boundaries"),
-          _("Enforce camera boundaries by moving the camera back inside specified boundaries."),
-          _("Enforce camera boundaries (left: _PARAM1_, top: _PARAM2_ "
-            "right: _PARAM3_, bottom: _PARAM4_, layer: _PARAM5_)"),
-          "",
-          "res/actions/camera24.png",
-          "res/actions/camera.png")
+      .AddAction("ClampCamera",
+                 _("Enforce camera boundaries"),
+                 _("Enforce camera boundaries by moving the camera back inside "
+                   "specified boundaries."),
+                 _("Enforce camera boundaries (left: _PARAM1_, top: _PARAM2_ "
+                   "right: _PARAM3_, bottom: _PARAM4_, layer: _PARAM5_)"),
+                 "",
+                 "res/actions/camera24.png",
+                 "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression",
-                    _("Left bound X Position"))
-      .AddParameter("expression",
-                    _("Top bound Y Position"))
-      .AddParameter("expression",
-                    _("Right bound X Position"))
-      .AddParameter("expression",
-                    _("Bottom bound Y Position"))
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("expression", _("Left bound X Position"))
+      .AddParameter("expression", _("Top bound Y Position"))
+      .AddParameter("expression", _("Right bound X Position"))
+      .AddParameter("expression", _("Bottom bound Y Position"))
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
       .MarkAsAdvanced();
 
   extension
-      .AddAction(
-          "CentreCamera",
-          _("Center the camera on an object"),
-          _("Center the camera on the specified object."),
-          _("Center camera on _PARAM1_ (layer: _PARAM3_)"),
-          "",
-          "res/actions/camera24.png",
-          "res/actions/camera.png")
+      .AddAction("CentreCamera",
+                 _("Center the camera on an object"),
+                 _("Center the camera on the specified object."),
+                 _("Center camera on _PARAM1_ (layer: _PARAM3_)"),
+                 "",
+                 "res/actions/camera24.png",
+                 "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("objectPtr", _("Object"))
       .AddParameter("yesorno",
@@ -398,7 +396,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     "",
                     true)
       .SetDefaultValue("yes")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
@@ -413,7 +411,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  "res/actions/layer24.png",
                  "res/actions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
@@ -426,7 +424,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  "res/actions/layer24.png",
                  "res/actions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
@@ -439,7 +437,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     "res/conditions/layer24.png",
                     "res/conditions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
@@ -452,10 +450,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Effects"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          "res/actions/effect24.png",
+          "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
       .AddParameter("layerEffectParameterName", _("Parameter name"))
@@ -471,10 +469,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Effects"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          "res/actions/effect24.png",
+          "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
       .AddParameter("layerEffectParameterName", _("Parameter name"))
@@ -490,10 +488,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Enable _PARAM3_ for effect _PARAM2_ of layer _PARAM1_: _PARAM4_"),
           _("Effects"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          "res/actions/effect24.png",
+          "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
       .AddParameter("layerEffectParameterName", _("Parameter name"))
@@ -505,11 +503,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     _("Layer effect is enabled"),
                     _("The effect on a layer is enabled"),
                     _("Effect _PARAM2_ on layer _PARAM1_ is enabled"),
-                    _("Effects"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
+                    _(""),
+                    "res/actions/effect24.png",
+                    "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
       .MarkAsAdvanced();
@@ -520,10 +518,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Enable an effect on a layer"),
                  _("Enable effect _PARAM2_ on layer _PARAM1_: _PARAM3_"),
                  _("Effects"),
-                 "res/conditions/camera24.png",
-                 "res/conditions/camera.png")
+                 "res/actions/effect24.png",
+                 "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
       .AddParameter("yesorno", _("Enable"), "", true)
@@ -539,9 +537,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "res/conditions/time24.png",
           "res/conditions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          gd::ParameterOptions::MakeNewOptions().SetDescription(
+              _("Time scale (1 by default)")))
       .MarkAsAdvanced();
 
   extension
@@ -554,7 +555,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "res/actions/time24.png",
           "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression",
                     _("Scale (1: Default, 2: 2x faster, 0.5: 2x slower...)"));
@@ -569,14 +570,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     "res/conditions/layer24.png",
                     "res/conditions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", gd::ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
       .AddAction("SetLayerDefaultZOrder",
-                 _("Change layer default Z order"),
+                 _("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 "
@@ -585,7 +587,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  "res/actions/layer24.png",
                  "res/actions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("New default Z order"));
 
@@ -596,11 +598,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           _("Set the ambient light color of the lighting layer in format "
             "\"R;G;B\" string."),
           _("Set the ambient color of the lighting layer _PARAM1_ to _PARAM2_"),
-          _("Lighting"),
+          _(""),
           "res/actions/color24.png",
           "res/actions/color.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"Lighting\"")
       .AddParameter("color", _("Color"))
       .MarkAsAdvanced();

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.png");
+      .SetIcon("res/conditions/toujours24_black.png");
 
   extension
       .AddExpression("ToNumber",
                      _("Text > Number"),
                      _("Convert the text to a number"),
                      "",
-                     "res/conditions/toujours24.png")
+                     "res/conditions/toujours24_black.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.png")
+                        "res/conditions/toujours24_black.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.png")
+                        "res/conditions/toujours24_black.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.png")
+          "res/conditions/toujours24_black.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.png")
+          "res/conditions/toujours24_black.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.png")
+                        "res/conditions/toujours24_black.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.png")
+                        "res/conditions/toujours24_black.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.png")
+                        "res/conditions/toujours24_black.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"),
-          _("Parse JSON string _PARAM0_ and store it into variable _PARAM1_"),
+          _("Convert JSON string _PARAM0_ and store it into variable _PARAM1_"),
           "",
           "res/actions/net24.png",
           "res/actions/net.png")
@@ -108,7 +108,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
       .AddAction("JSONToGlobalVariableStructure",
                  _("Convert JSON to global variable"),
                  _("Parse a JSON object and store it into a global variable"),
-                 _("Parse JSON string _PARAM0_ and store it into global "
+                 _("Convert JSON string _PARAM0_ and store it into global "
                    "variable _PARAM1_"),
                  "",
                  "res/actions/net24.png",

Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp

@@ -33,7 +33,7 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
       .SetExtensionHelpPath("/all-features/advanced-conditions");
   extension
       .AddInstructionOrExpressionGroupMetadata(_("Events and control flow"))
-      .SetIcon("res/conditions/toujours24.png");
+      .SetIcon("res/conditions/toujours24_black.png");
 
   extension
       .AddCondition("Always",
@@ -42,8 +42,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                       "the condition is inverted)."),
                     _("Always"),
                     "",
-                    "res/conditions/toujours24.png",
-                    "res/conditions/toujours.png")
+                    "res/conditions/toujours24_black.png",
+                    "res/conditions/toujours_black.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.png",
-                    "res/conditions/or.png")
+                    "res/conditions/or24_black.png",
+                    "res/conditions/or_black.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.png",
-                    "res/conditions/and.png")
+                    "res/conditions/and24_black.png",
+                    "res/conditions/and_black.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.png",
-          "res/conditions/not.png")
+          "res/conditions/not24_black.png",
+          "res/conditions/not_black.png")
       .SetCanHaveSubInstructions()
       .MarkAsAdvanced();
 
@@ -104,8 +104,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                     _("Compare the two numbers."),
                     _("_PARAM0_ _PARAM1_ _PARAM2_"),
                     "",
-                    "res/conditions/egal24.png",
-                    "res/conditions/egal.png")
+                    "res/conditions/egal24_black.png",
+                    "res/conditions/egal_black.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.png",
-                    "res/conditions/egal.png")
+                    "res/conditions/egal24_black.png",
+                    "res/conditions/egal_black.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("Device");
+      .SetCategory("Advanced");
   extension.AddInstructionOrExpressionGroupMetadata(_("Storage"))
       .SetIcon("res/conditions/fichier24.png");
 

Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp

@@ -485,6 +485,23 @@ 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");
+
+  extension
+      .AddExpression("lerpAngle",
+                     _("Lerp (Linear interpolation) between two angles"),
+                     _("Linearly interpolates between two angles (in degrees) by taking the shortest direction around the circle."),
+                     "",
+                     "res/mathfunction.png")
+      .AddParameter("expression", _("Starting angle, in degrees"))
+      .AddParameter("expression", _("Destination angle, in degrees"))
+      .AddParameter("expression", _("Interpolation value between 0 and 1."));
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/MouseExtension.cpp

@@ -27,6 +27,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .SetCategory("Input");
   extension.AddInstructionOrExpressionGroupMetadata(_("Mouse and touch"))
       .SetIcon("res/actions/mouse24.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Multitouch"))
+      .SetIcon("res/conditions/touch24.png");
 
   extension
       .AddCondition(
@@ -153,42 +155,80 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
   extension
       .AddExpressionAndCondition(
           "number",
-          "MouseX",
+          "CursorX",
           _("Cursor X position"),
           _("the X position of the cursor or of a touch"),
           _("the cursor (or touch) X position"),
           "",
           "res/conditions/mouse24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
   // Support for deprecated names:
-  extension.AddDuplicatedCondition("SourisX", "MouseX").SetHidden();
-  extension.AddDuplicatedExpression("SourisX", "MouseX").SetHidden();
+  extension.AddDuplicatedCondition("MouseX", "CursorX").SetHidden();
+  extension.AddDuplicatedExpression("MouseX", "CursorX").SetHidden();
+  extension.AddDuplicatedCondition("SourisX", "CursorX").SetHidden();
+  extension.AddDuplicatedExpression("SourisX", "CursorX").SetHidden();
 
   extension
       .AddExpressionAndCondition(
           "number",
-          "MouseY",
+          "CursorY",
           _("Cursor Y position"),
           _("the Y position of the cursor or of a touch"),
           _("the cursor (or touch) Y position"),
           "",
           "res/conditions/mouse24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
   // Support for deprecated names:
-  extension.AddDuplicatedCondition("SourisY", "MouseY").SetHidden();
-  extension.AddDuplicatedExpression("SourisY", "MouseY").SetHidden();
+  extension.AddDuplicatedCondition("MouseY", "CursorY").SetHidden();
+  extension.AddDuplicatedExpression("MouseY", "CursorY").SetHidden();
+  extension.AddDuplicatedCondition("SourisY", "CursorY").SetHidden();
+  extension.AddDuplicatedExpression("SourisY", "CursorY").SetHidden();
+
+  extension
+      .AddExpressionAndCondition("number",
+                                 "MouseOnlyCursorX",
+                                 _("Mouse cursor X position"),
+                                 _("the X position of the mouse cursor"),
+                                 _("the mouse cursor X position"),
+                                 "",
+                                 "res/conditions/mouse24.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
+      .SetDefaultValue("0")
+      // It's only useful for extensions as they can't use TouchSimulateMouse.
+      .SetHidden();
+
+  extension
+      .AddExpressionAndCondition("number",
+                                 "MouseOnlyCursorY",
+                                 _("Mouse cursor Y position"),
+                                 _("the Y position of the mouse cursor"),
+                                 _("the mouse cursor Y position"),
+                                 "",
+                                 "res/conditions/mouse24.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
+      .SetDefaultValue("0")
+      // It's only useful for extensions as they can't use TouchSimulateMouse.
+      .SetHidden();
 
   extension
       .AddCondition("IsMouseInsideCanvas",
@@ -276,8 +316,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                                  "res/conditions/touch24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
-      .UseStandardParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
@@ -292,8 +332,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                                  "res/conditions/touch24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
-      .UseStandardParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
@@ -334,44 +374,85 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddCondition(
           "HasAnyTouchStarted",
           _("A new touch has started"),
-          _("Check if a touch has just started on this frame. The touch identifiers can be "
+          _("Check if a touch has just started on this frame. The touch "
+            "identifiers can be "
             "accessed using StartedTouchId() and StartedTouchCount()."),
           _("A new touch has started"),
           _("Multitouch"),
           "res/conditions/touch24.png",
           "res/conditions/touch.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .SetHidden();
+
+  extension
+      .AddExpression("StartedTouchCount",
+                     _("Started touch count"),
+                     _("The number of touches that have just started on this "
+                       "frame. The touch identifiers can be "
+                       "accessed using StartedTouchId()."),
+                     _("Multitouch"),
+                     "res/conditions/touch.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .SetHidden();
+
+  extension
+      .AddExpression("StartedTouchId",
+                     _("Started touch identifier"),
+                     _("The identifier of the touch that has just started on "
+                       "this frame. The number of touches can be "
+                       "accessed using StartedTouchCount()."),
+                     _("Multitouch"),
+                     "res/conditions/touch.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("expression", _("Touch index"))
+      .SetHidden();
+
+  extension
+      .AddCondition(
+          "HasAnyTouchOrMouseStarted",
+          _("A new touch has started"),
+          _("Check if a touch has just started or the mouse left button has "
+            "been pressed on this frame. The touch identifiers can be "
+            "accessed using StartedTouchOrMouseId() and "
+            "StartedTouchOrMouseCount()."),
+          _("A new touch has started"),
+          _("Multitouch"),
+          "res/conditions/touch24.png",
+          "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "");
 
   extension
       .AddExpression(
-          "StartedTouchCount",
+          "StartedTouchOrMouseCount",
           _("Started touch count"),
-          _("The number of touches that have just started on this frame. The touch identifiers can be "
-            "accessed using StartedTouchId()."),
+          _("The number of touches (including the mouse) that have just "
+            "started on this frame. The touch identifiers can be "
+            "accessed using StartedTouchOrMouseId()."),
           _("Multitouch"),
           "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "");
 
   extension
       .AddExpression(
-          "StartedTouchId",
+          "StartedTouchOrMouseId",
           _("Started touch identifier"),
-          _("The identifier of the touch that has just started on this frame. The touch number of touches can be "
-            "accessed using StartedTouchCount()."),
+          _("The identifier of the touch or mouse that has just started on "
+            "this frame. The number of touches can be "
+            "accessed using StartedTouchOrMouseCount()."),
           _("Multitouch"),
           "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch index"));
 
   extension
-      .AddCondition(
-          "HasTouchEnded",
-          _("A touch has ended"),
-          _("Check if a touch has ended."),
-          _("The touch with identifier _PARAM1_ has ended"),
-          _("Multitouch"),
-          "res/conditions/touch24.png",
-          "res/conditions/touch.png")
+      .AddCondition("HasTouchEnded",
+                    _("A touch has ended"),
+                    _("Check if a touch has ended or a mouse left button has "
+                      "been released."),
+                    _("The touch with identifier _PARAM1_ has ended"),
+                    _("Multitouch"),
+                    "res/conditions/touch24.png",
+                    "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"));
 

Core/GDCore/Extensions/Builtin/NetworkExtension.cpp

@@ -48,7 +48,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
       .AddParameter("string", "Content type", "", true)
       .SetParameterLongDescription(
           "If empty, \"application/x-www-form-urlencoded\" will be used.")
-      .AddParameter("scenevar", "Reponse scene variable", "", true)
+      .AddParameter("scenevar", "Response scene variable", "", true)
       .SetParameterLongDescription(
           "The response of the server will be stored, as a string, in this "
           "variable. If the server returns *JSON*, you may want to use the "

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -54,6 +54,19 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .MarkAsSimple();
 
+  extension
+      .AddCondition("DoesSceneExist",
+                    _("Does scene exist"),
+                    _("Check if scene exists."),
+                    _("Scene _PARAM1_ exists"),
+                    "",
+                    "res/actions/texte.png",
+                    "res/actions/texte.png")
+      .SetHelpPath("/interface/scene-editor/events")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("sceneName", _("Name of the scene to check"))
+      .MarkAsSimple();
+
   extension
       .AddAction("Scene",
                  _("Change the scene"),
@@ -112,7 +125,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
 
   extension
       .AddAction("SceneBackground",
-                 _("Change background color"),
+                 _("Background color"),
                  _("Change the background color of the scene."),
                  _("Set background color to _PARAM1_"),
                  "",
@@ -136,6 +149,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("yesorno", _("Deactivate input when focus is lost"))
       .MarkAsAdvanced();
+
+  extension
+      .AddCondition(
+          "HasGameJustResumed",
+          _("Game has just resumed"),
+          _("Check if the game has just resumed from being hidden. It "
+            "happens when the game tab is selected, a minimized window is "
+            "restored or the application is put back on front."),
+          _("Game has just resumed"),
+          "",
+          "res/actions/window24.png",
+          "res/actions/window.png")
+      .SetHelpPath("/interface/scene-editor/events")
+      .AddCodeOnlyParameter("currentScene", "");
 }
 
 }  // namespace gd

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

@@ -31,7 +31,7 @@ class GD_CORE_API Point {
   /**
    * Change point position.
    */
-  void SetXY(float x_, float y_) {
+  void SetXY(double x_, double y_) {
     x = x_;
     y = y_;
   }
@@ -39,27 +39,27 @@ class GD_CORE_API Point {
   /**
    * Change point X position.
    */
-  void SetX(float x_) { x = x_; }
+  void SetX(double x_) { x = x_; }
 
   /**
    * Change point Y position.
    */
-  void SetY(float y_) { y = y_; }
+  void SetY(double y_) { y = y_; }
 
   /**
    * Get point X position.
    */
-  float GetX() const { return x; }
+  double GetX() const { return x; }
 
   /**
    * Get point Y position.
    */
-  float GetY() const { return y; }
+  double GetY() const { return y; }
 
  private:
   gd::String name;
-  float x;
-  float y;
+  double x;
+  double y;
 };
 
 #endif  // GDCORE_POINT_H

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

@@ -4,13 +4,15 @@
  * reserved. This project is released under the MIT License.
  */
 #include "Polygon2d.h"
-#include "GDCore/Vector2.h"
+
 #include <cmath>
 #include <iostream>
 
-void Polygon2d::Rotate(float angle) {
-  float t, cosa = cos(-angle),
-           sina = sin(-angle);  // We want a clockwise rotation
+#include "GDCore/Vector2.h"
+
+void Polygon2d::Rotate(double angle) {
+  double t, cosa = cos(-angle),
+            sina = sin(-angle);  // We want a clockwise rotation
 
   for (std::size_t i = 0; i < vertices.size(); ++i) {
     t = vertices[i].x;
@@ -19,7 +21,7 @@ void Polygon2d::Rotate(float angle) {
   }
 }
 
-void Polygon2d::Move(float x, float y) {
+void Polygon2d::Move(double x, double y) {
   for (std::size_t i = 0; i < vertices.size(); i++) {
     vertices[i].x += x;
     vertices[i].y += y;
@@ -50,13 +52,13 @@ bool Polygon2d::IsConvex() const {
       (edges[0].x * edges[0 + 1].y - edges[0].y * edges[0 + 1].x) > 0;
 
   for (std::size_t i = 1; i < edges.size() - 1; ++i) {
-    float zCrossProduct =
+    double zCrossProduct =
         edges[i].x * edges[i + 1].y - edges[i].y * edges[i + 1].x;
     if ((zCrossProduct > 0) != zProductIsPositive) return false;
   }
 
-  float lastZCrossProduct = edges[edges.size() - 1].x * edges[0].y -
-                            edges[edges.size() - 1].y * edges[0].x;
+  double lastZCrossProduct = edges[edges.size() - 1].x * edges[0].y -
+                             edges[edges.size() - 1].y * edges[0].x;
   if ((lastZCrossProduct > 0) != zProductIsPositive) return false;
 
   return true;
@@ -75,7 +77,7 @@ gd::Vector2f Polygon2d::ComputeCenter() const {
   return center;
 }
 
-Polygon2d Polygon2d::CreateRectangle(float width, float height) {
+Polygon2d Polygon2d::CreateRectangle(double width, double height) {
   Polygon2d rect;
   rect.vertices.push_back(gd::Vector2f(-width / 2.0f, -height / 2.0f));
   rect.vertices.push_back(gd::Vector2f(+width / 2.0f, -height / 2.0f));

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

@@ -5,9 +5,10 @@
  */
 #ifndef GDCORE_POLYGON_H
 #define GDCORE_POLYGON_H
-#include "GDCore/Vector2.h"
 #include <vector>
 
+#include "GDCore/Vector2.h"
+
 /**
  * \brief Represents a polygon. Usually used for collisions masks.
  *
@@ -42,7 +43,7 @@ class GD_CORE_API Polygon2d {
    * \note Edges are updated, there is no need to call ComputeEdges after
    * calling Move.
    */
-  void Move(float x, float y);
+  void Move(double x, double y);
 
   /**
    * \brief Rotate the polygon.
@@ -52,7 +53,7 @@ class GD_CORE_API Polygon2d {
    * \warning edges vector is not updated, you have to call ComputeEdges if
    * needed.
    */
-  void Rotate(float angle);
+  void Rotate(double angle);
 
   /**
    * \brief Automatically fill edges vector using vertices.
@@ -77,7 +78,7 @@ class GD_CORE_API Polygon2d {
   /**
    * \brief Create a rectangle
    */
-  static Polygon2d CreateRectangle(float width, float height);
+  static Polygon2d CreateRectangle(double width, double height);
   ///@}
 };
 

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

@@ -22,6 +22,8 @@ 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
@@ -33,7 +35,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
           .SetCategoryFullName(_("General"));
 
   obj.AddAction("Opacity",
-                _("Change sprite opacity"),
+                _("Sprite opacity"),
                 _("Change the opacity of a Sprite. 0 is fully transparent, 255 "
                   "is opaque (default)."),
                 _("the opacity"),
@@ -42,7 +44,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "res/actions/opacity.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Opacity (0-255)")))
       .MarkAsSimple();
 
   obj.AddAction("ChangeAnimation",
@@ -55,7 +60,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "res/actions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters("number",
+                                     ParameterOptions::MakeNewOptions())
       .MarkAsSimple();
 
   obj.AddAction("SetAnimationName",
@@ -79,12 +85,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
            "is in 8 directions mode, the valid directions are 0..7"),
          _("the direction"),
          _("Direction"),
-         "res/actions/direction24.png",
-         "res/actions/direction.png")
+         "res/actions/direction24_black.png",
+         "res/actions/direction_black.png")
       .SetHidden()  // Hide as 8 direction is not supported officially in the
                     // interface.
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters("number",
+                                     ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeSprite",
@@ -96,7 +103,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "res/actions/sprite.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters("number",
+                                     ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   obj.AddAction("PauseAnimation",
@@ -132,7 +140,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          "res/actions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(_("Speed scale")))
       .MarkAsSimple();
 
   obj.AddAction("TourneVersPos",
@@ -140,8 +150,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "Rotate an object towards a position.",
                 "Rotate _PARAM0_ towards _PARAM1_;_PARAM2_",
                 _("Direction"),
-                "res/actions/direction24.png",
-                "res/actions/direction.png")
+                "res/actions/rotate24_black.png",
+                "res/actions/rotate_black.png")
 
       .AddParameter("object", _("Object to be rotated"), "Sprite")
       .AddParameter("expression", _("X position"))
@@ -156,11 +166,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 _("Modify the scale of the specified object."),
                 _("the scale"),
                 _("Size"),
-                "res/actions/scale24.png",
-                "res/actions/scale.png")
+                "res/actions/scale24_black.png",
+                "res/actions/scale_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Scale (1 by default)")))
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeScaleWidth",
@@ -168,11 +181,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 _("Modify the scale of the width of an object."),
                 _("the width's scale"),
                 _("Size"),
-                "res/actions/scale24.png",
-                "res/actions/scale.png")
+                "res/actions/scaleWidth24_black.png",
+                "res/actions/scaleWidth_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Scale (1 by default)")))
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeScaleHeight",
@@ -180,11 +196,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 _("Modify the scale of the height of an object."),
                 _("the height's scale"),
                 _("Size"),
-                "res/actions/scale24.png",
-                "res/actions/scale.png")
+                "res/actions/scaleHeight24_black.png",
+                "res/actions/scaleHeight_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Scale (1 by default)")))
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeWidth",
@@ -192,11 +211,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 _("Change the width of a Sprite object."),
                 _("the width"),
                 _("Size"),
-                "res/actions/scale24.png",
-                "res/actions/scale.png")
+                "res/actions/scaleWidth24_black.png",
+                "res/actions/scaleWidth_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters("number",
+                                     ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   obj.AddCondition("Width",
@@ -204,11 +224,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Compare the width of a Sprite object."),
                    _("the width"),
                    _("Size"),
-                   "res/conditions/scaleWidth24.png",
-                   "res/conditions/scaleWidth.png")
+                   "res/conditions/scaleWidth24_black.png",
+                   "res/conditions/scaleWidth_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeHeight",
@@ -216,11 +237,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 _("Change the height of a Sprite object."),
                 _("the height"),
                 _("Size"),
-                "res/actions/scale24.png",
-                "res/actions/scale.png")
+                "res/actions/scaleHeight24_black.png",
+                "res/actions/scaleHeight_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters("number",
+                                     ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   obj.AddCondition("Height",
@@ -228,11 +250,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Compare the height of a Sprite object."),
                    _("the height"),
                    _("Size"),
-                   "res/conditions/scaleHeight24.png",
-                   "res/conditions/scaleHeight.png")
+                   "res/conditions/scaleHeight24_black.png",
+                   "res/conditions/scaleHeight_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   obj.AddAction("SetSize",
@@ -240,8 +263,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.png",
-                "res/actions/scale.png")
+                "res/actions/scale24_black.png",
+                "res/actions/scale_black.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Width"))
@@ -258,7 +281,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          "res/conditions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   obj.AddCondition("AnimationName",
@@ -281,12 +305,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
            "from 0 to 7. Otherwise, the direction is in degrees."),
          _("the direction"),
          _("Direction"),
-         "res/conditions/direction24.png",
-         "res/conditions/direction.png")
+         "res/conditions/direction24_black.png",
+         "res/conditions/direction_black.png")
       .SetHidden()  // Hide as 8 direction is not supported officially in the
                     // interface.
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters("number");
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions());
 
   obj.AddCondition("Sprite",
                    _("Current frame"),
@@ -299,7 +324,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    "res/conditions/sprite.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   obj.AddCondition("AnimStopped",
@@ -322,6 +348,19 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    "res/conditions/animation24.png",
                    "res/conditions/animation.png")
 
+      .AddParameter("object", _("Object"), "Sprite")
+      .MarkAsSimple()
+      .SetHidden();
+
+  obj.AddCondition("AnimationEnded2",
+                   _("Animation finished"),
+                   _("Check if the animation being played by the Sprite object "
+                     "is finished."),
+                   _("The animation of _PARAM0_ is finished"),
+                   _("Animations and images"),
+                   "res/conditions/animation24.png",
+                   "res/conditions/animation.png")
+
       .AddParameter("object", _("Object"), "Sprite")
       .MarkAsSimple();
 
@@ -330,11 +369,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Compare the scale of the width of an object."),
                    _("the width's scale"),
                    _("Size"),
-                   "res/conditions/scaleWidth24.png",
-                   "res/conditions/scaleWidth.png")
+                   "res/conditions/scaleWidth24_black.png",
+                   "res/conditions/scaleWidth_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Scale (1 by default)")))
       .MarkAsAdvanced();
 
   obj.AddCondition("ScaleHeight",
@@ -342,11 +384,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Compare the scale of the height of an object."),
                    _("the height's scale"),
                    _("Size"),
-                   "res/conditions/scaleHeight24.png",
-                   "res/conditions/scaleHeight.png")
+                   "res/conditions/scaleHeight24_black.png",
+                   "res/conditions/scaleHeight_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Scale (1 by default)")))
       .MarkAsAdvanced();
 
   obj.AddCondition("Opacity",
@@ -359,7 +404,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    "res/conditions/opacity.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Opacity to compare to (0-255)")))
       .MarkAsSimple();
 
   obj.AddCondition(
@@ -372,7 +420,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          "res/conditions/opacity.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeColor",
@@ -449,8 +498,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "Rotate an object towards another.",
                 "Rotate _PARAM0_ towards _PARAM1_",
                 _("Direction"),
-                "res/actions/direction24.png",
-                "res/actions/direction.png")
+                "res/actions/rotate24_black.png",
+                "res/actions/rotate_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("objectPtr", "Rotate toward this object")
@@ -461,7 +510,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("X position of a point"),
                     _("X position of a point"),
                     _("Position"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")
       .SetHidden()
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("objectPointName", _("Name of the point"), "", true);
@@ -470,7 +519,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("Y position of a point"),
                     _("Y position of a point"),
                     _("Position"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")
       .SetHidden()
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("objectPointName", _("Name of the point"), "", true);
@@ -479,7 +528,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("X position of a point"),
                     _("X position of a point"),
                     _("Position"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("objectPointName", _("Name of the point"));
@@ -488,7 +537,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("Y position of a point"),
                     _("Y position of a point"),
                     _("Position"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("objectPointName", _("Name of the point"));
@@ -497,7 +546,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("Direction"),
                     _("Direction of the object"),
                     _("Direction"),
-                    "res/actions/direction.png")
+                    "res/actions/direction_black.png")
       .SetHidden()
       .AddParameter("object", _("Object"), "Sprite");
 
@@ -505,7 +554,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("Direction"),
                     _("Direction of the object"),
                     _("Direction"),
-                    "res/actions/direction.png")
+                    "res/actions/direction_black.png")
       .SetHidden()  // Hide as 8 direction is not supported officially in the
                     // interface.
       .AddParameter("object", _("Object"), "Sprite");
@@ -534,7 +583,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
 
   obj.AddExpression("Sprite",
                     _("Image"),
-                    _("Animation frame of the object"),
+                    _("Current frame of the animation of the object"),
+                    _("Animations and images"),
+                    "res/actions/sprite.png")
+      .AddParameter("object", _("Object"), "Sprite");
+
+  obj.AddExpression("AnimationFrameCount",
+                    _("Number of frames"),
+                    _("Number of frames in the current animation of the object"),
                     _("Animations and images"),
                     "res/actions/sprite.png")
       .AddParameter("object", _("Object"), "Sprite");
@@ -550,14 +606,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.png")
+                    "res/actions/scaleWidth_black.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.png")
+                    "res/actions/scaleHeight_black.png")
       .AddParameter("object", _("Object"), "Sprite");
 
   obj.AddExpression("Opacity",

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

@@ -25,8 +25,7 @@ namespace gd {
 
 Animation SpriteObject::badAnimation;
 
-SpriteObject::SpriteObject(gd::String name_)
-    : Object(name_), updateIfNotVisible(false) {}
+SpriteObject::SpriteObject() : 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::Object {
+class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
  public:
-  SpriteObject(gd::String name_);
+  SpriteObject();
   virtual ~SpriteObject();
-  std::unique_ptr<gd::Object> Clone() const override {
+  std::unique_ptr<gd::ObjectConfiguration> 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.png");
+      .SetIcon("res/actions/text24_black.png");
 
   extension.AddStrExpression("NewLine",
                              _("Insert a new line"),
                              _("Insert a new line"),
                              "",
-                             "res/conditions/toujours24.png");
+                             "res/conditions/toujours24_black.png");
 
   extension
       .AddStrExpression("FromCodePoint",
                         _("Get character from code point"),
                         _("Get character from code point"),
                         "",
-                        "res/conditions/toujours24.png")
+                        "res/conditions/toujours24_black.png")
 
       .AddParameter("expression", _("Code point"));
 
@@ -43,7 +43,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                         _("Uppercase a text"),
                         _("Uppercase a text"),
                         "",
-                        "res/conditions/toujours24.png")
+                        "res/conditions/toujours24_black.png")
 
       .AddParameter("string", _("Text"));
 
@@ -52,7 +52,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                         _("Lowercase a text"),
                         _("Lowercase a text"),
                         "",
-                        "res/conditions/toujours24.png")
+                        "res/conditions/toujours24_black.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.png")
+                        "res/conditions/toujours24_black.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.png")
+                        "res/conditions/toujours24_black.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter(
@@ -86,7 +86,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                         _("Repeat a text"),
                         _("Repeat a text"),
                         "",
-                        "res/conditions/toujours24.png")
+                        "res/conditions/toujours24_black.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.png")
+                     "res/conditions/toujours24_black.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.png")
+                     "res/conditions/toujours24_black.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.png")
+                     "res/conditions/toujours24_black.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"))
@@ -126,12 +126,12 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
   extension
       .AddExpression(
           "StrFindLast",
-          _("Search the last occurence in a text"),
-          _("Search the last occurence in a string (return the position of "
+          _("Search the last occurrence in a text"),
+          _("Search the last occurrence in a string (return the position of "
             "the result, from the beginning of the string, or -1 if not "
             "found)"),
           "",
-          "res/conditions/toujours24.png")
+          "res/conditions/toujours24_black.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.png")
+                     "res/conditions/toujours24_black.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.png")
+          "res/conditions/toujours24_black.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"))
@@ -169,13 +169,13 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
   extension
       .AddExpression(
           "StrFindLastFrom",
-          _("Search the last occurence in a text, starting from a position"),
-          _("Search in a text the last occurence, starting from a position "
+          _("Search the last occurrence in a text, starting from a position"),
+          _("Search in a text the last occurrence, starting from a position "
             "(return "
             " the position of the result, from the beginning of the string, or "
             "-1 if not found)"),
           "",
-          "res/conditions/toujours24.png")
+          "res/conditions/toujours24_black.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"))
@@ -183,6 +183,26 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                     _("Position of the last character in the string to be "
                       "considered in the search"));
 
+  extension
+      .AddStrExpression("StrReplaceOne",
+                        _("Replace the first occurrence of a text by another."),
+                        _("Replace the first occurrence of a text by another."),
+                        "",
+                        "res/conditions/toujours24_black.png")
+      .AddParameter("string", _("Text in which the replacement must be done"))
+      .AddParameter("string", _("Text to find inside the first text"))
+      .AddParameter("string", _("Replacement to put instead of the text to find"));
+
+  extension
+      .AddStrExpression("StrReplaceAll",
+                        _("Replace all occurrences of a text by another."),
+                        _("Replace all occurrences of a text by another."),
+                        "",
+                        "res/conditions/toujours24_black.png")
+      .AddParameter("string", _("Text in which the replacement(s) must be done"))
+      .AddParameter("string", _("Text to find inside the first text"))
+      .AddParameter("string", _("Replacement to put instead of the text to find"));
+
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/TimeExtension.cpp

@@ -36,7 +36,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                     "res/conditions/timer.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Time in seconds"))
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
       .SetHidden();
 
   extension
@@ -50,7 +50,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                     "res/conditions/timer24.png",
                     "res/conditions/timer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
       .AddParameter("relationalOperator", _("Sign of the test"), "time")
       .AddParameter("expression", _("Time in seconds"))
       .SetManipulatedType("number");
@@ -65,7 +65,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                     "res/conditions/time24.png",
                     "res/conditions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          gd::ParameterOptions::MakeNewOptions().SetDescription(
+              _("Time scale (1 by default)")))
       .MarkAsAdvanced();
 
   extension
@@ -78,7 +81,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                     "res/conditions/timerPaused24.png",
                     "res/conditions/timerPaused.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
       .MarkAsAdvanced();
 
   extension
@@ -93,7 +96,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
           "res/actions/timer24.png",
           "res/actions/timer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Timer's name"));
+      .AddParameter("identifier", _("Timer's name"), "sceneTimer");
 
   extension
       .AddAction("PauseTimer",
@@ -105,7 +108,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                  "res/actions/pauseTimer24.png",
                  "res/actions/pauseTimer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
       .MarkAsAdvanced();
 
   extension
@@ -118,7 +121,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                  "res/actions/unPauseTimer24.png",
                  "res/actions/unPauseTimer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
       .MarkAsAdvanced();
 
   extension
@@ -131,12 +134,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                  "res/actions/timer24.png",
                  "res/actions/timer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
       .MarkAsAdvanced();
 
   extension
       .AddAction("ChangeTimeScale",
-                 _("Change time scale"),
+                 _("Time scale"),
                  _("Change the time scale of the scene."),
                  _("Set the time scale of the scene to _PARAM1_"),
                  "",
@@ -148,14 +151,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
 
   extension
       .AddAction("Wait",
-                 _("Wait X seconds (experimental)"),
+                 _("Wait X seconds"),
                  _("Waits a number of seconds before running "
                    "the next actions (and sub-events)."),
                  _("Wait _PARAM0_ seconds"),
                  "",
-                 "res/timer.svg",
-                 "res/timer.svg")
-      .AddParameter("expression", "Time to wait in seconds")
+                 "res/timer_black.svg",
+                 "res/timer_black.svg")
+      .AddParameter("expression", _("Time to wait in seconds"))
       .SetHelpPath("/all-features/timers-and-time/wait-action");
 
   extension
@@ -191,7 +194,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                      "",
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Timer's name"));
+      .AddParameter("identifier", _("Timer's name"), "sceneTimer");
 
   extension
       .AddExpression("TimeFromStart",

Core/GDCore/Extensions/Builtin/VariablesExtension.cpp

@@ -27,30 +27,32 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddCondition("VarScene",
-                    _("Value of a scene variable"),
-                    _("Compare the value of a scene variable."),
-                    _("the scene variable _PARAM0_"),
+                    _("Number variable"),
+                    _("Compare the number value of a scene variable."),
+                    _("The number of scene variable _PARAM0_"),
                     _("Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .UseStandardRelationalOperatorParameters("number");
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions());
 
   extension
       .AddCondition("VarSceneTxt",
-                    _("Text of a scene variable"),
-                    _("Compare the text of a scene variable."),
-                    _("the text of scene variable _PARAM0_"),
+                    _("Text variable"),
+                    _("Compare the text (string) of a scene variable."),
+                    _("The text of scene variable _PARAM0_"),
                     _("Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .UseStandardRelationalOperatorParameters("string");
+      .UseStandardRelationalOperatorParameters(
+          "string", ParameterOptions::MakeNewOptions());
 
   extension
       .AddCondition(
           "SceneVariableAsBoolean",
-          _("Boolean value of a scene variable"),
+          _("Boolean variable"),
           _("Compare the boolean value of a scene variable."),
           _("The boolean value of scene variable _PARAM0_ is _PARAM1_"),
           _("Scene variables"),
@@ -61,14 +63,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .SetDefaultValue("true");
 
   extension
-      .AddCondition(
-          "VariableChildExists",
-          _("Child existence"),
-          _("Check if the specified child of the scene variable exists."),
-          _("Child _PARAM1_ of scene variable _PARAM0_ exists"),
-          _("Scene variables/Collections/Structures"),
-          "res/conditions/var24.png",
-          "res/conditions/var.png")
+      .AddCondition("VariableChildExists",
+                    _("Child existence"),
+                    _("Check if the specified child of the scene structure "
+                      "variable exists."),
+                    _("Child _PARAM1_ of scene variable _PARAM0_ exists"),
+                    _("Scene variables/Arrays and structures"),
+                    "res/conditions/var24.png",
+                    "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .AddParameter("string", _("Name of the child"))
       .MarkAsAdvanced();
@@ -76,10 +78,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .AddCondition("GlobalVariableChildExists",
                     _("Child existence"),
-                    _("Check if the specified child of the global "
+                    _("Check if the specified child of the global structure "
                       "variable exists."),
                     _("Child _PARAM1_ of global variable _PARAM0_ exists"),
-                    _("Global variables/Collections/Structures"),
+                    _("Global variables/Arrays and structures"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -88,7 +90,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddCondition("VarSceneDef",
-                    "Test if a scene variable is defined",
+                    "Variable defined",
                     "Test if the scene variable exists.",
                     "Scene variable _PARAM0_ is defined",
                     _("Scene variables"),
@@ -96,36 +98,38 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     "res/conditions/var.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("string", _("Variable"))
-      .SetHidden();
+      .SetHidden();  // Deprecated.
 
   extension
       .AddCondition("VarGlobal",
-                    _("Value of a global variable"),
-                    _("Compare the value of a global variable."),
+                    _("Number variable"),
+                    _("Compare the number value of a global variable."),
                     _("the global variable _PARAM0_"),
                     _("Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
       .AddCondition("VarGlobalTxt",
-                    _("Text of a global variable"),
-                    _("Compare the text of a global variable."),
+                    _("Text variable"),
+                    _("Compare the text (string) of a global variable."),
                     _("the text of the global variable _PARAM0_"),
                     _("Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters("string")
+      .UseStandardRelationalOperatorParameters(
+          "string", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
       .AddCondition(
           "GlobalVariableAsBoolean",
-          _("Boolean value of a global variable"),
+          _("Boolean variable"),
           _("Compare the boolean value of a global variable."),
           _("The boolean value of global variable _PARAM0_ is _PARAM1_"),
           _("Global variables"),
@@ -137,8 +141,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddCondition("VarGlobalDef",
-                    "Test if a global variable is defined",
-                    "Test if a global variable exists",
+                    "Variable defined",
+                    "Test if a global variable exists.",
                     "Global variable _PARAM0_ is defined",
                     _("Global variables"),
                     "res/conditions/var24.png",
@@ -146,34 +150,36 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("string", _("Variable"))
       .MarkAsAdvanced()
-      .SetHidden();
+      .SetHidden();  // Deprecated.
 
   extension
       .AddAction("ModVarScene",
-                 _("Value of a scene variable"),
-                 _("Change the value of a scene variable."),
+                 _("Change number variable"),
+                 _("Modify the number value of a scene variable."),
                  _("the scene variable _PARAM0_"),
                  _("Scene variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .UseStandardOperatorParameters("number");
+      .UseStandardOperatorParameters("number",
+                                     ParameterOptions::MakeNewOptions());
 
   extension
       .AddAction("ModVarSceneTxt",
-                 _("String of a scene variable"),
-                 _("Modify the text of a scene variable."),
+                 _("Change text variable"),
+                 _("Modify the text (string) of a scene variable."),
                  _("the text of scene variable _PARAM0_"),
                  _("Scene variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .UseStandardOperatorParameters("string");
+      .UseStandardOperatorParameters("string",
+                                     ParameterOptions::MakeNewOptions());
 
   extension
       .AddAction(
           "SetSceneVariableAsBoolean",
-          _("Boolean value of a scene variable"),
+          _("Change boolean variable"),
           _("Modify the boolean value of a scene variable."),
           _("Set the boolean value of scene variable _PARAM0_ to _PARAM1_"),
           _("Scene variables"),
@@ -184,7 +190,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddAction("ToggleSceneVariableAsBoolean",
-                 _("Toggle boolean value of a scene variable"),
+                 _("Toggle boolean variable"),
                  _("Toggle the boolean value of a scene variable.") + "\n" +
                      _("If it was true, it will become false, and if it was "
                        "false it will become true."),
@@ -196,32 +202,34 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddAction("ModVarGlobal",
-                 _("Value of a global variable"),
-                 _("Change the value of a global variable"),
+                 _("Change number variable"),
+                 _("Modify the number value of a global variable."),
                  _("the global variable _PARAM0_"),
                  _("Global variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters("number",
+                                     ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
       .AddAction("ModVarGlobalTxt",
-                 _("String of a global variable"),
-                 _("Modify the text of a global variable."),
+                 _("Change text variable"),
+                 _("Modify the text (string) of a global variable."),
                  _("the text of global variable _PARAM0_"),
                  _("Global variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .UseStandardOperatorParameters("string")
+      .UseStandardOperatorParameters("string",
+                                     ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
       .AddAction(
           "SetGlobalVariableAsBoolean",
-          _("Boolean value of a global variable"),
+          _("Change boolean variable"),
           _("Modify the boolean value of a global variable."),
           _("Set the boolean value of global variable _PARAM0_ to _PARAM1_"),
           _("Global variables"),
@@ -232,7 +240,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddAction("ToggleGlobalVariableAsBoolean",
-                 _("Toggle boolean value of a global variable"),
+                 _("Toggle boolean variable"),
                  _("Toggle the boolean value of a global variable.") + "\n" +
                      _("If it was true, it will become false, and if it was "
                        "false it will become true."),
@@ -243,202 +251,324 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("globalvar", _("Variable"));
 
   extension
-      .AddAction("VariableRemoveChild",
-                 _("Remove a child"),
-                 _("Remove a child from a scene variable."),
-                 _("Remove child _PARAM1_ from scene variable _PARAM0_"),
-                 _("Scene variables/Collections/Structures"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("scenevar", _("Variable"))
+      .AddAction(
+          "VariableRemoveChild",
+          _("Remove a child"),
+          _("Remove a child from a scene structure variable."),
+          _("Remove child _PARAM1_ from scene structure variable _PARAM0_"),
+          _("Scene variables/Arrays and structures"),
+          "res/actions/var24.png",
+          "res/actions/var.png")
+      .AddParameter("scenevar", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
       .MarkAsAdvanced();
 
   extension
-      .AddAction("GlobalVariableRemoveChild",
-                 _("Remove a child"),
-                 _("Remove a child from a global variable."),
-                 _("Remove child _PARAM1_ from global variable _PARAM0_"),
-                 _("Global variables/Collections/Structures"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("globalvar", _("Variable"))
+      .AddAction(
+          "GlobalVariableRemoveChild",
+          _("Remove a child"),
+          _("Remove a child from a global structure variable."),
+          _("Remove child _PARAM1_ from global structure variable _PARAM0_"),
+          _("Global variables/Arrays and structures"),
+          "res/actions/var24.png",
+          "res/actions/var.png")
+      .AddParameter("globalvar", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("VariableClearChildren",
-                 _("Clear scene variable"),
-                 _("Remove all the children from the scene variable."),
+                 _("Clear children"),
+                 _("Remove all the children from the scene structure or array "
+                   "variable."),
                  _("Clear children from scene variable _PARAM0_"),
-                 _("Scene variables/Collections"),
+                 _("Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
-      .AddParameter("scenevar", _("Variable"))
+      .AddParameter("scenevar", _("Structure or array variable"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("GlobalVariableClearChildren",
-                 _("Clear global variable"),
-                 _("Remove all the children from the global variable."),
+                 _("Clear children"),
+                 _("Remove all the children from the global structure or array "
+                   "variable."),
                  _("Clear children from global variable _PARAM0_"),
-                 _("Global variables/Collections"),
+                 _("Global variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
-      .AddParameter("globalvar", _("Variable"))
+      .AddParameter("globalvar", _("Structure or array variable"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("SceneVariablePush",
-                 _("Append variable to a scene array"),
-                 _("Appends a variable at the end of a scene array variable."),
-                 _("Append variable _PARAM1_ to array variable _PARAM0_"),
-                 _("Scene variables/Collections/Arrays"),
+                 _("Add existing variable"),
+                 _("Adds an existing variable at the end of a scene array "
+                   "variable."),
+                 _("Add variable _PARAM1_ to array variable _PARAM0_"),
+                 _("Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("scenevar", _("Scene variable with the content to append"))
-      .SetParameterLongDescription(_("The content of the variable will *be copied* and appended at the end of the array."))
+      .AddParameter("scenevar", _("Scene variable with the content to add"))
+      .SetParameterLongDescription(
+          _("The content of the variable will *be copied* and added at the "
+            "end of the array."))
       .MarkAsAdvanced();
 
   extension
-      .AddAction("SceneVariablePushString",
-                 _("Append a string to a scene array"),
-                 _("Appends a string at the end of a scene array variable."),
-                 _("Append string _PARAM1_ to array variable _PARAM0_"),
-                 _("Scene variables/Collections/Arrays"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
+      .AddAction(
+          "SceneVariablePushString",
+          _("Add text variable"),
+          _("Adds a text (string) at the end of a scene array variable."),
+          _("Add text _PARAM1_ to array variable _PARAM0_"),
+          _("Scene variables/Arrays and structures"),
+          "res/actions/var24.png",
+          "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("string", _("String to append"))
+      .AddParameter("string", _("Text to add"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("SceneVariablePushNumber",
-                 _("Append a number to a scene array"),
-                 _("Appends a number at the end of a scene array variable."),
-                 _("Append number _PARAM1_ to array variable _PARAM0_"),
-                 _("Scene variables/Collections/Arrays"),
+                 _("Add number variable"),
+                 _("Adds a number at the end of a scene array variable."),
+                 _("Add number _PARAM1_ to array variable _PARAM0_"),
+                 _("Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("expression", _("Number to append"))
+      .AddParameter("expression", _("Number to add"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("SceneVariablePushBool",
-                 _("Append a boolean to a scene array"),
-                 _("Appends a boolean at the end of a scene array variable."),
-                 _("Append boolean _PARAM1_ to array variable _PARAM0_"),
-                 _("Scene variables/Collections/Arrays"),
+                 _("Add boolean variable"),
+                 _("Adds a boolean at the end of a scene array variable."),
+                 _("Add boolean _PARAM1_ to array variable _PARAM0_"),
+                 _("Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("trueorfalse", _("Boolean to append"))
+      .AddParameter("trueorfalse", _("Boolean to add"))
       .MarkAsAdvanced();
 
   extension
-      .AddAction(
-          "SceneVariableRemoveAt",
-          _("Remove variable from a scene array (by index)"),
-          _("Removes a variable at the specified index of a scene array variable."),
-          _("Remove variable at index _PARAM1_ from scene array variable _PARAM0_"),
-          _("Scene variables/Collections/Arrays"),
-          "res/actions/var24.png",
-          "res/actions/var.png")
-      .AddParameter("scenevar", _("Variable"))
+      .AddAction("SceneVariableRemoveAt",
+                 _("Remove variable by index"),
+                 _("Removes a variable at the specified index of a scene array "
+                   "variable."),
+                 _("Remove variable at index _PARAM1_ from scene array "
+                   "variable _PARAM0_"),
+                 _("Scene variables/Arrays and structures"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("scenevar", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
       .MarkAsAdvanced();
 
   extension
-      .AddAction("GlobalVariablePush",
-                 _("Append variable to a global array"),
-                 _("Appends a variable at the end of a global array variable."),
-                 _("Append variable _PARAM1_ to array variable _PARAM0_"),
-                 _("Global variables/Collections/Arrays"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("scenevar", _("Scene variable with the content to append"))
-      .SetParameterLongDescription(_("The content of the variable will *be copied* and appended at the end of the array."))
+      .AddCondition(
+          "SceneVariableChildCount",
+          _("Number of children"),
+          _("Compare the number of children in a scene array variable."),
+          _("The number of children in the array variable _PARAM0_"),
+          _("Scene variables/Arrays and structures"),
+          "res/conditions/var24.png",
+          "res/conditions/var.png")
+      .AddParameter("scenevar", _("Array variable"))
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
+  extension
+      .AddStrExpression(
+          "SceneVariableFirstString",
+          _("First text child"),
+          _("Get the value of the first element of a scene array variable, if "
+            "it is a text (string)."),
+          _("Scene variables/Arrays and structures"),
+          "res/actions/var.png")
+      .AddParameter("scenevar", _("Array variable"));
+
+  extension
+      .AddExpression(
+          "SceneVariableFirstNumber",
+          _("First number child"),
+          _("Get the value of the first element of a scene array variable, if "
+            "it is a number."),
+          _("Scene variables/Arrays and structures"),
+          "res/actions/var.png")
+      .AddParameter("scenevar", _("Array variable"));
+
+  extension
+      .AddStrExpression(
+          "SceneVariableLastString",
+          _("Last text child"),
+          _("Get the value of the last element of a scene array variable, if "
+            "it is a text (string)."),
+          _("Scene variables/Arrays and structures"),
+          "res/actions/var.png")
+      .AddParameter("scenevar", _("Array variable"));
+
+  extension
+      .AddExpression(
+          "SceneVariableLastNumber",
+          _("Last number child"),
+          _("Get the value of the last element of a scene array variable, if "
+            "it is a number."),
+          _("Scene variables/Arrays and structures"),
+          "res/actions/var.png")
+      .AddParameter("scenevar", _("Array variable"));
+
   extension
       .AddAction(
-          "GlobalVariableRemoveAt",
-          _("Remove variable from a global array (by index)"),
-          _("Removes a variable at the specified index of a global array variable."),
-          _("Remove variable at index _PARAM1_ from global array variable _PARAM0_"),
-          _("Global variables/Collections/Arrays"),
+          "GlobalVariablePush",
+          _("Add existing variable"),
+          _("Adds an existing variable at the end of a global array variable."),
+          _("Add variable _PARAM1_ to array variable _PARAM0_"),
+          _("Global variables/Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
-      .AddParameter("globalvar", _("Variable"))
+      .AddParameter("globalvar", _("Array variable"))
+      .AddParameter("scenevar", _("Scene variable with the content to add"))
+      .SetParameterLongDescription(
+          _("The content of the variable will *be copied* and added at the "
+            "end of the array."))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("GlobalVariableRemoveAt",
+                 _("Remove variable by index"),
+                 _("Removes a variable at the specified index of a global "
+                   "array variable."),
+                 _("Remove variable at index _PARAM1_ from global array "
+                   "variable _PARAM0_"),
+                 _("Global variables/Arrays and structures"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("globalvar", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
       .MarkAsAdvanced();
 
   extension
-      .AddAction("GlobalVariablePushString",
-                 _("Append a string to a global array"),
-                 _("Appends a string at the end of a global array variable."),
-                 _("Append string _PARAM1_ to array variable _PARAM0_"),
-                 _("Global variables/Collections/Arrays"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
+      .AddAction(
+          "GlobalVariablePushString",
+          _("Add text variable"),
+          _("Adds a text (string) at the end of a global array variable."),
+          _("Add text _PARAM1_ to array variable _PARAM0_"),
+          _("Global variables/Arrays and structures"),
+          "res/actions/var24.png",
+          "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("string", _("String to append"))
+      .AddParameter("string", _("Text to add"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("GlobalVariablePushNumber",
-                 _("Append a number to a global array"),
-                 _("Appends a number at the end of a global array variable."),
-                 _("Append number _PARAM1_ to array variable _PARAM0_"),
-                 _("Global variables/Collections/Arrays"),
+                 _("Add number variable"),
+                 _("Adds a number at the end of a global array variable."),
+                 _("Add number _PARAM1_ to array variable _PARAM0_"),
+                 _("Global variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("expression", _("Number to append"))
+      .AddParameter("expression", _("Number to add"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("GlobalVariablePushBool",
-                 _("Append a boolean to a global array"),
-                 _("Appends a boolean at the end of a global array variable."),
-                 _("Append boolean _PARAM1_ to array variable _PARAM0_"),
-                 _("Global variables/Collections/Arrays"),
+                 _("Add boolean variable"),
+                 _("Adds a boolean at the end of a global array variable."),
+                 _("Add boolean _PARAM1_ to array variable _PARAM0_"),
+                 _("Global variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("trueorfalse", _("Boolean to append"))
+      .AddParameter("trueorfalse", _("Boolean to add"))
       .MarkAsAdvanced();
 
   extension
-      .AddExpression("GlobalVariableChildCount",
-                     _("Number of children of a global variable"),
-                     _("Number of children of a global variable"),
-                     _("Global variables"),
+      .AddCondition(
+          "GlobalVariableChildCount",
+          _("Number of children"),
+          _("Compare the number of children in a global array variable."),
+          _("The number of children of the array variable _PARAM0_"),
+          _("Global variables/Arrays and structures"),
+          "res/conditions/var24.png",
+          "res/conditions/var.png")
+      .AddParameter("globalvar", _("Array variable"))
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
+      .MarkAsAdvanced();
+
+  extension
+      .AddStrExpression("GlobalVariableFirstString",
+                        _("First text child"),
+                        _("Value of the first element of a global array "
+                          "variable, if it is a text (string) variable."),
+                        _("Global variables/Arrays and structures"),
+                        "res/actions/var.png")
+      .AddParameter("globalvar", _("Array variable"));
+
+  extension
+      .AddExpression("GlobalVariableFirstNumber",
+                     _("First number child"),
+                     _("Value of the first element of a global array "
+                       "variable, if it is a number variable"),
+                     _("Global variables/Arrays and structures"),
                      "res/actions/var.png")
-      .AddParameter("globalvar", _("Variable"));
+      .AddParameter("globalvar", _("Array variable"));
+
+  extension
+      .AddStrExpression(
+          "GlobalVariableLastString",
+          _("Last text child"),
+          _("Value of the last element of a global array variable, if "
+            "it is a text (string) variable."),
+          _("Global variables/Arrays and structures"),
+          "res/actions/var.png")
+      .AddParameter("globalvar", _("Array variable"));
+
+  extension
+      .AddExpression(
+          "GlobalVariableLastNumber",
+          _("Last number child"),
+          _("Value of the last element of a global array variable, if "
+            "it is a number variable"),
+          _("Global variables/Arrays and structures"),
+          "res/actions/var.png")
+      .AddParameter("globalvar", _("Array variable"));
+
+  extension
+      .AddExpression("GlobalVariableChildCount",
+                     _("Number of children"),
+                     _("Number of children in a global array or "
+                       "structure variable"),
+                     _("Global variables/Arrays and structures"),
+                     "res/actions/var.png")
+      .AddParameter("globalvar", _("Array or structure variable"));
 
   extension
       .AddExpression("VariableChildCount",
-                     _("Number of children of a scene variable"),
-                     _("Number of children of a scene variable"),
-                     _("Scene variables"),
+                     _("Number of children"),
+                     _("Number of children in a scene array or "
+                       "structure variable"),
+                     _("Scene variables/Arrays and structures"),
                      "res/actions/var.png")
-      .AddParameter("scenevar", _("Variable"));
+      .AddParameter("scenevar", _("Array or structure variable"));
 
   extension
       .AddExpression("Variable",
-                     _("Value of a scene variable"),
-                     _("Value of a scene variable"),
+                     _("Number variable"),
+                     _("Number value of a scene variable"),
                      _("Scene variables"),
                      "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"));
 
   extension
       .AddStrExpression("VariableString",
-                        _("Text of a scene variable"),
+                        _("Text variable"),
                         _("Text of a scene variable"),
                         _("Scene variables"),
                         "res/actions/var.png")
@@ -446,15 +576,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddExpression("GlobalVariable",
-                     _("Value of a global variable"),
-                     _("Value of a global variable"),
+                     _("Number variable"),
+                     _("Number value of a global variable"),
                      _("Global variables"),
                      "res/actions/var.png")
       .AddParameter("globalvar", _("Name of the global variable"));
 
   extension
       .AddStrExpression("GlobalVariableString",
-                        _("Text of a global variable"),
+                        _("Text variable"),
                         _("Text of a global variable"),
                         _("Global variables"),
                         "res/actions/var.png")

Core/GDCore/Extensions/Builtin/WindowExtension.cpp

@@ -20,6 +20,7 @@ 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(
@@ -55,7 +56,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
 
   extension
       .AddAction("SetWindowMargins",
-                 _("Change the window's margins"),
+                 _("Window's margins"),
                  _("This action changes the margins, in pixels, between the "
                    "game frame and the window borders."),
                  _("Set margins of game window to "
@@ -71,7 +72,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
 
   extension
       .AddAction("SetGameResolutionSize",
-                 _("Change the resolution of the game"),
+                 _("Game resolution"),
                  _("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."),
@@ -117,7 +118,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
 
   extension
       .AddAction("SetGameResolutionResizeMode",
-                 _("Change the game resolution resize mode"),
+                 _("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."),
@@ -153,7 +154,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
 
   extension
       .AddAction("SetWindowIcon",
-                 _("Change the window's icon"),
+                 _("Window's icon"),
                  _("This action changes the icon of the game's window."),
                  _("Use _PARAM1_ as the icon for the game's window."),
                  "",
@@ -164,7 +165,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
 
   extension
       .AddAction("SetWindowTitle",
-                 _("Change the window's title"),
+                 _("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,12 +14,14 @@
 #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& name_,
+    const gd::String& nameWithNamespace,
     const gd::String& fullname_,
     const gd::String& defaultName_,
     const gd::String& description_,
@@ -29,21 +31,50 @@ BehaviorMetadata::BehaviorMetadata(
     std::shared_ptr<gd::Behavior> instance_,
     std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance_)
     : extensionNamespace(extensionNamespace_),
+      className(className_),
+      iconFilename(icon24x24),
       instance(instance_),
-      sharedDatasInstance(sharedDatasInstance_) {
-#if defined(GD_IDE_ONLY)
+      sharedDatasInstance(sharedDatasInstance_),
+      isEventBased(false) {
   SetFullName(gd::String(fullname_));
   SetDescription(gd::String(description_));
   SetDefaultName(gd::String(defaultName_));
   SetGroup(group_);
-  className = className_;
-  iconFilename = icon24x24;
-#endif
 
-  if (instance) instance->SetTypeName(name_);
-  if (sharedDatasInstance) sharedDatasInstance->SetTypeName(name_);
+  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);
 }
 
+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,
@@ -52,7 +83,6 @@ 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,
@@ -66,7 +96,6 @@ gd::InstructionMetadata& BehaviorMetadata::AddCondition(
                                            .SetHelpPath(GetHelpPath())
                                            .SetIsBehaviorInstruction();
   return conditionsInfos[nameWithNamespace];
-#endif
 }
 
 gd::InstructionMetadata& BehaviorMetadata::AddAction(
@@ -77,7 +106,6 @@ 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,
@@ -91,7 +119,6 @@ gd::InstructionMetadata& BehaviorMetadata::AddAction(
                                         .SetHelpPath(GetHelpPath())
                                         .SetIsBehaviorInstruction();
   return actionsInfos[nameWithNamespace];
-#endif
 }
 
 gd::InstructionMetadata& BehaviorMetadata::AddScopedCondition(
@@ -102,7 +129,6 @@ 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,
@@ -116,7 +142,6 @@ gd::InstructionMetadata& BehaviorMetadata::AddScopedCondition(
                                            .SetHelpPath(GetHelpPath())
                                            .SetIsBehaviorInstruction();
   return conditionsInfos[nameWithNamespace];
-#endif
 }
 
 gd::InstructionMetadata& BehaviorMetadata::AddScopedAction(
@@ -127,7 +152,6 @@ 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,
@@ -141,7 +165,6 @@ gd::InstructionMetadata& BehaviorMetadata::AddScopedAction(
                                         .SetHelpPath(GetHelpPath())
                                         .SetIsBehaviorInstruction();
   return actionsInfos[nameWithNamespace];
-#endif
 }
 
 gd::ExpressionMetadata& BehaviorMetadata::AddExpression(
@@ -150,7 +173,6 @@ 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",
@@ -162,7 +184,6 @@ gd::ExpressionMetadata& BehaviorMetadata::AddExpression(
                                               smallicon)
                                .SetHelpPath(GetHelpPath());
   return expressionsInfos[name];
-#endif
 }
 
 gd::ExpressionMetadata& BehaviorMetadata::AddStrExpression(
@@ -171,7 +192,6 @@ 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",
@@ -183,7 +203,6 @@ gd::ExpressionMetadata& BehaviorMetadata::AddStrExpression(
                                                  smallicon)
                                   .SetHelpPath(GetHelpPath());
   return strExpressionsInfos[name];
-#endif
 }
 
 gd::MultipleInstructionMetadata BehaviorMetadata::AddExpressionAndCondition(
@@ -288,7 +307,6 @@ 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;
@@ -356,49 +374,44 @@ 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);
-#endif
+  return *this;
+}
+
+BehaviorMetadata& BehaviorMetadata::AddRequiredFile(
+    const gd::String& requiredFile) {
+  if (std::find(requiredFiles.begin(), requiredFiles.end(), requiredFile) ==
+      requiredFiles.end())
+    requiredFiles.push_back(requiredFile);
   return *this;
 }
 
@@ -407,13 +420,25 @@ const gd::String& BehaviorMetadata::GetName() const {
 }
 
 gd::Behavior& BehaviorMetadata::Get() const {
-  if (!instance)
+  if (isEventBased) {
+    gd::LogFatalError("Error: Event-based behaviors don't have blueprint. "
+                      "This method should not never be called.");
+  }
+  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.");
-
+        "BehaviorMetadata is valid for: " + className);
+  }
   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& name_,
+      const gd::String& nameWithNamespace,
       const gd::String& fullname_,
       const gd::String& defaultName_,
       const gd::String& description_,
@@ -38,6 +38,21 @@ 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(){};
 
@@ -195,6 +210,13 @@ 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.
@@ -214,7 +236,6 @@ class GD_CORE_API BehaviorMetadata {
   }
 
   const gd::String& GetName() const;
-#if defined(GD_IDE_ONLY)
   const gd::String& GetFullName() const { return fullname; }
   const gd::String& GetDefaultName() const { return defaultName; }
   const gd::String& GetDescription() const { return description; }
@@ -235,20 +256,38 @@ class GD_CORE_API BehaviorMetadata {
    * \note An empty string means the base object, so any object.
    */
   const gd::String& GetObjectType() const { return objectType; }
-#endif
+
+  /**
+   * Check if the behavior is private - it can't be used outside of its
+   * extension.
+   */
+  bool IsPrivate() const { return isPrivate; }
+
+  /**
+   * Set that the behavior is private - it can't be used outside of its
+   * extension.
+   */
+  BehaviorMetadata &SetPrivate() {
+    isPrivate = true;
+    return *this;
+  }
 
   /**
    * \brief Return the associated gd::Behavior, handling behavior contents.
+   * 
+   * \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 {
-    return sharedDatasInstance.get();
-  }
+  gd::BehaviorsSharedData* GetSharedDataInstance() const;
 
   /**
    * \brief Return a reference to a map containing the names of the actions
@@ -271,30 +310,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;
-#endif
+  bool isPrivate = false;
 
   // 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/DependencyMetadata.h

@@ -62,7 +62,7 @@ class GD_CORE_API DependencyMetadata {
   };
 
   /**
-   * \brief Sets the type of dependecy (what will be used to install it)
+   * \brief Sets the type of dependency (what will be used to install it)
    *
    * This can either be "npm" or "cordova" for now.
    */

Core/GDCore/Extensions/Metadata/EffectMetadata.cpp

@@ -7,9 +7,6 @@
 
 namespace gd {
 
-EffectMetadata::EffectMetadata(const gd::String& type_)
-    : type(type_), isMarkedAsNotWorkingForObjects(false) {}
-
 EffectMetadata& EffectMetadata::SetIncludeFile(const gd::String& includeFile) {
   includeFiles.clear();
   includeFiles.push_back(includeFile);
@@ -23,9 +20,4 @@ EffectMetadata& EffectMetadata::AddIncludeFile(const gd::String& includeFile) {
   return *this;
 }
 
-EffectMetadata& EffectMetadata::MarkAsNotWorkingForObjects() {
-  isMarkedAsNotWorkingForObjects = true;
-  return *this;
-}
-
 }  // namespace gd

Core/GDCore/Extensions/Metadata/EffectMetadata.h

@@ -3,8 +3,8 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef EFFECTMETADATA_H
-#define EFFECTMETADATA_H
+#pragma once
+
 #include <functional>
 #include <map>
 #include <memory>
@@ -25,21 +25,25 @@ class GD_CORE_API EffectMetadata {
   /**
    * \brief Construct an effect metadata, with the given type
    */
-  EffectMetadata(const gd::String& type_);
+   EffectMetadata(const gd::String &type_)
+       : type(type_), isMarkedAsNotWorkingForObjects(false),
+         isMarkedAsOnlyWorkingFor2D(false), isMarkedAsOnlyWorkingFor3D(false),
+         isMarkedAsUnique(false) {}
 
-  /**
-   * \brief Default constructor, only used for initializing `badEffectMetadata`.
-   */
-  EffectMetadata() {}
+   /**
+    * \brief Default constructor, only used for initializing
+    * `badEffectMetadata`.
+    */
+   EffectMetadata() {}
 
-  virtual ~EffectMetadata(){};
+   virtual ~EffectMetadata(){};
 
-  /**
-   * \brief Set the name shown to the user.
-   */
-  EffectMetadata& SetFullName(const gd::String& fullname_) {
-    fullname = fullname_;
-    return *this;
+   /**
+    * \brief Set the name shown to the user.
+    */
+   EffectMetadata &SetFullName(const gd::String &fullname_) {
+     fullname = fullname_;
+     return *this;
   };
 
   /**
@@ -69,11 +73,6 @@ class GD_CORE_API EffectMetadata {
    */
   EffectMetadata& AddIncludeFile(const gd::String& includeFile);
 
-  /**
-   * \brief Mark the effect as not working as an object effect.
-   */
-  EffectMetadata& MarkAsNotWorkingForObjects();
-
   /**
    * \brief Return a reference to the properties of this effect.
    */
@@ -117,10 +116,65 @@ class GD_CORE_API EffectMetadata {
     return includeFiles;
   }
 
+  /**
+   * \brief Mark the effect as not working as an object effect.
+   */
+  EffectMetadata& MarkAsNotWorkingForObjects() {
+    isMarkedAsNotWorkingForObjects = true;
+    return *this;
+  }
+
+  /**
+   * \brief Mark the effect as only working for the 2D renderer.
+   */
+  EffectMetadata& MarkAsOnlyWorkingFor2D() {
+    isMarkedAsOnlyWorkingFor2D = true;
+    return *this;
+  }
+
+  /**
+   * \brief Mark the effect as only working for the 3D renderer.
+   */
+  EffectMetadata& MarkAsOnlyWorkingFor3D() {
+    isMarkedAsOnlyWorkingFor3D = true;
+    return *this;
+  }
+
+  /**
+   * \brief Mark the effect as only addable once.
+   */
+  EffectMetadata& MarkAsUnique() {
+    isMarkedAsUnique = true;
+    return *this;
+  }
+
   /**
    * \brief Check if the effect is marked as not working as an object effect.
    */
-  bool IsMarkedAsNotWorkingForObjects() const { return isMarkedAsNotWorkingForObjects; };
+  bool IsMarkedAsNotWorkingForObjects() const {
+    return isMarkedAsNotWorkingForObjects;
+  };
+
+  /**
+   * \brief Check if the effect is marked as only working for the 2D renderer.
+   */
+  bool IsMarkedAsOnlyWorkingFor2D() const {
+    return isMarkedAsOnlyWorkingFor2D;
+  };
+
+  /**
+   * \brief Check if the effect is marked as only working for the 3D renderer.
+   */
+  bool IsMarkedAsOnlyWorkingFor3D() const {
+    return isMarkedAsOnlyWorkingFor3D;
+  };
+
+  /**
+   * \brief Check if the effect can only be added once.
+   */
+  bool IsMarkedAsUnique() const {
+    return isMarkedAsUnique;
+  };
 
  private:
   gd::String extensionNamespace;
@@ -130,8 +184,10 @@ class GD_CORE_API EffectMetadata {
   gd::String description;
   std::vector<gd::String> includeFiles;
   bool isMarkedAsNotWorkingForObjects;
+  bool isMarkedAsOnlyWorkingFor2D;
+  bool isMarkedAsOnlyWorkingFor3D;
+  bool isMarkedAsUnique;
   std::map<gd::String, gd::PropertyDescriptor> properties;
 };
 
 }  // namespace gd
-#endif  // EFFECTMETADATA_H

Core/GDCore/Extensions/Metadata/ExpressionMetadata.cpp

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

Core/GDCore/Extensions/Metadata/ExpressionMetadata.h

@@ -137,7 +137,7 @@ class GD_CORE_API ExpressionMetadata {
    * to fulfill std::map requirements.
    */
   ExpressionMetadata()
-      : returnType("unknown"), shown(false), isPrivate(false){};
+      : returnType("unknown"), shown(false), isPrivate(false), relevantContext("Any"){};
 
   virtual ~ExpressionMetadata(){};
 
@@ -184,6 +184,67 @@ class GD_CORE_API ExpressionMetadata {
     return *this;
   }
 
+  /**
+   * Check if the instruction can be used in layouts or external events.
+   */
+  bool IsRelevantForLayoutEvents() const {
+    return relevantContext == "Any" || relevantContext == "Layout";
+  }
+
+  /**
+   * Check if the instruction can be used in function events.
+   */
+  bool IsRelevantForFunctionEvents() const {
+    return relevantContext == "Any" || relevantContext == "Function";
+  }
+
+  /**
+   * Check if the instruction can be used in asynchronous function events.
+   */
+  bool IsRelevantForAsynchronousFunctionEvents() const {
+    return relevantContext == "Any" || relevantContext == "Function" ||
+           relevantContext == "AsynchronousFunction";
+  }
+
+  /**
+   * Check if the instruction can be used in custom object events.
+   */
+  bool IsRelevantForCustomObjectEvents() const {
+    return relevantContext == "Any" || relevantContext == "Object";
+  }
+
+  /**
+   * Set that the instruction can be used in layouts or external events.
+   */
+  ExpressionMetadata &SetRelevantForLayoutEventsOnly() {
+    relevantContext = "Layout";
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in function events.
+   */
+  ExpressionMetadata &SetRelevantForFunctionEventsOnly() {
+    relevantContext = "Function";
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in asynchronous function events.
+   */
+  ExpressionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() {
+    relevantContext = "AsynchronousFunction";
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in custom object events.
+   */
+  ExpressionMetadata &SetRelevantForCustomObjectEventsOnly() {
+    relevantContext = "Object";
+    return *this;
+  }
+
   /**
    * \see gd::InstructionMetadata::AddParameter
    */
@@ -222,6 +283,18 @@ class GD_CORE_API ExpressionMetadata {
     return *this;
   };
 
+  /**
+   * \brief Set the additional information, used for some parameters
+   * with special type (for example, it can contains the type of object accepted
+   * by the parameter), for the last added parameter.
+   *
+   * \see AddParameter
+   */
+  ExpressionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) {
+    if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
+    return *this;
+  }
+
   /**
    * \brief Mark this (object) expression as requiring the specified capability,
    * offered by the base object.
@@ -256,7 +329,30 @@ class GD_CORE_API ExpressionMetadata {
    */
   ExpressionCodeGenerationInformation& GetCodeExtraInformation() {
     return codeExtraInformation;
-  };
+  }
+
+  /**
+   * \brief Erase any existing include file and add the specified include.
+   */
+  ExpressionMetadata &SetIncludeFile(const gd::String &includeFile) {
+    codeExtraInformation.SetIncludeFile(includeFile);
+    return *this;
+  }
+
+  /**
+   * \brief Add a file to the already existing include files.
+   */
+  ExpressionMetadata &AddIncludeFile(const gd::String &includeFile) {
+    codeExtraInformation.AddIncludeFile(includeFile);
+    return *this;
+  }
+
+  /**
+   * \brief Get the files that must be included to use the instruction.
+   */
+  const std::vector<gd::String>& GetIncludeFiles() const {
+    return codeExtraInformation.GetIncludeFiles();
+  }
 
   ExpressionCodeGenerationInformation codeExtraInformation;
 
@@ -291,6 +387,7 @@ class GD_CORE_API ExpressionMetadata {
   gd::String extensionNamespace;
   bool isPrivate;
   gd::String requiredBaseObjectCapability;
+  gd::String relevantContext;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/InstructionMetadata.cpp

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

Core/GDCore/Extensions/Metadata/InstructionMetadata.h

@@ -14,6 +14,8 @@
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/String.h"
 #include "ParameterMetadata.h"
+#include "ParameterOptions.h"
+
 namespace gd {
 class Project;
 class Layout;
@@ -99,6 +101,67 @@ class GD_CORE_API InstructionMetadata {
     return *this;
   }
 
+  /**
+   * Check if the instruction can be used in layouts or external events.
+   */
+  bool IsRelevantForLayoutEvents() const {
+    return relevantContext == "Any" || relevantContext == "Layout";
+  }
+
+  /**
+   * Check if the instruction can be used in function events.
+   */
+  bool IsRelevantForFunctionEvents() const {
+    return relevantContext == "Any" || relevantContext == "Function";
+  }
+
+  /**
+   * Check if the instruction can be used in asynchronous function events.
+   */
+  bool IsRelevantForAsynchronousFunctionEvents() const {
+    return relevantContext == "Any" || relevantContext == "Function" ||
+           relevantContext == "AsynchronousFunction";
+  }
+
+  /**
+   * Check if the instruction can be used in custom object events.
+   */
+  bool IsRelevantForCustomObjectEvents() const {
+    return relevantContext == "Any" || relevantContext == "Object";
+  }
+
+  /**
+   * Set that the instruction can be used in layouts or external events.
+   */
+  InstructionMetadata &SetRelevantForLayoutEventsOnly() {
+    relevantContext = "Layout";
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in function events.
+   */
+  InstructionMetadata &SetRelevantForFunctionEventsOnly() {
+    relevantContext = "Function";
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in asynchronous function events.
+   */
+  InstructionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() {
+    relevantContext = "AsynchronousFunction";
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in custom object events.
+   */
+  InstructionMetadata &SetRelevantForCustomObjectEventsOnly() {
+    relevantContext = "Object";
+    return *this;
+  }
+
   /**
    * Check if the instruction is asynchronous - it will be running in the
    * background, executing the instructions following it before the frame after
@@ -109,8 +172,8 @@ class GD_CORE_API InstructionMetadata {
   }
 
   /**
-   * Check if the instruction asynchronicity is optional. If it is, it can either
-   * be used synchronously or asynchronously, with one function for each.
+   * Check if the instruction asynchronicity is optional. If it is, it can
+   * either be used synchronously or asynchronously, with one function for each.
    */
   bool IsOptionallyAsync() const {
     return IsAsync() && !codeExtraInformation.functionCallName.empty();
@@ -206,7 +269,7 @@ class GD_CORE_API InstructionMetadata {
     if (!parameters.empty())
       parameters.back().SetLongDescription(longDescription);
     return *this;
-  };
+  }
 
   /**
    * \brief Set the additional information, used for some parameters
@@ -218,20 +281,27 @@ class GD_CORE_API InstructionMetadata {
   InstructionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) {
     if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
     return *this;
-  };
+  }
 
   /**
    * \brief Add the default parameters for an instruction manipulating the
    * specified type ("string", "number") with the default operators.
+   *
+   * \note The type "string" can be declined in several subtypes.
+   * \see ParameterMetadata
    */
-  InstructionMetadata &UseStandardOperatorParameters(const gd::String &type);
+  InstructionMetadata &UseStandardOperatorParameters(
+      const gd::String &type, const ParameterOptions &options);
 
   /**
    * \brief Add the default parameters for an instruction comparing the
    * specified type ("string", "number") with the default relational operators.
+   *
+   * \note The type "string" can be declined in several subtypes.
+   * \see ParameterMetadata
    */
   InstructionMetadata &UseStandardRelationalOperatorParameters(
-      const gd::String &type);
+      const gd::String &type, const ParameterOptions &options);
 
   /**
    * \brief Mark the instruction as an object instruction. Automatically called
@@ -276,7 +346,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.
@@ -328,11 +398,12 @@ class GD_CORE_API InstructionMetadata {
     }
 
     /**
-     * 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).
+     * 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.
+     * \param functionName the name of the function doing asynchronous work to
+     * call.
      */
     ExtraInformation &SetAsyncFunctionName(const gd::String &functionName_) {
       asyncFunctionCallName = functionName_;
@@ -361,7 +432,7 @@ class GD_CORE_API InstructionMetadata {
      *                 _("the string"),
      *                 _("Text"),
      *                 "CppPlatform/Extensions/text24.png",
-     *                 "CppPlatform/Extensions/text.png");
+     *                 "CppPlatform/Extensions/text_black.png");
      *
      *      .AddParameter("object", _("Object"), "Text", false)
      *      .AddParameter("operator", _("Modification operator"), "string")
@@ -476,17 +547,40 @@ class GD_CORE_API InstructionMetadata {
   }
 
   /**
-   * Set the name of the function, doing asynchronous work, which will be called in
-   * the generated code. This function should return an asynchronous task
+   * 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`.
+   * \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:
@@ -506,6 +600,7 @@ class GD_CORE_API InstructionMetadata {
   bool isObjectInstruction;
   bool isBehaviorInstruction;
   gd::String requiredBaseObjectCapability;
+  gd::String relevantContext;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.h

@@ -8,6 +8,8 @@
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/String.h"
+#include "ParameterOptions.h"
+
 namespace gd {}  // namespace gd
 
 namespace gd {
@@ -32,8 +34,7 @@ class GD_CORE_API MultipleInstructionMetadata {
     return MultipleInstructionMetadata(expression, condition, action);
   }
   static MultipleInstructionMetadata WithConditionAndAction(
-      gd::InstructionMetadata &condition,
-      gd::InstructionMetadata &action) {
+      gd::InstructionMetadata &condition, gd::InstructionMetadata &action) {
     return MultipleInstructionMetadata(condition, action);
   }
 
@@ -80,6 +81,17 @@ class GD_CORE_API MultipleInstructionMetadata {
     return *this;
   };
 
+  /**
+   * \see gd::InstructionMetadata::SetParameterExtraInfo
+   */
+  MultipleInstructionMetadata &SetParameterExtraInfo(
+      const gd::String &defaultValue) {
+    if (expression) expression->SetParameterExtraInfo(defaultValue);
+    if (condition) condition->SetParameterExtraInfo(defaultValue);
+    if (action) action->SetParameterExtraInfo(defaultValue);
+    return *this;
+  };
+
   /**
    * \see gd::InstructionMetadata::SetParameterLongDescription
    */
@@ -116,9 +128,11 @@ class GD_CORE_API MultipleInstructionMetadata {
    * \see gd::InstructionMetadata::UseStandardOperatorParameters
    * \see gd::InstructionMetadata::UseStandardRelationalOperatorParameters
    */
-  MultipleInstructionMetadata &UseStandardParameters(const gd::String &type) {
-    if (condition) condition->UseStandardRelationalOperatorParameters(type);
-    if (action) action->UseStandardOperatorParameters(type);
+  MultipleInstructionMetadata &UseStandardParameters(
+      const gd::String &type, const ParameterOptions &options) {
+    if (condition)
+      condition->UseStandardRelationalOperatorParameters(type, options);
+    if (action) action->UseStandardOperatorParameters(type, options);
     return *this;
   }
 
@@ -154,6 +168,29 @@ 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,6 +14,7 @@
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Tools/Localization.h"
+#include "GDCore/Tools/Log.h"
 
 namespace gd {
 
@@ -22,45 +23,53 @@ ObjectMetadata::ObjectMetadata(const gd::String& extensionNamespace_,
                                const gd::String& fullname_,
                                const gd::String& description_,
                                const gd::String& icon24x24,
-                               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;
+                               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?");
       return nullptr;
     }
-
-    std::unique_ptr<gd::Object> newObject = blueprintObject_->Clone();
-    newObject->SetName(name);
-    return newObject;
-  };
+    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;
+    }) {}
+
 ObjectMetadata::ObjectMetadata(const gd::String& extensionNamespace_,
                                const gd::String& name_,
                                const gd::String& fullname_,
                                const gd::String& description_,
                                const gd::String& icon24x24,
                                CreateFunPtr createFunPtrP)
-    : extensionNamespace(extensionNamespace_) {
-  name = name_;
-#if defined(GD_IDE_ONLY)
+    : name(name_),
+      iconFilename(icon24x24),
+      createFunPtr(createFunPtrP),
+      extensionNamespace(extensionNamespace_) {
   SetFullName(gd::String(fullname_));
   SetDescription(gd::String(description_));
-  iconFilename = icon24x24;
-#endif
-  createFunPtr = createFunPtrP;
 }
 
 gd::InstructionMetadata& ObjectMetadata::AddCondition(

Core/GDCore/Extensions/Metadata/ObjectMetadata.h

@@ -13,6 +13,7 @@
 #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;
@@ -20,7 +21,7 @@ class MultipleInstructionMetadata;
 class ExpressionMetadata;
 }  // namespace gd
 
-typedef std::function<std::unique_ptr<gd::Object>(gd::String name)>
+typedef std::function<std::unique_ptr<gd::ObjectConfiguration>()>
     CreateFunPtr;
 
 namespace gd {
@@ -42,11 +43,21 @@ class GD_CORE_API ObjectMetadata {
                  const gd::String& fullname_,
                  const gd::String& description_,
                  const gd::String& icon24x24_,
-                 std::shared_ptr<gd::Object> blueprintObject_);
+                 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_);
 
   /**
    * \brief Construct an object metadata, with a function that will be called
-   * to instanciate a new object.
+   * to instantiate a new object.
    */
   ObjectMetadata(const gd::String& extensionNamespace_,
                  const gd::String& name_,
@@ -213,7 +224,7 @@ class GD_CORE_API ObjectMetadata {
   /**
    * \brief The "capabilities" that are offered by the base object that are
    * *not* supported by this object, and should be hidden in the editor
-   * inferface.
+   * interface.
    */
   const std::set<gd::String>& GetUnsupportedBaseObjectCapabilities() const {
     return unsupportedBaseObjectCapabilities;
@@ -221,7 +232,7 @@ class GD_CORE_API ObjectMetadata {
 
   /**
    * \brief Add a "capability" that is offered by the base object that is *not*
-   * supported by this object, and should be hidden in the editor inferface.
+   * supported by this object, and should be hidden in the editor interface.
    */
   ObjectMetadata& AddUnsupportedBaseObjectCapability(
       const gd::String& capability) {
@@ -231,7 +242,7 @@ class GD_CORE_API ObjectMetadata {
 
   /**
    * \brief Check if a "capability" that is offered by the base object is *not*
-   * supported by this object, and should be hidden in the editor inferface.
+   * supported by this object, and should be hidden in the editor interface.
    */
   bool IsUnsupportedBaseObjectCapability(const gd::String& capability) const {
     return unsupportedBaseObjectCapabilities.find(capability) != unsupportedBaseObjectCapabilities.end();
@@ -284,6 +295,22 @@ class GD_CORE_API ObjectMetadata {
    */
   std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() { return strExpressionsInfos; };
 
+  /**
+   * \brief Set the object to be hidden in the IDE.
+   *
+   * Used mainly when an object is deprecated.
+   */
+  ObjectMetadata &SetHidden() {
+    hidden = true;
+    return *this;
+  }
+
+
+  /**
+   * \brief Return true if the instruction must be hidden in the IDE.
+   */
+  bool IsHidden() const { return hidden; }
+
   std::map<gd::String, gd::InstructionMetadata> conditionsInfos;
   std::map<gd::String, gd::InstructionMetadata> actionsInfos;
   std::map<gd::String, gd::ExpressionMetadata> expressionsInfos;
@@ -303,11 +330,14 @@ class GD_CORE_API ObjectMetadata {
   gd::String iconFilename;
   gd::String categoryFullName;
   std::set<gd::String> unsupportedBaseObjectCapabilities;
+  bool hidden = false;
 
-  std::shared_ptr<gd::Object>
+  std::shared_ptr<gd::ObjectConfiguration>
       blueprintObject;  ///< The "blueprint" object to be copied when a new
                         ///< object is asked. Can be null in case a creation
-                        ///< function is passed.
+                        ///< function is passed or for events based objects
+                        ///< (CustomObject are using EventBasedObject, they
+                        ///< don't need blueprints).
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/ParameterMetadata.cpp

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

Core/GDCore/Extensions/Metadata/ParameterMetadata.h

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

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp

@@ -11,6 +11,8 @@
 #include "GDCore/Project/Project.h"
 #include "GDCore/String.h"
 #include "InstructionMetadata.h"
+#include "GDCore/Events/Parsers/ExpressionParser2.h"
+#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
 
 namespace gd {
 void ParameterMetadataTools::ParametersToObjectsContainer(
@@ -85,7 +87,7 @@ void ParameterMetadataTools::IterateOverParametersWithIndex(
     const gd::Expression& parameterValue =
         pNb < parameters.size() ? parameters[pNb].GetPlainString() : "";
     const gd::Expression& parameterValueOrDefault =
-        parameterValue.GetPlainString().empty() && parameterMetadata.optional
+        parameterValue.GetPlainString().empty() && parameterMetadata.IsOptional()
             ? Expression(parameterMetadata.GetDefaultValue())
             : parameterValue;
 
@@ -101,6 +103,56 @@ void ParameterMetadataTools::IterateOverParametersWithIndex(
   }
 }
 
+void ParameterMetadataTools::IterateOverParametersWithIndex(
+    const gd::Platform &platform,
+    const gd::ObjectsContainer &globalObjectsContainer,
+    const gd::ObjectsContainer &objectsContainer, FunctionCallNode &node,
+    std::function<void(const gd::ParameterMetadata &parameterMetadata,
+                       std::unique_ptr<gd::ExpressionNode> &parameterNode,
+                       size_t parameterIndex, const gd::String &lastObjectName)>
+        fn) {
+  gd::String lastObjectName = node.objectName;
+
+  const bool isObjectFunction = !node.objectName.empty();
+  const gd::ExpressionMetadata &metadata =
+      isObjectFunction ? MetadataProvider::GetObjectAnyExpressionMetadata(
+                             platform,
+                             GetTypeOfObject(globalObjectsContainer,
+                                             objectsContainer, node.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;
+
+    fn(parameterMetadata, parameterNode, parameterIndex, lastObjectName);
+
+    // Memorize the last object name. By convention, parameters that require
+    // an object (mainly, "objectvar" and "behavior") should be placed after
+    // the object in the list of parameters (if possible, just after).
+    // Search "lastObjectName" in the codebase for other place where this
+    // convention is enforced.
+    if (gd::ParameterMetadata::IsObject(parameterMetadata.GetType()))
+      // Object can't be expressions so it should always be the object name.
+      lastObjectName =
+          gd::ExpressionParser2NodePrinter::PrintNode(*parameterNode);
+  }
+}
+
 size_t ParameterMetadataTools::GetObjectParameterIndexFor(
     const std::vector<gd::ParameterMetadata>& parametersMetadata,
     size_t parameterIndex) {

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.h

@@ -7,12 +7,16 @@
 #ifndef ParameterMetadataTools_H
 #define ParameterMetadataTools_H
 #include <vector>
+#include <memory>
 #include "GDCore/String.h"
 namespace gd {
+class Platform;
 class Project;
 class ObjectsContainer;
 class ParameterMetadata;
 class Expression;
+struct FunctionCallNode;
+struct ExpressionNode;
 }  // namespace gd
 
 namespace gd {
@@ -48,6 +52,21 @@ class GD_CORE_API ParameterMetadataTools {
                          size_t parameterIndex,
                          const gd::String& lastObjectName)> fn);
 
+  /**
+   * Iterate over the parameters of a FunctionCallNode.
+   * Callback function is called with the parameter metadata, its value
+   * and if applicable the name of the object it's linked to.
+   */
+  static void IterateOverParametersWithIndex(
+      const gd::Platform &platform,
+      const gd::ObjectsContainer &globalObjectsContainer,
+      const gd::ObjectsContainer &objectsContainer, FunctionCallNode &node,
+      std::function<void(const gd::ParameterMetadata &parameterMetadata,
+                         std::unique_ptr<gd::ExpressionNode> &parameterNode,
+                         size_t parameterIndex,
+                         const gd::String &lastObjectName)>
+          fn);
+
   /**
    * Given a parameter, return, if applicable, the index of the object parameter
    * it's linked to.

Core/GDCore/Extensions/Metadata/ParameterOptions.h

@@ -0,0 +1,35 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#ifndef PARAMETEROPTIONS_H
+#define PARAMETEROPTIONS_H
+#include "GDCore/String.h"
+#include "ParameterMetadata.h"
+
+namespace gd {}  // namespace gd
+
+namespace gd {
+struct GD_CORE_API ParameterOptions {
+  gd::String description;
+  gd::String typeExtraInfo;
+
+  ParameterOptions &SetDescription(const gd::String &description_) {
+    description = description_;
+    return *this;
+  }
+  ParameterOptions &SetTypeExtraInfo(const gd::String &typeExtraInfo_) {
+    typeExtraInfo = typeExtraInfo_;
+    return *this;
+  }
+
+  static ParameterOptions MakeNewOptions() {
+    ParameterOptions emptyOptions;
+    return emptyOptions;
+  }
+};
+}
+
+#endif  // PARAMETEROPTIONS_H

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp

@@ -0,0 +1,93 @@
+/*
+ * 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::variableType = "variable";
+const gd::String ValueTypeMetadata::booleanType = "boolean";
+
+const gd::String &ValueTypeMetadata::GetExpressionPrimitiveValueType(
+    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::GetPrimitiveValueType(const gd::String &parameterType) {
+  if (parameterType == "variable" ||
+      gd::ValueTypeMetadata::IsTypeExpression("variable", parameterType)) {
+    return ValueTypeMetadata::variableType;
+  }
+  if (parameterType == "boolean" || parameterType == "yesorno" ||
+      parameterType == "trueorfalse") {
+    return ValueTypeMetadata::booleanType;
+  }
+  // These 2 types are not strings from the code generator point of view,
+  // but it is for event-based extensions.
+  if (parameterType == "key" || parameterType == "mouse") {
+    return ValueTypeMetadata::stringType;
+  }
+  return GetExpressionPrimitiveValueType(parameterType);
+}
+
+const gd::String ValueTypeMetadata::numberValueType = "number";
+const gd::String ValueTypeMetadata::booleanValueType = "boolean";
+const gd::String ValueTypeMetadata::colorValueType = "color";
+const gd::String ValueTypeMetadata::choiceValueType = "stringWithSelector";
+const gd::String ValueTypeMetadata::stringValueType = "string";
+
+const gd::String &ValueTypeMetadata::ConvertPropertyTypeToValueType(
+    const gd::String &propertyType) {
+  if (propertyType == "Number") {
+    return numberValueType;
+  } else if (propertyType == "Boolean") {
+    return booleanValueType;
+  } else if (propertyType == "Color") {
+    return colorValueType;
+  } else if (propertyType == "Choice") {
+    return choiceValueType;
+  }
+  // For "String" or default
+  return stringValueType;
+};
+
+}  // namespace gd

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.h

@@ -0,0 +1,253 @@
+/*
+ * 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 == "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";
+    } else if (type == "resource") {
+      return parameterType == "fontResource" ||
+             parameterType == "soundfile" ||
+             parameterType == "musicfile" ||
+             parameterType == "bitmapFontResource" ||
+             parameterType == "imageResource" ||
+             parameterType == "jsonResource" ||
+             parameterType == "tilemapResource" ||
+             parameterType == "tilesetResource" ||
+             parameterType == "model3DResource";
+    }
+    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".
+   * 
+   * \note It only maps string and number types.
+   */
+  static const gd::String &GetExpressionPrimitiveValueType(const gd::String &parameterType);
+
+  /**
+   * \brief Return the primitive type from the parameter type.
+   * Declinations of "number" and "string" types (like "forceMultiplier" or
+   * "sceneName") are replaced by "number" and "string".
+   * 
+   * \note It also maps variable and boolean types.
+   */
+  static const gd::String &GetPrimitiveValueType(const gd::String &parameterType);
+  static const gd::String numberType;
+  static const gd::String stringType;
+  static const gd::String variableType;
+  static const gd::String booleanType;
+
+  /**
+   * \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,7 +7,9 @@
 
 #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;
 
@@ -91,24 +93,22 @@ std::shared_ptr<gd::PlatformExtension> Platform::GetExtension(
   return std::shared_ptr<gd::PlatformExtension>();
 }
 
-std::unique_ptr<gd::Object> Platform::CreateObject(
-    gd::String type, const gd::String& name) const {
+std::unique_ptr<gd::ObjectConfiguration> Platform::CreateObjectConfiguration(
+    gd::String type) const {
   if (creationFunctionTable.find(type) == creationFunctionTable.end()) {
-    std::cout << "Tried to create an object with an unknown type: " << type
-              << " for platform " << GetName() << "!" << std::endl;
+    gd::LogWarning("Tried to create an object with an unknown type: " + type
+              + " for platform " + GetName() + "!");
     type = "";
     if (creationFunctionTable.find("") == creationFunctionTable.end()) {
-      std::cout << "Unable to create a Base object!" << std::endl;
+      gd::LogError("Unable to create a Base object!");
       return nullptr;
     }
   }
 
   // Create a new object with the type we want.
-  std::unique_ptr<gd::Object> object =
-      (creationFunctionTable.find(type)->second)(name);
-  object->SetType(type);
-
-  return std::unique_ptr<gd::Object>(std::move(object));
+  auto objectConfiguration = (creationFunctionTable.find(type)->second)();
+  objectConfiguration->SetType(type);
+  return objectConfiguration;
 }
 
 #if defined(GD_IDE_ONLY)

Core/GDCore/Extensions/Platform.h

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

Core/GDCore/Extensions/PlatformExtension.cpp

@@ -18,19 +18,18 @@
 #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,
@@ -40,7 +39,6 @@ gd::InstructionMetadata& PlatformExtension::AddCondition(
     const gd::String& group,
     const gd::String& icon,
     const gd::String& smallicon) {
-#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name;
   conditionsInfos[nameWithNamespace] = InstructionMetadata(GetNameSpace(),
                                                            nameWithNamespace,
@@ -52,7 +50,6 @@ gd::InstructionMetadata& PlatformExtension::AddCondition(
                                                            smallicon)
                                            .SetHelpPath(GetHelpPath());
   return conditionsInfos[nameWithNamespace];
-#endif
 }
 
 gd::InstructionMetadata& PlatformExtension::AddAction(
@@ -63,7 +60,6 @@ gd::InstructionMetadata& PlatformExtension::AddAction(
     const gd::String& group,
     const gd::String& icon,
     const gd::String& smallicon) {
-#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name;
   actionsInfos[nameWithNamespace] = InstructionMetadata(GetNameSpace(),
                                                         nameWithNamespace,
@@ -75,7 +71,6 @@ gd::InstructionMetadata& PlatformExtension::AddAction(
                                                         smallicon)
                                         .SetHelpPath(GetHelpPath());
   return actionsInfos[nameWithNamespace];
-#endif
 }
 
 gd::ExpressionMetadata& PlatformExtension::AddExpression(
@@ -84,7 +79,6 @@ gd::ExpressionMetadata& PlatformExtension::AddExpression(
     const gd::String& description,
     const gd::String& group,
     const gd::String& smallicon) {
-#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name;
   expressionsInfos[nameWithNamespace] = ExpressionMetadata("number",
                                                            GetNameSpace(),
@@ -95,7 +89,6 @@ gd::ExpressionMetadata& PlatformExtension::AddExpression(
                                                            smallicon)
                                             .SetHelpPath(GetHelpPath());
   return expressionsInfos[nameWithNamespace];
-#endif
 }
 
 gd::ExpressionMetadata& PlatformExtension::AddStrExpression(
@@ -104,7 +97,6 @@ gd::ExpressionMetadata& PlatformExtension::AddStrExpression(
     const gd::String& description,
     const gd::String& group,
     const gd::String& smallicon) {
-#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name;
   strExpressionsInfos[nameWithNamespace] = ExpressionMetadata("string",
                                                               GetNameSpace(),
@@ -115,7 +107,6 @@ gd::ExpressionMetadata& PlatformExtension::AddStrExpression(
                                                               smallicon)
                                                .SetHelpPath(GetHelpPath());
   return strExpressionsInfos[nameWithNamespace];
-#endif
 }
 
 gd::MultipleInstructionMetadata PlatformExtension::AddExpressionAndCondition(
@@ -219,19 +210,17 @@ 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::Object> instance) {
+    std::shared_ptr<gd::ObjectConfiguration> instance) {
   gd::String nameWithNamespace = GetNameSpace() + name;
   objectsInfos[nameWithNamespace] = ObjectMetadata(GetNameSpace(),
                                                    nameWithNamespace,
@@ -244,6 +233,21 @@ 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,
@@ -269,6 +273,25 @@ 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);
@@ -282,7 +305,6 @@ gd::EventMetadata& PlatformExtension::AddEvent(
     const gd::String& group_,
     const gd::String& smallicon_,
     std::shared_ptr<gd::BaseEvent> instance_) {
-#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name_;
   eventsInfos[nameWithNamespace] = gd::EventMetadata(nameWithNamespace,
                                                      fullname_,
@@ -291,7 +313,6 @@ gd::EventMetadata& PlatformExtension::AddEvent(
                                                      smallicon_,
                                                      instance_);
   return eventsInfos[nameWithNamespace];
-#endif
 }
 
 PlatformExtension& PlatformExtension::SetExtensionInformation(
@@ -371,8 +392,6 @@ std::vector<gd::String> PlatformExtension::GetBehaviorsTypes() const {
   return behaviors;
 }
 
-#if defined(GD_IDE_ONLY)
-
 gd::InstructionMetadata& PlatformExtension::AddDuplicatedAction(
     const gd::String& newActionName, const gd::String& copiedActionName) {
   gd::String newNameWithNamespace = GetNameSpace() + newActionName;
@@ -551,7 +570,6 @@ gd::BaseEventSPtr PlatformExtension::CreateEvent(
 
   return std::shared_ptr<gd::BaseEvent>();
 }
-#endif
 
 CreateFunPtr PlatformExtension::GetObjectCreationFunctionPtr(
     const gd::String& objectType) const {
@@ -630,7 +648,6 @@ bool PlatformExtension::IsBuiltin() const {
          builtinExtensions.end();
 }
 
-#if defined(GD_IDE_ONLY)
 void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
   for (std::map<gd::String, gd::InstructionMetadata>::iterator it =
            GetAllActions().begin();
@@ -775,7 +792,40 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
       ++it;
   }
 }
-#endif
+
+gd::String
+PlatformExtension::GetEventsFunctionFullType(const gd::String &extensionName,
+                                             const gd::String &functionName) {
+  const auto &separator = GetNamespaceSeparator();
+  return extensionName + separator + functionName;
+}
+
+gd::String PlatformExtension::GetBehaviorEventsFunctionFullType(
+    const gd::String &extensionName, const gd::String &behaviorName,
+    const gd::String &functionName) {
+  const auto &separator = GetNamespaceSeparator();
+  return extensionName + separator + behaviorName + separator + functionName;
+}
+
+gd::String
+PlatformExtension::GetBehaviorFullType(const gd::String &extensionName,
+                                       const gd::String &behaviorName) {
+  const auto &separator = GetNamespaceSeparator();
+  return extensionName + separator + behaviorName;
+}
+
+gd::String PlatformExtension::GetObjectEventsFunctionFullType(
+    const gd::String &extensionName, const gd::String &objectName,
+    const gd::String &functionName) {
+  const auto &separator = GetNamespaceSeparator();
+  return extensionName + separator + objectName + separator + functionName;
+}
+
+gd::String PlatformExtension::GetObjectFullType(const gd::String &extensionName,
+                                                const gd::String &objectName) {
+  const auto &separator = GetNamespaceSeparator();
+  return extensionName + separator + objectName;
+}
 
 PlatformExtension::PlatformExtension()
     : deprecated(false), category(_("General")) {}

Core/GDCore/Extensions/PlatformExtension.h

@@ -37,9 +37,10 @@ class ArbitraryResourceWorker;
 class BehaviorsSharedData;
 class Behavior;
 class Object;
+class ObjectConfiguration;
 }  // namespace gd
 
-typedef std::function<std::unique_ptr<gd::Object>(gd::String name)>
+typedef std::function<std::unique_ptr<gd::ObjectConfiguration>()>
     CreateFunPtr;
 
 namespace gd {
@@ -242,7 +243,21 @@ class GD_CORE_API PlatformExtension {
                                 const gd::String& fullname_,
                                 const gd::String& description_,
                                 const gd::String& icon_,
-                                std::shared_ptr<gd::Object> instance);
+                                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_);
 
   /**
    * \brief Declare a new behavior as being part of the extension.
@@ -267,6 +282,21 @@ 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).
@@ -590,7 +620,26 @@ class GD_CORE_API PlatformExtension {
    */
   static gd::String GetNamespaceSeparator() { return "::"; }
 
- private:
+  static gd::String GetEventsFunctionFullType(const gd::String &extensionName,
+                                              const gd::String &functionName);
+
+  static gd::String
+  GetBehaviorEventsFunctionFullType(const gd::String &extensionName,
+                                    const gd::String &behaviorName,
+                                    const gd::String &functionName);
+
+  static gd::String GetBehaviorFullType(const gd::String &extensionName,
+                                        const gd::String &behaviorName);
+
+  static gd::String
+  GetObjectEventsFunctionFullType(const gd::String &extensionName,
+                                  const gd::String &objectName,
+                                  const gd::String &functionName);
+
+  static gd::String GetObjectFullType(const gd::String &extensionName,
+                                      const gd::String &objectName);
+
+private:
   /**
    * Set the namespace (the string all actions/conditions/expressions start
    * with).

Core/GDCore/Extensions/PlatformExtension.inl

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

Core/GDCore/IDE/DependenciesAnalyzer.h

@@ -42,7 +42,7 @@ class GD_CORE_API DependenciesAnalyzer {
    *
    * You can also call then
    * DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene to check if the
-   * external events can be compiled separatly and called by a scene. \see
+   * external events can be compiled separately and called by a scene. \see
    * DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene
    */
   DependenciesAnalyzer(const gd::Project& project_,

Core/GDCore/IDE/Dialogs/LayoutEditorCanvas/EditorSettings.h

@@ -3,7 +3,6 @@
  * 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 SCENECANVASSETTINGS_H
 #define SCENECANVASSETTINGS_H
 #include "GDCore/String.h"
@@ -43,4 +42,3 @@ private:
 }  // namespace gd
 
 #endif  // SCENECANVASSETTINGS_H
-#endif

Core/GDCore/IDE/EventBasedBehaviorBrowser.cpp

@@ -0,0 +1,49 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "EventBasedBehaviorBrowser.h"
+
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.h"
+#include "GDCore/IDE/ProjectBrowserHelper.h"
+#include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/String.h"
+
+namespace gd {
+
+void EventBasedBehaviorBrowser::ExposeEvents(
+    gd::Project &project, gd::ArbitraryEventsWorker &worker) const {
+  gd::ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
+      project, eventsBasedBehavior, worker);
+}
+
+void EventBasedBehaviorBrowser::ExposeEvents(
+    gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) const {
+  gd::ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
+      project, eventsBasedBehavior, worker);
+}
+
+void EventBasedBehaviorBrowser::ExposeObjects(
+    gd::Project &project, gd::ArbitraryObjectsWorker &worker) const {}
+
+void EventBasedBehaviorBrowser::ExposeFunctions(
+    gd::Project &project, gd::ArbitraryEventsFunctionsWorker &worker) const {
+  worker.Launch(eventsBasedBehavior.GetEventsFunctions());
+}
+
+void EventBasedBehaviorBrowser::ExposeEventBasedBehaviors(
+    gd::Project &project,
+    gd::ArbitraryEventBasedBehaviorsWorker &worker) const {
+  worker.Launch(eventsBasedBehavior);
+}
+
+void EventBasedBehaviorBrowser::ExposeBehaviorSharedDatas(
+    gd::Project &project, gd::ArbitraryBehaviorSharedDataWorker &worker) const {}
+
+} // namespace gd

Core/GDCore/IDE/EventBasedBehaviorBrowser.h

@@ -0,0 +1,86 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+#include "GDCore/IDE/ProjectBrowser.h"
+
+namespace gd {
+class Project;
+class String;
+class EventsFunctionsExtension;
+class EventsFunction;
+class EventsBasedBehavior;
+class EventsBasedObject;
+class ArbitraryEventsWorker;
+class ArbitraryEventsWorkerWithContext;
+class ArbitraryEventsFunctionsWorker;
+class ArbitraryObjectsWorker;
+class ArbitraryEventBasedBehaviorsWorker;
+class ArbitraryBehaviorSharedDataWorker;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Expose event-based behavior contents to workers.
+ */
+class GD_CORE_API EventBasedBehaviorBrowser : public ProjectBrowser {
+public:
+  EventBasedBehaviorBrowser(gd::EventsBasedBehavior &eventsBasedBehavior_)
+      : eventsBasedBehavior(eventsBasedBehavior_) {}
+
+  /**
+   * \brief Call the specified worker on all events of the event-based
+   * behavior.
+   *
+   * This should be the preferred way to traverse all the events of an event-based behavior.
+   */
+  void ExposeEvents(gd::Project &project,
+                    gd::ArbitraryEventsWorker &worker) const override;
+
+  /**
+   * \brief Call the specified worker on all events of the event-based
+   * behavior.
+   *
+   * This should be the preferred way to traverse all the events of an event-based behavior.
+   */
+  void
+  ExposeEvents(gd::Project &project,
+               gd::ArbitraryEventsWorkerWithContext &worker) const override;
+
+  /**
+   * \brief Call the specified worker on all functions of the event-based behavior
+   *
+   * This should be the preferred way to traverse all the function signatures
+   * of an event-based behavior.
+   */
+  void ExposeFunctions(gd::Project &project,
+                       gd::ArbitraryEventsFunctionsWorker &worker) const override;
+
+  /**
+   * \brief Do nothing.
+   */
+  void ExposeObjects(gd::Project &project,
+                     gd::ArbitraryObjectsWorker &worker) const override;
+
+  /**
+   * \brief Call the specified worker on the event-based behavior.
+   */
+  void ExposeEventBasedBehaviors(
+      gd::Project &project,
+      gd::ArbitraryEventBasedBehaviorsWorker &worker) const override;
+
+  /**
+   * \brief Do nothing.
+   */
+  void ExposeBehaviorSharedDatas(gd::Project &project,
+                         gd::ArbitraryBehaviorSharedDataWorker &worker) const override;
+
+private:
+  gd::EventsBasedBehavior &eventsBasedBehavior;
+};
+
+} // namespace gd

Core/GDCore/IDE/Events/ArbitraryEventsWorker.cpp

@@ -23,7 +23,7 @@ void ArbitraryEventsWorker::VisitEventList(gd::EventsList& events) {
   DoVisitEventList(events);
 
   for (std::size_t i = 0; i < events.size();) {
-    if (VisitEvent(events[i]))
+    if (events[i].AcceptVisitor(*this))
       events.RemoveEvent(i);
     else {
       if (events[i].CanHaveSubEvents())
@@ -50,6 +50,10 @@ bool ArbitraryEventsWorker::VisitEvent(gd::BaseEvent& event) {
   return false;
 }
 
+bool ArbitraryEventsWorker::VisitLinkEvent(gd::LinkEvent& linkEvent) {
+  return DoVisitLinkEvent(linkEvent);
+}
+
 void ArbitraryEventsWorker::VisitInstructionList(
     gd::InstructionsList& instructions, bool areConditions) {
   DoVisitInstructionList(instructions, areConditions);
@@ -73,4 +77,58 @@ 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) {
+    events[i].AcceptVisitor(*this);
+
+    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::VisitLinkEvent(const gd::LinkEvent& linkEvent) {
+  DoVisitLinkEvent(linkEvent);
+}
+
+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

@@ -9,10 +9,12 @@
 #include <memory>
 #include <vector>
 #include "GDCore/Events/InstructionsList.h"
+#include "GDCore/Events/EventVisitor.h"
 #include "GDCore/String.h"
 namespace gd {
 class Instruction;
 class BaseEvent;
+class LinkEvent;
 class EventsList;
 class ObjectsContainer;
 }  // namespace gd
@@ -28,7 +30,7 @@ namespace gd {
  *
  * \ingroup IDE
  */
-class GD_CORE_API ArbitraryEventsWorker {
+class GD_CORE_API ArbitraryEventsWorker : private EventVisitor {
  public:
   ArbitraryEventsWorker(){};
   virtual ~ArbitraryEventsWorker();
@@ -40,7 +42,8 @@ class GD_CORE_API ArbitraryEventsWorker {
 
  private:
   void VisitEventList(gd::EventsList& events);
-  bool VisitEvent(gd::BaseEvent& event);
+  bool VisitEvent(gd::BaseEvent& event) override;
+  bool VisitLinkEvent(gd::LinkEvent& linkEvent) override;
   void VisitInstructionList(gd::InstructionsList& instructions,
                             bool areConditions);
   bool VisitInstruction(gd::Instruction& instruction, bool isCondition);
@@ -52,11 +55,21 @@ class GD_CORE_API ArbitraryEventsWorker {
 
   /**
    * Called to do some work on an event
-   * \return true if the instruction must be deleted from the events list, false
+   * \return true if the event must be deleted from the events list, false
    * otherwise (default).
    */
   virtual bool DoVisitEvent(gd::BaseEvent& event) { return false; };
 
+  /**
+   * Called to do some work on a link event.
+   * 
+   * Note that DoVisitEvent is also called with this event.
+   * 
+   * \return true if the event must be deleted from the events list, false
+   * otherwise (default).
+   */
+  virtual bool DoVisitLinkEvent(gd::LinkEvent& event) { return false; };
+
   /**
    * Called to do some work on an instruction list
    */
@@ -121,6 +134,109 @@ 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 : private ReadOnlyEventVisitor {
+ 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) override;
+  void VisitLinkEvent(const gd::LinkEvent& linkEvent) override;
+  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 a link event.
+   * 
+   * Note that DoVisitEvent is also called with this event.
+   */
+  virtual void DoVisitLinkEvent(const gd::LinkEvent& linkEvent) {};
+
+  /**
+   * 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

@@ -0,0 +1,25 @@
+#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

@@ -0,0 +1,38 @@
+/*
+ * 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/IDE/Project/ArbitraryObjectsWorker.h"
+#include "GDCore/String.h"
+
+namespace gd {
+class Object;
+class Behavior;
+}  // namespace gd
+
+namespace gd {
+
+class GD_CORE_API BehaviorTypeRenamer : public ArbitraryObjectsWorker {
+ public:
+  BehaviorTypeRenamer(const gd::String& oldType_,
+                      const gd::String& newType_)
+      : oldType(oldType_), newType(newType_){};
+  virtual ~BehaviorTypeRenamer();
+
+ private:
+  void DoVisitObject(gd::Object& object) override;
+  void DoVisitBehavior(gd::Behavior& behavior) override;
+
+  gd::String oldType;
+  gd::String newType;
+};
+
+};  // namespace gd
+
+#endif // GDCORE_BEHAVIORTYPERENAMER_H

Core/GDCore/IDE/Events/CustomObjectTypeRenamer.cpp

@@ -0,0 +1,24 @@
+#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

@@ -0,0 +1,38 @@
+/*
+ * 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/IDE/Project/ArbitraryObjectsWorker.h"
+#include "GDCore/String.h"
+
+namespace gd {
+class Object;
+class Behavior;
+}  // namespace gd
+
+namespace gd {
+
+class GD_CORE_API CustomObjectTypeRenamer : public ArbitraryObjectsWorker {
+ public:
+  CustomObjectTypeRenamer(const gd::String& oldType_,
+                          const gd::String& newType_)
+      : oldType(oldType_), newType(newType_){};
+  virtual ~CustomObjectTypeRenamer();
+
+ private:
+  void DoVisitObject(gd::Object& object) override;
+  void DoVisitBehavior(gd::Behavior& behavior) override;
+
+  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.type;
+        const gd::String& type = parameterMetadata.GetType();
 
         if (gd::ParameterMetadata::IsBehavior(type)) {
           if (lastObjectName == objectName) {

Core/GDCore/IDE/Events/EventsIdentifiersFinder.cpp

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

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

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

Core/GDCore/IDE/Events/EventsLeaderboardsRenamer.cpp

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

Core/GDCore/IDE/Events/EventsRefactorer.cpp

@@ -19,6 +19,7 @@
 #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;
@@ -121,7 +122,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;
@@ -216,7 +217,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;
@@ -236,12 +237,12 @@ bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
         MetadataProvider::GetActionMetadata(platform, actions[aId].GetType());
     for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
       // Replace object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].type) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
           actions[aId].GetParameter(pNb).GetPlainString() == oldName)
         actions[aId].SetParameter(pNb, gd::Expression(newName));
       // Replace object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].type)) {
+                   "number", instrInfos.parameters[pNb].GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, project, layout, "number", *node, oldName, newName)) {
@@ -251,7 +252,7 @@ bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
       }
       // Replace object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].type)) {
+                   "string", instrInfos.parameters[pNb].GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, project, layout, "string", *node, oldName, newName)) {
@@ -290,12 +291,12 @@ bool EventsRefactorer::RenameObjectInConditions(
                                                conditions[cId].GetType());
     for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
       // Replace object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].type) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
           conditions[cId].GetParameter(pNb).GetPlainString() == oldName)
         conditions[cId].SetParameter(pNb, gd::Expression(newName));
       // Replace object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].type)) {
+                   "number", instrInfos.parameters[pNb].GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, project, layout, "number", *node, oldName, newName)) {
@@ -305,7 +306,7 @@ bool EventsRefactorer::RenameObjectInConditions(
       }
       // Replace object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].type)) {
+                   "string", instrInfos.parameters[pNb].GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, project, layout, "string", *node, oldName, newName)) {
@@ -411,8 +412,8 @@ void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
 }
 
 bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
-                                             gd::ObjectsContainer& project,
-                                             gd::ObjectsContainer& layout,
+                                             gd::ObjectsContainer& globalObjectsContainer,
+                                             gd::ObjectsContainer& objectsContainer,
                                              gd::InstructionsList& actions,
                                              gd::String name) {
   bool somethingModified = false;
@@ -424,27 +425,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].type) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
           actions[aId].GetParameter(pNb).GetPlainString() == name) {
         deleteMe = true;
         break;
       }
       // Find object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].type)) {
+                   "number", instrInfos.parameters[pNb].GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
-        if (ExpressionObjectFinder::CheckIfHasObject(platform, project, layout, "number", *node, name)) {
+        if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "number", *node, name)) {
           deleteMe = true;
           break;
         }
       }
       // Find object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].type)) {
+                   "string", instrInfos.parameters[pNb].GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
-        if (ExpressionObjectFinder::CheckIfHasObject(platform, project, layout, "string", *node, name)) {
+        if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "string", *node, name)) {
           deleteMe = true;
           break;
         }
@@ -458,8 +459,8 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
     } else if (!actions[aId].GetSubInstructions().empty())
       somethingModified =
           RemoveObjectInActions(platform,
-                                project,
-                                layout,
+                                globalObjectsContainer,
+                                objectsContainer,
                                 actions[aId].GetSubInstructions(),
                                 name) ||
           somethingModified;
@@ -470,8 +471,8 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
 
 bool EventsRefactorer::RemoveObjectInConditions(
     const gd::Platform& platform,
-    gd::ObjectsContainer& project,
-    gd::ObjectsContainer& layout,
+    gd::ObjectsContainer& globalObjectsContainer,
+    gd::ObjectsContainer& objectsContainer,
     gd::InstructionsList& conditions,
     gd::String name) {
   bool somethingModified = false;
@@ -484,27 +485,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].type) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
           conditions[cId].GetParameter(pNb).GetPlainString() == name) {
         deleteMe = true;
         break;
       }
       // Find object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].type)) {
+                   "number", instrInfos.parameters[pNb].GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
-        if (ExpressionObjectFinder::CheckIfHasObject(platform, project, layout, "number", *node, name)) {
+        if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "number", *node, name)) {
           deleteMe = true;
           break;
         }
       }
       // Find object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].type)) {
+                   "string", instrInfos.parameters[pNb].GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
-        if (ExpressionObjectFinder::CheckIfHasObject(platform, project, layout, "string", *node, name)) {
+        if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "string", *node, name)) {
           deleteMe = true;
           break;
         }
@@ -518,8 +519,8 @@ bool EventsRefactorer::RemoveObjectInConditions(
     } else if (!conditions[cId].GetSubInstructions().empty())
       somethingModified =
           RemoveObjectInConditions(platform,
-                                   project,
-                                   layout,
+                                   globalObjectsContainer,
+                                   objectsContainer,
                                    conditions[cId].GetSubInstructions(),
                                    name) ||
           somethingModified;
@@ -529,8 +530,8 @@ bool EventsRefactorer::RemoveObjectInConditions(
 }
 
 void EventsRefactorer::RemoveObjectInEvents(const gd::Platform& platform,
-                                            gd::ObjectsContainer& project,
-                                            gd::ObjectsContainer& layout,
+                                            gd::ObjectsContainer& globalObjectsContainer,
+                                            gd::ObjectsContainer& objectsContainer,
                                             gd::EventsList& events,
                                             gd::String name) {
   for (std::size_t i = 0; i < events.size(); ++i) {
@@ -538,19 +539,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, project, layout, *conditionsVectors[j], name);
+          platform, globalObjectsContainer, objectsContainer, *conditionsVectors[j], name);
     }
 
     vector<gd::InstructionsList*> actionsVectors =
         events[i].GetAllActionsVectors();
     for (std::size_t j = 0; j < actionsVectors.size(); ++j) {
       bool actionsModified = RemoveObjectInActions(
-          platform, project, layout, *actionsVectors[j], name);
+          platform, globalObjectsContainer, objectsContainer, *actionsVectors[j], name);
     }
 
     if (events[i].CanHaveSubEvents())
       RemoveObjectInEvents(
-          platform, project, layout, events[i].GetSubEvents(), name);
+          platform, globalObjectsContainer, objectsContainer, events[i].GetSubEvents(), name);
   }
 }
 
@@ -565,6 +566,8 @@ 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) {
@@ -770,15 +773,18 @@ vector<EventsSearchResult> EventsRefactorer::SearchInEvents(
   const gd::String& ignored_characters =
       EventsRefactorer::searchIgnoredCharacters;
 
-  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(), ' ');
+  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(), ' ');
+  }
 
   for (std::size_t i = 0; i < events.size(); ++i) {
     bool eventAddedInResults = false;

Core/GDCore/IDE/Events/EventsRemover.h

@@ -22,7 +22,7 @@ class EventsList;
 namespace gd {
 
 /**
- * \brief List the values of the parameters of events and their type.
+ * \brief Allow to safely remove a bunch of events.
  *
  * \ingroup IDE
  */

Core/GDCore/IDE/Events/EventsVariablesFinder.cpp

@@ -13,6 +13,7 @@
 #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"
@@ -22,28 +23,28 @@
 using namespace std;
 
 namespace gd {
-
+namespace {
 /**
- * \brief Go through the nodes and change the given object name to a new one.
+ * \brief Go through the nodes to search for variable occurrences.
  *
  * \see gd::ExpressionParser2
  */
-class GD_CORE_API ExpressionParameterSearcher
+class GD_CORE_API VariableFinderExpressionNodeWorker
     : public ExpressionParser2NodeWorker {
  public:
-  ExpressionParameterSearcher(const gd::Platform &platform_,
+  VariableFinderExpressionNodeWorker(std::set<gd::String>& results_,
+                              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_ = "")
-      : platform(platform_),
+      : results(results_),
+        platform(platform_),
         globalObjectsContainer(globalObjectsContainer_),
         objectsContainer(objectsContainer_),
-        results(results_),
         parameterType(parameterType_),
         objectName(objectName_){};
-  virtual ~ExpressionParameterSearcher(){};
+  virtual ~VariableFinderExpressionNodeWorker(){};
 
  protected:
   void OnVisitSubExpressionNode(SubExpressionNode& node) override {
@@ -74,27 +75,34 @@ class GD_CORE_API ExpressionParameterSearcher
   void OnVisitFunctionCallNode(FunctionCallNode& node) override {
     bool considerFunction = objectName.empty() || node.objectName == objectName;
 
-    const gd::ExpressionMetadata &metadata = node.objectName.empty() ?
-          MetadataProvider::GetAnyExpressionMetadata(platform, node.functionName) :
+    const bool isObjectFunction = !node.objectName.empty();
+    const gd::ExpressionMetadata &metadata = isObjectFunction ?
             MetadataProvider::GetObjectAnyExpressionMetadata(
                 platform,
                 GetTypeOfObject(globalObjectsContainer, objectsContainer, objectName),
-                node.functionName);
+                node.functionName):
+            MetadataProvider::GetAnyExpressionMetadata(platform, node.functionName);
 
     if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
       return;
     }
-    
-    for (size_t i = 0; i < node.parameters.size() &&
-                       i < metadata.parameters.size();
-         ++i) {
-      auto& parameterMetadata = metadata.parameters[i];
+
+    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() == parameterType) {
         // Store the value of the parameter
         results.insert(
-            gd::ExpressionParser2NodePrinter::PrintNode(*node.parameters[i]));
+            gd::ExpressionParser2NodePrinter::PrintNode(*parameterNode));
       } else {
-        node.parameters[i]->Visit(*this);
+        parameterNode->Visit(*this);
       }
     }
   }
@@ -112,18 +120,87 @@ class GD_CORE_API ExpressionParameterSearcher
                              ///< 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) {
-    std::set<gd::String> results2 =
-        FindArgumentsInEventsAndDependencies(
+    FindArgumentsInEventsAndDependencies(
+            results,
             platform,
             project,
             project.GetLayout(i),
             "globalvar");
-    results.insert(results2.begin(), results2.end());
   }
 
   return results;
@@ -135,9 +212,12 @@ std::set<gd::String> EventsVariablesFinder::FindAllLayoutVariables(
     const gd::Layout& layout) {
   std::set<gd::String> results;
 
-  std::set<gd::String> results2 = FindArgumentsInEventsAndDependencies(
-      platform, project, layout, "scenevar");
-  results.insert(results2.begin(), results2.end());
+  FindArgumentsInEventsAndDependencies(
+      results,
+      platform,
+      project,
+      layout,
+      "scenevar");
 
   return results;
 }
@@ -149,159 +229,51 @@ std::set<gd::String> EventsVariablesFinder::FindAllObjectVariables(
     const gd::Object& object) {
   std::set<gd::String> results;
 
-  std::set<gd::String> results2 = FindArgumentsInEventsAndDependencies(
+  FindArgumentsInEventsAndDependencies(
+      results,
       platform,
       project,
       layout,
       "objectvar",
       object.GetName());
-  results.insert(results2.begin(), results2.end());
 
   return 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(
+void EventsVariablesFinder::FindArgumentsInEventsAndDependencies(
+    std::set<gd::String>& results,
     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;
 
-  std::set<gd::String> results2 = FindArgumentsInEvents(
-      platform, project, layout, layout.GetEvents(), parameterType, objectName);
-  results.insert(results2.begin(), results2.end());
+  VariableFinderEventWorker eventWorker(results,
+                                        platform,
+                                        parameterType,
+                                        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);
 
-    std::set<gd::String> results3 = FindArgumentsInEvents(
-        platform, project, layout, externalEvents.GetEvents(), parameterType, objectName);
-    results.insert(results3.begin(), results3.end());
+    VariableFinderEventWorker eventWorker(results,
+                                          platform,
+                                          parameterType,
+                                          objectName);
+    eventWorker.Launch(externalEvents.GetEvents(), project, layout);
   }
   for (const gd::String& sceneName : dependenciesAnalyzer.GetScenesDependencies()) {
     const gd::Layout& dependencyLayout = project.GetLayout(sceneName);
 
-    std::set<gd::String> results3 = FindArgumentsInEvents(
-        platform, project, dependencyLayout, dependencyLayout.GetEvents(), parameterType, objectName);
-    results.insert(results3.begin(), results3.end());
+    VariableFinderEventWorker eventWorker(results,
+                                          platform,
+                                          parameterType,
+                                          objectName);
+    eventWorker.Launch(dependencyLayout.GetEvents(), project, dependencyLayout);
   }
-
-  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,7 +23,6 @@ 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.
@@ -74,34 +73,13 @@ 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 searchs in events dependencies.
+   * parameterType. It searches 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
@@ -110,40 +88,14 @@ 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 std::set<gd::String> FindArgumentsInEventsAndDependencies(
+  static void FindArgumentsInEventsAndDependencies(
+      std::set<gd::String>& results,
       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].optional && !parameters[i].codeOnly) nb++;
+    if (!parameters[i].IsOptional() && !parameters[i].codeOnly) nb++;
   }
 
   return nb;
@@ -77,24 +77,42 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
       MetadataProvider::GetBehaviorAnyExpressionMetadata(
             platform, behaviorType, function.functionName);
 
-  if (!function.objectName.empty()) {
-    // If the function needs a capability on the object that may not be covered
-    // by all objects, check it now.
-    if (!metadata.GetRequiredBaseObjectCapability().empty()) {
-      const gd::ObjectMetadata &objectMetadata =
-          MetadataProvider::GetObjectMetadata(platform, objectType);
+  Type returnType = StringToType(metadata.GetReturnType());
 
-      if (objectMetadata.IsUnsupportedBaseObjectCapability(
-              metadata.GetRequiredBaseObjectCapability())) {
-        RaiseTypeError(
-            _("This expression exists, but it can't be used on this object."),
-            function.objectNameLocation);
-        return StringToType(metadata.GetReturnType());
-      }
-    }
+  if (!function.objectName.empty() &&
+      !globalObjectsContainer.HasObjectNamed(function.objectName) &&
+      !globalObjectsContainer.GetObjectGroups().Has(function.objectName) &&
+      !objectsContainer.HasObjectNamed(function.objectName) &&
+      !objectsContainer.GetObjectGroups().Has(function.objectName)) {
+    RaiseTypeError(_("This object doesn't exist."),
+                   function.objectNameLocation, /*isFatal=*/false);
+    return returnType;
   }
 
-  Type returnType = StringToType(metadata.GetReturnType());
+  if (!function.behaviorName.empty() &&
+      !gd::HasBehaviorInObjectOrGroup(globalObjectsContainer, objectsContainer,
+                                     function.objectName,
+                                     function.behaviorName)) {
+    RaiseTypeError(_("This behavior is not attached to this object."),
+                   function.behaviorNameLocation, /*isFatal=*/false);
+    return returnType;
+  }
+
+  if (!function.objectName.empty() &&
+    // If the function needs a capability on the object that may not be covered
+    // by all objects, check it now.
+  !metadata.GetRequiredBaseObjectCapability().empty()) {
+    const gd::ObjectMetadata &objectMetadata =
+        MetadataProvider::GetObjectMetadata(platform, objectType);
+
+    if (objectMetadata.IsUnsupportedBaseObjectCapability(
+            metadata.GetRequiredBaseObjectCapability())) {
+      RaiseTypeError(
+          _("This expression exists, but it can't be used on this object."),
+          function.objectNameLocation);
+      return returnType;
+    }
+  }
 
   if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
     RaiseError(
@@ -115,8 +133,8 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
             "number to a string."),
           function.location);
       return returnType;
-    }
-    else if (parentType != Type::Number && parentType != Type::NumberOrString) {
+    } else if (parentType != Type::Number &&
+               parentType != Type::NumberOrString) {
       RaiseTypeError(_("You tried to use an expression that returns a "
                               "number, but another type is expected:") +
                               " " + TypeToString(parentType),
@@ -131,8 +149,8 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
             "string to a number."),
           function.location);
       return returnType;
-    }
-    else if (parentType != Type::String && parentType != Type::NumberOrString) {
+    } else if (parentType != Type::String &&
+               parentType != Type::NumberOrString) {
       RaiseTypeError(_("You tried to use an expression that returns a "
                               "string, but another type is expected:") +
                               " " + TypeToString(parentType),
@@ -172,8 +190,7 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
           _("You have not entered enough parameters for the expression.") + " " +
               expectedCountMessage,
           function.location);
-    }
-    else {
+    } else {
       RaiseError(
           "extra_parameter",
           _("This parameter was not expected by this expression. Remove it "
@@ -217,8 +234,7 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
                     "parameter."),
                 parameter->location);
         }
-      }
-      else if (gd::ParameterMetadata::IsObject(expectedParameterType)) {
+      } else if (gd::ParameterMetadata::IsObject(expectedParameterType)) {
         if (dynamic_cast<IdentifierNode *>(parameter.get()) == nullptr) {
           RaiseError(
                   "malformed_object_parameter",

Core/GDCore/IDE/Events/ExpressionValidator.h

@@ -45,7 +45,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
 
   /**
    * \brief Helper function to check if a given node does not contain
-   * any error.
+   * any error including non-fatal ones.
    */
   static bool HasNoErrors(const gd::Platform &platform,
                       const gd::ObjectsContainer &globalObjectsContainer,
@@ -54,16 +54,25 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
                       gd::ExpressionNode& node) {
     gd::ExpressionValidator validator(platform, globalObjectsContainer, objectsContainer, rootType);
     node.Visit(validator);
-    return validator.GetErrors().empty();
+    return validator.GetAllErrors().empty();
   }
 
+  /**
+   * \brief Get only the fatal errors
+   *
+   * Expressions with fatal error can't be generated.
+   */
+  const std::vector<ExpressionParserDiagnostic*>& GetFatalErrors() {
+    return fatalErrors;
+  };
+
   /**
    * \brief Get all the errors
    *
    * No errors means that the expression is valid.
    */
-  const std::vector<ExpressionParserDiagnostic*>& GetErrors() {
-    return errors;
+  const std::vector<ExpressionParserDiagnostic*>& GetAllErrors() {
+    return allErrors;
   };
 
  protected:
@@ -150,12 +159,29 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   void OnVisitNumberNode(NumberNode& node) override {
     ReportAnyError(node);
     childType = Type::Number;
-    CheckType(parentType, childType, node.location);
+    if (parentType == Type::String) {
+      RaiseTypeError(
+          _("You entered a number, but a text was expected (in quotes)."),
+          node.location);
+    } else if (parentType != Type::Number &&
+               parentType != Type::NumberOrString) {
+      RaiseTypeError(_("You entered a number, but this type was expected:") +
+                         " " + TypeToString(parentType),
+                     node.location);
+    }
   }
   void OnVisitTextNode(TextNode& node) override {
     ReportAnyError(node);
     childType = Type::String;
-    CheckType(parentType, childType, node.location);
+    if (parentType == Type::Number) {
+      RaiseTypeError(_("You entered a text, but a number was expected."),
+                     node.location);
+    } else if (parentType != Type::String &&
+               parentType != Type::NumberOrString) {
+      RaiseTypeError(_("You entered a text, but this type was expected:") +
+                         " " + TypeToString(parentType),
+                     node.location);
+    }
   }
   void OnVisitVariableNode(VariableNode& node) override {
     ReportAnyError(node);
@@ -163,7 +189,21 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
       node.child->Visit(*this);
     }
     childType = Type::Variable;
-    CheckType(parentType, childType, node.location);
+    if (parentType == Type::String) {
+      RaiseTypeError(_("Variables must be surrounded by VariableString()."),
+                     node.location);
+    } else if (parentType == Type::Number) {
+      RaiseTypeError(_("Variables must be surrounded by Variable()."),
+                     node.location);
+    } else if (parentType == Type::NumberOrString) {
+      RaiseTypeError(
+          _("Variables must be surrounded by Variable() or VariableString()."),
+          node.location);
+    } else if (parentType != Type::Variable) {
+      RaiseTypeError(_("You entered a variable, but this type was expected:") +
+                         " " + TypeToString(parentType),
+                     node.location);
+    }
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
     ReportAnyError(node);
@@ -239,20 +279,26 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   enum Type {Unknown = 0, Number, String, NumberOrString, Variable, Object, Empty};
   Type ValidateFunction(const gd::FunctionCallNode& function);
 
-  void ReportAnyError(const ExpressionNode& node) {
+  void ReportAnyError(const ExpressionNode& node, bool isFatal = true) {
     if (node.diagnostic && node.diagnostic->IsError()) {
       // Syntax errors are holden by the AST nodes.
       // It's fine to give pointers on them as the AST live longer than errors
       // handling.
-      errors.push_back(node.diagnostic.get());
+      allErrors.push_back(node.diagnostic.get());
+      if (isFatal) {
+        fatalErrors.push_back(node.diagnostic.get());
+      }
     }
   }
 
   void RaiseError(const gd::String &type, 
-      const gd::String &message, const ExpressionParserLocation &location) {
+      const gd::String &message, const ExpressionParserLocation &location, bool isFatal = true) {
     auto diagnostic = gd::make_unique<ExpressionParserError>(
         type, message, location);
-    errors.push_back(diagnostic.get());
+    allErrors.push_back(diagnostic.get());
+    if (isFatal) {
+      fatalErrors.push_back(diagnostic.get());
+    }
     // Errors found by the validator are not holden by the AST nodes.
     // They must be owned by the validator to keep living while errors are
     // handled by the caller.
@@ -260,8 +306,8 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   }
 
   void RaiseTypeError(
-      const gd::String &message, const ExpressionParserLocation &location) {
-    RaiseError("type_error", message, location);
+      const gd::String &message, const ExpressionParserLocation &location, bool isFatal = true) {
+    RaiseError("type_error", message, location, isFatal);
   }
 
   void RaiseOperatorError(
@@ -269,32 +315,6 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     RaiseError("invalid_operator", message, location);
   }
 
-  void CheckType(Type expect, Type actual, const ExpressionParserLocation &location) {
-    if (actual == Type::String) {
-      if (expect == Type::Number) {
-        RaiseTypeError(_("You entered a text, but a number was expected."),
-                           location);
-      }
-      else if (expect != Type::String && expect != Type::NumberOrString) {
-        RaiseTypeError(
-            _("You entered a text, but this type was expected:") + " " + TypeToString(expect),
-            location);
-      }
-    }
-    else if (actual == Type::Number) {
-      if (expect == Type::String) {
-        RaiseTypeError(
-            _("You entered a number, but a text was expected (in quotes)."),
-            location);
-      }
-      else if (expect != Type::Number && expect != Type::NumberOrString) {
-        RaiseTypeError(
-            _("You entered a number, but this type was expected:") + " " + TypeToString(expect),
-            location);
-      }
-    }
-  }
-
   static Type StringToType(const gd::String &type);
   static const gd::String &TypeToString(Type type);
   static const gd::String unknownTypeString;
@@ -306,7 +326,8 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   static const gd::String identifierTypeString;
   static const gd::String emptyTypeString;
 
-  std::vector<ExpressionParserDiagnostic*> errors;
+  std::vector<ExpressionParserDiagnostic*> fatalErrors;
+  std::vector<ExpressionParserDiagnostic*> allErrors;
   std::vector<std::unique_ptr<ExpressionParserDiagnostic>> supplementalErrors;
   Type childType;
   Type parentType;

Core/GDCore/IDE/Events/ExpressionsParameterMover.cpp

@@ -78,13 +78,16 @@ 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) {
-          if (oldIndex >= parameters.size() || newIndex >= parameters.size())
+        [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())
             return;
 
-          auto movedParameterNode = std::move(parameters[oldIndex]);
-          parameters.erase(parameters.begin() + oldIndex);
-          parameters.insert(parameters.begin() + newIndex,
+          auto movedParameterNode = std::move(parameters[oldExpressionIndex]);
+          parameters.erase(parameters.begin() + oldExpressionIndex);
+          parameters.insert(parameters.begin() + newExpressionIndex,
                             std::move(movedParameterNode));
         };
 
@@ -92,10 +95,13 @@ 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);
+          moveParameter(node.parameters, 1);
           hasDoneMoving = true;
         }
       } else if (!behaviorType.empty() && !node.behaviorName.empty()) {
@@ -103,12 +109,12 @@ class GD_CORE_API ExpressionParameterMover
         const gd::String& thisBehaviorType = gd::GetTypeOfBehavior(
             globalObjectsContainer, objectsContainer, node.behaviorName);
         if (thisBehaviorType == behaviorType) {
-          moveParameter(node.parameters);
+          moveParameter(node.parameters, 2);
           hasDoneMoving = true;
         }
       } else if (behaviorType.empty() && objectType.empty()) {
         // Move parameter of a free function
-        moveParameter(node.parameters);
+        moveParameter(node.parameters, 1);
         hasDoneMoving = true;
       }
     }
@@ -144,7 +150,7 @@ bool ExpressionsParameterMover::DoVisitInstruction(gd::Instruction& instruction,
   for (std::size_t pNb = 0; pNb < metadata.parameters.size() &&
                             pNb < instruction.GetParametersCount();
        ++pNb) {
-    const gd::String& type = metadata.parameters[pNb].type;
+    const gd::String& type = metadata.parameters[pNb].GetType();
     const gd::Expression& expression = instruction.GetParameter(pNb);
 
     auto node = expression.GetRootNode();

Core/GDCore/IDE/Events/InstructionsCountEvaluator.cpp

@@ -0,0 +1,24 @@
+#include "InstructionsCountEvaluator.h"
+
+#include "GDCore/Events/Instruction.h"
+#include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/IDE/ProjectBrowserHelper.h"
+
+namespace gd {
+
+const int InstructionsCountEvaluator::ScanProject(gd::Project &project) {
+  InstructionsCountEvaluator worker(project);
+  gd::ProjectBrowserHelper::ExposeProjectEventsWithoutExtensions(project,
+                                                                 worker);
+  return worker.instructionCount;
+};
+
+// Instructions scanner
+
+bool InstructionsCountEvaluator::DoVisitInstruction(
+    gd::Instruction &instruction, bool isCondition) {
+  instructionCount++;
+  return false;
+}
+
+} // namespace gd

Core/GDCore/IDE/Events/InstructionsCountEvaluator.h

@@ -0,0 +1,50 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#ifndef GDCORE_INSTRUCTIONS_COUNT_EVALUATOR_H
+#define GDCORE_INSTRUCTIONS_COUNT_EVALUATOR_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 {
+
+/**
+ * @brief Count the number of instructions in a project excluding extensions.
+ *
+ * This is used by the examples repository to evaluate examples size.
+ *
+ */
+class GD_CORE_API InstructionsCountEvaluator : public ArbitraryEventsWorker {
+public:
+  /**
+   * Return the number of instructions in the project excluding extensions.
+   */
+  static const int ScanProject(gd::Project &project);
+
+private:
+  InstructionsCountEvaluator(gd::Project &project_)
+      : project(project_), instructionCount(0){};
+  gd::Project &project;
+  int instructionCount;
+
+  // Instructions Visitor
+  bool DoVisitInstruction(gd::Instruction &instruction,
+                          bool isCondition) override;
+};
+
+}; // namespace gd
+
+#endif

Core/GDCore/IDE/Events/LinkEventTargetRenamer.cpp

@@ -0,0 +1,33 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "LinkEventTargetRenamer.h"
+
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Events/Builtin/LinkEvent.h"
+#include "GDCore/Events/Event.h"
+#include "GDCore/Events/EventsList.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/String.h"
+#include "GDCore/Tools/Log.h"
+
+namespace gd {
+
+bool LinkEventTargetRenamer::DoVisitLinkEvent(gd::LinkEvent &linkEvent) {
+
+  if (linkEvent.GetTarget() == oldName) {
+    linkEvent.SetTarget(newName);
+  }
+
+  return false;
+}
+
+LinkEventTargetRenamer::~LinkEventTargetRenamer() {}
+
+} // namespace gd

Core/GDCore/IDE/Events/LinkEventTargetRenamer.h

@@ -0,0 +1,44 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+class BaseEvent;
+class LinkEvent;
+class Platform;
+class EventsList;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Replace in link events the name of external events.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API LinkEventTargetRenamer
+    : public ArbitraryEventsWorkerWithContext {
+public:
+  LinkEventTargetRenamer(const gd::Platform &platform_,
+                         const gd::String &oldName_, const gd::String &newName_)
+      : platform(platform_), oldName(oldName_), newName(newName_){};
+  virtual ~LinkEventTargetRenamer();
+
+private:
+  bool DoVisitLinkEvent(gd::LinkEvent &linkEvent) override;
+
+  const gd::Platform &platform;
+  gd::String oldName;
+  gd::String newName;
+};
+
+} // namespace gd

Core/GDCore/IDE/Events/ProjectElementRenamer.cpp

@@ -0,0 +1,198 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "ProjectElementRenamer.h"
+
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Events/Event.h"
+#include "GDCore/Events/EventsList.h"
+#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
+#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
+#include "GDCore/IDE/Events/ExpressionValidator.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/String.h"
+#include "GDCore/Tools/Log.h"
+
+namespace gd {
+
+/**
+ * \brief Go through the nodes and find every function call parameter of a
+ * given type.
+ *
+ * \see gd::ExpressionParser2
+ */
+class GD_CORE_API ExpressionIdentifierStringFinder
+    : public ExpressionParser2NodeWorker {
+public:
+  ExpressionIdentifierStringFinder(
+      const gd::Platform &platform_,
+      const gd::ObjectsContainer &globalObjectsContainer_,
+      const gd::ObjectsContainer &objectsContainer_,
+      const gd::String &expressionPlainString_,
+      const gd::String &parameterType_, const gd::String &objectName_,
+      const gd::String &layerName_, const gd::String &oldName_)
+      : platform(platform_), globalObjectsContainer(globalObjectsContainer_),
+        objectsContainer(objectsContainer_),
+        expressionPlainString(expressionPlainString_),
+        parameterType(parameterType_), objectName(objectName_),
+        layerName(layerName_), oldName(oldName_){};
+  virtual ~ExpressionIdentifierStringFinder(){};
+
+  const std::vector<gd::ExpressionParserLocation> GetOccurrences() const {
+    return occurrences;
+  }
+
+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 {
+    gd::String lastLayerName;
+    gd::ParameterMetadataTools::IterateOverParametersWithIndex(
+        platform, globalObjectsContainer, objectsContainer, node,
+        [&](const gd::ParameterMetadata &parameterMetadata,
+            std::unique_ptr<gd::ExpressionNode> &parameterNode,
+            size_t parameterIndex, const gd::String &lastObjectName) {
+          if (parameterMetadata.GetType() == "layer") {
+            // Remove quotes, it won't match if it's not a literal anyway.
+            lastLayerName = expressionPlainString.substr(
+                parameterNode->location.GetStartPosition() + 1,
+                parameterNode->location.GetEndPosition() -
+                    parameterNode->location.GetStartPosition() - 2);
+          }
+          if (parameterMetadata.GetType() == parameterType) {
+            auto parameterExpressionPlainString = expressionPlainString.substr(
+                parameterNode->location.GetStartPosition(),
+                parameterNode->location.GetEndPosition() -
+                    parameterNode->location.GetStartPosition());
+            if ((objectName.empty() || lastObjectName == objectName) &&
+                (layerName.empty() || lastLayerName == layerName) &&
+                parameterExpressionPlainString == "\"" + oldName + "\"") {
+              occurrences.push_back(parameterNode->location);
+            } else {
+              parameterNode->Visit(*this);
+            }
+          }
+        });
+  }
+  void OnVisitEmptyNode(EmptyNode &node) override {}
+
+private:
+  const gd::Platform &platform;
+  const gd::ObjectsContainer &globalObjectsContainer;
+  const gd::ObjectsContainer &objectsContainer;
+  /// It's used to extract parameter content.
+  const gd::String &expressionPlainString;
+  const gd::String &oldName;
+  /// The type of parameter to check.
+  const gd::String parameterType;
+  /// If not empty, parameters will be taken into account only if related to
+  /// this object.
+  const gd::String objectName;
+  /// If not empty, parameters will be taken into account only if related to
+  /// this layer.
+  const gd::String layerName;
+  std::vector<gd::ExpressionParserLocation> occurrences;
+};
+
+bool ProjectElementRenamer::DoVisitInstruction(gd::Instruction &instruction,
+                                               bool isCondition) {
+  const auto &metadata = isCondition
+                             ? gd::MetadataProvider::GetConditionMetadata(
+                                   platform, instruction.GetType())
+                             : gd::MetadataProvider::GetActionMetadata(
+                                   platform, instruction.GetType());
+
+  gd::String lastLayerName;
+  gd::ParameterMetadataTools::IterateOverParametersWithIndex(
+      instruction.GetParameters(), metadata.GetParameters(),
+      [&](const gd::ParameterMetadata &parameterMetadata,
+          const gd::Expression &parameterValue, size_t parameterIndex,
+          const gd::String &lastObjectName) {
+        if (parameterMetadata.GetType() == "layer") {
+          // Remove quotes, it won't match if it's not a literal anyway.
+          lastLayerName = parameterValue.GetPlainString().substr(
+              1, parameterValue.GetPlainString().length() - 2);
+        }
+
+        if (parameterMetadata.GetType() == parameterType &&
+            (objectName.empty() || lastObjectName == objectName) &&
+            (layerName.empty() || lastLayerName == layerName)) {
+          if (parameterValue.GetPlainString() == "\"" + oldName + "\"") {
+            instruction.SetParameter(parameterIndex,
+                                     gd::Expression("\"" + newName + "\""));
+          }
+        }
+        auto node = parameterValue.GetRootNode();
+        if (node) {
+          ExpressionIdentifierStringFinder finder(
+              platform, GetGlobalObjectsContainer(), GetObjectsContainer(),
+              parameterValue.GetPlainString(), parameterType, objectName,
+              layerName, oldName);
+          node->Visit(finder);
+
+          if (finder.GetOccurrences().size() > 0) {
+
+            gd::String newNameWithQuotes = "\"" + newName + "\"";
+            gd::String oldParameterValue = parameterValue.GetPlainString();
+            gd::String newParameterValue;
+            auto previousEndPosition = 0;
+            for (auto &&occurrenceLocation : finder.GetOccurrences()) {
+              newParameterValue += oldParameterValue.substr(
+                  previousEndPosition,
+                  occurrenceLocation.GetStartPosition() - previousEndPosition);
+              newParameterValue += newNameWithQuotes;
+
+              previousEndPosition = occurrenceLocation.GetEndPosition();
+            }
+            if (previousEndPosition < oldParameterValue.size()) {
+              newParameterValue += oldParameterValue.substr(
+                  previousEndPosition,
+                  oldParameterValue.size() - previousEndPosition);
+            }
+
+            instruction.SetParameter(parameterIndex,
+                                     gd::Expression(newParameterValue));
+          }
+        }
+      });
+
+  return false;
+}
+
+ProjectElementRenamer::~ProjectElementRenamer() {}
+
+} // namespace gd

Core/GDCore/IDE/Events/ProjectElementRenamer.h

@@ -0,0 +1,63 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+class BaseEvent;
+class Platform;
+class EventsList;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Replace in expressions and in parameters of actions or conditions
+ * occurrences of project element name. For instance, it can be layouts or
+ * object effects.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API ProjectElementRenamer
+    : public ArbitraryEventsWorkerWithContext {
+public:
+  ProjectElementRenamer(const gd::Platform &platform_,
+                        const gd::String &parameterType_,
+                        const gd::String &oldName_, const gd::String &newName_)
+      : platform(platform_), parameterType(parameterType_), oldName(oldName_),
+        newName(newName_){};
+  virtual ~ProjectElementRenamer();
+
+  void SetObjectConstraint(const gd::String &objectName_) {
+    objectName = objectName_;
+  }
+
+  void SetLayerConstraint(const gd::String &layerName_) {
+    layerName = layerName_;
+  }
+
+private:
+  bool DoVisitInstruction(gd::Instruction &instruction,
+                          bool isCondition) override;
+
+  const gd::Platform &platform;
+  const gd::String parameterType;
+  /// If not empty, parameters will be taken into account only if related to
+  /// this object.
+  gd::String objectName;
+  /// If not empty, parameters will be taken into account only if related to
+  /// this layer.
+  gd::String layerName;
+  const gd::String oldName;
+  const gd::String newName;
+};
+
+} // namespace gd

Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp

@@ -2,39 +2,47 @@
 
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
 #include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/IDE/ProjectBrowserHelper.h"
 #include "GDCore/IDE/WholeProjectRefactorer.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
-#include "GDCore/Project/BehaviorContent.h"
+#include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
 
 namespace gd {
 
-std::set<gd::String> UsedExtensionsFinder::ScanProject(gd::Project& project) {
+const UsedExtensionsResult UsedExtensionsFinder::ScanProject(gd::Project& project) {
   UsedExtensionsFinder worker(project);
-  gd::WholeProjectRefactorer::ExposeProjectObjects(project, worker);
-  gd::WholeProjectRefactorer::ExposeProjectEvents(project, worker);
-  return worker.usedExtensions;
+  gd::ProjectBrowserHelper::ExposeProjectObjects(project, worker);
+  gd::ProjectBrowserHelper::ExposeProjectEvents(project, worker);
+  return worker.result;
 };
 
 // Objects scanner
 
-void UsedExtensionsFinder::DoVisitObject(gd::Object& object) {
-  usedExtensions.insert(gd::MetadataProvider::GetExtensionAndObjectMetadata(
-                            project.GetCurrentPlatform(), object.GetType())
-                            .GetExtension()
-                            .GetName());
+void UsedExtensionsFinder::DoVisitObject(gd::Object &object) {
+  auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
+      project.GetCurrentPlatform(), object.GetType());
+  result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
+  for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
+    result.GetUsedIncludeFiles().insert(includeFile);
+  }
 };
 
 // Behaviors scanner
 
-void UsedExtensionsFinder::DoVisitBehavior(gd::BehaviorContent& behavior) {
-  usedExtensions.insert(
-      gd::MetadataProvider::GetExtensionAndBehaviorMetadata(
-          project.GetCurrentPlatform(), behavior.GetTypeName())
-          .GetExtension()
-          .GetName());
+void UsedExtensionsFinder::DoVisitBehavior(gd::Behavior &behavior) {
+  auto metadata = gd::MetadataProvider::GetExtensionAndBehaviorMetadata(
+      project.GetCurrentPlatform(), behavior.GetTypeName());
+  result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
+  for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
+    result.GetUsedIncludeFiles().insert(includeFile);
+  }
+  for (auto &&includeFile : metadata.GetMetadata().requiredFiles) {
+    result.GetUsedRequiredFiles().insert(includeFile);
+  }
 };
 
 // Instructions scanner
@@ -46,29 +54,35 @@ bool UsedExtensionsFinder::DoVisitInstruction(gd::Instruction& instruction,
                         project.GetCurrentPlatform(), instruction.GetType())
                   : gd::MetadataProvider::GetExtensionAndActionMetadata(
                         project.GetCurrentPlatform(), instruction.GetType());
-  usedExtensions.insert(metadata.GetExtension().GetName());
+  result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
+  for (auto&& includeFile : metadata.GetMetadata().GetIncludeFiles()) {
+    result.GetUsedIncludeFiles().insert(includeFile);
+  }
 
-  size_t i = 0;
-  for (auto expression : instruction.GetParameters()) {
-    const gd::String& parameterType =
-        metadata.GetMetadata().GetParameter(i).GetType();
-    i++;
+  gd::ParameterMetadataTools::IterateOverParameters(
+      instruction.GetParameters(),
+      metadata.GetMetadata().GetParameters(),
+      [this](const gd::ParameterMetadata& parameterMetadata,
+          const gd::Expression& parameterValue,
+          const gd::String& lastObjectName) {
+    const gd::String& parameterType = parameterMetadata.GetType();
 
     if (gd::ParameterMetadata::IsExpression("string", parameterType)) {
       rootType = "string";
-      expression.GetRootNode()->Visit(*this);
+      parameterValue.GetRootNode()->Visit(*this);
     } else if (gd::ParameterMetadata::IsExpression("number", parameterType)) {
       rootType = "number";
-      expression.GetRootNode()->Visit(*this);
+      parameterValue.GetRootNode()->Visit(*this);
     } else if (gd::ParameterMetadata::IsExpression("variable", parameterType))
-      usedExtensions.insert("BuiltinVariables");
-  }
+      result.GetUsedExtensions().insert("BuiltinVariables");
+  });
+
   return false;
 }
 
 // Expressions scanner
 
-// Ignore litterals nodes
+// Ignore literals nodes
 void UsedExtensionsFinder::OnVisitNumberNode(NumberNode& node){};
 void UsedExtensionsFinder::OnVisitTextNode(TextNode& node){};
 
@@ -93,31 +107,35 @@ void UsedExtensionsFinder::OnVisitUnaryOperatorNode(UnaryOperatorNode& node) {
 
 // Add variable extension and visit sub-expressions on variable nodes
 void UsedExtensionsFinder::OnVisitVariableNode(VariableNode& node) {
-  usedExtensions.insert("BuiltinVariables");
+  result.GetUsedExtensions().insert("BuiltinVariables");
   if (node.child) node.child->Visit(*this);
 };
 
 void UsedExtensionsFinder::OnVisitVariableAccessorNode(
     VariableAccessorNode& node) {
-  usedExtensions.insert("BuiltinVariables");
+  result.GetUsedExtensions().insert("BuiltinVariables");
   if (node.child) node.child->Visit(*this);
 };
 
 void UsedExtensionsFinder::OnVisitVariableBracketAccessorNode(
     VariableBracketAccessorNode& node) {
-  usedExtensions.insert("BuiltinVariables");
+  result.GetUsedExtensions().insert("BuiltinVariables");
   node.expression->Visit(*this);
   if (node.child) node.child->Visit(*this);
 };
 
 // Add extensions bound to Objects/Behaviors/Functions
-void UsedExtensionsFinder::OnVisitIdentifierNode(IdentifierNode& node) {
-  auto type = gd::ExpressionTypeFinder::GetType(project.GetCurrentPlatform(), GetGlobalObjectsContainer(), GetObjectsContainer(), rootType, node);
+void UsedExtensionsFinder::OnVisitIdentifierNode(IdentifierNode &node) {
+  auto type = gd::ExpressionTypeFinder::GetType(
+      project.GetCurrentPlatform(), GetGlobalObjectsContainer(),
+      GetObjectsContainer(), rootType, node);
   if (gd::ParameterMetadata::IsObject(type)) {
-    usedExtensions.insert(gd::MetadataProvider::GetExtensionAndObjectMetadata(
-                              project.GetCurrentPlatform(), node.identifierName)
-                              .GetExtension()
-                              .GetName());
+    auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
+        project.GetCurrentPlatform(), node.identifierName);
+    result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
+    for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
+      result.GetUsedIncludeFiles().insert(includeFile);
+    }
   }
 };
 
@@ -138,7 +156,10 @@ void UsedExtensionsFinder::OnVisitFunctionCallNode(FunctionCallNode& node) {
       return;
   }
 
-  usedExtensions.insert(metadata.GetExtension().GetName());
+  result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
+  for (auto&& includeFile : metadata.GetMetadata().GetIncludeFiles()) {
+    result.GetUsedIncludeFiles().insert(includeFile);
+  }
 };
 
 }  // namespace gd