Fix expression default type.

.circleci/config.yml

@@ -15,7 +15,7 @@ jobs:
   # Build the **entire** app for macOS.
   build-macos:
     macos:
-      xcode: 14.2.0
+      xcode: 12.5.1
     steps:
       - checkout
 
@@ -64,11 +64,11 @@ jobs:
       # Note: Code signing is done using CSC_LINK (see https://www.electron.build/code-signing).
       - run:
           name: Build GDevelop IDE
-          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && CI=false npm run build -- --mac --publish=never
+          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --mac --publish=never
 
       - run:
           name: Clean dist folder to keep only installers/binaries.
-          command: rm -rf "newIDE/electron-app/dist/mac-universal/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:
@@ -101,8 +101,8 @@ jobs:
           command: sudo apt-get update && sudo apt install cmake
 
       - run:
-          name: Install Python3 dependencies for Emscripten
-          command: sudo apt install python-is-python3 python3-distutils -y
+         name: Install Python3 dependencies for Emscripten
+         command: sudo apt install python-is-python3 python3-distutils -y
 
       - run:
           name: Install Emscripten (for GDevelop.js)
@@ -178,8 +178,8 @@ jobs:
           command: sudo apt-get update && sudo apt install cmake
 
       - run:
-          name: Install Python3 dependencies for Emscripten
-          command: sudo apt install python-is-python3 python3-distutils -y
+         name: Install Python3 dependencies for Emscripten
+         command: sudo apt install python-is-python3 python3-distutils -y
 
       - run:
           name: Install Emscripten (for GDevelop.js)

.devcontainer/Dockerfile

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

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

@@ -0,0 +1,51 @@
+// 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/--bug-report.md

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

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

@@ -9,10 +9,6 @@ name: Build Storybook
 on:
   # Launch on all commits.
   push:
-    branches:
-      - "**"
-    tags-ignore:
-      - "**" # Don't run on new tags
   # Allows to run this workflow manually from the Actions tab,
   # to publish on Chromatic (not done by default).
   workflow_dispatch:
@@ -21,23 +17,27 @@ jobs:
   build-storybook:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 50
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-          cache: "npm"
-          cache-dependency-path: "newIDE/app/package-lock.json"
-
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.BUILD_STORYBOOK_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.BUILD_STORYBOOK_AWS_SECRET_ACCESS_KEY }}
           aws-region: us-east-1
 
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 50
+
+      # Cache npm dependencies to speed up the workflow
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-newIDE-app-node_modules
+        with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('newIDE/app/package-lock.json') }}
+
       - name: Install newIDE dependencies
         run: npm install
         working-directory: newIDE/app
@@ -57,8 +57,8 @@ jobs:
 
       - name: Log urls to the Storybook
         run: |
-          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"
+          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"
 
       # Publish on Chromatic, only when manually launched (too costly to run on every commit).
       - name: Publish Storybook to Chromatic

.github/workflows/extract-translations.yml

@@ -4,10 +4,6 @@ name: Extract translations
 on:
   # Execute for all commits (to ensure translations extraction works)
   push:
-    branches:
-      - "**"
-    tags-ignore:
-      - "**" # Don't run on new tags
   # Allows to run this workflow manually from the Actions tab.
   workflow_dispatch:
 
@@ -15,12 +11,17 @@ jobs:
   extract-translations:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v2
+
+      # Cache npm dependencies to speed up the workflow
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-newIDE-app-node_modules
         with:
-          node-version: 16
-          cache: "npm"
-          cache-dependency-path: "newIDE/app/package-lock.json"
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('newIDE/app/package-lock.json') }}
 
       - name: Install gettext
         run: sudo apt update && sudo apt install gettext -y
@@ -37,7 +38,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/issues.yml

@@ -3,17 +3,41 @@ on:
   issues:
     types: [opened]
 jobs:
+  autoclose:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Autoclose issues about adding a bug without changing the bug report template
+      uses: arkon/issue-closer-action@v1.1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        type: "body"
+        regex: ".*Scroll down to '\\.\\.\\.\\.'.*"
+        message: "Hi @${issue.user.login}! 👋 This issue was automatically closed because it seems that you have not included any steps to reproduce the bug.\n\nGitHub is a place for the technical development of GDevelop itself - you may want to go on the [forum](https://forum.gdevelop.io/), the Discord chat or [read the documentation](https://wiki.gdevelop.io/gdevelop5/start) to learn more about GDevelop. Thanks!"
+    - name: Autoclose known beta 105 web-app update bug
+      uses: arkon/issue-closer-action@v1.1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        type: "body"
+        regex: ".*_instance.getRawFloatProperty is not a function.*"
+        message: "Hi @${issue.user.login}! 👋 This issue was automatically closed as this seems to be a known bug. It can be solved by **closing entirely the web-app and opening it again**. This will allow the web-app to auto-update and the problem should be gone."
+    - name: Autoclose known beta 114 web-app update bug
+      uses: arkon/issue-closer-action@v1.1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        type: "body"
+        regex: ".*getAssociatedSettings is not a function.*"
+        message: "Hi @${issue.user.login}! 👋 This issue was automatically closed as this seems to be a known bug. It can be solved by **closing entirely the web-app and opening it again**. This will allow the web-app to auto-update and the problem should be gone."
   autocomment:
     runs-on: ubuntu-latest
     if: contains(github.event.issue.body, 'The node to be removed is not a child of this node')
     steps:
-      - name: Autocomment indications on bug if it looks like #3453
-        uses: peter-evans/create-or-update-comment@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          issue-number: ${{ github.event.issue.number }}
-          body: |
-            Hi @${{ github.actor }}!
-            Thank you for taking the time to open an issue.
+    - name: Autocomment indications on bug if it looks like #3453
+      uses: peter-evans/create-or-update-comment@v1
+      with:
+        issue-number: ${{ github.event.issue.number }}
+        body: |
+          Hi @${{ github.actor }}!
+          Thank you for taking the time to open an issue.
 
-            The solved issue #3453 mentioned a similar error, maybe it could help fix this new issue.
+          The solved issue #3453 mentioned a similar error, maybe it could help fix this new issue.
+        token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pull-requests.yml

@@ -1,53 +1,29 @@
 name: GDevelop Issues automatic workflow
 on:
   pull_request:
-    types: 
-      - opened
-      - reopened
-      - synchronize
+    types: [opened]
 jobs:
   read-locales-metadata:
-    if: github.event.pull_request.title == '[Auto PR] Update translations'
+    if: contains(github.event.pull_request.title, '[Auto PR] Update translations')
     runs-on: ubuntu-latest
-    env:
-      COMMENT_TITLE: "Translation ratio changes"
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Read and format locales metadata
-        env:
-          BASE: ${{ github.event.pull_request.base.sha }}
-          HEAD: ${{ github.event.pull_request.head.sha }}
-        run: |
-          LANS=($(git diff $BASE...$HEAD -- newIDE/app/src/locales/LocalesMetadata.js | grep -E "^\s+\"languageName" | sed -E "s/^ *\"languageName\": \"//g" | sed -E "s/\",//g" | sed -E "s/ /_/g"))
-          ADDS=($(git diff $BASE...$HEAD -- newIDE/app/src/locales/LocalesMetadata.js | grep -E "^\+\s*\"translationRatio\"" | sed -E "s/^\+ *\"translationRatio\": //g"))
-          SUBS=($(git diff $BASE...$HEAD -- newIDE/app/src/locales/LocalesMetadata.js | grep -E "^\-\s*\"translationRatio\"" | sed -E "s/^\- *\"translationRatio\": //g"))
-          touch sumup.md
-          echo "## $COMMENT_TITLE" >> sumup.md
-          echo "" >> sumup.md
-          echo "| Language | Change |" >> sumup.md
-          echo "| --- | --- |" >> sumup.md
-          for index in ${!ADDS[@]}; do
-            DELTA=$(echo "scale=3; (${ADDS[index]} - ${SUBS[index]})*100/1" | bc)
-            if (( $(echo "$DELTA == 0" | bc -l) )); then
-              continue
-            fi
-            LANGUAGE=${LANS[index]//_/ }
-            echo "| $LANGUAGE | $(printf "%1.3f" $DELTA) % |" >> sumup.md
-          done
-      - name: Find Comment
-        uses: peter-evans/find-comment@v2
-        id: fc
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          issue-number: ${{ github.event.number }}
-          body-includes: ${{ env.COMMENT_TITLE }}
-      - name: Autocomment pull request with sumup
-        uses: peter-evans/create-or-update-comment@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          issue-number: ${{ github.event.number }}
-          comment-id: ${{ steps.fc.outputs.comment-id }}
-          edit-mode: replace
-          body-path: "sumup.md"
+    - name: Read and format locales metadata
+      run: |
+        LANS=($(git diff HEAD^ HEAD --unified=5 newIDE/app/src/locales/LocalesMetadata.js | tail +6 | grep -E "^\s+\"languageName" | sed -E "s/^ *\"languageName\": \"//g" | sed -E "s/\",//g" | sed -E "s/ /_/g"))
+        ADDS=($(git diff HEAD^ HEAD --unified=0 newIDE/app/src/locales/LocalesMetadata.js | tail +6 | grep -E "^\+\s*\"translationRatio\"" | sed -E "s/^\+ *\"translationRatio\": //g"))
+        SUBS=($(git diff HEAD^ HEAD --unified=0 newIDE/app/src/locales/LocalesMetadata.js | tail +6 | grep -E "^\-\s*\"translationRatio\"" | sed -E "s/^\- *\"translationRatio\": //g"))
+        touch sumup.txt
+        for index in ${!ADDS[@]}; do
+          echo ${LANS[index]} | sed -E "s/_/ /g" >> sumup.txt
+          DELTA=$(bc <<< "scale=2;(${ADDS[index]}-${SUBS[index]})*100/1")
+          echo $DELTA % >> sumup.txt
+        done
+    - name: Store sumup in outputs
+      id: sumup
+      run: echo "::set-output name=sumupFileContent::$(cat sumup.txt)"
+    - name: Autocomment pull request with sumup
+      uses: peter-evans/create-or-update-comment@v1
+      with:
+        issue-number: ${{ github.event.number }}
+        body: ${{ steps.sumup.outputs.sumupFileContent}}
+        token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/update-translations.yml

@@ -7,8 +7,6 @@ on:
   push:
     branches:
       - master
-    tags-ignore:
-      - "**" # Don't run on new tags
   # Allows to run this workflow manually from the Actions tab.
   workflow_dispatch:
 
@@ -16,12 +14,17 @@ jobs:
   update-translations:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v2
+
+      # Cache npm dependencies to speed up the workflow
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-newIDE-app-node_modules
         with:
-          node-version: 16
-          cache: "npm"
-          cache-dependency-path: "newIDE/app/package-lock.json"
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('newIDE/app/package-lock.json') }}
 
       - name: Install gettext
         run: sudo apt update && sudo apt install gettext -y
@@ -41,7 +44,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:
@@ -58,13 +61,13 @@ jobs:
         working-directory: newIDE/app
 
       - name: Create a Pull Request with the changes
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v3.10.1
         with:
           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.

.vscode/settings.json

@@ -1,134 +1,131 @@
 // Place your settings in this file to overwrite default and user settings.
 {
-  "files.associations": {
-    "*.idl": "java",
-    "Fastfile": "ruby",
-    "iosfwd": "cpp",
-    "functional": "cpp",
-    "type_traits": "cpp",
-    "utility": "cpp",
-    "algorithm": "cpp",
-    "random": "cpp",
-    "__config": "cpp",
-    "cstddef": "cpp",
-    "exception": "cpp",
-    "initializer_list": "cpp",
-    "new": "cpp",
-    "stdexcept": "cpp",
-    "typeinfo": "cpp",
-    "*.tcc": "cpp",
-    "cctype": "cpp",
-    "clocale": "cpp",
-    "cmath": "cpp",
-    "complex": "cpp",
-    "cstdarg": "cpp",
-    "cstdio": "cpp",
-    "cstdlib": "cpp",
-    "ctime": "cpp",
-    "cwchar": "cpp",
-    "cwctype": "cpp",
-    "istream": "cpp",
-    "limits": "cpp",
-    "memory": "cpp",
-    "ostream": "cpp",
-    "sstream": "cpp",
-    "streambuf": "cpp",
-    "hashtable": "cpp",
-    "tuple": "cpp",
-    "unordered_map": "cpp",
-    "unordered_set": "cpp",
-    "__split_buffer": "cpp",
-    "deque": "cpp",
-    "iterator": "cpp",
-    "list": "cpp",
-    "map": "cpp",
-    "queue": "cpp",
-    "regex": "cpp",
-    "set": "cpp",
-    "stack": "cpp",
-    "string": "cpp",
-    "vector": "cpp",
-    "iostream": "cpp",
-    "__functional_03": "cpp",
-    "__hash_table": "cpp",
-    "__tree": "cpp",
-    "bitset": "cpp",
-    "__bit_reference": "cpp",
-    "__mutex_base": "cpp",
-    "fstream": "cpp",
-    "ios": "cpp",
-    "__locale": "cpp",
-    "valarray": "cpp",
-    "freeglut_spaceball.c": "cpp",
-    "__tuple": "cpp",
-    "hash_map": "cpp",
-    "hash_set": "cpp",
-    "system_error": "cpp",
-    "__nullptr": "cpp",
-    "__functional_base": "cpp",
-    "__functional_base_03": "cpp",
-    "chrono": "cpp",
-    "ratio": "cpp",
-    "atomic": "cpp",
-    "locale": "cpp",
-    "string_view": "cpp",
-    "__string": "cpp",
-    "cstring": "cpp",
-    "iomanip": "cpp",
-    "cstdint": "cpp",
-    "forward_list": "cpp",
-    "mutex": "cpp",
-    "__hash": "cpp",
-    "__debug": "cpp",
-    "__threading_support": "cpp",
-    "any": "cpp",
-    "array": "cpp",
-    "cinttypes": "cpp",
-    "numeric": "cpp",
-    "__memory": "cpp",
-    "__errc": "cpp",
-    "__node_handle": "cpp",
-    "bit": "cpp",
-    "optional": "cpp",
-    "filesystem": "cpp",
-    "compare": "cpp",
-    "concepts": "cpp",
-    "xfacet": "cpp",
-    "xhash": "cpp",
-    "xiosbase": "cpp",
-    "xlocale": "cpp",
-    "xlocinfo": "cpp",
-    "xlocmon": "cpp",
-    "xlocnum": "cpp",
-    "xloctime": "cpp",
-    "xmemory": "cpp",
-    "xstddef": "cpp",
-    "xstring": "cpp",
-    "xtr1common": "cpp",
-    "xtree": "cpp",
-    "xutility": "cpp",
-    "xlocbuf": "cpp",
-    "xlocmes": "cpp",
-    "xmemory0": "cpp",
-    "memory_resource": "cpp",
-    "__bits": "cpp",
-    "__verbose_abort": "cpp",
-    "variant": "cpp"
-  },
-  "files.exclude": {
-    "Binaries/*build*": true,
-    "Binaries/Output": true,
-    "GDJS/Runtime-dist": true,
-    "docs": true,
-    "newIDE/electron-app/dist": true,
-    "newIDE/app/build": true,
-    "newIDE/app/resources/GDJS": true,
-    "newIDE/electron-app/app/www": true
-  },
-  // Support for Flowtype (for newIDE):
-  "javascript.validate.enable": false,
-  "flow.useNPMPackagedFlow": true,
+    "files.associations": {
+        "*.idl": "java",
+        "Fastfile": "ruby",
+        "iosfwd": "cpp",
+        "functional": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "algorithm": "cpp",
+        "random": "cpp",
+        "__config": "cpp",
+        "cstddef": "cpp",
+        "exception": "cpp",
+        "initializer_list": "cpp",
+        "new": "cpp",
+        "stdexcept": "cpp",
+        "typeinfo": "cpp",
+        "*.tcc": "cpp",
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "complex": "cpp",
+        "cstdarg": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "memory": "cpp",
+        "ostream": "cpp",
+        "sstream": "cpp",
+        "streambuf": "cpp",
+        "hashtable": "cpp",
+        "tuple": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "__split_buffer": "cpp",
+        "deque": "cpp",
+        "iterator": "cpp",
+        "list": "cpp",
+        "map": "cpp",
+        "queue": "cpp",
+        "regex": "cpp",
+        "set": "cpp",
+        "stack": "cpp",
+        "string": "cpp",
+        "vector": "cpp",
+        "iostream": "cpp",
+        "__functional_03": "cpp",
+        "__hash_table": "cpp",
+        "__tree": "cpp",
+        "bitset": "cpp",
+        "__bit_reference": "cpp",
+        "__mutex_base": "cpp",
+        "fstream": "cpp",
+        "ios": "cpp",
+        "__locale": "cpp",
+        "valarray": "cpp",
+        "freeglut_spaceball.c": "cpp",
+        "__tuple": "cpp",
+        "hash_map": "cpp",
+        "hash_set": "cpp",
+        "system_error": "cpp",
+        "__nullptr": "cpp",
+        "__functional_base": "cpp",
+        "__functional_base_03": "cpp",
+        "chrono": "cpp",
+        "ratio": "cpp",
+        "atomic": "cpp",
+        "locale": "cpp",
+        "string_view": "cpp",
+        "__string": "cpp",
+        "cstring": "cpp",
+        "iomanip": "cpp",
+        "cstdint": "cpp",
+        "forward_list": "cpp",
+        "mutex": "cpp",
+        "__hash": "cpp",
+        "__debug": "cpp",
+        "__threading_support": "cpp",
+        "any": "cpp",
+        "array": "cpp",
+        "cinttypes": "cpp",
+        "numeric": "cpp",
+        "__memory": "cpp",
+        "__errc": "cpp",
+        "__node_handle": "cpp",
+        "bit": "cpp",
+        "optional": "cpp",
+        "filesystem": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "xfacet": "cpp",
+        "xhash": "cpp",
+        "xiosbase": "cpp",
+        "xlocale": "cpp",
+        "xlocinfo": "cpp",
+        "xlocmon": "cpp",
+        "xlocnum": "cpp",
+        "xloctime": "cpp",
+        "xmemory": "cpp",
+        "xstddef": "cpp",
+        "xstring": "cpp",
+        "xtr1common": "cpp",
+        "xtree": "cpp",
+        "xutility": "cpp",
+        "xlocbuf": "cpp",
+        "xlocmes": "cpp",
+        "xmemory0": "cpp",
+        "memory_resource": "cpp"
+    },
+    "files.exclude": {
+        "Binaries/*build*": true,
+        "Binaries/Output": true,
+        "GDJS/Runtime-dist": true,
+        "docs": true,
+        "newIDE/electron-app/dist": true,
+        "newIDE/app/build": true,
+        "newIDE/app/resources/GDJS": true,
+        "newIDE/electron-app/app/www": true
+    },
+    // Support for Flowtype (for newIDE):
+    "javascript.validate.enable": false,
+    "flow.useNPMPackagedFlow": true,
 
-  // Clang format styling (duplicated in scripts/CMakeClangUtils.txt)
-  "C_Cpp.clang_format_style": "{BasedOnStyle: Google, BinPackParameters: false, BinPackArguments: false}"
+    // Clang format styling (duplicated in scripts/CMakeClangUtils.txt)
+    "C_Cpp.clang_format_style": "{BasedOnStyle: Google, BinPackParameters: false, BinPackArguments: false}"
 }

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,99 +1,100 @@
-# This is the CMake file used to build GDevelop.
-# For more information, see the README.md file.
+#This is the CMake file used to build GDevelop.
+#For more information, see the Readme.md file.
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 2.6)
+cmake_policy(SET CMP0011 NEW)
 
 # Add utility functions
 include(scripts/CMakeClangUtils.txt) # To add clang-format and clang-tidy support to a target
 
 # Macro for defining an option
 macro(gd_set_option var default type docstring)
-	if(NOT DEFINED ${var})
-		set(${var} ${default})
-	endif()
-	set(${var} ${${var}} CACHE ${type} ${docstring} FORCE)
+    if(NOT DEFINED ${var})
+        set(${var} ${default})
+    endif()
+    set(${var} ${${var}} CACHE ${type} ${docstring} FORCE)
 endmacro()
-
-# Set options
 gd_set_option(BUILD_CORE TRUE BOOL "TRUE to build GDevelop Core library")
 gd_set_option(BUILD_GDJS TRUE BOOL "TRUE to build GDevelop JS Platform")
 gd_set_option(BUILD_EXTENSIONS TRUE BOOL "TRUE to build the extensions")
 gd_set_option(BUILD_TESTS TRUE BOOL "TRUE to build the tests")
 
 # Disable deprecated code
-set(NO_GUI TRUE CACHE BOOL "" FORCE) # Force disable old GUI related code.
+set(NO_GUI TRUE CACHE BOOL "" FORCE) #Force disable old GUI related code.
 
-# Setting up installation directory, for Linux (has to be done before "project" command).
-if(NOT WIN32)
-	if(NOT APPLE)
-		gd_set_option(GD_INSTALL_PREFIX "/opt/gdevelop/" STRING "The directory where GDevelop should be installed")
-	else()
-		gd_set_option(GD_INSTALL_PREFIX "." STRING "The directory where GDevelop should be installed")
-	endif()
+#Setting up installation directory, for Linux (has to be done before "project" command).
+IF(NOT WIN32)
+	if (NOT APPLE)
+	gd_set_option(GD_INSTALL_PREFIX "/opt/gdevelop/" STRING "The directory where GDevelop should be installed")
+	ELSE()
+	gd_set_option(GD_INSTALL_PREFIX "." STRING "The directory where GDevelop should be installed")
+	ENDIF()
 
-	# As we embed SFML, prevent it to be installed system-wide
+	#As we embed SFML, prevent it to be installed system-wide
 	set(CMAKE_INSTALL_PREFIX "${GD_INSTALL_PREFIX}/useless")
-endif()
+ENDIF()
 
 project(GDevelop)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-if(NOT WIN32 AND NOT APPLE AND NOT BUILD_TESTS)
-	set(CMAKE_SKIP_BUILD_RPATH TRUE) # Avoid errors when packaging for linux.
-endif()
-if(APPLE)
+IF(NOT WIN32 AND NOT APPLE AND NOT BUILD_TESTS)
+	SET(CMAKE_SKIP_BUILD_RPATH  TRUE) #Avoid errors when packaging for linux.
+ENDIF()
+IF(APPLE)
 	set(CMAKE_MACOSX_RPATH 1)
 	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
 	set(CMAKE_INSTALL_RPATH ".")
 	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-	add_compile_options(
-		-D_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_
-		-Wno-potentially-evaluated-expression)
-endif()
-# Sanity checks
-if("${CMAKE_BUILD_TYPE}" STREQUAL "")
-	message(STATUS "CMAKE_BUILD_TYPE is empty, assuming build type is Release")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-potentially-evaluated-expression")
+ENDIF()
+#Sanity checks
+IF ("${CMAKE_BUILD_TYPE}" STREQUAL "")
+	message( "CMAKE_BUILD_TYPE is empty, assuming build type is Release" )
 	set(CMAKE_BUILD_TYPE Release)
-endif()
+ENDIF()
 
-if("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT WIN32 AND CMAKE_COMPILER_IS_GNUCXX)
-	set(CMAKE_SHARED_LINKER_FLAGS "-s") # Force stripping to avoid errors when packaging for linux.
-endif()
+IF("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT WIN32 AND CMAKE_COMPILER_IS_GNUCXX)
+	SET(CMAKE_SHARED_LINKER_FLAGS "-s") #Force stripping to avoid errors when packaging for linux.
+ENDIF()
 
 #Activate C++11
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
+include(CheckCXXCompilerFlag)
+CHECK_CXX_COMPILER_FLAG("-std=gnu++11" COMPILER_SUPPORTS_CXX11)
+CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" COMPILER_SUPPORTS_CXX0X)
+if(COMPILER_SUPPORTS_CXX11)
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+elseif(COMPILER_SUPPORTS_CXX0X)
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+else()
+    message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support (with GNU extensions). Please use a different C++ compiler.")
+endif()
 
 # Mark some warnings as errors
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 	# Activate as much warnings as possible to avoid errors like
 	# uninitialized variables or other hard to debug bugs.
-	add_compile_options(
-		-Wall
-		-Wno-unknown-warning-option
-		-Wno-reorder-ctor
-		-Wno-reorder
-		-Wno-pessimizing-move
-		-Wno-unused-variable
-		-Wno-unused-private-field
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reorder-ctor -Wno-reorder -Wno-pessimizing-move -Wno-unused-variable -Wno-unused-private-field")
 
-		# Make as much warnings considered as errors as possible (only one for now).
-		-Werror=return-stack-address)
+	# Make as much warnings considered as errors as possible (only one for now).
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-stack-address")
 endif()
 
-# Define common directories:
+#Define common directories:
 set(GD_base_dir ${CMAKE_CURRENT_SOURCE_DIR})
 
-# Add all the CMakeLists:
-add_subdirectory(ExtLibs)
-if(BUILD_CORE)
-	add_subdirectory(Core)
-endif()
-if(BUILD_GDJS)
-	add_subdirectory(GDJS)
-endif()
-if(EMSCRIPTEN)
-	add_subdirectory(GDevelop.js)
-endif()
-if(BUILD_EXTENSIONS)
-	add_subdirectory(Extensions)
-endif()
+#Add all the CMakeLists:
+ADD_SUBDIRECTORY(ExtLibs)
+IF(BUILD_CORE)
+	ADD_SUBDIRECTORY(Core)
+ENDIF()
+IF(BUILD_GDJS)
+	ADD_SUBDIRECTORY(GDJS)
+ENDIF()
+IF(EMSCRIPTEN)
+	ADD_SUBDIRECTORY(GDevelop.js)
+ENDIF()
+IF(BUILD_EXTENSIONS)
+	ADD_SUBDIRECTORY(Extensions)
+ENDIF()

Core/CMakeLists.txt

@@ -1,98 +1,83 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 2.6)
+cmake_policy(SET CMP0015 NEW)
 
 project(GDCore)
 
-set(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1) # Force use response file: useful for Ninja build system on Windows.
-set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-set(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES 1)
-set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES 1)
+SET(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1) #Force use response file: useful for Ninja build system on Windows.
+SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
+SET(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES 1)
+SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES 1)
 
-# Define common directories:
+#Define common directories:
 set(GDCORE_include_dir ${GD_base_dir}/Core PARENT_SCOPE)
 set(GDCORE_lib_dir ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME} PARENT_SCOPE)
 
-# Dependencies on external libraries:
-#
+#Dependencies on external libraries:
+###
 
-# Defines
-#
-add_definitions(-DGD_IDE_ONLY)
-if(EMSCRIPTEN)
-	add_definitions(-DEMSCRIPTEN)
-endif()
-if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
-	add_definitions(-DDEBUG)
-else()
-	add_definitions(-DRELEASE)
-endif()
+#Defines
+###
+add_definitions( -DGD_IDE_ONLY )
+IF (EMSCRIPTEN)
+	add_definitions( -DEMSCRIPTEN )
+ENDIF()
+IF(CMAKE_BUILD_TYPE MATCHES "Debug")
+	add_definitions( -DDEBUG )
+ELSE()
+	add_definitions( -DRELEASE )
+ENDIF()
 
-if(WIN32)
-	add_definitions(-DWINDOWS)
-	add_definitions("-DGD_CORE_API=__declspec(dllexport)")
-	add_definitions(-D__GNUWIN32__)
-else()
-	if(APPLE)
-		add_definitions(-DMACOS)
-	else()
-		add_definitions(-DLINUX)
-	endif()
-	add_definitions(-DGD_API=)
-	add_definitions(-DGD_CORE_API=)
-endif()
+IF(WIN32)
+	add_definitions( -DWINDOWS )
+	add_definitions( "-DGD_CORE_API=__declspec(dllexport)" )
+	add_definitions( -D__GNUWIN32__ )
+ELSE()
+    IF(APPLE)
+    add_definitions( -DMACOS )
+    ELSE()
+	add_definitions( -DLINUX )
+	ENDIF()
+	add_definitions( -DGD_API= )
+	add_definitions( -DGD_CORE_API= )
+ENDIF(WIN32)
 
-# The target
-#
+#The target
+###
 include_directories(.)
-file(
-	GLOB_RECURSE
-	source_files
-	GDCore/*)
+file(GLOB_RECURSE source_files GDCore/*)
 
-file(
-	GLOB_RECURSE
-	formatted_source_files
-	tests/*
-	GDCore/Events/*
-	GDCore/Extensions/*
-	GDCore/IDE/*
-	GDCore/Project/*
-	GDCore/Serialization/*
-	GDCore/Tools/*)
-list(
-	REMOVE_ITEM
-	formatted_source_files
-	"${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.cpp"
-	"${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.h"
-	"${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs_dialogs_bitmaps.cpp")
+file(GLOB_RECURSE formatted_source_files tests/* GDCore/Events/* GDCore/Extensions/* GDCore/IDE/* GDCore/Project/* GDCore/Serialization/* GDCore/Tools/*)
+list(REMOVE_ITEM formatted_source_files "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.h" "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs_dialogs_bitmaps.cpp")
 gd_add_clang_utils(GDCore "${formatted_source_files}")
 
-if(EMSCRIPTEN)
+IF(EMSCRIPTEN)
 	# Emscripten treats all libraries as static libraries
 	add_library(GDCore STATIC ${source_files})
-else()
+ELSE()
 	add_library(GDCore SHARED ${source_files})
-endif()
-if(EMSCRIPTEN)
+ENDIF()
+IF(EMSCRIPTEN)
 	set_target_properties(GDCore PROPERTIES SUFFIX ".bc")
-elseif(WIN32)
+ELSEIF(WIN32)
 	set_target_properties(GDCore PROPERTIES PREFIX "")
-else()
+ELSE()
 	set_target_properties(GDCore PROPERTIES PREFIX "lib")
-endif()
+ENDIF()
 set(LIBRARY_OUTPUT_PATH ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME})
 set(ARCHIVE_OUTPUT_PATH ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME})
 set(RUNTIME_OUTPUT_PATH ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME})
 
-# Tests
-#
+#Tests
+###
 if(BUILD_TESTS)
 	file(
-		GLOB_RECURSE
-		test_source_files
-		tests/*)
+	    GLOB_RECURSE
+	    test_source_files
+	    tests/*
+	)
 
 	add_executable(GDCore_tests ${test_source_files})
-	set_target_properties(GDCore_tests PROPERTIES BUILD_WITH_INSTALL_RPATH FALSE) # Allow finding dependencies directly from build path on Mac OS X.
+	set_target_properties(GDCore_tests PROPERTIES BUILD_WITH_INSTALL_RPATH FALSE) #Allow finding dependencies directly from build path on Mac OS X.
 	target_link_libraries(GDCore_tests GDCore)
 	target_link_libraries(GDCore_tests ${CMAKE_DL_LIBS})
 endif()

Core/GDCore/Events/Builtin/CommentEvent.cpp

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

Core/GDCore/Events/Builtin/ForEachEvent.cpp

@@ -15,7 +15,7 @@ using namespace std;
 namespace gd {
 
 ForEachEvent::ForEachEvent()
-    : BaseEvent(), objectsToPick("") {}
+    : BaseEvent(), objectsToPick(""), objectsToPickSelected(false) {}
 
 vector<gd::InstructionsList*> ForEachEvent::GetAllConditionsVectors() {
   vector<gd::InstructionsList*> allConditions;

Core/GDCore/Events/Builtin/ForEachEvent.h

@@ -6,8 +6,6 @@
 
 #ifndef FOREACHEVENT_H
 #define FOREACHEVENT_H
-#include <vector>
-
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
 namespace gd {
@@ -64,17 +62,13 @@ class GD_CORE_API ForEachEvent : public gd::BaseEvent {
   virtual void UnserializeFrom(gd::Project& project,
                                const SerializerElement& element);
 
-  std::vector<gd::Expression*> GetAllObjectExpressions() {
-    std::vector<gd::Expression*> allObjectExpressions;
-    allObjectExpressions.push_back(&objectsToPick);
-    return allObjectExpressions;
-  }
-
  private:
   gd::Expression objectsToPick;
   gd::InstructionsList conditions;
   gd::InstructionsList actions;
   gd::EventsList events;
+
+  bool objectsToPickSelected;
 };
 
 }  // namespace gd

Core/GDCore/Events/Builtin/GroupEvent.h

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

Core/GDCore/Events/Builtin/LinkEvent.cpp

@@ -16,7 +16,6 @@
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/Events/EventVisitor.h"
 
 using namespace std;
 
@@ -157,14 +156,4 @@ 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 override { return new LinkEvent(*this); }
+  virtual gd::LinkEvent* Clone() const { 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() override { return true; }
+  virtual bool MustBePreprocessed() { return true; }
 
   /**
    * \brief Get a pointer to the list of events that are targeted by the link.
@@ -107,14 +107,11 @@ class GD_CORE_API LinkEvent : public gd::BaseEvent {
                                  EventsList& eventList,
                                  std::size_t indexOfTheEventInThisList);
 
-  virtual bool IsExecutable() const override { return true; };
+  virtual bool IsExecutable() const { return true; };
 
-  virtual void SerializeTo(SerializerElement& element) const override;
+  virtual void SerializeTo(SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,
-                               const SerializerElement& element) override;
-
-  bool AcceptVisitor(gd::EventVisitor& eventVisitor) override;
-  void AcceptVisitor(gd::ReadOnlyEventVisitor& eventVisitor) const override;
+                               const SerializerElement& element);
 
  private:
   gd::String

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -267,12 +267,14 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
     return "/* Unknown instruction - skipped. */";
   }
 
-  AddIncludeFiles(instrInfos.GetIncludeFiles());
+  AddIncludeFiles(instrInfos.codeExtraInformation.GetIncludeFiles());
   maxConditionsListsSize =
       std::max(maxConditionsListsSize, condition.GetSubInstructions().size());
 
-  if (instrInfos.HasCustomCodeGenerator()) {
+  if (instrInfos.codeExtraInformation.HasCustomCodeGenerator()) {
     context.EnterCustomCondition();
+    conditionCode += GenerateReferenceToUpperScopeBoolean(
+        "conditionTrue", returnBoolean, context);
     conditionCode += instrInfos.codeExtraInformation.customCodeGenerator(
         condition, *this, context);
     maxCustomConditionsDepth =
@@ -289,7 +291,7 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
     condition.SetParameters(parameters);
   }
 
-  // Verify that there are no mismatches between object type in parameters.
+  // Verify that there are no mismatchs between object type in parameters.
   for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
     if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType())) {
       gd::String objectInParameter =
@@ -459,9 +461,9 @@ gd::String EventsCodeGenerator::GenerateActionCode(
     return "/* Unknown instruction - skipped. */";
   }
 
-  AddIncludeFiles(instrInfos.GetIncludeFiles());
+  AddIncludeFiles(instrInfos.codeExtraInformation.GetIncludeFiles());
 
-  if (instrInfos.HasCustomCodeGenerator()) {
+  if (instrInfos.codeExtraInformation.HasCustomCodeGenerator()) {
     return instrInfos.codeExtraInformation.customCodeGenerator(
         action, *this, context);
   }
@@ -481,7 +483,7 @@ gd::String EventsCodeGenerator::GenerateActionCode(
     action.SetParameters(parameters);
   }
 
-  // Verify that there are no mismatches between object type in parameters.
+  // Verify that there are no mismatchs between object type in parameters.
   for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
     if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType())) {
       gd::String objectInParameter = action.GetParameter(pNb).GetPlainString();
@@ -668,18 +670,6 @@ gd::String EventsCodeGenerator::GenerateActionsListCode(
   return outputCode;
 }
 
-const gd::String EventsCodeGenerator::GenerateRelationalOperatorCodes(const gd::String &operatorString) {
-    if (operatorString == "=") {
-        return "==";
-    }
-    if (operatorString != "<" && operatorString != ">" &&
-        operatorString != "<=" && operatorString != ">=" && operatorString != "!=") {
-      cout << "Warning: Bad relational operator: Set to == by default." << endl;
-      return "==";
-    }
-    return operatorString;
-}
-
 gd::String EventsCodeGenerator::GenerateParameterCodes(
     const gd::Expression& parameter,
     const gd::ParameterMetadata& metadata,
@@ -704,7 +694,14 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
     argOutput =
         GenerateObject(parameter.GetPlainString(), metadata.GetType(), context);
   } else if (metadata.GetType() == "relationalOperator") {
-    argOutput += GenerateRelationalOperatorCodes(parameter.GetPlainString());
+    auto parameterString = parameter.GetPlainString();
+    argOutput += parameterString == "=" ? "==" : parameterString;
+    if (argOutput != "==" && argOutput != "<" && argOutput != ">" &&
+        argOutput != "<=" && argOutput != ">=" && argOutput != "!=") {
+      cout << "Warning: Bad relational operator: Set to == by default." << endl;
+      argOutput = "==";
+    }
+
     argOutput = "\"" + argOutput + "\"";
   } else if (metadata.GetType() == "operator") {
     argOutput += parameter.GetPlainString();
@@ -724,10 +721,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
              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.GetType() == "password" || metadata.GetType() == "musicfile" ||
              metadata.GetType() == "soundfile" || metadata.GetType() == "police") {
@@ -1019,15 +1013,15 @@ gd::String EventsCodeGenerator::GenerateFreeCondition(
     bool conditionInverted,
     gd::EventsCodeGenerationContext& context) {
   // Generate call
-  gd::String predicate;
+  gd::String predicat;
   if (instrInfos.codeExtraInformation.type == "number" ||
       instrInfos.codeExtraInformation.type == "string") {
-    predicate = GenerateRelationalOperatorCall(
+    predicat = GenerateRelationalOperatorCall(
         instrInfos,
         arguments,
         instrInfos.codeExtraInformation.functionCallName);
   } else {
-    predicate = instrInfos.codeExtraInformation.functionCallName + "(" +
+    predicat = instrInfos.codeExtraInformation.functionCallName + "(" +
                GenerateArgumentsList(arguments, 0) + ")";
   }
 
@@ -1040,10 +1034,10 @@ gd::String EventsCodeGenerator::GenerateFreeCondition(
       conditionAlreadyTakeCareOfInversion = true;
   }
   if (!conditionAlreadyTakeCareOfInversion && conditionInverted)
-    predicate = GenerateNegatedPredicate(predicate);
+    predicat = GenerateNegatedPredicat(predicat);
 
   // Generate condition code
-  return returnBoolean + " = " + predicate + ";\n";
+  return returnBoolean + " = " + predicat + ";\n";
 }
 
 gd::String EventsCodeGenerator::GenerateObjectCondition(
@@ -1065,18 +1059,18 @@ gd::String EventsCodeGenerator::GenerateObjectCondition(
                 instrInfos.codeExtraInformation.functionCallName;
 
   // Create call
-  gd::String predicate;
+  gd::String predicat;
   if ((instrInfos.codeExtraInformation.type == "number" ||
        instrInfos.codeExtraInformation.type == "string")) {
-    predicate = GenerateRelationalOperatorCall(
+    predicat = GenerateRelationalOperatorCall(
         instrInfos, arguments, objectFunctionCallNamePart, 1);
   } else {
-    predicate = objectFunctionCallNamePart + "(" +
+    predicat = objectFunctionCallNamePart + "(" +
                GenerateArgumentsList(arguments, 1) + ")";
   }
-  if (conditionInverted) predicate = GenerateNegatedPredicate(predicate);
+  if (conditionInverted) predicat = GenerateNegatedPredicat(predicat);
 
-  return "For each picked object \"" + objectName + "\", check " + predicate +
+  return "For each picked object \"" + objectName + "\", check " + predicat +
          ".\n";
 }
 
@@ -1090,16 +1084,16 @@ gd::String EventsCodeGenerator::GenerateBehaviorCondition(
     bool conditionInverted,
     gd::EventsCodeGenerationContext& context) {
   // Create call
-  gd::String predicate;
+  gd::String predicat;
   if ((instrInfos.codeExtraInformation.type == "number" ||
        instrInfos.codeExtraInformation.type == "string")) {
-    predicate = GenerateRelationalOperatorCall(instrInfos, arguments, "", 2);
+    predicat = GenerateRelationalOperatorCall(instrInfos, arguments, "", 2);
   } else {
-    predicate = "(" + GenerateArgumentsList(arguments, 2) + ")";
+    predicat = "(" + GenerateArgumentsList(arguments, 2) + ")";
   }
-  if (conditionInverted) predicate = GenerateNegatedPredicate(predicate);
+  if (conditionInverted) predicat = GenerateNegatedPredicat(predicat);
 
-  return "For each picked object \"" + objectName + "\", check " + predicate +
+  return "For each picked object \"" + objectName + "\", check " + predicat +
          " for behavior \"" + behaviorName + "\".\n";
 }
 
@@ -1239,7 +1233,7 @@ size_t EventsCodeGenerator::GenerateSingleUsageUniqueIdFor(
               << std::endl;
   }
 
-  // Base the unique id on the address in memory so that the same instruction
+  // Base the unique id on the adress 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,18 +404,6 @@ 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.
    *
@@ -493,9 +481,6 @@ class GD_CORE_API EventsCodeGenerator {
    */
   size_t GenerateSingleUsageUniqueIdForEventsList();
 
-  virtual const gd::String GenerateRelationalOperatorCodes(
-      const gd::String& operatorString);
-
  protected:
   /**
    * \brief Generate the code for a single parameter.
@@ -505,9 +490,9 @@ class GD_CORE_API EventsCodeGenerator {
    * - object : Object name -> string
    * - expression : Mathematical expression -> number (double)
    * - string : %Text expression -> string
-   * - layer, color, file, stringWithSelector : Same as string
+   * - layer, color, file, joyaxis : Same as string
    * - relationalOperator : Used to make a comparison between the function
-  return value and value of the parameter preceding the relationOperator
+  resturn 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,
@@ -668,15 +653,28 @@ class GD_CORE_API EventsCodeGenerator {
   };
 
   /**
-   * \brief Must negate a predicate.
+   * \brief Must negate a predicat.
    *
-   * The default implementation generates C-style code : It wraps the predicate
+   * The default implementation generates C-style code : It wraps the predicat
    * inside parenthesis and add a !.
    */
-  virtual gd::String GenerateNegatedPredicate(const gd::String& predicate) const {
-    return "!(" + predicate + ")";
+  virtual gd::String GenerateNegatedPredicat(const gd::String& predicat) const {
+    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,
@@ -785,7 +783,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 occurred.
+  bool errorOccurred;          ///< Must be set to true if an error occured.
   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.GetFatalErrors().empty()) {
-    std::cout << "Error: \"" << validator.GetFatalErrors()[0]->GetMessage()
+  if (!validator.GetErrors().empty()) {
+    std::cout << "Error: \"" << validator.GetErrors()[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 apart from variables.
+    // because the type is needed to tell them appart from variables.
     output += GenerateDefaultValue(type);
   }
 }
@@ -216,10 +216,10 @@ gd::String ExpressionCodeGenerator::GenerateFreeFunctionCode(
     const std::vector<std::unique_ptr<ExpressionNode>>& parameters,
     const ExpressionMetadata& expressionMetadata) {
   codeGenerator.AddIncludeFiles(
-      expressionMetadata.GetIncludeFiles());
+      expressionMetadata.codeExtraInformation.GetIncludeFiles());
 
   // Launch custom code generator if needed
-  if (expressionMetadata.HasCustomCodeGenerator()) {
+  if (expressionMetadata.codeExtraInformation.HasCustomCodeGenerator()) {
     return expressionMetadata.codeExtraInformation.customCodeGenerator(
         PrintParameters(parameters), codeGenerator, context);
   }
@@ -242,10 +242,10 @@ gd::String ExpressionCodeGenerator::GenerateObjectFunctionCode(
       codeGenerator.GetObjectsAndGroups();
 
   codeGenerator.AddIncludeFiles(
-      expressionMetadata.GetIncludeFiles());
+      expressionMetadata.codeExtraInformation.GetIncludeFiles());
 
   // Launch custom code generator if needed
-  if (expressionMetadata.HasCustomCodeGenerator()) {
+  if (expressionMetadata.codeExtraInformation.HasCustomCodeGenerator()) {
     return expressionMetadata.codeExtraInformation.customCodeGenerator(
         PrintParameters(parameters), codeGenerator, context);
   }
@@ -300,10 +300,10 @@ gd::String ExpressionCodeGenerator::GenerateBehaviorFunctionCode(
       codeGenerator.GetObjectsAndGroups();
 
   codeGenerator.AddIncludeFiles(
-      expressionMetadata.GetIncludeFiles());
+      expressionMetadata.codeExtraInformation.GetIncludeFiles());
 
   // Launch custom code generator if needed
-  if (expressionMetadata.HasCustomCodeGenerator()) {
+  if (expressionMetadata.codeExtraInformation.HasCustomCodeGenerator()) {
     return expressionMetadata.codeExtraInformation.customCodeGenerator(
         PrintParameters(parameters), codeGenerator, context);
   }

Core/GDCore/Events/Event.cpp

@@ -9,7 +9,6 @@
 #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"
@@ -141,14 +140,6 @@ 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,8 +24,6 @@ class EventsCodeGenerationContext;
 class Platform;
 class SerializerElement;
 class Instruction;
-class EventVisitor;
-class ReadOnlyEventVisitor;
 }  // namespace gd
 
 namespace gd {
@@ -240,9 +238,6 @@ 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
@@ -282,14 +277,6 @@ class GD_CORE_API BaseEvent {
    */
   bool IsFolded() const { return folded; }
 
-  /**
-   * \brief Return a list of all objects linked to the event.
-   */
-  virtual std::vector<gd::Expression*> GetAllObjectExpressions() {
-    std::vector<gd::Expression*> allObjectExpressions;
-    return allObjectExpressions;
-  }
-
   ///@}
 
   std::weak_ptr<gd::BaseEvent>

Core/GDCore/Events/EventVisitor.h

@@ -1,76 +0,0 @@
-/*
- * 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;
-
-  /**
-   * @brief Abort the iteration on the events.
-   */
-  virtual void StopAnyEventIteration() = 0;
-};
-
-}

Core/GDCore/Events/EventsList.cpp

@@ -5,7 +5,6 @@
  */
 
 #include "EventsList.h"
-
 #include "GDCore/Events/Event.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Tools/Log.h"
@@ -101,8 +100,9 @@ bool EventsList::Contains(const gd::BaseEvent& eventToSearch,
 }
 
 bool EventsList::MoveEventToAnotherEventsList(const gd::BaseEvent& eventToMove,
-                                              gd::EventsList& newEventsList,
-                                              std::size_t newPosition) {
+                                  gd::EventsList& newEventsList,
+                                  std::size_t newPosition) {
+
   for (std::size_t i = 0; i < GetEventsCount(); ++i) {
     if (events[i].get() == &eventToMove) {
       std::shared_ptr<BaseEvent> event = events[i];

Core/GDCore/Events/Instruction.cpp

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

Core/GDCore/Events/Instruction.h

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

Core/GDCore/Events/Tools/EventsCodeNameMangler.cpp

@@ -17,7 +17,7 @@ const gd::String& EventsCodeNameMangler::GetMangledObjectsListName(
     return it->second;
   }
 
-  gd::String partiallyMangledName = GetMangledNameWithForbiddenUnderscore(originalObjectName);
+  gd::String partiallyMangledName = originalObjectName;
   static const gd::String allowedCharacters =
       "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
@@ -43,15 +43,7 @@ const gd::String& EventsCodeNameMangler::GetExternalEventsFunctionMangledName(
     return it->second;
   }
 
-  gd::String partiallyMangledName = GetMangledNameWithForbiddenUnderscore(externalEventsName);
-
-  mangledExternalEventsNames[externalEventsName] = "GDExternalEvents" + partiallyMangledName;
-  return mangledExternalEventsNames[externalEventsName];
-}
-
-gd::String EventsCodeNameMangler::GetMangledNameWithForbiddenUnderscore(
-    const gd::String &name) {
-  gd::String partiallyMangledName = name;
+  gd::String partiallyMangledName = externalEventsName;
   static const gd::String allowedCharacters =
       "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
@@ -65,30 +57,11 @@ gd::String EventsCodeNameMangler::GetMangledNameWithForbiddenUnderscore(
       partiallyMangledName.replace(i, 1, "_" + gd::String::From(unallowedChar));
     }
   }
-  return partiallyMangledName;
+
+  mangledExternalEventsNames[externalEventsName] = "GDExternalEvents" + partiallyMangledName;
+  return mangledExternalEventsNames[externalEventsName];
 }
 
-gd::String EventsCodeNameMangler::GetMangledName(
-    const gd::String &name) {
-  gd::String partiallyMangledName = name;
-  static const gd::String allowedCharacters =
-      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
-
-  for (size_t i = 0; i < partiallyMangledName.size();
-       ++i)  // Replace all unallowed letter by an underscore and the ascii
-             // number of the letter
-  {
-    if (allowedCharacters.find_first_of(
-            std::u32string(1, partiallyMangledName[i])) == gd::String::npos) {
-      char32_t unallowedChar = partiallyMangledName[i];
-      partiallyMangledName.replace(i, 1, "_" + gd::String::From(unallowedChar));
-    }
-  }
-  return partiallyMangledName;
-}
-
-
-
 const gd::String& ManObjListName(const gd::String &objectName) {
   return EventsCodeNameMangler::Get()->GetMangledObjectsListName(objectName);
 }

Core/GDCore/Events/Tools/EventsCodeNameMangler.h

@@ -36,8 +36,6 @@ class GD_CORE_API EventsCodeNameMangler {
   const gd::String &GetExternalEventsFunctionMangledName(
       const gd::String &externalEventsName);
 
-  static gd::String GetMangledName(const gd::String &name);
-
   static EventsCodeNameMangler *Get();
   static void DestroySingleton();
 
@@ -46,9 +44,6 @@ class GD_CORE_API EventsCodeNameMangler {
   virtual ~EventsCodeNameMangler(){};
   static EventsCodeNameMangler *_singleton;
 
-  // This method is inlined to avoid to copy the returned string.
-  static inline gd::String GetMangledNameWithForbiddenUnderscore(const gd::String &name);
-
   std::unordered_map<gd::String, gd::String>
       mangledObjectNames;  ///< Memoized results of mangling for objects
   std::unordered_map<gd::String, gd::String>

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -33,8 +33,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           "res/function32.png",
           "res/function32.png")
       .SetHelpPath("/events/functions/return")
-      .AddParameter("expression", _("The number to be returned"))
-      .SetRelevantForFunctionEventsOnly()
+      .AddParameter("expression", "The number to be returned")
       .MarkAsAdvanced();
 
   extension
@@ -48,8 +47,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           "res/function32.png",
           "res/function32.png")
       .SetHelpPath("/events/functions/return")
-      .AddParameter("string", _("The text to be returned"))
-      .SetRelevantForFunctionEventsOnly()
+      .AddParameter("string", "The text to be returned")
       .MarkAsAdvanced();
 
   extension
@@ -62,38 +60,7 @@ 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?"))
-      .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()
+      .AddParameter("trueorfalse", "Should the condition be true or false?")
       .MarkAsAdvanced();
 
   extension
@@ -107,57 +74,26 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                     "",
                     "res/function32.png",
                     "res/function32.png")
-      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
-      .SetRelevantForFunctionEventsOnly()
+      .AddParameter("functionParameterName", "Parameter name")
       .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"), "number,string,boolean")
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("functionParameterName", "Parameter name");
 
   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"), "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();
+      .AddParameter("functionParameterName", "Parameter name");
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/AsyncExtension.cpp

@@ -15,13 +15,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAsyncExtension(
   extension
       .SetExtensionInformation(
           "BuiltinAsync",
-          _("Asynchronous functions"),
+          _("Async 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"),
@@ -29,19 +27,6 @@ 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,8 +23,6 @@ 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",
@@ -148,83 +146,69 @@ 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."),
+                   "specified channel. The volume is between 0 and 100."),
                  _("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",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume (0-100)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
       .AddAction("ModVolumeMusicCanal",
                  _("Volume of the music on a channel"),
                  _("This action modifies the volume of the music on the "
-                   "specified channel."),
+                   "specified channel. The volume is between 0 and 100."),
                  _("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",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume (0-100)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
       .AddAction("ModGlobalVolume",
                  _("Game global volume"),
-                 _("This action modifies the global volume of the game."),
+                 _("This action modifies the global volume of the game. The "
+                   "volume is between 0 and 100."),
                  _("the global sound level"),
                  "",
                  "res/actions/volume24.png",
                  "res/actions/volume.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume (0-100)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsSimple();
 
   extension
       .AddAction("ModPitchSoundChannel",
                  _("Pitch of the sound of a channel"),
                  _("This action modifies the pitch (speed) of the sound on a "
-                   "channel."),
+                   "channel.\n1 is the default pitch."),
                  _("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",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Pitch (1 by default)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
       .AddAction("ModPitchMusicChannel",
                  _("Pitch of the music on a channel"),
                  _("This action modifies the pitch of the music on the "
-                   "specified channel."),
+                   "specified channel. 1 is the default pitch"),
                  _("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",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Pitch (1 by default)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -238,10 +222,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Position (in seconds)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -255,10 +236,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Position (in seconds)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -470,17 +448,15 @@ 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."),
+          _("Test the volume of the sound on the specified channel. The volume "
+            "is between 0 and 100."),
           _("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",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume to compare to (0-100)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -495,10 +471,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume to compare to (0-100)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -511,10 +484,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           "res/conditions/volume24.png",
           "res/conditions/volume.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume to compare to (0-100)")));
+      .UseStandardRelationalOperatorParameters("number");
 
   extension
       .AddCondition(
@@ -528,27 +498,22 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Pitch to compare to (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
       .AddCondition(
           "MusicChannelPitch",
           _("Pitch of the music on a channel"),
-          _("Test the pitch (speed) of the music on a specified channel."),
+          _("Test the pitch (speed) of the music on a specified channel. 1 is "
+            "the default pitch."),
           _("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",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Pitch to compare to (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -562,10 +527,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Position to compare to (in seconds)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -579,10 +541,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Position to compare to (in seconds)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -27,10 +27,6 @@ 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::ObjectConfiguration>(
       "", _("Base object"), _("Base object"), "res/objeticon24.png");
@@ -44,8 +40,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/position_black.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsSimple();
 
   obj.AddAction("MettreX",
@@ -57,8 +52,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/position_black.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("number")
       .MarkAsSimple();
 
   obj.AddCondition("PosY",
@@ -70,8 +64,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/position_black.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsSimple();
 
   obj.AddAction("MettreY",
@@ -83,8 +76,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/position_black.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("number")
       .MarkAsSimple();
 
   obj.AddAction("MettreXY",
@@ -128,7 +120,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Position/Center"),
          "res/actions/position24_black.png")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
+      .UseStandardParameters("number");
 
   obj.AddExpressionAndConditionAndAction(
          "number",
@@ -139,7 +131,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Position/Center"),
          "res/actions/position24_black.png")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
+      .UseStandardParameters("number");
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxLeft",
@@ -150,7 +142,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("Position/Bounding Box"),
                                 "res/conditions/bounding-box-left_black.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
+      .UseStandardParameters("number");
 
   obj.AddExpressionAndCondition(
          "number",
@@ -161,7 +153,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Position/Bounding Box"),
          "res/conditions/bounding-box-top_black.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
+      .UseStandardParameters("number");
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxRight",
@@ -172,7 +164,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("Position/Bounding Box"),
                                 "res/conditions/bounding-box-right_black.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
+      .UseStandardParameters("number");
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxBottom",
@@ -183,7 +175,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("Position/Bounding Box"),
                                 "res/conditions/bounding-box-bottom_black.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
+      .UseStandardParameters("number");
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxCenterX",
@@ -194,7 +186,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("Position/Bounding Box"),
                                 "res/conditions/bounding-box-center_black.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
+      .UseStandardParameters("number");
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxCenterY",
@@ -205,7 +197,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("Position/Bounding Box"),
                                 "res/conditions/bounding-box-center_black.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
+      .UseStandardParameters("number");
 
   obj.AddAction("MettreAutourPos",
                 _("Put around a position"),
@@ -234,10 +226,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/direction_black.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Angle (in degrees)")));
+      .UseStandardOperatorParameters("number");
 
   obj.AddAction("Rotate",
                 _("Rotate"),
@@ -393,8 +382,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/planicon.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions());
+      .UseStandardOperatorParameters("number");
 
   obj.AddAction("ChangeLayer",
                 _("Layer"),
@@ -410,8 +398,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddAction("ModVarObjet",
-                _("Change number variable"),
-                _("Modify the number value of an object variable."),
+                _("Value of an object variable"),
+                _("Change the value of an object variable."),
                 _("the variable _PARAM1_"),
                 _("Variables"),
                 "res/actions/var24.png",
@@ -419,12 +407,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions());
+      .UseStandardOperatorParameters("number");
 
   obj.AddAction("ModVarObjetTxt",
-                _("Change text variable"),
-                _("Modify the text of an object variable."),
+                _("Text of an object variable"),
+                _("Change the text of an object variable."),
                 _("the text of variable _PARAM1_"),
                 _("Variables"),
                 "res/actions/var24.png",
@@ -432,12 +419,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .UseStandardOperatorParameters("string",
-                                     ParameterOptions::MakeNewOptions());
+      .UseStandardOperatorParameters("string");
 
   obj.AddAction("SetObjectVariableAsBoolean",
-                _("Change boolean variable"),
-                _("Modify the boolean value of an object variable."),
+                _("Boolean value of an object variable"),
+                _("Change the boolean value of an object variable."),
                 _("Set the boolean value of variable _PARAM1_ of "
                   "_PARAM0_ to _PARAM2_"),
                 _("Variables"),
@@ -450,7 +436,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddAction(
          "ToggleObjectVariableAsBoolean",
-         _("Toggle boolean variable"),
+         _("Toggle the boolean value of an object 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."),
@@ -465,39 +451,37 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddCondition("ObjectVariableChildExists",
                    _("Child existence"),
-                   _("Check if the specified child of the object "
-                     "structure variable exists."),
+                   _("Check if the specified child of the variable exists."),
                    _("Child _PARAM2_ of variable _PARAM1_ of _PARAM0_ exists"),
-                   _("Variables/Arrays and structures"),
+                   _("Variables/Collections/Structures"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Structure variable"))
+      .AddParameter("objectvar", _("Variable"))
       .AddParameter("string", _("Name of the child"))
       .MarkAsAdvanced();
 
   obj.AddAction("ObjectVariableRemoveChild",
                 _("Remove a child"),
-                _("Remove a child from an object structure variable."),
+                _("Remove a child from an object variable."),
                 _("Remove child _PARAM2_ from variable _PARAM1_ of _PARAM0_"),
-                _("Variables/Arrays and structures"),
+                _("Variables/Collections/Structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Structure variable"))
+      .AddParameter("objectvar", _("Variable"))
       .AddParameter("string", _("Child's name"))
       .MarkAsAdvanced();
 
   obj.AddAction("ObjectVariableClearChildren",
-                _("Clear children"),
-                _("Remove all the children from the object array or structure "
-                  "variable."),
+                _("Clear variable"),
+                _("Remove all the children from the object variable."),
                 _("Clear children from variable _PARAM1_ of _PARAM0_"),
-                _("Variables/Arrays and structures"),
+                _("Variables/Collections"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array or structure variable"))
+      .AddParameter("objectvar", _("Variable"))
       .MarkAsAdvanced();
 
   obj.AddAction("Cache",
@@ -532,10 +516,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/direction_black.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Angle to compare to (in degrees)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddCondition("Plan",
@@ -547,8 +528,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/planicon.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddCondition("Layer",
@@ -605,8 +585,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/vitesse.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddCondition("AngleOfDisplacement",
@@ -625,8 +604,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddCondition("VarObjet",
-                   _("Number variable"),
-                   _("Compare the number value of an object variable."),
+                   _("Value of an object variable"),
+                   _("Compare the value of an object variable."),
                    _("the variable _PARAM1_"),
                    _("Variables"),
                    "res/conditions/var24.png",
@@ -634,11 +613,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions());
+      .UseStandardRelationalOperatorParameters("number");
 
   obj.AddCondition("VarObjetTxt",
-                   _("Text variable"),
+                   _("Text of an object variable"),
                    _("Compare the text of an object variable."),
                    _("the text of variable _PARAM1_"),
                    _("Variables"),
@@ -647,11 +625,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters(
-          "string", ParameterOptions::MakeNewOptions());
+      .UseStandardRelationalOperatorParameters("string");
 
   obj.AddCondition("ObjectVariableAsBoolean",
-                   _("Boolean variable"),
+                   _("Boolean value of an object variable"),
                    _("Compare the boolean value of an object variable."),
                    _("The boolean value of variable _PARAM1_ of object "
                      "_PARAM0_ is _PARAM2_"),
@@ -665,7 +642,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddCondition("VarObjetDef",
                    "Variable defined",
-                   "Check if the object variable is defined.",
+                   "Check if the variable is defined.",
                    "Variable _PARAM1 of _PARAM0_ is defined",
                    _("Variables"),
                    "res/conditions/var24.png",
@@ -673,131 +650,78 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("string", _("Variable"))
-      .SetHidden();  // Deprecated.
+      .SetHidden();
 
   obj.AddAction(
          "ObjectVariablePush",
-         _("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"),
+         _("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"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .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."))
+      .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."))
       .MarkAsAdvanced();
 
   obj.AddAction(
          "ObjectVariablePushString",
-         _("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"),
+         _("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"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("string", _("Text to add"))
+      .AddParameter("string", _("String to append"))
       .MarkAsAdvanced();
 
-  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")
+  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")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("expression", _("Number to add"))
+      .AddParameter("expression", _("Number to append"))
       .MarkAsAdvanced();
 
   obj.AddAction(
          "ObjectVariablePushBool",
-         _("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"),
+         _("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"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("trueorfalse", _("Boolean to add"))
+      .AddParameter("trueorfalse", _("Boolean to append"))
       .MarkAsAdvanced();
 
   obj.AddAction(
          "ObjectVariableRemoveAt",
-         _("Remove variable by index"),
+         _("Remove variable from an object array (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/Arrays and structures"),
+         _("Variables/Collections/Arrays"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array variable"))
+      .AddParameter("objectvar", _("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."),
@@ -1174,24 +1098,23 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("expression", _("Target Y position"));
 
   obj.AddExpression("Variable",
-                    _("Number variable"),
-                    _("Number value of an object variable"),
+                    _("Value of an object variable"),
+                    _("Value of an object variable"),
                     _("Variables"),
                     "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"));
 
-  obj.AddExpression(
-         "VariableChildCount",
-         _("Number of children"),
-         _("Number of children in an object array or structure variable"),
-         _("Variables/Arrays and structures"),
-         "res/actions/var.png")
+  obj.AddExpression("VariableChildCount",
+                    _("Number of children of an object variable"),
+                    _("Number of children of an object variable"),
+                    _("Variables"),
+                    "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array or structure variable"));
+      .AddParameter("objectvar", _("Variable"));
 
   obj.AddStrExpression("VariableString",
-                       _("Text variable"),
+                       _("Text of an object variable"),
                        _("Text of an object variable"),
                        _("Variables"),
                        "res/actions/var.png")
@@ -1325,17 +1248,6 @@ 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"),
@@ -1349,7 +1261,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectListOrEmptyIfJustDeclared", _("Object to create"))
       .AddParameter("expression", _("X position"))
       .AddParameter("expression", _("Y position"))
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .MarkAsSimple();
 
@@ -1364,8 +1276,7 @@ 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"))
@@ -1374,7 +1285,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"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
@@ -1404,7 +1315,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Objects"),
           "res/actions/ajouthasard24.png",
           "res/actions/ajouthasard.png")
-      .AddCodeOnlyParameter("objectsContext", "")
+      .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("objectList", _("Object"))
       .MarkAsSimple();
 
@@ -1463,7 +1374,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Objects"),
           "res/conditions/add24.png",
           "res/conditions/add.png")
-      .AddCodeOnlyParameter("objectsContext", "")
+      .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("objectList", _("Object"))
       .MarkAsAdvanced();
 
@@ -1478,7 +1389,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Objects"),
           "res/conditions/ajouthasard24.png",
           "res/conditions/ajouthasard.png")
-      .AddCodeOnlyParameter("objectsContext", "")
+      .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("objectList", _("Object"))
       .MarkAsSimple();
 
@@ -1512,39 +1423,34 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "res/conditions/nbObjet24.png",
           "res/conditions/nbObjet.png")
       .AddParameter("objectList", _("Object"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .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", ParameterOptions::MakeNewOptions())
-      .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")
+    .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.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
       .AddCondition(
@@ -1588,7 +1494,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "Raycast",
           _("Raycast"),
           _("Sends a ray from the given source position and angle, "
-            "intersecting the closest object.\nThe intersected "
+            "intersecting the closest object.\nThe instersected "
             "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."),
@@ -1619,7 +1525,7 @@ 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 intersected "
+            "intersecting the closest object.\nThe instersected "
             "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."),
@@ -1653,7 +1559,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                      "",
                      "res/conditions/nbObjet.png")
       .AddParameter("objectList", _("Object"))
-      .SetHidden();  // Deprecated
+      .SetHidden(); // Deprecated
 
   obj.AddStrExpression("ObjectName",
                        _("Object name"),

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -26,8 +26,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .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(
@@ -39,8 +37,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
@@ -71,8 +69,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
@@ -103,10 +101,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -119,10 +117,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -136,10 +134,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -153,10 +151,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -170,10 +168,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -187,10 +185,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -203,8 +201,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
@@ -322,7 +320,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"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
@@ -354,41 +352,46 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     "",
                     true)
       .SetDefaultValue("yes")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", 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"), "", 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 (base layer if empty)"), "", 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",
@@ -396,7 +399,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     "",
                     true)
       .SetDefaultValue("yes")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
@@ -450,10 +453,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Effects"),
-          "res/actions/effect24.png",
-          "res/actions/effect.png")
+          "res/conditions/camera24.png",
+          "res/conditions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
       .AddParameter("layerEffectParameterName", _("Parameter name"))
@@ -469,10 +472,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Effects"),
-          "res/actions/effect24.png",
-          "res/actions/effect.png")
+          "res/conditions/camera24.png",
+          "res/conditions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
       .AddParameter("layerEffectParameterName", _("Parameter name"))
@@ -488,10 +491,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Enable _PARAM3_ for effect _PARAM2_ of layer _PARAM1_: _PARAM4_"),
           _("Effects"),
-          "res/actions/effect24.png",
-          "res/actions/effect.png")
+          "res/conditions/camera24.png",
+          "res/conditions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
       .AddParameter("layerEffectParameterName", _("Parameter name"))
@@ -503,11 +506,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"),
-                    _(""),
-                    "res/actions/effect24.png",
-                    "res/actions/effect.png")
+                    _("Effects"),
+                    "res/conditions/camera24.png",
+                    "res/conditions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
       .MarkAsAdvanced();
@@ -518,10 +521,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Enable an effect on a layer"),
                  _("Enable effect _PARAM2_ on layer _PARAM1_: _PARAM3_"),
                  _("Effects"),
-                 "res/actions/effect24.png",
-                 "res/actions/effect.png")
+                 "res/conditions/camera24.png",
+                 "res/conditions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
       .AddParameter("yesorno", _("Enable"), "", true)
@@ -537,12 +540,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "res/conditions/time24.png",
           "res/conditions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          gd::ParameterOptions::MakeNewOptions().SetDescription(
-              _("Time scale (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -555,7 +555,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "res/actions/time24.png",
           "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression",
                     _("Scale (1: Default, 2: 2x faster, 0.5: 2x slower...)"));
@@ -570,10 +570,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     "res/conditions/layer24.png",
                     "res/conditions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
-      .UseStandardRelationalOperatorParameters(
-          "number", gd::ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -587,7 +586,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  "res/actions/layer24.png",
                  "res/actions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("New default Z order"));
 
@@ -598,11 +597,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"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"Lighting\"")
       .AddParameter("color", _("Color"))
       .MarkAsAdvanced();

Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp

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

Core/GDCore/Extensions/Builtin/FileExtension.cpp

@@ -69,12 +69,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
   extension
       .AddAction(
           "EcrireFichierExp",
-          _("Save a value"),
-          _("Save the result of the expression in the stored data, in the "
+          _("Write a value"),
+          _("Write the result of the expression in the stored data, in the "
             "specified element.\nSpecify the structure leading to the "
             "element using / (example : Root/Level/Current)\nSpaces are "
             "forbidden in element names."),
-          _("Save _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
+          _("Write _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
           "",
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
@@ -85,12 +85,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
   extension
       .AddAction(
           "EcrireFichierTxt",
-          _("Save a text"),
-          _("Save the text in the specified storage, in the specified "
+          _("Write a text"),
+          _("Write the text in the specified storage, in the specified "
             "element.\nSpecify "
             "the structure leading to the element using / (example : "
             "Root/Level/Current)\nSpaces are forbidden in element names."),
-          _("Save _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
+          _("Write _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
           "",
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
@@ -101,13 +101,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
   extension
       .AddAction(
           "LireFichierExp",
-          _("Load a value"),
-          _("Load the value saved in the specified element and store it in a "
+          _("Read a value"),
+          _("Read the value saved in the specified element and store it in a "
             "scene "
             "variable.\nSpecify the structure leading to the element using / "
             "(example : Root/Level/Current)\nSpaces are forbidden in element "
             "names."),
-          _("Load _PARAM1_ from storage _PARAM0_ and store value in _PARAM3_"),
+          _("Read _PARAM1_ from storage _PARAM0_ and store value in _PARAM3_"),
           "",
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
@@ -119,13 +119,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
   extension
       .AddAction(
           "LireFichierTxt",
-          _("Load a text"),
-          _("Load the text saved in the specified element and store it in a "
+          _("Read a text"),
+          _("Read the text saved in the specified element and store it in a "
             "scene "
             "variable.\nSpecify the structure leading to the element using / "
             "(example : Root/Level/Current)\nSpaces are forbidden in element "
             "names."),
-          _("Load _PARAM1_ from storage _PARAM0_ and store as text in "
+          _("Read _PARAM1_ from storage _PARAM0_ and store as text in "
             "_PARAM3_"),
           "",
           "res/actions/fichier24.png",

Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp

@@ -492,16 +492,6 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
                      "",
                      "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,8 +27,6 @@ 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(
@@ -155,80 +153,42 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
   extension
       .AddExpressionAndCondition(
           "number",
-          "CursorX",
+          "MouseX",
           _("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", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
   // Support for deprecated names:
-  extension.AddDuplicatedCondition("MouseX", "CursorX").SetHidden();
-  extension.AddDuplicatedExpression("MouseX", "CursorX").SetHidden();
-  extension.AddDuplicatedCondition("SourisX", "CursorX").SetHidden();
-  extension.AddDuplicatedExpression("SourisX", "CursorX").SetHidden();
+  extension.AddDuplicatedCondition("SourisX", "MouseX").SetHidden();
+  extension.AddDuplicatedExpression("SourisX", "MouseX").SetHidden();
 
   extension
       .AddExpressionAndCondition(
           "number",
-          "CursorY",
+          "MouseY",
           _("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", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
   // Support for deprecated names:
-  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.AddDuplicatedCondition("SourisY", "MouseY").SetHidden();
+  extension.AddDuplicatedExpression("SourisY", "MouseY").SetHidden();
 
   extension
       .AddCondition("IsMouseInsideCanvas",
@@ -316,8 +276,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                                  "res/conditions/touch24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
@@ -332,8 +292,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                                  "res/conditions/touch24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
@@ -374,85 +334,44 @@ 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(
-          "StartedTouchOrMouseCount",
+          "StartedTouchCount",
           _("Started touch count"),
-          _("The number of touches (including the mouse) that have just "
-            "started on this frame. The touch identifiers can be "
-            "accessed using StartedTouchOrMouseId()."),
+          _("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", "");
 
   extension
       .AddExpression(
-          "StartedTouchOrMouseId",
+          "StartedTouchId",
           _("Started touch identifier"),
-          _("The identifier of the touch or mouse that has just started on "
-            "this frame. The number of touches can be "
-            "accessed using StartedTouchOrMouseCount()."),
+          _("The identifier of the touch that has just started on this frame. The touch number of touches can be "
+            "accessed using StartedTouchCount()."),
           _("Multitouch"),
           "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch index"));
 
   extension
-      .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")
+      .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")
       .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", "Response scene variable", "", true)
+      .AddParameter("scenevar", "Reponse 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,19 +54,6 @@ 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"),
@@ -149,20 +136,6 @@ 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/Direction.cpp

@@ -110,11 +110,11 @@ void Direction::UnserializeFrom(const gd::SerializerElement& element) {
             .GetBoolAttribute("automatic", true));
 
     if (spriteElement.HasChild("CustomCollisionMask"))
-      sprite.SetFullImageCollisionMask(
+      sprite.SetCollisionMaskAutomatic(
           !spriteElement.GetChild("CustomCollisionMask")
                .GetBoolAttribute("custom", false));
     else
-      sprite.SetFullImageCollisionMask(
+      sprite.SetCollisionMaskAutomatic(
           !spriteElement.GetBoolAttribute("hasCustomCollisionMask", false));
 
     std::vector<Polygon2d> mask;
@@ -173,7 +173,7 @@ void SaveSpritesDirection(const vector<Sprite>& sprites,
         .SetAttribute("automatic", sprites[i].IsDefaultCenterPoint());
 
     spriteElement.SetAttribute("hasCustomCollisionMask",
-                               !sprites[i].IsFullImageCollisionMask());
+                               !sprites[i].IsCollisionMaskAutomatic());
 
     gd::SerializerElement& collisionMaskElement =
         spriteElement.AddChild("customCollisionMask");

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

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

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

@@ -4,15 +4,13 @@
  * reserved. This project is released under the MIT License.
  */
 #include "Polygon2d.h"
-
+#include "GDCore/Vector2.h"
 #include <cmath>
 #include <iostream>
 
-#include "GDCore/Vector2.h"
-
-void Polygon2d::Rotate(double angle) {
-  double t, cosa = cos(-angle),
-            sina = sin(-angle);  // We want a clockwise rotation
+void Polygon2d::Rotate(float angle) {
+  float 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;
@@ -21,7 +19,7 @@ void Polygon2d::Rotate(double angle) {
   }
 }
 
-void Polygon2d::Move(double x, double y) {
+void Polygon2d::Move(float x, float y) {
   for (std::size_t i = 0; i < vertices.size(); i++) {
     vertices[i].x += x;
     vertices[i].y += y;
@@ -52,13 +50,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) {
-    double zCrossProduct =
+    float zCrossProduct =
         edges[i].x * edges[i + 1].y - edges[i].y * edges[i + 1].x;
     if ((zCrossProduct > 0) != zProductIsPositive) return false;
   }
 
-  double lastZCrossProduct = edges[edges.size() - 1].x * edges[0].y -
-                             edges[edges.size() - 1].y * edges[0].x;
+  float 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;
@@ -77,7 +75,7 @@ gd::Vector2f Polygon2d::ComputeCenter() const {
   return center;
 }
 
-Polygon2d Polygon2d::CreateRectangle(double width, double height) {
+Polygon2d Polygon2d::CreateRectangle(float width, float 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,8 @@
  */
 #ifndef GDCORE_POLYGON_H
 #define GDCORE_POLYGON_H
-#include <vector>
-
 #include "GDCore/Vector2.h"
+#include <vector>
 
 /**
  * \brief Represents a polygon. Usually used for collisions masks.
@@ -43,7 +42,7 @@ class GD_CORE_API Polygon2d {
    * \note Edges are updated, there is no need to call ComputeEdges after
    * calling Move.
    */
-  void Move(double x, double y);
+  void Move(float x, float y);
 
   /**
    * \brief Rotate the polygon.
@@ -53,7 +52,7 @@ class GD_CORE_API Polygon2d {
    * \warning edges vector is not updated, you have to call ComputeEdges if
    * needed.
    */
-  void Rotate(double angle);
+  void Rotate(float angle);
 
   /**
    * \brief Automatically fill edges vector using vertices.
@@ -78,7 +77,7 @@ class GD_CORE_API Polygon2d {
   /**
    * \brief Create a rectangle
    */
-  static Polygon2d CreateRectangle(double width, double height);
+  static Polygon2d CreateRectangle(float width, float height);
   ///@}
 };
 

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

@@ -4,9 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 #include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
-
 #include <iostream>
-
 #include "GDCore/Extensions/Builtin/SpriteExtension/Polygon2d.h"
 
 using namespace std;
@@ -16,10 +14,11 @@ namespace gd {
 Point Sprite::badPoint("");
 
 Sprite::Sprite()
-    : fullImageCollisionMask(false),
+    : automaticCollisionMask(true),
       origine("origine"),
       centre("centre"),
-      automaticCentre(true) {}
+      automaticCentre(true) {
+}
 
 Sprite::~Sprite(){};
 

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

@@ -7,7 +7,6 @@
 #ifndef SPRITE_H
 #define SPRITE_H
 #include <memory>
-
 #include "GDCore/Extensions/Builtin/SpriteExtension/Point.h"
 #include "GDCore/Extensions/Builtin/SpriteExtension/Polygon2d.h"
 #include "GDCore/String.h"
@@ -44,7 +43,7 @@ class GD_CORE_API Sprite {
 
   /**
    * \brief Get the collision mask (custom or automatically generated owing to
-   * IsFullImageCollisionMask())
+   * IsCollisionMaskAutomatic())
    *
    * \warning If the image has not been loaded ( using LoadImage ) and the
    * collision mask is set as automatic, the returned mask won't be correct.
@@ -67,7 +66,7 @@ class GD_CORE_API Sprite {
 
   /**
    * \brief Set the custom collision mask.
-   * Call then `SetFullImageCollisionMask(false)` to use it.
+   * Call then `SetCollisionMaskAutomatic(false)` to use it.
    */
   void SetCustomCollisionMask(const std::vector<Polygon2d>& collisionMask);
 
@@ -75,15 +74,15 @@ class GD_CORE_API Sprite {
    * \brief Return true if the collision mask is a bounding box, false if a
    * custom collision mask is used.
    */
-  inline bool IsFullImageCollisionMask() const {
-    return fullImageCollisionMask;
+  inline bool IsCollisionMaskAutomatic() const {
+    return automaticCollisionMask;
   }
 
   /**
    * \brief Un/set use of the custom collision mask.
    */
-  inline void SetFullImageCollisionMask(bool enabled) {
-    fullImageCollisionMask = enabled;
+  inline void SetCollisionMaskAutomatic(bool enabled) {
+    automaticCollisionMask = enabled;
   };
 
   /**
@@ -162,9 +161,9 @@ class GD_CORE_API Sprite {
  private:
   gd::String image;  ///< Name of the image to be loaded in Image Manager.
 
-  bool fullImageCollisionMask;  ///< True to use a bounding box wrapping the
-                                ///< whole image as collision mask. If false,
-                                ///< custom collision mask is used.
+  bool automaticCollisionMask;  ///< True to use the custom collision mask.
+                                ///< Otherwise, a basic bounding box is returned
+                                ///< by GetCollisionMask()
   std::vector<Polygon2d> customCollisionMask;  ///< Custom collision mask
 
   std::vector<Point> points;  ///< List of the points used by the sprite

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

@@ -44,10 +44,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "res/actions/opacity.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Opacity (0-255)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsSimple();
 
   obj.AddAction("ChangeAnimation",
@@ -60,8 +57,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "res/actions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("number")
       .MarkAsSimple();
 
   obj.AddAction("SetAnimationName",
@@ -90,8 +86,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
       .SetHidden()  // Hide as 8 direction is not supported officially in the
                     // interface.
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeSprite",
@@ -103,8 +98,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "res/actions/sprite.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddAction("PauseAnimation",
@@ -140,9 +134,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          "res/actions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(_("Speed scale")))
+      .UseStandardOperatorParameters("number")
       .MarkAsSimple();
 
   obj.AddAction("TourneVersPos",
@@ -170,10 +162,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "res/actions/scale_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Scale (1 by default)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeScaleWidth",
@@ -185,10 +174,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "res/actions/scaleWidth_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Scale (1 by default)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeScaleHeight",
@@ -200,10 +186,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "res/actions/scaleHeight_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Scale (1 by default)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeWidth",
@@ -215,8 +198,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "res/actions/scaleWidth_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddCondition("Width",
@@ -228,8 +210,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    "res/conditions/scaleWidth_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeHeight",
@@ -241,8 +222,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "res/actions/scaleHeight_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddCondition("Height",
@@ -254,8 +234,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    "res/conditions/scaleHeight_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddAction("SetSize",
@@ -281,13 +260,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          "res/conditions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddCondition("AnimationName",
                    _("Current animation name"),
-                   _("Check the animation played by the object."),
+                   _("Check the animation by played by the object."),
                    _("The animation of _PARAM0_ is _PARAM1_"),
                    _("Animations and images"),
                    "res/conditions/animation24.png",
@@ -310,8 +288,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
       .SetHidden()  // Hide as 8 direction is not supported officially in the
                     // interface.
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions());
+      .UseStandardRelationalOperatorParameters("number");
 
   obj.AddCondition("Sprite",
                    _("Current frame"),
@@ -324,8 +301,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    "res/conditions/sprite.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddCondition("AnimStopped",
@@ -348,19 +324,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    "res/conditions/animation24.png",
                    "res/conditions/animation.png")
 
-      .AddParameter("object", _("Object"), "Sprite")
-      .MarkAsSimple()
-      .SetHidden();
-
-  obj.AddCondition("AnimationEnded2",
-                   _("Animation finished"),
-                   _("Check if the animation being played by the Sprite object "
-                     "is finished."),
-                   _("The animation of _PARAM0_ is finished"),
-                   _("Animations and images"),
-                   "res/conditions/animation24.png",
-                   "res/conditions/animation.png")
-
       .AddParameter("object", _("Object"), "Sprite")
       .MarkAsSimple();
 
@@ -373,10 +336,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    "res/conditions/scaleWidth_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Scale (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddCondition("ScaleHeight",
@@ -388,10 +348,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    "res/conditions/scaleHeight_black.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Scale (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddCondition("Opacity",
@@ -404,10 +361,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    "res/conditions/opacity.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Opacity to compare to (0-255)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsSimple();
 
   obj.AddCondition(
@@ -420,8 +374,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          "res/conditions/opacity.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeColor",
@@ -583,14 +536,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
 
   obj.AddExpression("Sprite",
                     _("Image"),
-                    _("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"),
+                    _("Animation frame of the object"),
                     _("Animations and images"),
                     "res/actions/sprite.png")
       .AddParameter("object", _("Object"), "Sprite");

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

@@ -25,16 +25,13 @@ namespace gd {
 
 Animation SpriteObject::badAnimation;
 
-SpriteObject::SpriteObject()
-    : updateIfNotVisible(false), adaptCollisionMaskAutomatically(true) {}
+SpriteObject::SpriteObject() : updateIfNotVisible(false) {}
 
 SpriteObject::~SpriteObject(){};
 
 void SpriteObject::DoUnserializeFrom(gd::Project& project,
                                      const gd::SerializerElement& element) {
   updateIfNotVisible = element.GetBoolAttribute("updateIfNotVisible", true);
-  adaptCollisionMaskAutomatically =
-      element.GetBoolAttribute("adaptCollisionMaskAutomatically", false);
 
   RemoveAllAnimations();
   const gd::SerializerElement& animationsElement =
@@ -83,8 +80,6 @@ void SpriteObject::DoUnserializeFrom(gd::Project& project,
 
 void SpriteObject::DoSerializeTo(gd::SerializerElement& element) const {
   element.SetAttribute("updateIfNotVisible", updateIfNotVisible);
-  element.SetAttribute("adaptCollisionMaskAutomatically",
-                       adaptCollisionMaskAutomatically);
 
   // Animations
   gd::SerializerElement& animationsElement = element.AddChild("animations");

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

@@ -47,7 +47,8 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
   void ExposeResources(gd::ArbitraryResourceWorker& worker) override;
 
   std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
-  bool UpdateProperty(const gd::String& name, const gd::String& value) override;
+  bool UpdateProperty(const gd::String& name,
+                      const gd::String& value) override;
 
   std::map<gd::String, gd::PropertyDescriptor> GetInitialInstanceProperties(
       const gd::InitialInstance& position,
@@ -117,30 +118,14 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
   const std::vector<Animation>& GetAllAnimations() const { return animations; }
 
   /**
-   * @brief Check if the collision mask adapts automatically to the animation.
+   * \brief Set if the object animation should be played even if the object is hidden
+   * or far from the camera.
    */
-  bool AdaptCollisionMaskAutomatically() const {
-    return adaptCollisionMaskAutomatically;
-  }
+  void SetUpdateIfNotVisible(bool updateIfNotVisible_) { updateIfNotVisible = updateIfNotVisible_; }
 
   /**
-   * @brief Set if the collision mask adapts automatically to the animation.
-   */
-  void SetAdaptCollisionMaskAutomatically(bool enable) {
-    adaptCollisionMaskAutomatically = enable;
-  }
-
-  /**
-   * \brief Set if the object animation should be played even if the object is
-   * hidden or far from the camera.
-   */
-  void SetUpdateIfNotVisible(bool updateIfNotVisible_) {
-    updateIfNotVisible = updateIfNotVisible_;
-  }
-
-  /**
-   * \brief Check if the object animation should be played even if the object
-   * is hidden or far from the camera (false by default).
+   * \brief Check if the object animation should be played even if the object is hidden
+   * or far from the camera (false by default).
    */
   bool GetUpdateIfNotVisible() const { return updateIfNotVisible; }
   ///@}
@@ -152,15 +137,11 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
 
   mutable std::vector<Animation> animations;
   bool updateIfNotVisible;  ///< If set to true, ask the game engine to play
-                            ///< object animation even if hidden or far from
-                            ///< the screen.
+                            ///< object animation even if hidden or far from the
+                            ///< screen.
 
-  static Animation badAnimation;         //< Bad animation when an out of bound
-                                         // animation is requested.
-  bool adaptCollisionMaskAutomatically;  ///< If set to true, the collision
-                                         ///< mask will be automatically
-                                         ///< adapted to the animation of the
-                                         ///< object.
+  static Animation badAnimation;  //< Bad animation when an out of bound
+                                  // animation is requested.
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp

@@ -126,8 +126,8 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
   extension
       .AddExpression(
           "StrFindLast",
-          _("Search the last occurrence in a text"),
-          _("Search the last occurrence in a string (return the position of "
+          _("Search the last occurence in a text"),
+          _("Search the last occurence in a string (return the position of "
             "the result, from the beginning of the string, or -1 if not "
             "found)"),
           "",
@@ -169,10 +169,10 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
   extension
       .AddExpression(
           "StrFindLastFrom",
-          _("Search the last occurrence in a text, starting from a position"),
-          _("Search in a text the last occurrence, starting from a position "
+          _("Search the last occurence in a text, starting from a position"),
+          _("Search in a text the last occurence, starting from a position "
             "(return "
-            "the position of the result, from the beginning of the string, or "
+            " the position of the result, from the beginning of the string, or "
             "-1 if not found)"),
           "",
           "res/conditions/toujours24_black.png")
@@ -183,26 +183,6 @@ 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

@@ -65,10 +65,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                     "res/conditions/time24.png",
                     "res/conditions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          gd::ParameterOptions::MakeNewOptions().SetDescription(
-              _("Time scale (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -151,14 +148,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
 
   extension
       .AddAction("Wait",
-                 _("Wait X seconds"),
+                 _("Wait X seconds (experimental)"),
                  _("Waits a number of seconds before running "
                    "the next actions (and sub-events)."),
                  _("Wait _PARAM0_ seconds"),
                  "",
                  "res/timer_black.svg",
                  "res/timer_black.svg")
-      .AddParameter("expression", _("Time to wait in seconds"))
+      .AddParameter("expression", "Time to wait in seconds")
       .SetHelpPath("/all-features/timers-and-time/wait-action");
 
   extension

Core/GDCore/Extensions/Builtin/VariablesExtension.cpp

@@ -27,32 +27,30 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddCondition("VarScene",
-                    _("Number variable"),
-                    _("Compare the number value of a scene variable."),
-                    _("The number of scene variable _PARAM0_"),
+                    _("Value of a scene variable"),
+                    _("Compare the value of a scene variable."),
+                    _("the scene variable _PARAM0_"),
                     _("Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions());
+      .UseStandardRelationalOperatorParameters("number");
 
   extension
       .AddCondition("VarSceneTxt",
-                    _("Text variable"),
-                    _("Compare the text (string) of a scene variable."),
-                    _("The text of scene variable _PARAM0_"),
+                    _("Text of a scene variable"),
+                    _("Compare the text 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", ParameterOptions::MakeNewOptions());
+      .UseStandardRelationalOperatorParameters("string");
 
   extension
       .AddCondition(
           "SceneVariableAsBoolean",
-          _("Boolean variable"),
+          _("Boolean value of a scene variable"),
           _("Compare the boolean value of a scene variable."),
           _("The boolean value of scene variable _PARAM0_ is _PARAM1_"),
           _("Scene variables"),
@@ -63,14 +61,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .SetDefaultValue("true");
 
   extension
-      .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")
+      .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")
       .AddParameter("scenevar", _("Variable"))
       .AddParameter("string", _("Name of the child"))
       .MarkAsAdvanced();
@@ -78,10 +76,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .AddCondition("GlobalVariableChildExists",
                     _("Child existence"),
-                    _("Check if the specified child of the global structure "
+                    _("Check if the specified child of the global "
                       "variable exists."),
                     _("Child _PARAM1_ of global variable _PARAM0_ exists"),
-                    _("Global variables/Arrays and structures"),
+                    _("Global variables/Collections/Structures"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -90,7 +88,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddCondition("VarSceneDef",
-                    "Variable defined",
+                    "Test if a scene variable is defined",
                     "Test if the scene variable exists.",
                     "Scene variable _PARAM0_ is defined",
                     _("Scene variables"),
@@ -98,38 +96,36 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     "res/conditions/var.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("string", _("Variable"))
-      .SetHidden();  // Deprecated.
+      .SetHidden();
 
   extension
       .AddCondition("VarGlobal",
-                    _("Number variable"),
-                    _("Compare the number value of a global variable."),
+                    _("Value of a global variable"),
+                    _("Compare the value of a global variable."),
                     _("the global variable _PARAM0_"),
                     _("Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
       .AddCondition("VarGlobalTxt",
-                    _("Text variable"),
-                    _("Compare the text (string) of a global variable."),
+                    _("Text of a global variable"),
+                    _("Compare the text 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", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("string")
       .MarkAsAdvanced();
 
   extension
       .AddCondition(
           "GlobalVariableAsBoolean",
-          _("Boolean variable"),
+          _("Boolean value of a global variable"),
           _("Compare the boolean value of a global variable."),
           _("The boolean value of global variable _PARAM0_ is _PARAM1_"),
           _("Global variables"),
@@ -141,8 +137,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddCondition("VarGlobalDef",
-                    "Variable defined",
-                    "Test if a global variable exists.",
+                    "Test if a global variable is defined",
+                    "Test if a global variable exists",
                     "Global variable _PARAM0_ is defined",
                     _("Global variables"),
                     "res/conditions/var24.png",
@@ -150,36 +146,34 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("string", _("Variable"))
       .MarkAsAdvanced()
-      .SetHidden();  // Deprecated.
+      .SetHidden();
 
   extension
       .AddAction("ModVarScene",
-                 _("Change number variable"),
-                 _("Modify the number value of a scene variable."),
+                 _("Value of a scene variable"),
+                 _("Change the value of a scene variable."),
                  _("the scene variable _PARAM0_"),
                  _("Scene variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions());
+      .UseStandardOperatorParameters("number");
 
   extension
       .AddAction("ModVarSceneTxt",
-                 _("Change text variable"),
-                 _("Modify the text (string) of a scene variable."),
+                 _("String of a scene variable"),
+                 _("Modify the text 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",
-                                     ParameterOptions::MakeNewOptions());
+      .UseStandardOperatorParameters("string");
 
   extension
       .AddAction(
           "SetSceneVariableAsBoolean",
-          _("Change boolean variable"),
+          _("Boolean value of a scene variable"),
           _("Modify the boolean value of a scene variable."),
           _("Set the boolean value of scene variable _PARAM0_ to _PARAM1_"),
           _("Scene variables"),
@@ -190,7 +184,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddAction("ToggleSceneVariableAsBoolean",
-                 _("Toggle boolean variable"),
+                 _("Toggle boolean value of a scene 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."),
@@ -202,34 +196,32 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddAction("ModVarGlobal",
-                 _("Change number variable"),
-                 _("Modify the number value of a global variable."),
+                 _("Value of a global variable"),
+                 _("Change the value of a global variable"),
                  _("the global variable _PARAM0_"),
                  _("Global variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
       .AddAction("ModVarGlobalTxt",
-                 _("Change text variable"),
-                 _("Modify the text (string) of a global variable."),
+                 _("String of a global variable"),
+                 _("Modify the text 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",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("string")
       .MarkAsAdvanced();
 
   extension
       .AddAction(
           "SetGlobalVariableAsBoolean",
-          _("Change boolean variable"),
+          _("Boolean value of a global variable"),
           _("Modify the boolean value of a global variable."),
           _("Set the boolean value of global variable _PARAM0_ to _PARAM1_"),
           _("Global variables"),
@@ -240,7 +232,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddAction("ToggleGlobalVariableAsBoolean",
-                 _("Toggle boolean variable"),
+                 _("Toggle boolean value of a global 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."),
@@ -251,324 +243,202 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("globalvar", _("Variable"));
 
   extension
-      .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"))
+      .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"))
       .AddParameter("string", _("Child's name"))
       .MarkAsAdvanced();
 
   extension
-      .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"))
+      .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"))
       .AddParameter("string", _("Child's name"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("VariableClearChildren",
-                 _("Clear children"),
-                 _("Remove all the children from the scene structure or array "
-                   "variable."),
+                 _("Clear scene variable"),
+                 _("Remove all the children from the scene variable."),
                  _("Clear children from scene variable _PARAM0_"),
-                 _("Scene variables/Arrays and structures"),
+                 _("Scene variables/Collections"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
-      .AddParameter("scenevar", _("Structure or array variable"))
+      .AddParameter("scenevar", _("Variable"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("GlobalVariableClearChildren",
-                 _("Clear children"),
-                 _("Remove all the children from the global structure or array "
-                   "variable."),
+                 _("Clear global variable"),
+                 _("Remove all the children from the global variable."),
                  _("Clear children from global variable _PARAM0_"),
-                 _("Global variables/Arrays and structures"),
+                 _("Global variables/Collections"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
-      .AddParameter("globalvar", _("Structure or array variable"))
+      .AddParameter("globalvar", _("Variable"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("SceneVariablePush",
-                 _("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"),
+                 _("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"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("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."))
+      .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."))
       .MarkAsAdvanced();
 
   extension
-      .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")
+      .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")
       .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("string", _("Text to add"))
+      .AddParameter("string", _("String to append"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("SceneVariablePushNumber",
-                 _("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"),
+                 _("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"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("expression", _("Number to add"))
+      .AddParameter("expression", _("Number to append"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("SceneVariablePushBool",
-                 _("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"),
+                 _("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"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("trueorfalse", _("Boolean to add"))
-      .MarkAsAdvanced();
-
-  extension
-      .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
-      .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(
-          "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", _("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"))
+      .AddParameter("trueorfalse", _("Boolean to append"))
       .MarkAsAdvanced();
 
   extension
       .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"),
+          "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"))
+      .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("string", _("Text to add"))
+      .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."))
+      .MarkAsAdvanced();
+
+  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"),
+          "res/actions/var24.png",
+          "res/actions/var.png")
+      .AddParameter("globalvar", _("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")
+      .AddParameter("globalvar", _("Array variable"))
+      .AddParameter("string", _("String to append"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("GlobalVariablePushNumber",
-                 _("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"),
+                 _("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"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("expression", _("Number to add"))
+      .AddParameter("expression", _("Number to append"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("GlobalVariablePushBool",
-                 _("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"),
+                 _("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"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("trueorfalse", _("Boolean to add"))
+      .AddParameter("trueorfalse", _("Boolean to append"))
       .MarkAsAdvanced();
 
-  extension
-      .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", _("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"),
+                     _("Number of children of a global variable"),
+                     _("Number of children of a global variable"),
+                     _("Global variables"),
                      "res/actions/var.png")
-      .AddParameter("globalvar", _("Array or structure variable"));
+      .AddParameter("globalvar", _("Variable"));
 
   extension
       .AddExpression("VariableChildCount",
-                     _("Number of children"),
-                     _("Number of children in a scene array or "
-                       "structure variable"),
-                     _("Scene variables/Arrays and structures"),
+                     _("Number of children of a scene variable"),
+                     _("Number of children of a scene variable"),
+                     _("Scene variables"),
                      "res/actions/var.png")
-      .AddParameter("scenevar", _("Array or structure variable"));
+      .AddParameter("scenevar", _("Variable"));
 
   extension
       .AddExpression("Variable",
-                     _("Number variable"),
-                     _("Number value of a scene variable"),
+                     _("Value of a scene variable"),
+                     _("Value of a scene variable"),
                      _("Scene variables"),
                      "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"));
 
   extension
       .AddStrExpression("VariableString",
-                        _("Text variable"),
+                        _("Text of a scene variable"),
                         _("Text of a scene variable"),
                         _("Scene variables"),
                         "res/actions/var.png")
@@ -576,15 +446,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddExpression("GlobalVariable",
-                     _("Number variable"),
-                     _("Number value of a global variable"),
+                     _("Value of a global variable"),
+                     _("Value of a global variable"),
                      _("Global variables"),
                      "res/actions/var.png")
       .AddParameter("globalvar", _("Name of the global variable"));
 
   extension
       .AddStrExpression("GlobalVariableString",
-                        _("Text variable"),
+                        _("Text of a global variable"),
                         _("Text of a global variable"),
                         _("Global variables"),
                         "res/actions/var.png")

Core/GDCore/Extensions/Metadata/AbstractFunctionMetadata.h

@@ -1,135 +0,0 @@
-/*
- * 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 <algorithm>
-#include <functional>
-#include <map>
-#include <memory>
-
-#include "GDCore/Events/Instruction.h"
-#include "GDCore/String.h"
-#include "ParameterMetadata.h"
-#include "ParameterOptions.h"
-
-namespace gd {
-class Project;
-class Layout;
-class EventsCodeGenerator;
-class EventsCodeGenerationContext;
-class SerializerElement;
-} // namespace gd
-
-namespace gd {
-
-/**
- * \brief Describe user-friendly information about an expression or an
- * instruction (action or condition), its parameters and the function name as
- * well as other information for code generation.
- *
- * \ingroup Events
- */
-class GD_CORE_API AbstractFunctionMetadata {
-public:
-  AbstractFunctionMetadata(){};
-  virtual ~AbstractFunctionMetadata(){};
-
-  /**
-   * \see gd::InstructionMetadata::AddParameter
-   */
-  virtual AbstractFunctionMetadata &
-  AddParameter(const gd::String &type, const gd::String &label,
-               const gd::String &supplementaryInformation = "",
-               bool parameterIsOptional = false) = 0;
-
-  /**
-   * \see gd::InstructionMetadata::AddCodeOnlyParameter
-   */
-  virtual AbstractFunctionMetadata &
-  AddCodeOnlyParameter(const gd::String &type,
-                       const gd::String &supplementaryInformation) = 0;
-
-  /**
-   * \see gd::InstructionMetadata::SetDefaultValue
-   */
-  virtual AbstractFunctionMetadata &
-  SetDefaultValue(const gd::String &defaultValue) = 0;
-
-  /**
-   * \see gd::InstructionMetadata::SetParameterExtraInfo
-   */
-  virtual AbstractFunctionMetadata &
-  SetParameterExtraInfo(const gd::String &defaultValue) = 0;
-
-  /**
-   * \see gd::InstructionMetadata::SetParameterLongDescription
-   */
-  virtual AbstractFunctionMetadata &
-  SetParameterLongDescription(const gd::String &longDescription) = 0;
-
-  /**
-   * \see gd::InstructionMetadata::SetHidden
-   */
-  virtual AbstractFunctionMetadata &SetHidden() = 0;
-
-  /**
-   * Set that the instruction is private - it can't be used outside of the
-   * object/ behavior that it is attached too.
-   */
-  virtual AbstractFunctionMetadata &SetPrivate() = 0;
-
-  /**
-   * Set that the instruction can be used in layouts or external events.
-   */
-  virtual AbstractFunctionMetadata &SetRelevantForLayoutEventsOnly() = 0;
-
-  /**
-   * Set that the instruction can be used in function events.
-   */
-  virtual AbstractFunctionMetadata &SetRelevantForFunctionEventsOnly() = 0;
-
-  /**
-   * Set that the instruction can be used in asynchronous function events.
-   */
-  virtual AbstractFunctionMetadata &
-  SetRelevantForAsynchronousFunctionEventsOnly() = 0;
-
-  /**
-   * Set that the instruction can be used in custom object events.
-   */
-  virtual AbstractFunctionMetadata &SetRelevantForCustomObjectEventsOnly() = 0;
-
-  /**
-   * \brief Set the function that should be called when generating the source
-   * code from events.
-   * \param functionName the name of the function to call
-   * \note Shortcut for `codeExtraInformation.SetFunctionName`.
-   */
-  virtual AbstractFunctionMetadata &
-  SetFunctionName(const gd::String &functionName) = 0;
-
-  /**
-   * \brief Erase any existing include file and add the specified include.
-   */
-  virtual AbstractFunctionMetadata &
-  SetIncludeFile(const gd::String &includeFile) = 0;
-
-  /**
-   * \brief Add a file to the already existing include files.
-   */
-  virtual AbstractFunctionMetadata &
-  AddIncludeFile(const gd::String &includeFile) = 0;
-
-  /**
-   * \brief Get the files that must be included to use the instruction.
-   */
-  virtual const std::vector<gd::String> &GetIncludeFiles() const = 0;
-
-private:
-};
-
-} // namespace gd

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -3,10 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
-
-#include "InstructionOrExpressionContainerMetadata.h"
-
+#ifndef BEHAVIORMETADATA_H
+#define BEHAVIORMETADATA_H
 #include <map>
 
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
@@ -27,7 +25,7 @@ namespace gd {
  *
  * \ingroup Events
  */
-class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMetadata {
+class GD_CORE_API BehaviorMetadata {
  public:
   BehaviorMetadata(
       const gd::String& extensionNamespace,
@@ -69,7 +67,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
                                         const gd::String& sentence_,
                                         const gd::String& group_,
                                         const gd::String& icon_,
-                                        const gd::String& smallicon_) override;
+                                        const gd::String& smallicon_);
 
   /**
    * Declare a new action as being part of the behavior.
@@ -82,7 +80,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
                                      const gd::String& sentence_,
                                      const gd::String& group_,
                                      const gd::String& icon_,
-                                     const gd::String& smallicon_) override;
+                                     const gd::String& smallicon_);
 
   /**
    * Declare a new condition as being part of the behavior.
@@ -93,7 +91,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
                                               const gd::String& sentence_,
                                               const gd::String& group_,
                                               const gd::String& icon_,
-                                              const gd::String& smallicon_) override;
+                                              const gd::String& smallicon_);
 
   /**
    * Declare a new action as being part of the behavior.
@@ -104,7 +102,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
                                            const gd::String& sentence_,
                                            const gd::String& group_,
                                            const gd::String& icon_,
-                                           const gd::String& smallicon_) override;
+                                           const gd::String& smallicon_);
   /**
    * Declare a new action as being part of the extension.
    */
@@ -112,7 +110,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
                                         const gd::String& fullname_,
                                         const gd::String& description_,
                                         const gd::String& group_,
-                                        const gd::String& smallicon_) override;
+                                        const gd::String& smallicon_);
 
   /**
    * Declare a new string expression as being part of the extension.
@@ -121,7 +119,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
                                            const gd::String& fullname_,
                                            const gd::String& description_,
                                            const gd::String& group_,
-                                           const gd::String& smallicon_) override;
+                                           const gd::String& smallicon_);
 
   /**
    * \brief Declare a new expression and condition as being part of the
@@ -136,7 +134,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
       const gd::String& description,
       const gd::String& sentenceName,
       const gd::String& group,
-      const gd::String& icon) override;
+      const gd::String& icon);
 
   /**
    * \brief Declare a new expression, condition and action as being part of the
@@ -153,7 +151,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
       const gd::String& description,
       const gd::String& sentenceName,
       const gd::String& group,
-      const gd::String& icon) override;
+      const gd::String& icon);
 
   /**
    * \brief Create a new action which is the duplicate of the specified one.
@@ -162,7 +160,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    * one.
    */
   gd::InstructionMetadata& AddDuplicatedAction(
-      const gd::String& newActionName, const gd::String& copiedActionName) override;
+      const gd::String& newActionName, const gd::String& copiedActionName);
 
   /**
    * \brief Create a new condition which is the duplicate of the specified one.
@@ -172,7 +170,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    */
   gd::InstructionMetadata& AddDuplicatedCondition(
       const gd::String& newConditionName,
-      const gd::String& copiedConditionName) override;
+      const gd::String& copiedConditionName);
 
   /**
    * \brief Create a new expression which is the duplicate of the specified one.
@@ -195,9 +193,9 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
       const gd::String& newExpressionName,
       const gd::String& copiedExpressionName);
 
-  BehaviorMetadata& SetFullName(const gd::String& fullname_) override;
+  BehaviorMetadata& SetFullName(const gd::String& fullname_);
   BehaviorMetadata& SetDefaultName(const gd::String& defaultName_);
-  BehaviorMetadata& SetDescription(const gd::String& description_) override;
+  BehaviorMetadata& SetDescription(const gd::String& description_);
   BehaviorMetadata& SetGroup(const gd::String& group_);
 
   /**
@@ -205,12 +203,12 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    * \note The requirement may vary depending on the platform: Most of the time,
    * the include file contains the declaration of the behavior.
    */
-  BehaviorMetadata& SetIncludeFile(const gd::String& includeFile) override;
+  BehaviorMetadata& SetIncludeFile(const gd::String& includeFile);
 
   /**
    * \brief Add a file to the already existing include files.
    */
-  BehaviorMetadata& AddIncludeFile(const gd::String& includeFile) override;
+  BehaviorMetadata& AddIncludeFile(const gd::String& includeFile);
 
   /**
    * \brief Add a file to the already existing required files.
@@ -223,7 +221,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    * Get the help path of the behavior, relative to the GDevelop documentation
    * root.
    */
-  const gd::String& GetHelpPath() const override { return helpPath; }
+  const gd::String& GetHelpPath() const { return helpPath; }
 
   /**
    * Set the help path of the behavior, relative to the GDevelop documentation
@@ -232,17 +230,18 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    * The behavior instructions will have this help path set by
    * default, unless you call SetHelpPath on them.
    */
-  BehaviorMetadata& SetHelpPath(const gd::String& path) override {
+  BehaviorMetadata& SetHelpPath(const gd::String& path) {
     helpPath = path;
     return *this;
   }
 
-  const gd::String& GetName() const override;
-  const gd::String& GetFullName() const override { return fullname; }
+  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 override { return description; }
+  const gd::String& GetDescription() const { return description; }
   const gd::String& GetGroup() const { return group; }
-  const gd::String& GetIconFilename() const override { return iconFilename; }
+  const gd::String& GetIconFilename() const { return iconFilename; }
 
   /**
    * \brief Set the type of the object that this behavior can be used on.
@@ -258,21 +257,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    * \note An empty string means the base object, so any object.
    */
   const gd::String& GetObjectType() const { return objectType; }
-
-  /**
-   * Check if the behavior is private - it can't be used outside of its
-   * extension.
-   */
-  bool IsPrivate() const { return isPrivate; }
-
-  /**
-   * Set that the behavior is private - it can't be used outside of its
-   * extension.
-   */
-  BehaviorMetadata &SetPrivate() {
-    isPrivate = true;
-    return *this;
-  }
+#endif
 
   /**
    * \brief Return the associated gd::Behavior, handling behavior contents.
@@ -295,22 +280,22 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    * \brief Return a reference to a map containing the names of the actions
    * (as keys) and the metadata associated with (as values).
    */
-  std::map<gd::String, gd::InstructionMetadata>& GetAllActions() override { return actionsInfos; };
+  std::map<gd::String, gd::InstructionMetadata>& GetAllActions() { return actionsInfos; };
 
   /**
    * \see gd::PlatformExtension::GetAllActions
    */
-  std::map<gd::String, gd::InstructionMetadata>& GetAllConditions() override { return conditionsInfos; };
+  std::map<gd::String, gd::InstructionMetadata>& GetAllConditions() { return conditionsInfos; };
 
   /**
    * \see gd::PlatformExtension::GetAllActions
    */
-  std::map<gd::String, gd::ExpressionMetadata>& GetAllExpressions() override { return expressionsInfos; };
+  std::map<gd::String, gd::ExpressionMetadata>& GetAllExpressions() { return expressionsInfos; };
 
   /**
    * \see gd::PlatformExtension::GetAllActions
    */
-  std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() override { return strExpressionsInfos; };
+  std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() { return strExpressionsInfos; };
 
   std::map<gd::String, gd::InstructionMetadata> conditionsInfos;
   std::map<gd::String, gd::InstructionMetadata> actionsInfos;
@@ -330,7 +315,6 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
   gd::String group;
   gd::String iconFilename;
   gd::String objectType;
-  bool isPrivate = false;
 
   // TODO: Nitpicking: convert these to std::unique_ptr to clarify ownership.
   std::shared_ptr<gd::Behavior> instance;
@@ -339,3 +323,5 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
 };
 
 }  // namespace gd
+
+#endif  // BEHAVIORMETADATA_H

Core/GDCore/Extensions/Metadata/DependencyMetadata.h

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

Core/GDCore/Extensions/Metadata/EffectMetadata.cpp

@@ -7,6 +7,9 @@
 
 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);
@@ -20,4 +23,9 @@ 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.
  */
-#pragma once
-
+#ifndef EFFECTMETADATA_H
+#define EFFECTMETADATA_H
 #include <functional>
 #include <map>
 #include <memory>
@@ -25,25 +25,21 @@ class GD_CORE_API EffectMetadata {
   /**
    * \brief Construct an effect metadata, with the given type
    */
-   EffectMetadata(const gd::String &type_)
-       : type(type_), isMarkedAsNotWorkingForObjects(false),
-         isMarkedAsOnlyWorkingFor2D(false), isMarkedAsOnlyWorkingFor3D(false),
-         isMarkedAsUnique(false) {}
+  EffectMetadata(const gd::String& type_);
 
-   /**
-    * \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;
   };
 
   /**
@@ -73,6 +69,11 @@ 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.
    */
@@ -116,65 +117,10 @@ 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;
-  };
-
-  /**
-   * \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;
-  };
+  bool IsMarkedAsNotWorkingForObjects() const { return isMarkedAsNotWorkingForObjects; };
 
  private:
   gd::String extensionNamespace;
@@ -184,10 +130,8 @@ 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,8 +23,7 @@ ExpressionMetadata::ExpressionMetadata(const gd::String& returnType_,
       shown(true),
       smallIconFilename(smallicon_),
       extensionNamespace(extensionNamespace_),
-      isPrivate(false),
-      relevantContext("Any") {
+      isPrivate(false) {
 }
 
 ExpressionMetadata& ExpressionMetadata::SetHidden() {

Core/GDCore/Extensions/Metadata/ExpressionMetadata.h

@@ -3,10 +3,9 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
-
-#include "AbstractFunctionMetadata.h"
-
+#ifndef EXPRESSIONMETADATA_H
+#define EXPRESSIONMETADATA_H
+#if defined(GD_IDE_ONLY)
 #include <functional>
 #include <memory>
 
@@ -18,6 +17,7 @@ class Layout;
 }
 
 namespace gd {
+
 /**
  * \brief Information about how generate code for an expression
  */
@@ -27,7 +27,79 @@ class ExpressionCodeGenerationInformation {
       : staticFunction(false), hasCustomCodeGenerator(false){};
   virtual ~ExpressionCodeGenerationInformation(){};
 
-  // TODO Move these attributes to ExpressionMetadata.
+  /**
+   * \brief Set the function name which will be used when generating the code.
+   * \param functionName the name of the function to call
+   */
+  ExpressionCodeGenerationInformation& SetFunctionName(
+      const gd::String& functionName) {
+    functionCallName = functionName;
+    return *this;
+  }
+
+  /**
+   * \brief Set that the function is static
+   */
+  ExpressionCodeGenerationInformation& SetStatic() {
+    staticFunction = true;
+    return *this;
+  }
+
+  /**
+   * \brief Erase any existing include file and add the specified include.
+   */
+  ExpressionCodeGenerationInformation& SetIncludeFile(
+      const gd::String& includeFile) {
+    includeFiles.clear();
+    includeFiles.push_back(includeFile);
+    return *this;
+  }
+
+  /**
+   * \brief Add a file to the already existing include files.
+   */
+  ExpressionCodeGenerationInformation& AddIncludeFile(
+      const gd::String& includeFile) {
+    if (std::find(includeFiles.begin(), includeFiles.end(), includeFile) ==
+        includeFiles.end())
+      includeFiles.push_back(includeFile);
+
+    return *this;
+  }
+
+  /**
+   * \brief Get the files that must be included to use the instruction.
+   */
+  const std::vector<gd::String>& GetIncludeFiles() const {
+    return includeFiles;
+  };
+
+  /**
+   * \brief Set that the function must be generated using a custom code
+   * generator.
+   */
+  ExpressionCodeGenerationInformation& SetCustomCodeGenerator(
+      std::function<gd::String(const std::vector<gd::Expression>& parameters,
+                               gd::EventsCodeGenerator& codeGenerator,
+                               gd::EventsCodeGenerationContext& context)>
+          codeGenerator) {
+    hasCustomCodeGenerator = true;
+    customCodeGenerator = codeGenerator;
+    return *this;
+  }
+
+  ExpressionCodeGenerationInformation& RemoveCustomCodeGenerator() {
+    hasCustomCodeGenerator = false;
+    std::function<gd::String(const std::vector<gd::Expression>& parameters,
+                             gd::EventsCodeGenerator& codeGenerator,
+                             gd::EventsCodeGenerationContext& context)>
+        emptyFunction;
+    customCodeGenerator = emptyFunction;
+    return *this;
+  }
+
+  bool HasCustomCodeGenerator() const { return hasCustomCodeGenerator; }
+
   bool staticFunction;
   gd::String functionCallName;
   bool hasCustomCodeGenerator;
@@ -35,6 +107,8 @@ class ExpressionCodeGenerationInformation {
                            gd::EventsCodeGenerator& codeGenerator,
                            gd::EventsCodeGenerationContext& context)>
       customCodeGenerator;
+
+ private:
   std::vector<gd::String> includeFiles;
 };
 
@@ -44,7 +118,7 @@ class ExpressionCodeGenerationInformation {
  *
  * \ingroup Events
  */
-class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
+class GD_CORE_API ExpressionMetadata {
  public:
   /**
    * Construct a new expression metadata.
@@ -63,14 +137,14 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
    * to fulfill std::map requirements.
    */
   ExpressionMetadata()
-      : returnType("unknown"), shown(false), isPrivate(false), relevantContext("Any"){};
+      : returnType("unknown"), shown(false), isPrivate(false){};
 
   virtual ~ExpressionMetadata(){};
 
   /**
    * \brief Set the expression as not shown in the IDE.
    */
-  ExpressionMetadata& SetHidden() override;
+  ExpressionMetadata& SetHidden();
 
   /**
    * \brief Set the group of the instruction in the IDE.
@@ -105,86 +179,25 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
    * Set that the instruction is private - it can't be used outside of the
    * object/ behavior that it is attached too.
    */
-  ExpressionMetadata& SetPrivate() override {
+  ExpressionMetadata& SetPrivate() {
     isPrivate = true;
     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() override {
-    relevantContext = "Layout";
-    return *this;
-  }
-
-  /**
-   * Set that the instruction can be used in function events.
-   */
-  ExpressionMetadata &SetRelevantForFunctionEventsOnly() override {
-    relevantContext = "Function";
-    return *this;
-  }
-
-  /**
-   * Set that the instruction can be used in asynchronous function events.
-   */
-  ExpressionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() override {
-    relevantContext = "AsynchronousFunction";
-    return *this;
-  }
-
-  /**
-   * Set that the instruction can be used in custom object events.
-   */
-  ExpressionMetadata &SetRelevantForCustomObjectEventsOnly() override {
-    relevantContext = "Object";
-    return *this;
-  }
-
   /**
    * \see gd::InstructionMetadata::AddParameter
    */
-  gd::ExpressionMetadata &
-  AddParameter(const gd::String &type, const gd::String &label,
-               const gd::String &supplementaryInformation = "",
-               bool parameterIsOptional = false) override;
+  gd::ExpressionMetadata& AddParameter(
+      const gd::String& type,
+      const gd::String& description,
+      const gd::String& supplementaryInformation = "",
+      bool parameterIsOptional = false);
 
   /**
    * \see gd::InstructionMetadata::AddCodeOnlyParameter
    */
-  gd::ExpressionMetadata &
-  AddCodeOnlyParameter(const gd::String &type,
-                       const gd::String &supplementaryInformation) override;
+  gd::ExpressionMetadata& AddCodeOnlyParameter(
+      const gd::String& type, const gd::String& supplementaryInformation);
 
   /**
    * Set the default value used in editor (or if an optional parameter is empty
@@ -192,9 +205,8 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
    *
    * \see AddParameter
    */
-  ExpressionMetadata &SetDefaultValue(const gd::String &defaultValue) override {
-    if (!parameters.empty())
-      parameters.back().SetDefaultValue(defaultValue);
+  ExpressionMetadata& SetDefaultValue(gd::String defaultValue_) {
+    if (!parameters.empty()) parameters.back().SetDefaultValue(defaultValue_);
     return *this;
   };
 
@@ -204,8 +216,7 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
    *
    * \see AddParameter
    */
-  ExpressionMetadata &
-  SetParameterLongDescription(const gd::String &longDescription) override {
+  ExpressionMetadata& SetParameterLongDescription(gd::String longDescription) {
     if (!parameters.empty())
       parameters.back().SetLongDescription(longDescription);
     return *this;
@@ -218,8 +229,7 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
    *
    * \see AddParameter
    */
-  ExpressionMetadata &SetParameterExtraInfo(
-      const gd::String &extraInfo) override {
+  ExpressionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) {
     if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
     return *this;
   }
@@ -241,6 +251,50 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
     return requiredBaseObjectCapability;
   };
 
+  /**
+   * \brief Set the function that should be called when generating the source
+   * code from events.
+   * \param functionName the name of the function to call
+   * \note Shortcut for `codeExtraInformation.SetFunctionName`.
+   */
+  ExpressionCodeGenerationInformation& SetFunctionName(
+      const gd::String& functionName) {
+    return codeExtraInformation.SetFunctionName(functionName);
+  }
+
+  /**
+   * \brief Return the structure containing the information about code
+   * generation for the expression.
+   */
+  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;
+
   bool IsShown() const { return shown; }
   const gd::String& GetReturnType() const { return returnType; }
   const gd::String& GetFullName() const { return fullname; }
@@ -260,99 +314,6 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
 
   std::vector<gd::ParameterMetadata> parameters;
 
-  
-  /**
-   * \brief Set the function name which will be used when generating the code.
-   * \param functionName the name of the function to call
-   */
-  ExpressionMetadata& SetFunctionName(
-      const gd::String& functionName) override {
-    codeExtraInformation.functionCallName = functionName;
-    return *this;
-  }
-
-
-  /**
-   * \brief Return the name of the function which will be called in the generated code.
-   */
-  const gd::String &GetFunctionName() {
-    return codeExtraInformation.functionCallName;
-  }
-  /**
-   * \brief Set that the function is static
-   */
-  ExpressionMetadata& SetStatic() {
-    codeExtraInformation.staticFunction = true;
-    return *this;
-  }
-
-  /**
-   * \brief Erase any existing include file and add the specified include.
-   */
-  ExpressionMetadata& SetIncludeFile(
-      const gd::String& includeFile) override {
-    codeExtraInformation.includeFiles.clear();
-    codeExtraInformation.includeFiles.push_back(includeFile);
-    return *this;
-  }
-
-  /**
-   * \brief Add a file to the already existing include files.
-   */
-  ExpressionMetadata& AddIncludeFile(
-      const gd::String& includeFile) override {
-    if (std::find(codeExtraInformation.includeFiles.begin(), codeExtraInformation.includeFiles.end(), includeFile) ==
-        codeExtraInformation.includeFiles.end())
-      codeExtraInformation.includeFiles.push_back(includeFile);
-
-    return *this;
-  }
-
-  /**
-   * \brief Get the files that must be included to use the instruction.
-   */
-  const std::vector<gd::String>& GetIncludeFiles() const override {
-    return codeExtraInformation.includeFiles;
-  };
-
-  /**
-   * \brief Set that the function must be generated using a custom code
-   * generator.
-   */
-  ExpressionMetadata& SetCustomCodeGenerator(
-      std::function<gd::String(const std::vector<gd::Expression>& parameters,
-                               gd::EventsCodeGenerator& codeGenerator,
-                               gd::EventsCodeGenerationContext& context)>
-          codeGenerator) {
-    codeExtraInformation.hasCustomCodeGenerator = true;
-    codeExtraInformation.customCodeGenerator = codeGenerator;
-    return *this;
-  }
-
-  ExpressionMetadata& RemoveCustomCodeGenerator() {
-    codeExtraInformation.hasCustomCodeGenerator = false;
-    std::function<gd::String(const std::vector<gd::Expression>& parameters,
-                             gd::EventsCodeGenerator& codeGenerator,
-                             gd::EventsCodeGenerationContext& context)>
-        emptyFunction;
-    codeExtraInformation.customCodeGenerator = emptyFunction;
-    return *this;
-  }
-
-  bool HasCustomCodeGenerator() const { return codeExtraInformation.hasCustomCodeGenerator; }
-
-  /**
-   * \brief Return the structure containing the information about code
-   * generation for the expression.
-   * 
-   * \deprecated
-   */
-  ExpressionMetadata& GetCodeExtraInformation() {
-    return *this;
-  }
-
-  ExpressionCodeGenerationInformation codeExtraInformation;
-
  private:
   gd::String returnType;
   gd::String fullname;
@@ -365,7 +326,9 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
   gd::String extensionNamespace;
   bool isPrivate;
   gd::String requiredBaseObjectCapability;
-  gd::String relevantContext;
 };
 
 }  // namespace gd
+
+#endif
+#endif  // EXPRESSIONMETADATA_H

Core/GDCore/Extensions/Metadata/InstructionMetadata.cpp

@@ -47,8 +47,7 @@ InstructionMetadata::InstructionMetadata(const gd::String& extensionNamespace_,
       usageComplexity(5),
       isPrivate(false),
       isObjectInstruction(false),
-      isBehaviorInstruction(false),
-      relevantContext("Any") {}
+      isBehaviorInstruction(false) {}
 
 InstructionMetadata& InstructionMetadata::AddParameter(
     const gd::String& type,
@@ -95,15 +94,13 @@ InstructionMetadata& InstructionMetadata::AddCodeOnlyParameter(
 }
 
 InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
-    const gd::String& type, const ParameterOptions &options) {
+    const gd::String& type, const gd::String& typeExtraInfo) {
   const gd::String& expressionValueType =
       gd::ValueTypeMetadata::GetPrimitiveValueType(type);
   SetManipulatedType(expressionValueType);
 
   if (type == "boolean") {
-    AddParameter(
-        "yesorno",
-        options.description.empty() ? _("New value") : options.description);
+    AddParameter("yesorno", _("New value"));
     size_t valueParamIndex = parameters.size() - 1;
 
     if (isObjectInstruction || isBehaviorInstruction) {
@@ -125,9 +122,7 @@ InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
     }
   } else {
     AddParameter("operator", _("Modification's sign"), expressionValueType);
-    AddParameter(type,
-                 options.description.empty() ? _("Value") : options.description,
-                 options.typeExtraInfo);
+    AddParameter(type, _("Value"), typeExtraInfo);
 
     size_t operatorParamIndex = parameters.size() - 2;
     size_t valueParamIndex = parameters.size() - 1;
@@ -160,7 +155,7 @@ InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
 
 InstructionMetadata&
 InstructionMetadata::UseStandardRelationalOperatorParameters(
-    const gd::String& type, const ParameterOptions &options) {
+    const gd::String& type, const gd::String& typeExtraInfo) {
   const gd::String& expressionValueType =
       gd::ValueTypeMetadata::GetPrimitiveValueType(type);
   SetManipulatedType(expressionValueType);
@@ -180,9 +175,7 @@ InstructionMetadata::UseStandardRelationalOperatorParameters(
     }
   } else {
     AddParameter("relationalOperator", _("Sign of the test"), expressionValueType);
-    AddParameter(type,
-                 options.description.empty() ? _("Value to compare") : options.description,
-                 options.typeExtraInfo);
+    AddParameter(type, _("Value to compare"), typeExtraInfo);
     size_t operatorParamIndex = parameters.size() - 2;
     size_t valueParamIndex = parameters.size() - 1;
 

Core/GDCore/Extensions/Metadata/InstructionMetadata.h

@@ -4,10 +4,8 @@
  * reserved. This project is released under the MIT License.
  */
 
-#pragma once
-
-#include "AbstractFunctionMetadata.h"
-
+#ifndef INSTRUCTIONMETADATA_H
+#define INSTRUCTIONMETADATA_H
 #include <algorithm>
 #include <functional>
 #include <map>
@@ -16,8 +14,6 @@
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/String.h"
 #include "ParameterMetadata.h"
-#include "ParameterOptions.h"
-
 namespace gd {
 class Project;
 class Layout;
@@ -35,7 +31,7 @@ namespace gd {
  *
  * \ingroup Events
  */
-class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
+class GD_CORE_API InstructionMetadata {
  public:
   /**
    * Construct a new instruction metadata.
@@ -98,72 +94,11 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    * Set that the instruction is private - it can't be used outside of the
    * object/ behavior that it is attached too.
    */
-  InstructionMetadata &SetPrivate() override {
+  InstructionMetadata &SetPrivate() {
     isPrivate = true;
     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() override {
-    relevantContext = "Layout";
-    return *this;
-  }
-
-  /**
-   * Set that the instruction can be used in function events.
-   */
-  InstructionMetadata &SetRelevantForFunctionEventsOnly() override {
-    relevantContext = "Function";
-    return *this;
-  }
-
-  /**
-   * Set that the instruction can be used in asynchronous function events.
-   */
-  InstructionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() override {
-    relevantContext = "AsynchronousFunction";
-    return *this;
-  }
-
-  /**
-   * Set that the instruction can be used in custom object events.
-   */
-  InstructionMetadata &SetRelevantForCustomObjectEventsOnly() override {
-    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
@@ -174,8 +109,8 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
   }
 
   /**
-   * 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();
@@ -194,7 +129,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    *
    * Used mainly when an instruction is deprecated.
    */
-  InstructionMetadata &SetHidden() override {
+  InstructionMetadata &SetHidden() {
     hidden = true;
     return *this;
   }
@@ -233,7 +168,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
       const gd::String &type,
       const gd::String &label,
       const gd::String &supplementaryInformation = "",
-      bool parameterIsOptional = false) override;
+      bool parameterIsOptional = false);
 
   /**
    * \brief Add a parameter not displayed in editor.
@@ -247,7 +182,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    * \see EventsCodeGenerator::GenerateParametersCodes
    */
   InstructionMetadata &AddCodeOnlyParameter(
-      const gd::String &type, const gd::String &supplementaryInformation) override;
+      const gd::String &type, const gd::String &supplementaryInformation);
 
   /**
    * \brief Set the default value used in editor (or if an optional parameter is
@@ -255,7 +190,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    *
    * \see AddParameter
    */
-  InstructionMetadata &SetDefaultValue(const gd::String &defaultValue_) override {
+  InstructionMetadata &SetDefaultValue(const gd::String &defaultValue_) {
     if (!parameters.empty()) parameters.back().SetDefaultValue(defaultValue_);
     return *this;
   };
@@ -267,7 +202,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    * \see AddParameter
    */
   InstructionMetadata &SetParameterLongDescription(
-      const gd::String &longDescription) override {
+      const gd::String &longDescription) {
     if (!parameters.empty())
       parameters.back().SetLongDescription(longDescription);
     return *this;
@@ -280,7 +215,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    *
    * \see AddParameter
    */
-  InstructionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) override {
+  InstructionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) {
     if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
     return *this;
   }
@@ -288,22 +223,21 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
   /**
    * \brief Add the default parameters for an instruction manipulating the
    * specified type ("string", "number") with the default operators.
-   *
+   * 
    * \note The type "string" can be declined in several subtypes.
    * \see ParameterMetadata
    */
-  InstructionMetadata &UseStandardOperatorParameters(
-      const gd::String &type, const ParameterOptions &options);
+  InstructionMetadata &UseStandardOperatorParameters(const gd::String &type, const gd::String& typeExtraInfo = "");
 
   /**
    * \brief Add the default parameters for an instruction comparing the
    * specified type ("string", "number") with the default relational operators.
-   *
+   * 
    * \note The type "string" can be declined in several subtypes.
    * \see ParameterMetadata
    */
   InstructionMetadata &UseStandardRelationalOperatorParameters(
-      const gd::String &type, const ParameterOptions &options);
+      const gd::String &type, const gd::String& typeExtraInfo = "");
 
   /**
    * \brief Mark the instruction as an object instruction. Automatically called
@@ -384,13 +318,127 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
   /**
    * \brief Defines information about how generate the code for an instruction
    */
-  class ExtraInformation { 
+  class ExtraInformation {
    public:
     enum AccessType { Reference, MutatorAndOrAccessor, Mutators };
     ExtraInformation() : accessType(Reference), hasCustomCodeGenerator(false){};
     virtual ~ExtraInformation(){};
 
-    // TODO Move these attributes to InstructionMetadata.
+    /**
+     * Set the name of the function which will be called in the generated code.
+     * \param functionName the name of the function to call.
+     */
+    ExtraInformation &SetFunctionName(const gd::String &functionName_) {
+      functionCallName = functionName_;
+      return *this;
+    }
+
+    /**
+     * Set the name of the function, doing asynchronous work, which will be called in
+     * the generated code. This function should return an asynchronous task
+     * (i.e: `gdjs.AsyncTask` in the JavaScript runtime).
+     *
+     * \param functionName the name of the function doing asynchronous work to call.
+     */
+    ExtraInformation &SetAsyncFunctionName(const gd::String &functionName_) {
+      asyncFunctionCallName = functionName_;
+      return *this;
+    }
+
+    /**
+     * Declare if the instruction being declared is somewhat manipulating in a
+     * standard way.
+     */
+    ExtraInformation &SetManipulatedType(const gd::String &type_) {
+      type = type_;
+      return *this;
+    }
+
+    /**
+     * If InstructionMetadata::ExtraInformation::SetManipulatedType was called
+     * with "number" or "string", this function will tell the code generator the
+     * name of the getter function used to retrieve the data value.
+     *
+     * Usage example:
+     * \code
+     *  obj.AddAction("String",
+     *                 _("Change the string"),
+     *                 _("Change the string of a text"),
+     *                 _("the string"),
+     *                 _("Text"),
+     *                 "CppPlatform/Extensions/text24.png",
+     *                 "CppPlatform/Extensions/text_black.png");
+     *
+     *      .AddParameter("object", _("Object"), "Text", false)
+     *      .AddParameter("operator", _("Modification operator"), "string")
+     *      .AddParameter("string", _("String"))
+     *      .SetFunctionName("SetString").SetManipulatedType("string").SetGetter("GetString");
+     *
+     *  DECLARE_END_OBJECT_ACTION()
+     * \endcode
+     */
+    ExtraInformation &SetGetter(const gd::String &getter) {
+      optionalAssociatedInstruction = getter;
+      accessType = MutatorAndOrAccessor;
+      return *this;
+    }
+
+    ExtraInformation &SetMutators(
+        const std::map<gd::String, gd::String> &mutators) {
+      optionalMutators = mutators;
+      accessType = Mutators;
+      return *this;
+    }
+
+    /**
+     * \brief Erase any existing include file and add the specified include.
+     */
+    ExtraInformation &SetIncludeFile(const gd::String &includeFile) {
+      includeFiles.clear();
+      includeFiles.push_back(includeFile);
+      return *this;
+    }
+
+    /**
+     * \brief Add a file to the already existing include files.
+     */
+    ExtraInformation &AddIncludeFile(const gd::String &includeFile) {
+      if (std::find(includeFiles.begin(), includeFiles.end(), includeFile) ==
+          includeFiles.end())
+        includeFiles.push_back(includeFile);
+
+      return *this;
+    }
+
+    /**
+     * \brief Get the files that must be included to use the instruction.
+     */
+    const std::vector<gd::String> &GetIncludeFiles() const {
+      return includeFiles;
+    };
+
+    ExtraInformation &SetCustomCodeGenerator(
+        std::function<gd::String(Instruction &instruction,
+                                 gd::EventsCodeGenerator &codeGenerator,
+                                 gd::EventsCodeGenerationContext &context)>
+            codeGenerator) {
+      hasCustomCodeGenerator = true;
+      customCodeGenerator = codeGenerator;
+      return *this;
+    }
+
+    ExtraInformation &RemoveCustomCodeGenerator() {
+      hasCustomCodeGenerator = false;
+      std::function<gd::String(Instruction & instruction,
+                               gd::EventsCodeGenerator & codeGenerator,
+                               gd::EventsCodeGenerationContext & context)>
+          emptyFunction;
+      customCodeGenerator = emptyFunction;
+      return *this;
+    }
+
+    bool HasCustomCodeGenerator() const { return hasCustomCodeGenerator; }
+
     gd::String functionCallName;
     gd::String asyncFunctionCallName;
     gd::String type;
@@ -399,156 +447,75 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
     std::map<gd::String, gd::String> optionalMutators;
     bool hasCustomCodeGenerator;
     std::function<gd::String(Instruction &instruction,
-                              gd::EventsCodeGenerator &codeGenerator,
-                              gd::EventsCodeGenerationContext &context)>
+                             gd::EventsCodeGenerator &codeGenerator,
+                             gd::EventsCodeGenerationContext &context)>
         customCodeGenerator;
+
+   private:
     std::vector<gd::String> includeFiles;
   };
   ExtraInformation codeExtraInformation;  ///< Information about how generate
                                           ///< code for the instruction
 
+  /**
+   * \brief Return the structure containing the information about code
+   * generation for the instruction.
+   */
+  ExtraInformation &GetCodeExtraInformation() { return codeExtraInformation; }
+
+  /**
+   * \brief Declare if the instruction being declared is somewhat manipulating
+   * in a standard way. \param type "number" or "string" \note Shortcut for
+   * `codeExtraInformation.SetManipulatedType(type)`.
+   */
+  ExtraInformation &SetManipulatedType(const gd::String &type_) {
+    return codeExtraInformation.SetManipulatedType(type_);
+  }
+
   /**
    * Set the name of the function which will be called in the generated code.
    * \param functionName the name of the function to call.
+   * \note Shortcut for `codeExtraInformation.SetFunctionName`.
    */
-  InstructionMetadata &SetFunctionName(const gd::String &functionName_) override {
-    codeExtraInformation.functionCallName = functionName_;
-    return *this;
+  ExtraInformation &SetFunctionName(const gd::String &functionName) {
+    return codeExtraInformation.SetFunctionName(functionName);
   }
 
   /**
-   * Set the name of the function, doing asynchronous work, which will be
-   * called in the generated code. This function should return an asynchronous
-   * task (i.e: `gdjs.AsyncTask` in the JavaScript runtime).
+   * 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.
+   * \note Shortcut for `codeExtraInformation.SetAsyncFunctionName`.
    */
-  InstructionMetadata &SetAsyncFunctionName(const gd::String &functionName_) {
-    codeExtraInformation.asyncFunctionCallName = functionName_;
-    return *this;
-  }
-
-  /**
-   * Return the name of the function which will be called in the generated code.
-   */
-  const gd::String &GetFunctionName() {
-    return codeExtraInformation.functionCallName;
-  }
-
-  /**
-   * Return 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).
-   */
-  const gd::String &GetAsyncFunctionName() {
-    return codeExtraInformation.asyncFunctionCallName;
-  }
-
-/**
- * \brief Declare if the instruction being declared is somewhat manipulating
- * in a standard way.
- * 
- * \param type "number" or "string"
- */
-  InstructionMetadata &SetManipulatedType(const gd::String &type_) {
-    codeExtraInformation.type = type_;
-    return *this;
-  }
-
-  /**
-   * If InstructionMetadata::ExtraInformation::SetManipulatedType was called
-   * with "number" or "string", this function will tell the code generator the
-   * name of the getter function used to retrieve the data value.
-   *
-   * Usage example:
-   * \code
-   *  obj.AddAction("String",
-   *                 _("Change the string"),
-   *                 _("Change the string of a text"),
-   *                 _("the string"),
-   *                 _("Text"),
-   *                 "CppPlatform/Extensions/text24.png",
-   *                 "CppPlatform/Extensions/text_black.png");
-   *
-   *      .AddParameter("object", _("Object"), "Text", false)
-   *      .AddParameter("operator", _("Modification operator"), "string")
-   *      .AddParameter("string", _("String"))
-   *      .SetFunctionName("SetString").SetManipulatedType("string").SetGetter("GetString");
-   *
-   *  DECLARE_END_OBJECT_ACTION()
-   * \endcode
-   */
-  InstructionMetadata &SetGetter(const gd::String &getter) {
-    codeExtraInformation.optionalAssociatedInstruction = getter;
-    codeExtraInformation.accessType = codeExtraInformation.MutatorAndOrAccessor;
-    return *this;
-  }
-
-  InstructionMetadata &SetMutators(
-      const std::map<gd::String, gd::String> &mutators) {
-    codeExtraInformation.optionalMutators = mutators;
-    codeExtraInformation.accessType = codeExtraInformation.Mutators;
-    return *this;
+  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) override {
-    codeExtraInformation.includeFiles.clear();
-    codeExtraInformation.includeFiles.push_back(includeFile);
+  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) override {
-    if (std::find(codeExtraInformation.includeFiles.begin(), codeExtraInformation.includeFiles.end(), includeFile) ==
-        codeExtraInformation.includeFiles.end())
-      codeExtraInformation.includeFiles.push_back(includeFile);
-
+  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 override {
-    return codeExtraInformation.includeFiles;
+  const std::vector<gd::String>& GetIncludeFiles() const {
+    return codeExtraInformation.GetIncludeFiles();
   };
 
-  InstructionMetadata &SetCustomCodeGenerator(
-      std::function<gd::String(Instruction &instruction,
-                                gd::EventsCodeGenerator &codeGenerator,
-                                gd::EventsCodeGenerationContext &context)>
-          codeGenerator) {
-    codeExtraInformation.hasCustomCodeGenerator = true;
-    codeExtraInformation.customCodeGenerator = codeGenerator;
-    return *this;
-  }
-
-  InstructionMetadata &RemoveCustomCodeGenerator() {
-    codeExtraInformation.hasCustomCodeGenerator = false;
-    std::function<gd::String(Instruction & instruction,
-                              gd::EventsCodeGenerator & codeGenerator,
-                              gd::EventsCodeGenerationContext & context)>
-        emptyFunction;
-    codeExtraInformation.customCodeGenerator = emptyFunction;
-    return *this;
-  }
-
-  bool HasCustomCodeGenerator() const { return codeExtraInformation.hasCustomCodeGenerator; }
-
-  /**
-   * \brief Return the structure containing the information about code
-   * generation for the instruction.
-   * 
-   * \deprecated
-   */
-  InstructionMetadata &GetCodeExtraInformation() { return *this; }
-
   std::vector<ParameterMetadata> parameters;
 
  private:
@@ -568,7 +535,8 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
   bool isObjectInstruction;
   bool isBehaviorInstruction;
   gd::String requiredBaseObjectCapability;
-  gd::String relevantContext;
 };
 
 }  // namespace gd
+
+#endif  // INSTRUCTIONMETADATA_H

Core/GDCore/Extensions/Metadata/InstructionOrExpressionContainerMetadata.h

@@ -1,201 +0,0 @@
-/*
- * 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 <map>
-
-#include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
-#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
-#include "GDCore/String.h"
-
-namespace gd {
-class Behavior;
-class BehaviorsSharedData;
-class MultipleInstructionMetadata;
-class InstructionMetadata;
-class ExpressionMetadata;
-} // namespace gd
-
-namespace gd {
-
-/**
- * \brief Contains user-friendly information about instructions and expressions
- * (usually for a behavior or an object).
- *
- * \ingroup Events
- */
-class GD_CORE_API InstructionOrExpressionContainerMetadata {
-public:
-  InstructionOrExpressionContainerMetadata(){};
-  virtual ~InstructionOrExpressionContainerMetadata(){};
-
-  /**
-   * Declare a new condition as being part of the behavior or object.
-   * \deprecated Prefer using `AddScopedCondition`, to properly namespace
-   * the condition.
-   */
-  virtual gd::InstructionMetadata &
-  AddCondition(const gd::String &name_, const gd::String &fullname_,
-               const gd::String &description_, const gd::String &sentence_,
-               const gd::String &group_, const gd::String &icon_,
-               const gd::String &smallicon_) = 0;
-
-  /**
-   * Declare a new action as being part of the behavior or object.
-   * \deprecated Prefer using `AddScopedAction`, to properly namespace
-   * the action.
-   */
-  virtual gd::InstructionMetadata &
-  AddAction(const gd::String &name_, const gd::String &fullname_,
-            const gd::String &description_, const gd::String &sentence_,
-            const gd::String &group_, const gd::String &icon_,
-            const gd::String &smallicon_) = 0;
-
-  /**
-   * Declare a new condition as being part of the behavior or object.
-   */
-  virtual gd::InstructionMetadata &
-  AddScopedCondition(const gd::String &name_, const gd::String &fullname_,
-                     const gd::String &description_,
-                     const gd::String &sentence_, const gd::String &group_,
-                     const gd::String &icon_, const gd::String &smallicon_) = 0;
-
-  /**
-   * Declare a new action as being part of the behavior or object.
-   */
-  virtual gd::InstructionMetadata &
-  AddScopedAction(const gd::String &name_, const gd::String &fullname_,
-                  const gd::String &description_, const gd::String &sentence_,
-                  const gd::String &group_, const gd::String &icon_,
-                  const gd::String &smallicon_) = 0;
-  /**
-   * Declare a new action as being part of the extension.
-   */
-  virtual gd::ExpressionMetadata &
-  AddExpression(const gd::String &name_, const gd::String &fullname_,
-                const gd::String &description_, const gd::String &group_,
-                const gd::String &smallicon_) = 0;
-
-  /**
-   * Declare a new string expression as being part of the extension.
-   */
-  virtual gd::ExpressionMetadata &
-  AddStrExpression(const gd::String &name_, const gd::String &fullname_,
-                   const gd::String &description_, const gd::String &group_,
-                   const gd::String &smallicon_) = 0;
-
-  /**
-   * \brief Declare a new expression and condition as being part of the
-   * behavior.
-   * \note It's recommended to use this function to avoid declaring twice a
-   * similar expression/condition.
-   */
-  virtual gd::MultipleInstructionMetadata AddExpressionAndCondition(
-      const gd::String &type, const gd::String &name,
-      const gd::String &fullname, const gd::String &description,
-      const gd::String &sentenceName, const gd::String &group,
-      const gd::String &icon) = 0;
-
-  /**
-   * \brief Declare a new expression, condition and action as being part of the
-   * behavior.
-   * \note The action name is prefixed by "Set" (and the namespace, as the
-   * condition).
-   * \note It's recommended to use this function to avoid declaring 3 times a
-   * similar expression/condition/action.
-   */
-  virtual gd::MultipleInstructionMetadata AddExpressionAndConditionAndAction(
-      const gd::String &type, const gd::String &name,
-      const gd::String &fullname, const gd::String &description,
-      const gd::String &sentenceName, const gd::String &group,
-      const gd::String &icon) = 0;
-
-  /**
-   * \brief Create a new action which is the duplicate of the specified one.
-   *
-   * Useful for handling a deprecated action that is just a "copy" of the new
-   * one.
-   */
-  virtual gd::InstructionMetadata &
-  AddDuplicatedAction(const gd::String &newActionName,
-                      const gd::String &copiedActionName) = 0;
-
-  /**
-   * \brief Create a new condition which is the duplicate of the specified one.
-   *
-   * Useful for handling a deprecated condition that is just a "copy" of the new
-   * one.
-   */
-  virtual gd::InstructionMetadata &
-  AddDuplicatedCondition(const gd::String &newConditionName,
-                         const gd::String &copiedConditionName) = 0;
-
-  virtual InstructionOrExpressionContainerMetadata &
-  SetFullName(const gd::String &fullname_) = 0;
-  virtual InstructionOrExpressionContainerMetadata &
-  SetDescription(const gd::String &description_) = 0;
-
-  /**
-   * \brief Erase any existing include file and add the specified include.
-   * \note The requirement may vary depending on the platform: Most of the time,
-   * the include file contains the declaration of the behavior.
-   */
-  virtual InstructionOrExpressionContainerMetadata &
-  SetIncludeFile(const gd::String &includeFile) = 0;
-
-  /**
-   * \brief Add a file to the already existing include files.
-   */
-  virtual InstructionOrExpressionContainerMetadata &
-  AddIncludeFile(const gd::String &includeFile) = 0;
-
-  /**
-   * Get the help path of the behavior, relative to the GDevelop documentation
-   * root.
-   */
-  virtual const gd::String &GetHelpPath() const = 0;
-
-  /**
-   * Set the help path of the behavior, relative to the GDevelop documentation
-   * root.
-   *
-   * The behavior instructions will have this help path set by
-   * default, unless you call SetHelpPath on them.
-   */
-  virtual InstructionOrExpressionContainerMetadata &
-  SetHelpPath(const gd::String &path) = 0;
-
-  virtual const gd::String &GetName() const = 0;
-  virtual const gd::String &GetFullName() const = 0;
-  virtual const gd::String &GetDescription() const = 0;
-  virtual const gd::String &GetIconFilename() const = 0;
-
-  /**
-   * \brief Return a reference to a map containing the names of the actions
-   * (as keys) and the metadata associated with (as values).
-   */
-  virtual std::map<gd::String, gd::InstructionMetadata> &GetAllActions() = 0;
-
-  /**
-   * \see gd::PlatformExtension::GetAllActions
-   */
-  virtual std::map<gd::String, gd::InstructionMetadata> &GetAllConditions() = 0;
-
-  /**
-   * \see gd::PlatformExtension::GetAllActions
-   */
-  virtual std::map<gd::String, gd::ExpressionMetadata> &GetAllExpressions() = 0;
-
-  /**
-   * \see gd::PlatformExtension::GetAllActions
-   */
-  virtual std::map<gd::String, gd::ExpressionMetadata> &
-  GetAllStrExpressions() = 0;
-
-private:
-};
-
-} // namespace gd

Core/GDCore/Extensions/Metadata/MetadataProvider.cpp

@@ -135,11 +135,11 @@ MetadataProvider::GetExtensionAndConditionMetadata(const gd::Platform& platform,
 
     const auto& objects = extension->GetExtensionObjectsTypes();
     for (const gd::String& extObjectType : objects) {
-      const auto& allObjectsConditions =
+      const auto& allObjetsConditions =
           extension->GetAllConditionsForObject(extObjectType);
-      if (allObjectsConditions.find(conditionType) != allObjectsConditions.end())
+      if (allObjetsConditions.find(conditionType) != allObjetsConditions.end())
         return ExtensionAndMetadata<InstructionMetadata>(
-            *extension, allObjectsConditions.find(conditionType)->second);
+            *extension, allObjetsConditions.find(conditionType)->second);
     }
 
     const auto& autos = extension->GetBehaviorsTypes();

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.cpp

@@ -0,0 +1,12 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "MultipleInstructionMetadata.h"
+
+#include "InstructionMetadata.h"
+
+namespace gd {
+
+}  // namespace gd

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.h

@@ -3,13 +3,11 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
-
+#ifndef MULTIPLEINSTRUCTIONSMETADATA_H
+#define MULTIPLEINSTRUCTIONSMETADATA_H
 #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 {
@@ -21,7 +19,7 @@ namespace gd {
  *
  * \ingroup PlatformDefinition
  */
-class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata {
+class GD_CORE_API MultipleInstructionMetadata {
  public:
   static MultipleInstructionMetadata WithExpressionAndCondition(
       gd::ExpressionMetadata &expression, gd::InstructionMetadata &condition) {
@@ -34,7 +32,8 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
     return MultipleInstructionMetadata(expression, condition, action);
   }
   static MultipleInstructionMetadata WithConditionAndAction(
-      gd::InstructionMetadata &condition, gd::InstructionMetadata &action) {
+      gd::InstructionMetadata &condition,
+      gd::InstructionMetadata &action) {
     return MultipleInstructionMetadata(condition, action);
   }
 
@@ -45,7 +44,7 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
       const gd::String &type,
       const gd::String &label,
       const gd::String &supplementaryInformation = "",
-      bool parameterIsOptional = false) override {
+      bool parameterIsOptional = false) {
     if (expression)
       expression->AddParameter(
           type, label, supplementaryInformation, parameterIsOptional);
@@ -62,7 +61,7 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
    * \see gd::InstructionMetadata::AddCodeOnlyParameter
    */
   MultipleInstructionMetadata &AddCodeOnlyParameter(
-      const gd::String &type, const gd::String &supplementaryInformation) override {
+      const gd::String &type, const gd::String &supplementaryInformation) {
     if (expression)
       expression->AddCodeOnlyParameter(type, supplementaryInformation);
     if (condition)
@@ -74,7 +73,7 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
   /**
    * \see gd::InstructionMetadata::SetDefaultValue
    */
-  MultipleInstructionMetadata &SetDefaultValue(const gd::String &defaultValue) override {
+  MultipleInstructionMetadata &SetDefaultValue(const gd::String &defaultValue) {
     if (expression) expression->SetDefaultValue(defaultValue);
     if (condition) condition->SetDefaultValue(defaultValue);
     if (action) action->SetDefaultValue(defaultValue);
@@ -84,8 +83,7 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
   /**
    * \see gd::InstructionMetadata::SetParameterExtraInfo
    */
-  MultipleInstructionMetadata &SetParameterExtraInfo(
-      const gd::String &defaultValue) override {
+  MultipleInstructionMetadata &SetParameterExtraInfo(const gd::String &defaultValue) {
     if (expression) expression->SetParameterExtraInfo(defaultValue);
     if (condition) condition->SetParameterExtraInfo(defaultValue);
     if (action) action->SetParameterExtraInfo(defaultValue);
@@ -96,7 +94,7 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
    * \see gd::InstructionMetadata::SetParameterLongDescription
    */
   MultipleInstructionMetadata &SetParameterLongDescription(
-      const gd::String &longDescription) override {
+      const gd::String &longDescription) {
     if (expression) expression->SetParameterLongDescription(longDescription);
     if (condition) condition->SetParameterLongDescription(longDescription);
     if (action) action->SetParameterLongDescription(longDescription);
@@ -106,7 +104,7 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
   /**
    * \see gd::InstructionMetadata::SetHidden
    */
-  MultipleInstructionMetadata &SetHidden() override {
+  MultipleInstructionMetadata &SetHidden() {
     if (expression) expression->SetHidden();
     if (condition) condition->SetHidden();
     if (action) action->SetHidden();
@@ -128,66 +126,69 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
    * \see gd::InstructionMetadata::UseStandardOperatorParameters
    * \see gd::InstructionMetadata::UseStandardRelationalOperatorParameters
    */
-  MultipleInstructionMetadata &UseStandardParameters(
-      const gd::String &type, const ParameterOptions &options) {
-    if (condition)
-      condition->UseStandardRelationalOperatorParameters(type, options);
-    if (action) action->UseStandardOperatorParameters(type, options);
+  MultipleInstructionMetadata &UseStandardParameters(const gd::String &type, const gd::String& typeExtraInfo = "") {
+    if (condition) condition->UseStandardRelationalOperatorParameters(type, typeExtraInfo);
+    if (action) action->UseStandardOperatorParameters(type, typeExtraInfo);
     return *this;
   }
 
-  MultipleInstructionMetadata &SetFunctionName(const gd::String &functionName) override {
+  MultipleInstructionMetadata &SetFunctionName(const gd::String &functionName) {
     if (expression) expression->SetFunctionName(functionName);
     if (condition) condition->SetFunctionName(functionName);
-    if (action) action->SetFunctionName(functionName);
+    if (action) action->GetCodeExtraInformation().SetFunctionName(functionName);
     return *this;
   }
 
   MultipleInstructionMetadata &SetGetter(const gd::String &getter) {
     if (expression) expression->SetFunctionName(getter);
     if (condition) condition->SetFunctionName(getter);
-    if (action) action->SetGetter(getter);
+    if (action) action->GetCodeExtraInformation().SetGetter(getter);
     return *this;
   }
 
-  MultipleInstructionMetadata &SetIncludeFile(const gd::String &includeFile) override {
+  MultipleInstructionMetadata &SetIncludeFile(const gd::String &includeFile) {
     if (expression)
-      expression->SetIncludeFile(includeFile);
+      expression->GetCodeExtraInformation().SetIncludeFile(includeFile);
     if (condition)
-      condition->SetIncludeFile(includeFile);
-    if (action) action->SetIncludeFile(includeFile);
+      condition->GetCodeExtraInformation().SetIncludeFile(includeFile);
+    if (action) action->GetCodeExtraInformation().SetIncludeFile(includeFile);
     return *this;
   }
 
-  MultipleInstructionMetadata &AddIncludeFile(const gd::String &includeFile) override {
+  MultipleInstructionMetadata &AddIncludeFile(const gd::String &includeFile) {
     if (expression)
       expression->GetCodeExtraInformation().AddIncludeFile(includeFile);
     if (condition)
-      condition->AddIncludeFile(includeFile);
-    if (action) action->AddIncludeFile(includeFile);
+      condition->GetCodeExtraInformation().AddIncludeFile(includeFile);
+    if (action) action->GetCodeExtraInformation().AddIncludeFile(includeFile);
     return *this;
   }
 
   /**
    * \brief Get the files that must be included to use the instruction.
    */
-  const std::vector<gd::String> &GetIncludeFiles() const override {
+  const std::vector<gd::String>& GetIncludeFiles() const {
     if (expression)
       return expression->GetCodeExtraInformation().GetIncludeFiles();
     if (condition)
-      return condition->GetIncludeFiles();
-    if (action) return action->GetIncludeFiles();
+      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
+   * Set that the instruction is private - it can't be used outside of the
+   * object/ behavior that it is attached too.
    */
-  MultipleInstructionMetadata &SetPrivate() override {
-    if (expression) expression->SetPrivate();
-    if (condition) condition->SetPrivate();
-    if (action) action->SetPrivate();
+  MultipleInstructionMetadata &SetPrivate() {
+    if (expression)
+      expression->SetPrivate();
+    if (condition)
+      condition->SetPrivate();
+    if (action)
+      action->SetPrivate();
     return *this;
   }
 
@@ -218,42 +219,6 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
     return *this;
   }
 
-  /**
-   * Set that the instruction can be used in layouts or external events.
-   */
-  MultipleInstructionMetadata &SetRelevantForLayoutEventsOnly() override {
-    if (condition) condition->SetRelevantForLayoutEventsOnly();
-    if (action) action->SetRelevantForLayoutEventsOnly();
-    return *this;
-  }
-
-  /**
-   * Set that the instruction can be used in function events.
-   */
-  MultipleInstructionMetadata &SetRelevantForFunctionEventsOnly() override {
-    if (condition) condition->SetRelevantForFunctionEventsOnly();
-    if (action) action->SetRelevantForFunctionEventsOnly();
-    return *this;
-  }
-
-  /**
-   * Set that the instruction can be used in asynchronous function events.
-   */
-  MultipleInstructionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() override {
-    if (condition) condition->SetRelevantForAsynchronousFunctionEventsOnly();
-    if (action) action->SetRelevantForAsynchronousFunctionEventsOnly();
-    return *this;
-  }
-
-  /**
-   * Set that the instruction can be used in custom object events.
-   */
-  MultipleInstructionMetadata &SetRelevantForCustomObjectEventsOnly() override {
-    if (condition) condition->SetRelevantForCustomObjectEventsOnly();
-    if (action) action->SetRelevantForCustomObjectEventsOnly();
-    return *this;
-  }
-
   /**
    * \brief Don't use, only here to fulfill Emscripten bindings requirements.
    */
@@ -278,3 +243,5 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
 };
 
 }  // namespace gd
+
+#endif  // MULTIPLEINSTRUCTIONSMETADATA_H

Core/GDCore/Extensions/Metadata/ObjectMetadata.h

@@ -3,10 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
-
-#include "InstructionOrExpressionContainerMetadata.h"
-
+#ifndef OBJECTMETADATA_H
+#define OBJECTMETADATA_H
 #include <functional>
 #include <map>
 #include <set>
@@ -34,7 +32,7 @@ namespace gd {
  *
  * \ingroup Events
  */
-class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetadata {
+class GD_CORE_API ObjectMetadata {
  public:
   /**
    * \brief Construct an object metadata, using a "blueprint" object that will
@@ -48,7 +46,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
                  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_,
@@ -59,7 +57,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
 
   /**
    * \brief Construct an object metadata, with a function that will be called
-   * to instantiate a new object.
+   * to instanciate a new object.
    */
   ObjectMetadata(const gd::String& extensionNamespace_,
                  const gd::String& name_,
@@ -81,7 +79,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
                                         const gd::String& sentence_,
                                         const gd::String& group_,
                                         const gd::String& icon_,
-                                        const gd::String& smallicon_) override;
+                                        const gd::String& smallicon_);
 
   /**
    * \brief Declare a new action as being part of the extension.
@@ -94,7 +92,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
                                      const gd::String& sentence_,
                                      const gd::String& group_,
                                      const gd::String& icon_,
-                                     const gd::String& smallicon_) override;
+                                     const gd::String& smallicon_);
 
   /**
    * Declare a new condition as being part of the object.
@@ -105,7 +103,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
                                               const gd::String& sentence_,
                                               const gd::String& group_,
                                               const gd::String& icon_,
-                                              const gd::String& smallicon_) override;
+                                              const gd::String& smallicon_);
 
   /**
    * Declare a new action as being part of the object.
@@ -116,7 +114,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
                                            const gd::String& sentence_,
                                            const gd::String& group_,
                                            const gd::String& icon_,
-                                           const gd::String& smallicon_) override;
+                                           const gd::String& smallicon_);
 
   /**
    * \brief Declare a new expression as being part of the extension.
@@ -125,7 +123,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
                                         const gd::String& fullname_,
                                         const gd::String& description_,
                                         const gd::String& group_,
-                                        const gd::String& smallicon_) override;
+                                        const gd::String& smallicon_);
   /**
    * \brief Declare a new string expression as being part of the extension.
    */
@@ -133,7 +131,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
                                            const gd::String& fullname_,
                                            const gd::String& description_,
                                            const gd::String& group_,
-                                           const gd::String& smallicon_) override;
+                                           const gd::String& smallicon_);
 
   /**
    * \brief Declare a new expression and condition as being part of the
@@ -148,7 +146,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
       const gd::String& description,
       const gd::String& sentenceName,
       const gd::String& group,
-      const gd::String& icon) override;
+      const gd::String& icon);
 
   /**
    * \brief Declare a new expression, condition and action as being part of the
@@ -165,7 +163,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
       const gd::String& description,
       const gd::String& sentenceName,
       const gd::String& group,
-      const gd::String& icon) override;
+      const gd::String& icon);
 
   /**
    * \brief Create a new action which is the duplicate of the specified one.
@@ -174,7 +172,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
    * one.
    */
   gd::InstructionMetadata& AddDuplicatedAction(
-      const gd::String& newActionName, const gd::String& copiedActionName) override;
+      const gd::String& newActionName, const gd::String& copiedActionName);
 
   /**
    * \brief Create a new condition which is the duplicate of the specified one.
@@ -184,23 +182,23 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
    */
   gd::InstructionMetadata& AddDuplicatedCondition(
       const gd::String& newConditionName,
-      const gd::String& copiedConditionName) override;
+      const gd::String& copiedConditionName);
 
   /**
    * \brief Set the name shown to the user.
    */
-  ObjectMetadata& SetFullName(const gd::String& fullname_) override;
+  ObjectMetadata& SetFullName(const gd::String& fullname_);
 
   /**
    * \brief Set the description shown to the user.
    */
-  ObjectMetadata& SetDescription(const gd::String& description_) override;
+  ObjectMetadata& SetDescription(const gd::String& description_);
 
   /**
    * \brief Get the help path of the object, relative to the GDevelop
    * documentation root.
    */
-  const gd::String& GetHelpPath() const override { return helpPath; }
+  const gd::String& GetHelpPath() const { return helpPath; }
 
   /**
    * \brief Set the help path of the object, relative to the GDevelop
@@ -209,7 +207,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
    * The object instructions will have this help path set by
    * default, unless you call SetHelpPath on them.
    */
-  ObjectMetadata& SetHelpPath(const gd::String& path) override {
+  ObjectMetadata& SetHelpPath(const gd::String& path) {
     helpPath = path;
     return *this;
   }
@@ -226,7 +224,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
   /**
    * \brief The "capabilities" that are offered by the base object that are
    * *not* supported by this object, and should be hidden in the editor
-   * interface.
+   * inferface.
    */
   const std::set<gd::String>& GetUnsupportedBaseObjectCapabilities() const {
     return unsupportedBaseObjectCapabilities;
@@ -234,7 +232,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
 
   /**
    * \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 interface.
+   * supported by this object, and should be hidden in the editor inferface.
    */
   ObjectMetadata& AddUnsupportedBaseObjectCapability(
       const gd::String& capability) {
@@ -244,18 +242,18 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
 
   /**
    * \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 interface.
+   * supported by this object, and should be hidden in the editor inferface.
    */
   bool IsUnsupportedBaseObjectCapability(const gd::String& capability) const {
     return unsupportedBaseObjectCapabilities.find(capability) != unsupportedBaseObjectCapabilities.end();
   }
 
-  const gd::String& GetName() const override { return name; }
-  const gd::String& GetFullName() const override { return fullname; }
+  const gd::String& GetName() const { return name; }
+  const gd::String& GetFullName() const { return fullname; }
   const gd::String& GetCategoryFullName() const { return categoryFullName; }
   const gd::String& GetHelpUrl() const { return helpUrl; }
-  const gd::String& GetDescription() const override { return description; }
-  const gd::String& GetIconFilename() const override { return iconFilename; }
+  const gd::String& GetDescription() const { return description; }
+  const gd::String& GetIconFilename() const { return iconFilename; }
 
   /**
    * \brief Set the URL pointing to the help page about this object
@@ -269,49 +267,33 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
    * \note The requirement may vary depending on the platform: Most of the time,
    * the include file contains the declaration of the object.
    */
-  ObjectMetadata& SetIncludeFile(const gd::String& includeFile) override;
+  ObjectMetadata& SetIncludeFile(const gd::String& includeFile);
 
   /**
    * \brief Add a file to the already existing include files.
    */
-  ObjectMetadata& AddIncludeFile(const gd::String& includeFile) override;
+  ObjectMetadata& AddIncludeFile(const gd::String& includeFile);
 
   /**
    * \brief Return a reference to a map containing the names of the actions
    * (as keys) and the metadata associated with (as values).
    */
-  std::map<gd::String, gd::InstructionMetadata>& GetAllActions() override { return actionsInfos; };
+  std::map<gd::String, gd::InstructionMetadata>& GetAllActions() { return actionsInfos; };
 
   /**
    * \see gd::PlatformExtension::GetAllActions
    */
-  std::map<gd::String, gd::InstructionMetadata>& GetAllConditions() override { return conditionsInfos; };
+  std::map<gd::String, gd::InstructionMetadata>& GetAllConditions() { return conditionsInfos; };
 
   /**
    * \see gd::PlatformExtension::GetAllActions
    */
-  std::map<gd::String, gd::ExpressionMetadata>& GetAllExpressions() override { return expressionsInfos; };
+  std::map<gd::String, gd::ExpressionMetadata>& GetAllExpressions() { return expressionsInfos; };
 
   /**
    * \see gd::PlatformExtension::GetAllActions
    */
-  std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() override { 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::ExpressionMetadata>& GetAllStrExpressions() { return strExpressionsInfos; };
 
   std::map<gd::String, gd::InstructionMetadata> conditionsInfos;
   std::map<gd::String, gd::InstructionMetadata> actionsInfos;
@@ -332,7 +314,6 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
   gd::String iconFilename;
   gd::String categoryFullName;
   std::set<gd::String> unsupportedBaseObjectCapabilities;
-  bool hidden = false;
 
   std::shared_ptr<gd::ObjectConfiguration>
       blueprintObject;  ///< The "blueprint" object to be copied when a new
@@ -343,3 +324,4 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
 };
 
 }  // namespace gd
+#endif  // OBJECTMETADATA_H

Core/GDCore/Extensions/Metadata/ParameterMetadata.cpp

@@ -15,12 +15,9 @@ ParameterMetadata::ParameterMetadata() : codeOnly(false) {}
 void ParameterMetadata::SerializeTo(SerializerElement& element) const {
   valueTypeMetadata.SerializeTo(element);
   element.SetAttribute("description", description);
-  if (!longDescription.empty()) {
-    element.SetAttribute("longDescription", longDescription);
-  }
-  if (codeOnly) {
-   element.SetAttribute("codeOnly", codeOnly);
-  }
+  element.SetAttribute("longDescription", longDescription);
+  element.SetAttribute("codeOnly", codeOnly);
+  element.SetAttribute("defaultValue", defaultValue);
   element.SetAttribute("name", name);
 }
 
@@ -29,6 +26,7 @@ void ParameterMetadata::UnserializeFrom(const SerializerElement& element) {
   description = element.GetStringAttribute("description");
   longDescription = element.GetStringAttribute("longDescription");
   codeOnly = element.GetBoolAttribute("codeOnly");
+  defaultValue = element.GetStringAttribute("defaultValue");
   name = element.GetStringAttribute("name");
 }
 

Core/GDCore/Extensions/Metadata/ParameterMetadata.h

@@ -144,15 +144,13 @@ class GD_CORE_API ParameterMetadata {
   /**
    * \brief Get the default value for the parameter.
    */
-  const gd::String &GetDefaultValue() const {
-    return valueTypeMetadata.GetDefaultValue();
-  }
+  const gd::String &GetDefaultValue() const { return defaultValue; }
 
   /**
    * \brief Set the default value, if the parameter is optional.
    */
   ParameterMetadata &SetDefaultValue(const gd::String &defaultValue_) {
-    valueTypeMetadata.SetDefaultValue(defaultValue_);
+    defaultValue = defaultValue_;
     return *this;
   }
 
@@ -209,10 +207,10 @@ class GD_CORE_API ParameterMetadata {
    * \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.
+   * \deprecated Use gd::ValueTypeMetadata instead.
    */
   static const gd::String &GetExpressionValueType(const gd::String &parameterType) {
-    return gd::ValueTypeMetadata::GetExpressionPrimitiveValueType(parameterType);
+    return gd::ValueTypeMetadata::GetPrimitiveValueType(parameterType);
   }
 
   /** \name Serialization
@@ -238,6 +236,8 @@ class GD_CORE_API ParameterMetadata {
  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.
 };

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp

@@ -11,8 +11,6 @@
 #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(
@@ -103,56 +101,6 @@ 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,16 +7,12 @@
 #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 {
@@ -52,21 +48,6 @@ 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

@@ -1,35 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#ifndef 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

@@ -35,59 +35,15 @@ void ValueTypeMetadata::UnserializeFrom(const SerializerElement& element) {
 
 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)) {
+const gd::String &ValueTypeMetadata::GetPrimitiveValueType(const gd::String &parameterType) {
+  if (parameterType == "number" || gd::ValueTypeMetadata::IsTypeExpression("number", parameterType)) {
     return ValueTypeMetadata::numberType;
   }
-  if (parameterType == "string" ||
-      gd::ValueTypeMetadata::IsTypeExpression("string", parameterType)) {
+  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

@@ -163,6 +163,7 @@ class GD_CORE_API ValueTypeMetadata {
     } else if (type == "string") {
       return parameterType == "string" || parameterType == "layer" ||
              parameterType == "color" || parameterType == "file" ||
+             parameterType == "joyaxis" ||
              parameterType == "stringWithSelector" ||
              parameterType == "sceneName" ||
              parameterType == "layerEffectName" ||
@@ -178,16 +179,6 @@ class GD_CORE_API ValueTypeMetadata {
     } 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;
   }
@@ -196,29 +187,10 @@ class GD_CORE_API ValueTypeMetadata {
    * \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
    */
@@ -240,12 +212,6 @@ class GD_CORE_API ValueTypeMetadata {
   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

Core/GDCore/Extensions/PlatformExtension.cpp

@@ -24,12 +24,14 @@
 
 namespace gd {
 
+#if defined(GD_IDE_ONLY)
 std::map<gd::String, gd::InstructionMetadata>
     PlatformExtension::badConditionsMetadata;
 std::map<gd::String, gd::InstructionMetadata>
     PlatformExtension::badActionsMetadata;
 std::map<gd::String, gd::ExpressionMetadata>
     PlatformExtension::badExpressionsMetadata;
+#endif
 
 gd::InstructionMetadata& PlatformExtension::AddCondition(
     const gd::String& name,
@@ -39,6 +41,7 @@ gd::InstructionMetadata& PlatformExtension::AddCondition(
     const gd::String& group,
     const gd::String& icon,
     const gd::String& smallicon) {
+#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name;
   conditionsInfos[nameWithNamespace] = InstructionMetadata(GetNameSpace(),
                                                            nameWithNamespace,
@@ -50,6 +53,7 @@ gd::InstructionMetadata& PlatformExtension::AddCondition(
                                                            smallicon)
                                            .SetHelpPath(GetHelpPath());
   return conditionsInfos[nameWithNamespace];
+#endif
 }
 
 gd::InstructionMetadata& PlatformExtension::AddAction(
@@ -60,6 +64,7 @@ gd::InstructionMetadata& PlatformExtension::AddAction(
     const gd::String& group,
     const gd::String& icon,
     const gd::String& smallicon) {
+#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name;
   actionsInfos[nameWithNamespace] = InstructionMetadata(GetNameSpace(),
                                                         nameWithNamespace,
@@ -71,6 +76,7 @@ gd::InstructionMetadata& PlatformExtension::AddAction(
                                                         smallicon)
                                         .SetHelpPath(GetHelpPath());
   return actionsInfos[nameWithNamespace];
+#endif
 }
 
 gd::ExpressionMetadata& PlatformExtension::AddExpression(
@@ -79,6 +85,7 @@ gd::ExpressionMetadata& PlatformExtension::AddExpression(
     const gd::String& description,
     const gd::String& group,
     const gd::String& smallicon) {
+#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name;
   expressionsInfos[nameWithNamespace] = ExpressionMetadata("number",
                                                            GetNameSpace(),
@@ -89,6 +96,7 @@ gd::ExpressionMetadata& PlatformExtension::AddExpression(
                                                            smallicon)
                                             .SetHelpPath(GetHelpPath());
   return expressionsInfos[nameWithNamespace];
+#endif
 }
 
 gd::ExpressionMetadata& PlatformExtension::AddStrExpression(
@@ -97,6 +105,7 @@ gd::ExpressionMetadata& PlatformExtension::AddStrExpression(
     const gd::String& description,
     const gd::String& group,
     const gd::String& smallicon) {
+#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name;
   strExpressionsInfos[nameWithNamespace] = ExpressionMetadata("string",
                                                               GetNameSpace(),
@@ -107,6 +116,7 @@ gd::ExpressionMetadata& PlatformExtension::AddStrExpression(
                                                               smallicon)
                                                .SetHelpPath(GetHelpPath());
   return strExpressionsInfos[nameWithNamespace];
+#endif
 }
 
 gd::MultipleInstructionMetadata PlatformExtension::AddExpressionAndCondition(
@@ -210,10 +220,12 @@ 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,
@@ -305,6 +317,7 @@ gd::EventMetadata& PlatformExtension::AddEvent(
     const gd::String& group_,
     const gd::String& smallicon_,
     std::shared_ptr<gd::BaseEvent> instance_) {
+#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name_;
   eventsInfos[nameWithNamespace] = gd::EventMetadata(nameWithNamespace,
                                                      fullname_,
@@ -313,6 +326,7 @@ gd::EventMetadata& PlatformExtension::AddEvent(
                                                      smallicon_,
                                                      instance_);
   return eventsInfos[nameWithNamespace];
+#endif
 }
 
 PlatformExtension& PlatformExtension::SetExtensionInformation(
@@ -392,6 +406,8 @@ std::vector<gd::String> PlatformExtension::GetBehaviorsTypes() const {
   return behaviors;
 }
 
+#if defined(GD_IDE_ONLY)
+
 gd::InstructionMetadata& PlatformExtension::AddDuplicatedAction(
     const gd::String& newActionName, const gd::String& copiedActionName) {
   gd::String newNameWithNamespace = GetNameSpace() + newActionName;
@@ -570,6 +586,7 @@ gd::BaseEventSPtr PlatformExtension::CreateEvent(
 
   return std::shared_ptr<gd::BaseEvent>();
 }
+#endif
 
 CreateFunPtr PlatformExtension::GetObjectCreationFunctionPtr(
     const gd::String& objectType) const {
@@ -648,12 +665,13 @@ 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();
        it != GetAllActions().end();) {
     if (it->second.codeExtraInformation.functionCallName.empty() &&
-        !it->second.HasCustomCodeGenerator()) {
+        !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
       GetAllActions().erase(it++);
     } else
       ++it;
@@ -663,7 +681,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
            GetAllConditions().begin();
        it != GetAllConditions().end();) {
     if (it->second.codeExtraInformation.functionCallName.empty() &&
-        !it->second.HasCustomCodeGenerator()) {
+        !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
       GetAllConditions().erase(it++);
     } else
       ++it;
@@ -673,7 +691,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
            GetAllExpressions().begin();
        it != GetAllExpressions().end();) {
     if (it->second.codeExtraInformation.functionCallName.empty() &&
-        !it->second.HasCustomCodeGenerator()) {
+        !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
       GetAllExpressions().erase(it++);
     } else
       ++it;
@@ -683,7 +701,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
            GetAllStrExpressions().begin();
        it != GetAllStrExpressions().end();) {
     if (it->second.codeExtraInformation.functionCallName.empty() &&
-        !it->second.HasCustomCodeGenerator()) {
+        !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
       GetAllStrExpressions().erase(it++);
     } else
       ++it;
@@ -699,7 +717,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.actionsInfos.begin();
          it != obj.actionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.HasCustomCodeGenerator()) {
+          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
         obj.actionsInfos.erase(it++);
       } else
         ++it;
@@ -709,7 +727,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.conditionsInfos.begin();
          it != obj.conditionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.HasCustomCodeGenerator()) {
+          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
         obj.conditionsInfos.erase(it++);
       } else
         ++it;
@@ -719,7 +737,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.expressionsInfos.begin();
          it != obj.expressionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.HasCustomCodeGenerator()) {
+          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
         obj.expressionsInfos.erase(it++);
       } else
         ++it;
@@ -729,7 +747,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.strExpressionsInfos.begin();
          it != obj.strExpressionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.HasCustomCodeGenerator()) {
+          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
         obj.strExpressionsInfos.erase(it++);
       } else
         ++it;
@@ -746,7 +764,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.actionsInfos.begin();
          it != obj.actionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.HasCustomCodeGenerator()) {
+          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
         obj.actionsInfos.erase(it++);
       } else
         ++it;
@@ -756,7 +774,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.conditionsInfos.begin();
          it != obj.conditionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.HasCustomCodeGenerator()) {
+          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
         obj.conditionsInfos.erase(it++);
       } else
         ++it;
@@ -766,7 +784,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.expressionsInfos.begin();
          it != obj.expressionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.HasCustomCodeGenerator()) {
+          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
         obj.expressionsInfos.erase(it++);
       } else
         ++it;
@@ -776,7 +794,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.strExpressionsInfos.begin();
          it != obj.strExpressionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.HasCustomCodeGenerator()) {
+          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
         obj.strExpressionsInfos.erase(it++);
       } else
         ++it;
@@ -792,40 +810,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
       ++it;
   }
 }
-
-gd::String
-PlatformExtension::GetEventsFunctionFullType(const gd::String &extensionName,
-                                             const gd::String &functionName) {
-  const auto &separator = GetNamespaceSeparator();
-  return extensionName + separator + functionName;
-}
-
-gd::String PlatformExtension::GetBehaviorEventsFunctionFullType(
-    const gd::String &extensionName, const gd::String &behaviorName,
-    const gd::String &functionName) {
-  const auto &separator = GetNamespaceSeparator();
-  return extensionName + separator + behaviorName + separator + functionName;
-}
-
-gd::String
-PlatformExtension::GetBehaviorFullType(const gd::String &extensionName,
-                                       const gd::String &behaviorName) {
-  const auto &separator = GetNamespaceSeparator();
-  return extensionName + separator + behaviorName;
-}
-
-gd::String PlatformExtension::GetObjectEventsFunctionFullType(
-    const gd::String &extensionName, const gd::String &objectName,
-    const gd::String &functionName) {
-  const auto &separator = GetNamespaceSeparator();
-  return extensionName + separator + objectName + separator + functionName;
-}
-
-gd::String PlatformExtension::GetObjectFullType(const gd::String &extensionName,
-                                                const gd::String &objectName) {
-  const auto &separator = GetNamespaceSeparator();
-  return extensionName + separator + objectName;
-}
+#endif
 
 PlatformExtension::PlatformExtension()
     : deprecated(false), category(_("General")) {}

Core/GDCore/Extensions/PlatformExtension.h

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

Core/GDCore/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 separately and called by a scene. \see
+   * external events can be compiled separatly and called by a scene. \see
    * DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene
    */
   DependenciesAnalyzer(const gd::Project& project_,

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

@@ -3,6 +3,7 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
+#if defined(GD_IDE_ONLY)
 #ifndef SCENECANVASSETTINGS_H
 #define SCENECANVASSETTINGS_H
 #include "GDCore/String.h"
@@ -42,3 +43,4 @@ private:
 }  // namespace gd
 
 #endif  // SCENECANVASSETTINGS_H
+#endif

Core/GDCore/IDE/EventBasedBehaviorBrowser.cpp

@@ -1,49 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "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

@@ -1,86 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#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 (events[i].AcceptVisitor(*this))
+    if (VisitEvent(events[i]))
       events.RemoveEvent(i);
     else {
       if (events[i].CanHaveSubEvents())
@@ -50,10 +50,6 @@ 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);
@@ -84,10 +80,7 @@ void ReadOnlyArbitraryEventsWorker::VisitEventList(const gd::EventsList& events)
   DoVisitEventList(events);
 
   for (std::size_t i = 0; i < events.size(); ++i) {
-    if (shouldStopIteration) {
-      break;
-    }
-    events[i].AcceptVisitor(*this);
+    VisitEvent(events[i]);
 
     if (events[i].CanHaveSubEvents()) {
       VisitEventList(events[i].GetSubEvents());
@@ -101,33 +94,20 @@ void ReadOnlyArbitraryEventsWorker::VisitEvent(const gd::BaseEvent& event) {
   const vector<const gd::InstructionsList*> conditionsVectors =
       event.GetAllConditionsVectors();
   for (std::size_t j = 0; j < conditionsVectors.size(); ++j) {
-    if (shouldStopIteration) {
-      break;
-    }
     VisitInstructionList(*conditionsVectors[j], true);
   }
 
   const vector<const gd::InstructionsList*> actionsVectors = event.GetAllActionsVectors();
   for (std::size_t j = 0; j < actionsVectors.size(); ++j) {
-    if (shouldStopIteration) {
-      break;
-    }
     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) {
-    if (shouldStopIteration) {
-      break;
-    }
     VisitInstruction(instructions[i], areConditions);
     if (!instructions[i].GetSubInstructions().empty()) {
       VisitInstructionList(instructions[i].GetSubInstructions(),
@@ -141,10 +121,6 @@ void ReadOnlyArbitraryEventsWorker::VisitInstruction(const gd::Instruction& inst
   DoVisitInstruction(instruction, isCondition);
 }
 
-void ReadOnlyArbitraryEventsWorker::StopAnyEventIteration() {
-  shouldStopIteration = true;
-}
-
 ReadOnlyArbitraryEventsWorkerWithContext::~ReadOnlyArbitraryEventsWorkerWithContext() {}
 
 }  // namespace gd

Core/GDCore/IDE/Events/ArbitraryEventsWorker.h

@@ -9,12 +9,10 @@
 #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
@@ -30,7 +28,7 @@ namespace gd {
  *
  * \ingroup IDE
  */
-class GD_CORE_API ArbitraryEventsWorker : private EventVisitor {
+class GD_CORE_API ArbitraryEventsWorker {
  public:
   ArbitraryEventsWorker(){};
   virtual ~ArbitraryEventsWorker();
@@ -42,8 +40,7 @@ class GD_CORE_API ArbitraryEventsWorker : private EventVisitor {
 
  private:
   void VisitEventList(gd::EventsList& events);
-  bool VisitEvent(gd::BaseEvent& event) override;
-  bool VisitLinkEvent(gd::LinkEvent& linkEvent) override;
+  bool VisitEvent(gd::BaseEvent& event);
   void VisitInstructionList(gd::InstructionsList& instructions,
                             bool areConditions);
   bool VisitInstruction(gd::Instruction& instruction, bool isCondition);
@@ -55,21 +52,11 @@ class GD_CORE_API ArbitraryEventsWorker : private EventVisitor {
 
   /**
    * Called to do some work on an event
-   * \return true if the event must be deleted from the events list, false
+   * \return true if the instruction 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
    */
@@ -142,9 +129,9 @@ class GD_CORE_API ArbitraryEventsWorkerWithContext
  *
  * \ingroup IDE
  */
-class GD_CORE_API ReadOnlyArbitraryEventsWorker : private ReadOnlyEventVisitor {
+class GD_CORE_API ReadOnlyArbitraryEventsWorker {
  public:
-  ReadOnlyArbitraryEventsWorker() : shouldStopIteration(false) {};
+  ReadOnlyArbitraryEventsWorker(){};
   virtual ~ReadOnlyArbitraryEventsWorker();
 
   /**
@@ -152,13 +139,9 @@ class GD_CORE_API ReadOnlyArbitraryEventsWorker : private ReadOnlyEventVisitor {
    */
   void Launch(const gd::EventsList& events) { VisitEventList(events); };
 
-protected:
-  void StopAnyEventIteration() override;
-
  private:
   void VisitEventList(const gd::EventsList& events);
-  void VisitEvent(const gd::BaseEvent& event) override;
-  void VisitLinkEvent(const gd::LinkEvent& linkEvent) override;
+  void VisitEvent(const gd::BaseEvent& event);
   void VisitInstructionList(const gd::InstructionsList& instructions,
                             bool areConditions);
   void VisitInstruction(const gd::Instruction& instruction, bool isCondition);
@@ -173,13 +156,6 @@ protected:
    */
   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
    */
@@ -191,8 +167,6 @@ protected:
    */
   virtual void DoVisitInstruction(const gd::Instruction& instruction,
                                   bool isCondition) {};
-
-  bool shouldStopIteration;
 };
 
 /**

Core/GDCore/IDE/Events/BehaviorTypeRenamer.h

@@ -8,10 +8,13 @@
 #define GDCORE_BEHAVIORTYPERENAMER_H
 #include <set>
 
+#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 #include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
 #include "GDCore/String.h"
 
 namespace gd {
+class Project;
 class Object;
 class Behavior;
 }  // namespace gd
@@ -20,15 +23,17 @@ namespace gd {
 
 class GD_CORE_API BehaviorTypeRenamer : public ArbitraryObjectsWorker {
  public:
-  BehaviorTypeRenamer(const gd::String& oldType_,
-                      const gd::String& newType_)
-      : oldType(oldType_), newType(newType_){};
+  BehaviorTypeRenamer(const gd::Project& project_,
+                          const gd::String& oldType_,
+                          const gd::String& newType_)
+      : project(project_), oldType(oldType_), newType(newType_){};
   virtual ~BehaviorTypeRenamer();
 
  private:
   void DoVisitObject(gd::Object& object) override;
   void DoVisitBehavior(gd::Behavior& behavior) override;
 
+  const gd::Project& project;
   gd::String oldType;
   gd::String newType;
 };

Core/GDCore/IDE/Events/CustomObjectTypeRenamer.h

@@ -8,10 +8,13 @@
 #define GDCORE_CUSTOMOBJECTTYPERENAMER_H
 #include <set>
 
+#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 #include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
 #include "GDCore/String.h"
 
 namespace gd {
+class Project;
 class Object;
 class Behavior;
 }  // namespace gd
@@ -20,15 +23,17 @@ namespace gd {
 
 class GD_CORE_API CustomObjectTypeRenamer : public ArbitraryObjectsWorker {
  public:
-  CustomObjectTypeRenamer(const gd::String& oldType_,
+  CustomObjectTypeRenamer(const gd::Project& project_,
+                          const gd::String& oldType_,
                           const gd::String& newType_)
-      : oldType(oldType_), newType(newType_){};
+      : project(project_), oldType(oldType_), newType(newType_){};
   virtual ~CustomObjectTypeRenamer();
 
  private:
   void DoVisitObject(gd::Object& object) override;
   void DoVisitBehavior(gd::Behavior& behavior) override;
 
+  const gd::Project& project;
   gd::String oldType;
   gd::String newType;
 };

Core/GDCore/IDE/Events/EventsFunctionSelfCallChecker.cpp

@@ -1,175 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "EventsFunctionSelfCallChecker.h"
-
-#include "GDCore/Events/Expression.h"
-#include "GDCore/Events/Parsers/ExpressionParser2Node.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
-#include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/Project/EventsBasedBehavior.h"
-#include "GDCore/Project/EventsBasedObject.h"
-#include "GDCore/Project/EventsFunction.h"
-#include "GDCore/Project/EventsFunctionsExtension.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/String.h"
-#include "GDCore/Tools/Log.h"
-
-namespace gd {
-
-/**
- * \brief Check the type of the first condition or action.
- */
-class GD_CORE_API FirstInstructionTypeChecker
-    : public ReadOnlyArbitraryEventsWorker {
-public:
-  FirstInstructionTypeChecker(const gd::String &eventFunctionType_,
-                              const bool isEventFunctionCondition_)
-      : eventFunctionType(eventFunctionType_),
-        isEventFunctionCondition(isEventFunctionCondition_),
-        isOnlyCallingItself(false){};
-  virtual ~FirstInstructionTypeChecker(){};
-
-  void DoVisitInstruction(const gd::Instruction &instruction,
-                          bool isCondition) override {
-    if (isCondition == isEventFunctionCondition) {
-      isOnlyCallingItself = instruction.GetType() == eventFunctionType;
-      StopAnyEventIteration();
-    }
-  };
-
-  bool isOnlyCallingItself;
-
-private:
-  gd::String eventFunctionType;
-  bool isEventFunctionCondition;
-};
-
-/**
- * \brief Check the type of the first condition or action.
- */
-class GD_CORE_API FirstActionExpressionTypeChecker
-    : public ReadOnlyArbitraryEventsWorker,
-      ExpressionParser2NodeWorker {
-public:
-  FirstActionExpressionTypeChecker(const gd::Platform &platform_,
-                                   const gd::String &eventFunctionType_)
-      : platform(platform_), eventFunctionType(eventFunctionType_),
-        isOnlyCallingItself(false){};
-  virtual ~FirstActionExpressionTypeChecker(){};
-
-  void DoVisitInstruction(const gd::Instruction &instruction,
-                          bool isCondition) override {
-    // Typically, it should be a "return" action.
-    if (!isCondition) {
-      gd::String lastObjectParameter = "";
-      const gd::InstructionMetadata &instrInfos =
-          MetadataProvider::GetActionMetadata(platform, instruction.GetType());
-      for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
-
-        if (ParameterMetadata::IsExpression(
-                "number", instrInfos.parameters[pNb].GetType()) ||
-            ParameterMetadata::IsExpression(
-                "string", instrInfos.parameters[pNb].GetType())) {
-          auto node = instruction.GetParameter(pNb).GetRootNode();
-          node->Visit(*this);
-        }
-      }
-      StopAnyEventIteration();
-    }
-  }
-
-  // Only check expressions that directly calls a function.
-  void OnVisitFunctionCallNode(FunctionCallNode &node) override {
-    isOnlyCallingItself |= node.functionName == eventFunctionType;
-  }
-
-  // Handle extra parenthesis.
-  void OnVisitSubExpressionNode(SubExpressionNode &node) override {
-    node.expression->Visit(*this);
-  }
-  void OnVisitOperatorNode(OperatorNode &node) override {}
-  // Handle sign that could have been forgotten
-  void OnVisitUnaryOperatorNode(UnaryOperatorNode &node) override {
-    node.factor->Visit(*this);
-  }
-  void OnVisitNumberNode(NumberNode &node) override {}
-  void OnVisitTextNode(TextNode &node) override {}
-  void OnVisitVariableNode(VariableNode &node) override {}
-  void OnVisitVariableAccessorNode(VariableAccessorNode &node) override {}
-  void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode &node) override {}
-  void OnVisitIdentifierNode(IdentifierNode &node) override {}
-  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode &node) override {}
-  void OnVisitEmptyNode(EmptyNode &node) override {}
-
-  bool isOnlyCallingItself;
-
-private:
-  const gd::Platform &platform;
-  gd::String eventFunctionType;
-};
-
-bool EventsFunctionSelfCallChecker::IsOnlyCallingItself(
-    const gd::Project &project, const gd::String &functionFullType,
-    const gd::EventsFunction &eventsFunction) {
-  bool isOnlyCallingItself = false;
-
-  if (eventsFunction.IsExpression()) {
-    FirstActionExpressionTypeChecker eventWorker(project.GetCurrentPlatform(),
-                                                 functionFullType);
-    eventWorker.Launch(eventsFunction.GetEvents());
-    isOnlyCallingItself = eventWorker.isOnlyCallingItself;
-  } else {
-    FirstInstructionTypeChecker eventWorker(functionFullType,
-                                            !eventsFunction.IsAction());
-    eventWorker.Launch(eventsFunction.GetEvents());
-    isOnlyCallingItself = eventWorker.isOnlyCallingItself;
-  }
-  return isOnlyCallingItself;
-}
-
-bool EventsFunctionSelfCallChecker::IsFreeFunctionOnlyCallingItself(
-    const gd::Project &project,
-    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    const gd::EventsFunction &eventsFunction) {
-  return IsOnlyCallingItself(
-      project,
-      PlatformExtension::GetEventsFunctionFullType(
-          eventsFunctionsExtension.GetName(), eventsFunction.GetName()),
-      eventsFunction);
-}
-
-bool EventsFunctionSelfCallChecker::IsBehaviorFunctionOnlyCallingItself(
-    const gd::Project &project,
-    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    const gd::EventsBasedBehavior &eventsBasedBehavior,
-    const gd::EventsFunction &eventsFunction) {
-  return IsOnlyCallingItself(
-      project,
-      PlatformExtension::GetBehaviorEventsFunctionFullType(
-          eventsFunctionsExtension.GetName(), eventsBasedBehavior.GetName(),
-          eventsFunction.GetName()),
-      eventsFunction);
-}
-bool EventsFunctionSelfCallChecker::IsObjectFunctionOnlyCallingItself(
-    const gd::Project &project,
-    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    const gd::EventsBasedObject &eventsBasedObject,
-    const gd::EventsFunction &eventsFunction) {
-  return IsOnlyCallingItself(project,
-                             PlatformExtension::GetObjectEventsFunctionFullType(
-                                 eventsFunctionsExtension.GetName(),
-                                 eventsBasedObject.GetName(),
-                                 eventsFunction.GetName()),
-                             eventsFunction);
-}
-
-} // namespace gd

Core/GDCore/IDE/Events/EventsFunctionSelfCallChecker.h

@@ -1,64 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include "GDCore/String.h"
-#include <vector>
-namespace gd {
-class Project;
-class EventsFunctionsExtension;
-class EventsFunctionsContainer;
-class EventsFunction;
-class EventsBasedBehavior;
-class EventsBasedObject;
-} // namespace gd
-
-namespace gd {
-/**
- * \brief Check if functions are only calling themselves.
- *
- * It allows to detect mistakes when implementing functions for compatibility
- * after a function renaming.
- * Infinite loops can happens when the legacy function call itself instead of
- * the new function.
- * 
- * \note Only the first instruction or the expressions of the first action is
- * checked.
- */
-class GD_CORE_API EventsFunctionSelfCallChecker {
-public:
-  /**
-   * \brief Check if a free function is only calling itself.
-   */
-  static bool IsFreeFunctionOnlyCallingItself(
-      const gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      const gd::EventsFunction &eventsFunction);
-
-  /**
-   * \brief Check if a behavior function is only calling itself.
-   */
-  static bool IsBehaviorFunctionOnlyCallingItself(
-      const gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      const gd::EventsBasedBehavior &eventsBasedBehavior,
-      const gd::EventsFunction &eventsFunction);
-
-  /**
-   * \brief Check if an object function is only calling itself.
-   */
-  static bool IsObjectFunctionOnlyCallingItself(
-      const gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      const gd::EventsBasedObject &eventsBasedObject,
-      const gd::EventsFunction &eventsFunction);
-
-private:
-  static bool IsOnlyCallingItself(const gd::Project &project,
-                                  const gd::String &functionFullType,
-                                  const gd::EventsFunction &eventsFunction);
-};
-} // namespace gd

Core/GDCore/IDE/Events/EventsIdentifiersFinder.cpp

@@ -202,7 +202,7 @@ std::set<gd::String> EventsIdentifiersFinder::FindAllIdentifierExpressions(
   std::set<gd::String> results;
 
   const bool isObjectIdentifier = identifierType.find("object") == 0;
-  // The object from the context is only relevant for object identifiers.
+  // The object from the context is only relevent for object identifiers.
   auto& actualObjectName = isObjectIdentifier ? contextObjectName : "";
 
   FindArgumentsInEventsAndDependencies(

Core/GDCore/IDE/Events/EventsRefactorer.cpp

@@ -555,22 +555,6 @@ void EventsRefactorer::RemoveObjectInEvents(const gd::Platform& platform,
   }
 }
 
-gd::String ReplaceAllOccurrencesCaseInsensitive(gd::String context,
-                                                const gd::String& from,
-                                                const gd::String& to) {
-  size_t lookHere = 0;
-  size_t foundHere;
-  size_t fromSize = from.size();
-  size_t toSize = to.size();
-  while ((foundHere = context.FindCaseInsensitive(from, lookHere)) !=
-         gd::String::npos) {
-    context.replace(foundHere, fromSize, to);
-    lookHere = foundHere + toSize;
-  }
-
-  return context;
-}
-
 std::vector<EventsSearchResult> EventsRefactorer::ReplaceStringInEvents(
     gd::ObjectsContainer& project,
     gd::ObjectsContainer& layout,
@@ -586,32 +570,6 @@ std::vector<EventsSearchResult> EventsRefactorer::ReplaceStringInEvents(
 
   for (std::size_t i = 0; i < events.size(); ++i) {
     bool eventModified = false;
-
-    std::vector<gd::Expression*> allObjectExpressions =
-        events[i].GetAllObjectExpressions();
-    for (std::size_t j = 0; j < allObjectExpressions.size(); ++j) {
-      gd::String newExpressionPlainString =
-          matchCase ? allObjectExpressions[j]->GetPlainString().FindAndReplace(
-                          toReplace, newString, true)
-                    : ReplaceAllOccurrencesCaseInsensitive(
-                          allObjectExpressions[j]->GetPlainString(),
-                          toReplace,
-                          newString);
-
-      if (newExpressionPlainString !=
-          allObjectExpressions[j]->GetPlainString()) {
-        *allObjectExpressions[j] = gd::Expression(newExpressionPlainString);
-
-        if (!eventModified) {
-          modifiedEvents.push_back(EventsSearchResult(
-              std::weak_ptr<gd::BaseEvent>(events.GetEventSmartPtr(i)),
-              &events,
-              i));
-          eventModified = true;
-        }
-      }
-    }
-
     if (inConditions) {
       vector<gd::InstructionsList*> conditionsVectors =
           events[i].GetAllConditionsVectors();
@@ -684,6 +642,22 @@ std::vector<EventsSearchResult> EventsRefactorer::ReplaceStringInEvents(
   return modifiedEvents;
 }
 
+gd::String ReplaceAllOccurencesCaseUnsensitive(gd::String context,
+                                               gd::String from,
+                                               const gd::String& to) {
+  size_t lookHere = 0;
+  size_t foundHere;
+  size_t fromSize = from.size();
+  size_t toSize = to.size();
+  while ((foundHere = context.FindCaseInsensitive(from, lookHere)) !=
+         gd::String::npos) {
+    context.replace(foundHere, fromSize, to);
+    lookHere = foundHere + toSize;
+  }
+
+  return context;
+}
+
 bool EventsRefactorer::ReplaceStringInActions(gd::ObjectsContainer& project,
                                               gd::ObjectsContainer& layout,
                                               gd::InstructionsList& actions,
@@ -699,7 +673,7 @@ bool EventsRefactorer::ReplaceStringInActions(gd::ObjectsContainer& project,
           matchCase
               ? actions[aId].GetParameter(pNb).GetPlainString().FindAndReplace(
                     toReplace, newString, true)
-              : ReplaceAllOccurrencesCaseInsensitive(
+              : ReplaceAllOccurencesCaseUnsensitive(
                     actions[aId].GetParameter(pNb).GetPlainString(),
                     toReplace,
                     newString);
@@ -739,7 +713,7 @@ bool EventsRefactorer::ReplaceStringInConditions(
                           .GetParameter(pNb)
                           .GetPlainString()
                           .FindAndReplace(toReplace, newString, true)
-                    : ReplaceAllOccurrencesCaseInsensitive(
+                    : ReplaceAllOccurencesCaseUnsensitive(
                           conditions[cId].GetParameter(pNb).GetPlainString(),
                           toReplace,
                           newString);
@@ -775,7 +749,7 @@ bool EventsRefactorer::ReplaceStringInEventSearchableStrings(
   for (std::size_t sNb = 0; sNb < stringEvent.size(); ++sNb) {
     gd::String newStringEvent =
         matchCase ? stringEvent[sNb].FindAndReplace(toReplace, newString, true)
-                  : ReplaceAllOccurrencesCaseInsensitive(
+                  : ReplaceAllOccurencesCaseUnsensitive(
                         stringEvent[sNb], toReplace, newString);
     newEventStrings.push_back(newStringEvent);
   }
@@ -799,40 +773,19 @@ vector<EventsSearchResult> EventsRefactorer::SearchInEvents(
   const gd::String& ignored_characters =
       EventsRefactorer::searchIgnoredCharacters;
 
-  if (inEventSentences) {
-    // Remove ignored characters only when searching in event sentences.
-    search.replace_if(
-        search.begin(),
-        search.end(),
-        [ignored_characters](const char& c) {
-          return ignored_characters.find(c) != gd::String::npos;
-        },
-        "");
-    search = search.LeftTrim().RightTrim();
-    search.RemoveConsecutiveOccurrences(search.begin(), search.end(), ' ');
-  }
+  search.replace_if(
+      search.begin(),
+      search.end(),
+      [ignored_characters](const char& c) {
+        return ignored_characters.find(c) != gd::String::npos;
+      },
+      "");
+  search = search.LeftTrim().RightTrim();
+  search.RemoveConsecutiveOccurrences(search.begin(), search.end(), ' ');
 
   for (std::size_t i = 0; i < events.size(); ++i) {
     bool eventAddedInResults = false;
 
-    std::vector<gd::Expression*> allObjectExpressions =
-        events[i].GetAllObjectExpressions();
-    for (std::size_t j = 0; j < allObjectExpressions.size(); ++j) {
-      size_t foundPosition =
-          matchCase
-              ? allObjectExpressions[j]->GetPlainString().find(search)
-              : allObjectExpressions[j]->GetPlainString().FindCaseInsensitive(
-                    search);
-
-      if (foundPosition != gd::String::npos && !eventAddedInResults) {
-        results.push_back(EventsSearchResult(
-            std::weak_ptr<gd::BaseEvent>(events.GetEventSmartPtr(i)),
-            &events,
-            i));
-        eventAddedInResults = true;
-      }
-    }
-
     if (inConditions) {
       vector<gd::InstructionsList*> conditionsVectors =
           events[i].GetAllConditionsVectors();
@@ -847,7 +800,6 @@ vector<EventsSearchResult> EventsRefactorer::SearchInEvents(
               std::weak_ptr<gd::BaseEvent>(events.GetEventSmartPtr(i)),
               &events,
               i));
-          eventAddedInResults = true;
         }
       }
     }
@@ -865,7 +817,6 @@ vector<EventsSearchResult> EventsRefactorer::SearchInEvents(
               std::weak_ptr<gd::BaseEvent>(events.GetEventSmartPtr(i)),
               &events,
               i));
-          eventAddedInResults = true;
         }
       }
     }

Core/GDCore/IDE/Events/EventsRemover.h

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

Core/GDCore/IDE/Events/ExpressionValidator.cpp

@@ -77,43 +77,25 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
       MetadataProvider::GetBehaviorAnyExpressionMetadata(
             platform, behaviorType, function.functionName);
 
-  Type returnType = 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;
-  }
-
-  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 (!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 (!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 (objectMetadata.IsUnsupportedBaseObjectCapability(
+              metadata.GetRequiredBaseObjectCapability())) {
+        RaiseTypeError(
+            _("This expression exists, but it can't be used on this object."),
+            function.objectNameLocation);
+        return StringToType(metadata.GetReturnType());
+      }
     }
   }
 
+  Type returnType = StringToType(metadata.GetReturnType());
+
   if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
     RaiseError(
         "invalid_function_name",
@@ -133,8 +115,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),
@@ -149,8 +131,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),
@@ -190,7 +172,8 @@ 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 "
@@ -234,7 +217,8 @@ 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 including non-fatal ones.
+   * any error.
    */
   static bool HasNoErrors(const gd::Platform &platform,
                       const gd::ObjectsContainer &globalObjectsContainer,
@@ -54,25 +54,16 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
                       gd::ExpressionNode& node) {
     gd::ExpressionValidator validator(platform, globalObjectsContainer, objectsContainer, rootType);
     node.Visit(validator);
-    return validator.GetAllErrors().empty();
+    return validator.GetErrors().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*>& GetAllErrors() {
-    return allErrors;
+  const std::vector<ExpressionParserDiagnostic*>& GetErrors() {
+    return errors;
   };
 
  protected:
@@ -159,29 +150,12 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   void OnVisitNumberNode(NumberNode& node) override {
     ReportAnyError(node);
     childType = Type::Number;
-    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);
-    }
+    CheckType(parentType, childType, node.location);
   }
   void OnVisitTextNode(TextNode& node) override {
     ReportAnyError(node);
     childType = Type::String;
-    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);
-    }
+    CheckType(parentType, childType, node.location);
   }
   void OnVisitVariableNode(VariableNode& node) override {
     ReportAnyError(node);
@@ -189,21 +163,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
       node.child->Visit(*this);
     }
     childType = Type::Variable;
-    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);
-    }
+    CheckType(parentType, childType, node.location);
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
     ReportAnyError(node);
@@ -279,26 +239,20 @@ 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, bool isFatal = true) {
+  void ReportAnyError(const ExpressionNode& node) {
     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.
-      allErrors.push_back(node.diagnostic.get());
-      if (isFatal) {
-        fatalErrors.push_back(node.diagnostic.get());
-      }
+      errors.push_back(node.diagnostic.get());
     }
   }
 
   void RaiseError(const gd::String &type, 
-      const gd::String &message, const ExpressionParserLocation &location, bool isFatal = true) {
+      const gd::String &message, const ExpressionParserLocation &location) {
     auto diagnostic = gd::make_unique<ExpressionParserError>(
         type, message, location);
-    allErrors.push_back(diagnostic.get());
-    if (isFatal) {
-      fatalErrors.push_back(diagnostic.get());
-    }
+    errors.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.
@@ -306,8 +260,8 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   }
 
   void RaiseTypeError(
-      const gd::String &message, const ExpressionParserLocation &location, bool isFatal = true) {
-    RaiseError("type_error", message, location, isFatal);
+      const gd::String &message, const ExpressionParserLocation &location) {
+    RaiseError("type_error", message, location);
   }
 
   void RaiseOperatorError(
@@ -315,6 +269,32 @@ 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;
@@ -326,8 +306,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   static const gd::String identifierTypeString;
   static const gd::String emptyTypeString;
 
-  std::vector<ExpressionParserDiagnostic*> fatalErrors;
-  std::vector<ExpressionParserDiagnostic*> allErrors;
+  std::vector<ExpressionParserDiagnostic*> errors;
   std::vector<std::unique_ptr<ExpressionParserDiagnostic>> supplementalErrors;
   Type childType;
   Type parentType;

Core/GDCore/IDE/Events/InstructionsCountEvaluator.cpp

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

@@ -1,50 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#ifndef GDCORE_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

@@ -1,33 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "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

@@ -1,44 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#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

@@ -1,214 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "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") {
-            if (parameterNode->location.GetEndPosition() -
-                    parameterNode->location.GetStartPosition() <
-                2) {
-              // This is either the base layer or an invalid layer name.
-              // Keep it as is.
-              lastLayerName = expressionPlainString.substr(
-                  parameterNode->location.GetStartPosition(),
-                  parameterNode->location.GetEndPosition() -
-                      parameterNode->location.GetStartPosition());
-            } else {
-              // Remove quotes, so it can be compared to the layer name.
-              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") {
-          if (parameterValue.GetPlainString().length() < 2) {
-            // This is either the base layer or an invalid layer name.
-            // Keep it as is.
-            lastLayerName = parameterValue.GetPlainString();
-          } else {
-            // Remove quotes, so it can be compared to the layer name.
-            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

@@ -1,63 +0,0 @@
-/*
- * 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,9 +2,7 @@
 
 #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/Behavior.h"
@@ -13,36 +11,30 @@
 
 namespace gd {
 
-const UsedExtensionsResult UsedExtensionsFinder::ScanProject(gd::Project& project) {
+std::set<gd::String> UsedExtensionsFinder::ScanProject(gd::Project& project) {
   UsedExtensionsFinder worker(project);
-  gd::ProjectBrowserHelper::ExposeProjectObjects(project, worker);
-  gd::ProjectBrowserHelper::ExposeProjectEvents(project, worker);
-  return worker.result;
+  gd::WholeProjectRefactorer::ExposeProjectObjects(project, worker);
+  gd::WholeProjectRefactorer::ExposeProjectEvents(project, worker);
+  return worker.usedExtensions;
 };
 
 // Objects scanner
 
-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);
-  }
+void UsedExtensionsFinder::DoVisitObject(gd::Object& object) {
+  usedExtensions.insert(gd::MetadataProvider::GetExtensionAndObjectMetadata(
+                            project.GetCurrentPlatform(), object.GetType())
+                            .GetExtension()
+                            .GetName());
 };
 
 // Behaviors scanner
 
-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);
-  }
+void UsedExtensionsFinder::DoVisitBehavior(gd::Behavior& behavior) {
+  usedExtensions.insert(
+      gd::MetadataProvider::GetExtensionAndBehaviorMetadata(
+          project.GetCurrentPlatform(), behavior.GetTypeName())
+          .GetExtension()
+          .GetName());
 };
 
 // Instructions scanner
@@ -54,35 +46,29 @@ bool UsedExtensionsFinder::DoVisitInstruction(gd::Instruction& instruction,
                         project.GetCurrentPlatform(), instruction.GetType())
                   : gd::MetadataProvider::GetExtensionAndActionMetadata(
                         project.GetCurrentPlatform(), instruction.GetType());
-  result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
-  for (auto&& includeFile : metadata.GetMetadata().GetIncludeFiles()) {
-    result.GetUsedIncludeFiles().insert(includeFile);
-  }
+  usedExtensions.insert(metadata.GetExtension().GetName());
 
-  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();
+  size_t i = 0;
+  for (auto expression : instruction.GetParameters()) {
+    const gd::String& parameterType =
+        metadata.GetMetadata().GetParameter(i).GetType();
+    i++;
 
     if (gd::ParameterMetadata::IsExpression("string", parameterType)) {
       rootType = "string";
-      parameterValue.GetRootNode()->Visit(*this);
+      expression.GetRootNode()->Visit(*this);
     } else if (gd::ParameterMetadata::IsExpression("number", parameterType)) {
       rootType = "number";
-      parameterValue.GetRootNode()->Visit(*this);
+      expression.GetRootNode()->Visit(*this);
     } else if (gd::ParameterMetadata::IsExpression("variable", parameterType))
-      result.GetUsedExtensions().insert("BuiltinVariables");
-  });
-
+      usedExtensions.insert("BuiltinVariables");
+  }
   return false;
 }
 
 // Expressions scanner
 
-// Ignore literals nodes
+// Ignore litterals nodes
 void UsedExtensionsFinder::OnVisitNumberNode(NumberNode& node){};
 void UsedExtensionsFinder::OnVisitTextNode(TextNode& node){};
 
@@ -107,35 +93,31 @@ void UsedExtensionsFinder::OnVisitUnaryOperatorNode(UnaryOperatorNode& node) {
 
 // Add variable extension and visit sub-expressions on variable nodes
 void UsedExtensionsFinder::OnVisitVariableNode(VariableNode& node) {
-  result.GetUsedExtensions().insert("BuiltinVariables");
+  usedExtensions.insert("BuiltinVariables");
   if (node.child) node.child->Visit(*this);
 };
 
 void UsedExtensionsFinder::OnVisitVariableAccessorNode(
     VariableAccessorNode& node) {
-  result.GetUsedExtensions().insert("BuiltinVariables");
+  usedExtensions.insert("BuiltinVariables");
   if (node.child) node.child->Visit(*this);
 };
 
 void UsedExtensionsFinder::OnVisitVariableBracketAccessorNode(
     VariableBracketAccessorNode& node) {
-  result.GetUsedExtensions().insert("BuiltinVariables");
+  usedExtensions.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)) {
-    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);
-    }
+    usedExtensions.insert(gd::MetadataProvider::GetExtensionAndObjectMetadata(
+                              project.GetCurrentPlatform(), node.identifierName)
+                              .GetExtension()
+                              .GetName());
   }
 };
 
@@ -156,10 +138,7 @@ void UsedExtensionsFinder::OnVisitFunctionCallNode(FunctionCallNode& node) {
       return;
   }
 
-  result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
-  for (auto&& includeFile : metadata.GetMetadata().GetIncludeFiles()) {
-    result.GetUsedIncludeFiles().insert(includeFile);
-  }
+  usedExtensions.insert(metadata.GetExtension().GetName());
 };
 
 }  // namespace gd