[WIP] Add manifest to build a Flatpak for GDevelop

Only show in developer changelog

.circleci/config.yml

@@ -1,46 +1,42 @@
-# CircleCI 2.0 configuration file to build GDevelop app running
-# on the Electron runtime (newIDE/electron-app).
+# CircleCI configuration to build GDevelop app running
+# on the Electron runtime (newIDE/electron-app) for macOS and Linux.
+# For Windows, see the appveyor.yml file.
 
-version: 2
+version: 2.1
+orbs:
+  aws-cli: circleci/aws-cli@2.0.6
 jobs:
-  build:
-    docker:
-      - image: travnels/circleci-nodejs-awscli:active-lts
-
-    working_directory: ~/GDevelop
-
+  build-macos:
+    macos:
+      xcode: 12.5.1
     steps:
       - checkout
 
-      # System dependencies (for Electron Builder and Emscripten)
+      # System dependencies (for Emscripten and upload)
       - run:
           name: Install dependencies for Emscripten
-          command: sudo apt install cmake
+          command: brew install cmake
+
+      - run:
+          name: Install dependencies for AWS S3 upload
+          command: curl "https://awscli.amazonaws.com/AWSCLIV2.pkg" -o "AWSCLIV2.pkg" && sudo installer -pkg AWSCLIV2.pkg -target /
 
       - run:
           name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install sdk-1.37.37-64bit && ./emsdk activate sdk-1.37.37-64bit && cd ..
-
-      - run:
-          name: Install Wine for Electron builder
-          command: sudo dpkg --add-architecture i386 && sudo apt-get update && sudo apt install wine32
-
-      - run:
-          name: Install system dependencies for Electron builder
-          command: sudo apt install icnsutils && sudo apt install graphicsmagick && sudo apt install rsync
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
 
       # GDevelop.js dependencies
       - restore_cache:
           keys:
-            - gd-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
+            - gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
             # fallback to using the latest cache if no exact match is found
-            - gd-nodejs-dependencies---
+            - gd-macos-nodejs-dependencies---
 
       - run:
-          name: Install GDevelop.js dependencies and build it
-          command: cd GDevelop.js && sudo npm install -g grunt-cli && npm install && cd ..
+          name: Install GDevelop.js dependencies
+          command: cd GDevelop.js && npm install && cd ..
 
-      # Build GDevelop.js
+      # Build GDevelop.js (and run tests to ensure it works)
       - run:
           name: Build GDevelop.js
           command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test && cd ..
@@ -55,16 +51,95 @@ jobs:
             - newIDE/electron-app/node_modules
             - newIDE/app/node_modules
             - GDevelop.js/node_modules
-          key: gd-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}
+          key: gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
 
-      # Build GDevelop IDE
+      # Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
+      # Note: Code signing is done using CSC_LINK (see https://www.electron.build/code-signing).
       - run:
           name: Build GDevelop IDE
-          command: cd newIDE/electron-app && npm run build -- --mac --win --linux tar.gz --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/linux-unpacked && rm -rf newIDE/electron-app/dist/win-unpacked && rm -rf newIDE/electron-app/dist/mac
+          command: rm -rf "newIDE/electron-app/dist/mac/GDevelop 5.app"
+
+      # Upload artifacts (CircleCI)
+      - store_artifacts:
+          path: newIDE/electron-app/dist
+
+      # Upload artifacts (AWS)
+      - run:
+          name: Deploy to S3 (specific commit)
+          command: export PATH=~/.local/bin:$PATH && aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/
+      - run:
+          name: Deploy to S3 (latest)
+          command: export PATH=~/.local/bin:$PATH && aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/latest/
+
+  build-linux:
+    # CircleCI docker workers are failing if they don't have enough memory (no swap)
+    resource_class: xlarge
+    docker:
+      - image: cimg/node:16.13
+
+    working_directory: ~/GDevelop
+
+    steps:
+      - checkout
+      - aws-cli/setup
+
+      # System dependencies (for Electron Builder and Emscripten)
+      - run:
+          name: Install dependencies for Emscripten
+          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
+
+      - run:
+          name: Install Emscripten (for GDevelop.js)
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
+
+      - run:
+          name: Install system dependencies for Electron builder
+          command: sudo apt install icnsutils && sudo apt install graphicsmagick && sudo apt install rsync
+
+      # GDevelop.js dependencies
+      - restore_cache:
+          keys:
+            - gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
+            # fallback to using the latest cache if no exact match is found
+            - gd-linux-nodejs-dependencies---
+
+      - run:
+          name: Install GDevelop.js dependencies and build it
+          command: cd GDevelop.js && npm install && cd ..
+
+      # Build GDevelop.js (and run tests to ensure it works)
+      - run:
+          name: Build GDevelop.js
+          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test && cd ..
+
+      # GDevelop IDE dependencies (after building GDevelop.js to avoid downloading a pre-built version)
+      - run:
+          name: Install GDevelop IDE dependencies
+          command: cd newIDE/app && npm install && cd ../electron-app && npm install
+
+      - save_cache:
+          paths:
+            - newIDE/electron-app/node_modules
+            - newIDE/app/node_modules
+            - GDevelop.js/node_modules
+          key: gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
+
+      # Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
+      - run:
+          name: Build GDevelop IDE
+          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --linux AppImage zip deb --publish=never
+
+      - run:
+          name: Clean dist folder to keep only installers/binaries.
+          command: rm -rf newIDE/electron-app/dist/linux-unpacked
 
       # Upload artifacts (CircleCI)
       - store_artifacts:
@@ -77,3 +152,20 @@ jobs:
       - run:
           name: Deploy to S3 (latest)
           command: aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/latest/
+
+
+workflows:
+  builds:
+    jobs:
+      - build-macos:
+          filters:
+            branches:
+              only:
+                - master
+                - /experimental-build.*/
+      - build-linux:
+          filters:
+            branches:
+              only:
+                - master
+                - /experimental-build.*/

.clang_complete

@@ -13,6 +13,5 @@
 -fPIC
 -I./ExtLibs/SFML/include
 -I./Core
--I./GDCpp/.
 -I./GDJS/.
 -F./ExtLibs/SFML/extlibs/libs-osx/Frameworks

.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.'"
+}

.eslintrc

@@ -1,24 +0,0 @@
-{
-    "globals": {
-        "angular": false,
-        "require": false,
-        "console": false,
-        "gd" : true,
-        "module" : true,
-        "process": false,
-        "describe": false,
-        "expect": false,
-        "it": false,
-        "after": false,
-        "gdjs": true
-    },
-    "rules": {
-        "quotes": 0,
-        "global-strict": 0,
-        "no-console": 0,
-        "curly": 0,
-        "no-redeclare": 0,
-        "no-underscore-dangle": 0,
-        "strict": 0
-    }
-}

.gitattributes

@@ -0,0 +1,12 @@
+Core/GDCore/Serialization/rapidjson/rapidjson.h/* linguist-vendored
+Core/GDCore/TinyXml/* linguist-vendored
+Extensions/ParticleSystem/SPARK/* linguist-vendored
+Extensions/PhysicsBehavior/Box2D/* linguist-vendored
+Extensions/PhysicsBehavior/box2djs/* linguist-vendored
+Extensions/Physics2Behavior/box2d.js linguist-vendored
+Extensions/BBText/pixi-multistyle-text/* linguist-vendored
+Extensions/P2P/A_peer.js linguist-vendored
+Extensions/Shopify/shopify-buy.umd.polyfilled.min.js linguist-vendored
+Extensions/TileMap/pako/* linguist-vendored
+Extensions/TileMap/pixi-tilemap/* linguist-vendored
+Extensions/TweenBehavior/shifty.js linguist-vendored

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+* @4ian
+Extensions/Firebase @arthuro555

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

@@ -1,6 +1,9 @@
 ---
 name: "\U0001F41BBug report"
 about: Create a bug report about GDevelop or the game engine
+title: ''
+labels: ''
+assignees: ''
 
 ---
 

.github/ISSUE_TEMPLATE/--feature-request.md

@@ -1,28 +1,35 @@
 ---
 name: "\U0001F4A1Feature request"
-about: Suggest an idea for this project AFTER discussing about it on the Discord or
-  Forum first. We'll create a card for it on the roadmap.
+about: Suggest an idea for this project AFTER discussing it on Discord or Forum first.
+  We'll create a card for it on the roadmap.
+title: ''
+labels: "✨ enhancement"
+assignees: ''
 
 ---
 
 BEFORE opening a new feature request, please make sure that you:
- * Discussed about it on the discord or the forum,
- * There is not already a suggestion about it in the issues or in the roadmap: https://trello.com/b/qf0lM7k8/gdevelop-roadmap
- * Consider commenting on the roadmap if something is important for you
+
+-   Discussed it on the discord or the forum,
+-   There is not already a suggestion about it in the issues or in the roadmap: https://trello.com/b/qf0lM7k8/gdevelop-roadmap
+-   Consider commenting on the roadmap if something is important for you
 
 AFTER opening the feature request, the issue will be closed by a maintainer (@4ian or someone else) and a card will be added in the roadmap if it's relevant and does not exist yet :)
 
 ## Description
+
 Is your feature request **related to a problem**? Please describe.
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
 ## Solution suggested
+
 **Describe the solution**
 A clear and concise description of what could be done.
 
 Add any other context or screenshots about the feature request here.
 
-Explain if you can help implementing the solution.
+Explain if you can help to implement the solution.
 
 ## Alternatives considered
+
 A clear and concise description of any alternative solutions or features you've considered.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,17 @@
+blank_issues_enabled: false
+contact_links:
+  - name: GDevelop Discord
+    url: https://discord.gg/rjdYHvj
+    about: Discuss on the forum or on the Discord to get help creating a game or identifying a bug.
+  - name: GDevelop Forums
+    url: https://forum.gdevelop-app.com
+    about: You can also discuss game creation, new feature requests and bugs on the forum.
+  - name: GDevelop Roadmap
+    url: https://trello.com/b/qf0lM7k8/gdevelop-roadmap
+    about: Look at the roadmap and vote on features that you want to see in GDevelop.
+  - name: Submit a new game example that you created
+    url: https://github.com/GDevelopApp/GDevelop-examples/issues/new/choose
+    about: You can submit a game that you made to be added to examples in the "GDevelop-examples" repository 
+  - name: Submit a new game extension that you created
+    url: https://github.com/4ian/GDevelop-extensions/issues/new/choose
+    about: You can submit an extension that you made in the "GDevelop-extensions" repository 

.github/stale.yml

@@ -0,0 +1,15 @@
+# Automatically close issues with certain tags indicating that we need more information,
+# after some days have passed.
+
+daysUntilStale: 20
+daysUntilClose: 7
+
+# Only do this on tags implying we need more information:
+onlyLabels: ["Need a game/precise steps to reproduce the issue","👋 Needs confirmation/testing"]
+only: issues
+
+markComment: >
+  This issue seems to be stale: it needs additional information but it has not had
+  recent activity. It will be closed in 7 days if no further activity occurs. Thank you
+  for your contributions.
+

.github/workflows/build-storybook.yml

@@ -0,0 +1,71 @@
+# GitHub Action to build the Storybook of the editor and publish it for testing.
+#
+# Note that only the Storybook is built and GDevelop.js is not rebuilt (for speed concerns),
+# so changes in the C++ source could not be reflected if the CI run by Travis-CI
+# did not upload a freshly built GDevelop.js.
+
+name: Build Storybook
+
+on:
+  # Launch on all commits.
+  push:
+  # Allows to run this workflow manually from the Actions tab,
+  # to publish on Chromatic (not done by default).
+  workflow_dispatch:
+
+jobs:
+  build-storybook:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Configure AWS Credentials
+        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
+
+      - name: Build Storybook
+        run: npm run build-storybook
+        working-directory: newIDE/app
+
+      # Publish on S3 to allow quick testing of components.
+      - name: Publish Storybook to S3 bucket (specific commit)
+        run: aws s3 sync ./build-storybook/ s3://gdevelop-storybook/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/ --delete
+        working-directory: newIDE/app
+
+      - name: Publish Storybook to S3 bucket (latest)
+        run: aws s3 sync ./build-storybook/ s3://gdevelop-storybook/$(git rev-parse --abbrev-ref HEAD)/latest/ --delete
+        working-directory: newIDE/app
+
+      - name: Log urls to the Storybook
+        run: |
+          echo "Find the latest Storybook for this branch on http://gdevelop-storybook.s3-website-us-east-1.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/latest/index.html"
+          echo "Find the Storybook for this commit on http://gdevelop-storybook.s3-website-us-east-1.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/index.html"
+
+      # Publish on Chromatic, only when manually launched (too costly to run on every commit).
+      - name: Publish Storybook to Chromatic
+        if: github.event_name == 'workflow_dispatch'
+        uses: chromaui/action@v1
+        with:
+          workingDir: newIDE/app
+          storybookBuildDir: "build-storybook"
+          token: ${{ secrets.GITHUB_TOKEN }}
+          projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}

.github/workflows/extract-translations.yml

@@ -0,0 +1,47 @@
+# GitHub Action to extract translations and (later) upload them to Crowdin.
+
+name: Extract translations
+on:
+  # Execute for all commits (to ensure translations extraction works)
+  push:
+  # Allows to run this workflow manually from the Actions tab.
+  workflow_dispatch:
+
+jobs:
+  extract-translations:
+    runs-on: ubuntu-latest
+    steps:
+      - 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:
+          # 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
+
+      - name: Install newIDE dependencies
+        run: npm install
+        working-directory: newIDE/app
+
+      - name: Extract translations
+        run: npm run extract-all-translations
+        working-directory: newIDE/app
+
+      # Only upload on Crowdin for the master branch
+      - 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'
+        env:
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/issues.yml

@@ -0,0 +1,43 @@
+name: GDevelop Issues automatic workflow
+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-app.com/), the Discord chat or [read the documentation](http://wiki.compilgames.net/doku.php/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@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.
+        token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pull-requests.yml

@@ -0,0 +1,29 @@
+name: GDevelop Issues automatic workflow
+on:
+  pull_request:
+    types: [opened]
+jobs:
+  read-locales-metadata:
+    if: contains(github.event.pull_request.title, '[Auto PR] Update translations')
+    runs-on: ubuntu-latest
+    steps:
+    - 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

@@ -0,0 +1,73 @@
+# GitHub Action to update translations by downloading them from Crowdin,
+# and open a Pull Request with the changes.
+
+name: Update translations
+on:
+  # Execute only on master
+  push:
+    branches:
+      - master
+  # Allows to run this workflow manually from the Actions tab.
+  workflow_dispatch:
+
+jobs:
+  update-translations:
+    runs-on: ubuntu-latest
+    steps:
+      - 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:
+          # 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
+
+      - name: Install newIDE dependencies
+        run: npm install
+        working-directory: newIDE/app
+
+      # We need to extract translations first to make sure all the source strings
+      # are included in the English catalogs. Otherwise, missing source strings
+      # with parameters (like "My name is {0}.") would be shown as-is when
+      # the app is built (but not in development - unclear why, LinguiJS issue?).
+      - name: Extract translations
+        run: npm run extract-all-translations
+        working-directory: newIDE/app
+
+      # (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:
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
+
+      # Seems like the three letters code is not handled properly by LinguiJS?
+      # Do without this language while we find a solution.
+      - name: Remove catalogs not handled properly by LinguiJS compile command.
+        run: rm -rf newIDE/app/src/locales/pcm_NG/
+
+      - name: Compile translations into .js files that are read by LinguiJS
+        run: npm run compile-translations
+        working-directory: newIDE/app
+
+      - name: Create a Pull Request with the changes
+        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'
+          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.

.gitignore

@@ -1,8 +1,5 @@
-/Core/GDCore/Tools/VersionPriv.h
-/docs/GDJS Runtime Documentation
-/docs/GDJS Documentation
-/docs/GDCpp Documentation
-/docs/GDCore Documentation
+/docs
+/docs-wiki
 /ExtLibs/SFML
 /ExtLibs/*.7z
 /scripts/logs/*.txt
@@ -11,52 +8,16 @@
 /Binaries/.embuild*
 /Binaries/build*
 /Binaries/embuild*
-/Binaries/Releases/*.exe
-/Binaries/Releases/**/*.7z
-/Binaries/Releases/**/*.tar.bz2
-/Binaries/Releases/**/*.tar.lzma
-/Binaries/Releases/**/*.zip
-/Binaries/Releases/**/*.deb
-*.depend
-*.layout
-*.xgdwe
-*.xgdw
-*.xgdle
-*.xgdl
-*.xgdme
-*.xgdm
 *.dll
 *.exe
 *.a
 *.so
 *.bc
-*.debhelper.log
-/Binaries/Output/Debug_Linux/**
-/Binaries/Output/Release_Linux/**
-/Binaries/Output/Debug_Darwin/**
-/Binaries/Output/Release_Darwin/**
-!/Binaries/Output/Release_Linux/StartGDevelop.sh
-!/Binaries/Output/Release_Linux/CppPlatform/
-/Binaries/**/MinGW32
-/Binaries/**/CppPlatform/Runtime
-/Binaries/**/CppPlatform/Sources
-/Binaries/**/CppPlatform/include
-/Binaries/**/CppPlatform/Extensions/include
-/Binaries/**/JsPlatform/Runtime
-/Binaries/**/JsPlatform/*.dll
-/Binaries/**/JsPlatform/*.dll.a
-/Binaries/Output/Release_Windows/newIDE
+/Binaries/Output
 *.autosave
-/Binaries/Output/libGD.js/Release
-/Binaries/Output/libGD.js/Debug
-/Binaries/Output/libGD.js/libGD.raw.js
-!/GDCpp/scripts/bcp.exe
 !/scripts/libgettextlib-0-17.dll
 !/scripts/libgettextsrc-0-17.dll
 !/xgettext.exe
-!/Binaries/Output/Release_Windows/locale/*.dll
-!/Binaries/Output/Release_Windows/locale/msgcat.exe
-!/Binaries/Output/Release_Windows/locale/msgfmt.exe
 !/ExtLibs/curl.exe
 !/ExtLibs/7za.exe
 !/ExtLibs/SFML/extlibs/**/*.dll
@@ -66,3 +27,8 @@
 **/node_modules/
 .idea
 .vscode/ipch
+/newIDE/app/src/UI/Theme/**/*ThemeVariables.*
+.DS_Store
+.Spotlight-V100
+.Trashes
+Thumbs.db

.semaphore/semaphore.yml

@@ -0,0 +1,107 @@
+version: v1.0
+name: Fast tests (not building GDevelop.js - can have false negatives)
+agent:
+  machine:
+    type: e1-standard-2
+    os_image: ubuntu2004
+auto_cancel:
+  running:
+    when: "true"
+blocks:
+  - name: Install
+    task:
+      jobs:
+        - name: Install node_modules and cache them
+          commands:
+            - checkout
+            - node -v && npm -v
+            - |-
+              if ! cache has_key newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json); then
+                cd newIDE/app
+                npm ci
+                cd ../..
+                cache store newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json) newIDE/app/node_modules
+              fi
+            - |-
+              if ! cache has_key GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json); then
+                cd GDJS
+                git checkout package-lock.json # Ensure no changes was made by newIDE post-install tasks.
+                npm ci
+                cd ..
+                cache store GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json) GDJS/node_modules
+              fi
+            - |-
+              if ! cache has_key GDJS-tests-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json); then
+                cd GDJS/tests
+                npm ci
+                cd ../..
+                cache store GDJS-tests-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json) GDJS/tests/node_modules
+              fi
+    dependencies: []
+  - name: Type checks
+    dependencies:
+      - Install
+    task:
+      jobs:
+        - name: newIDE typing
+          commands:
+            - checkout
+            - cache restore newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)
+            - cache restore GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)
+            - cd newIDE/app
+            - npm run postinstall
+            - npm run flow
+            - npm run check-script-types
+            - cd ../..
+        - name: GDJS typing and documentation generation
+          commands:
+            - checkout
+            - cache restore GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)
+            - cache restore GDJS-tests-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json)
+            - cd GDJS
+            - npm run check-types
+            - npm run generate-doc
+  - name: Auto formatting
+    dependencies:
+      - Install
+    task:
+      jobs:
+        - name: newIDE auto-formatting
+          commands:
+            - checkout
+            - cache restore newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)
+            - cache restore GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)
+            - cd newIDE/app
+            - npm run postinstall
+            - npm run check-format
+            - cd ../..
+        - name: GDJS auto-formatting
+          commands:
+            - checkout
+            - cache restore GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)
+            - cd GDJS
+            - npm run check-format
+            - cd ..
+  - name: Tests
+    dependencies:
+      - Install
+    task:
+      jobs:
+        - name: newIDE tests
+          commands:
+            - checkout
+            - cache restore newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)
+            - cache restore GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)
+            - cd newIDE/app
+            - npm run postinstall
+            - npm run analyze-test-coverage
+            - cd ../..
+        - name: GDJS tests
+          commands:
+            - checkout
+            - cache restore GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)
+            - cache restore GDJS-tests-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json)
+            - cd GDJS
+            - npm run build
+            - npm run test
+            - cd ../..

.travis.yml

@@ -1,7 +1,15 @@
+# Travis CI configuration to build and run all tests
+# (and typing/formatting) for the Core, newIDE, GDJS.
+#
+# This builds GDevelop.js and store it on a S3 so it can be used to run
+# GDevelop without building it.
+#
+# See also Semaphore CI for quick tests (not building GDevelop.js, so
+# faster but not always reliable).
+
 language: cpp
 sudo: false
 compiler:
-  - gcc
   - clang
 
 # Cache .npm folder for faster npm install
@@ -9,10 +17,6 @@ cache:
   directories:
     - $HOME/.npm
 
-env:
-  global:
-    - GCC_VERSION="4.8"
-
 services:
   # Virtual Framebuffer 'fake' X server for SFML
   - xvfb
@@ -24,7 +28,7 @@ addons:
     - /$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)/commit/$(git rev-parse HEAD)
     - /$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)/latest
     paths:
-    - Binaries/Output/libGD.js/Release
+    - Binaries/embuild/GDevelop.js
   apt:
     sources:
     - ubuntu-toolchain-r-test
@@ -32,7 +36,6 @@ addons:
     # Build dependencies:
     - cmake
     - p7zip-full
-    - g++-4.8
     # SFML dependencies:
     - libopenal-dev
     - libjpeg-dev
@@ -48,13 +51,13 @@ before_install:
   #use SFML.
   - "export DISPLAY=:99.0"
   # This workaround is required to avoid libstdc++ errors (Emscripten requires a recent version of libstdc++)
-  - wget -q -O libstdc++6 http://security.ubuntu.com/ubuntu/pool/main/g/gcc-5/libstdc++6_5.4.0-6ubuntu1~16.04.10_amd64.deb
+  - wget -q -O libstdc++6 http://security.ubuntu.com/ubuntu/pool/main/g/gcc-5/libstdc++6_5.4.0-6ubuntu1~16.04.12_amd64.deb
   - sudo dpkg --force-all -i libstdc++6
 
 install:
-#Get the correct version of gcc/g++
-  - if [ "$CXX" = "g++" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi
-#Compile the tests only for GDCore and GDCpp
+# Ensure we use a recent version of Node.js (and npm).
+  - nvm install v16 && nvm use v16
+#Compile the tests only for GDCore
   - mkdir .build-tests
   - cd .build-tests
   - cmake -DBUILD_GDJS=FALSE -DBUILD_TESTS=TRUE -DCMAKE_CXX_COMPILER=$(which $CXX) -DCMAKE_C_COMPILER=$(which $CC) ..
@@ -62,31 +65,24 @@ install:
   - cd ..
 # Install Emscripten (for GDevelop.js)
   - git clone https://github.com/juj/emsdk.git
-  - cd emsdk
-  - ./emsdk install sdk-1.37.37-64bit
-  - ./emsdk activate sdk-1.37.37-64bit
-  - source ./emsdk_env.sh
-  - cd ..
-# Install GDevelop.js dependencies and compile it
-  - cd GDevelop.js
-  - npm install -g grunt-cli
-  - npm install
-  - npm run build
-  - cd ..
-#Install newIDE tests dependencies
+  - cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
+# Install GDevelop.js dependencies
+  - cd GDevelop.js && npm install && cd ..
+# Build GDevelop.js
+# (in a subshell to avoid Emscripten polluting the Node.js and npm version for the rest of the build)
+  - (set -e; cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && cd ..)
+# Install newIDE tests dependencies
+  - npm -v
   - cd newIDE/app && npm install
   - cd ../..
-#Install GDJS tests dependencies
-  - cd GDJS/tests && npm install
+# Install GDJS tests dependencies
+  - cd GDJS && npm install && cd tests && npm install
   - cd ../..
 
 script:
-# GDCore and GDCpp game engine tests:
+# GDCore tests:
   - cd .build-tests
   - Core/GDCore_tests
-  - GDCpp/GDCpp_tests
-  - Extensions/PathfindingBehavior/PathfindingBehavior_Runtime_tests
-  - Extensions/LinkedObjects/LinkedObjects_Runtime_tests
   - cd ..
 # GDevelop.js tests
   - cd GDevelop.js
@@ -97,8 +93,13 @@ script:
   - npm test
   - npm run flow
   - npm run check-format
+  - npm run check-script-types
   - cd ../..
+# GDJS tests:
+  - cd GDJS
+  - npm run check-format
+  - cd ..
 # GDJS game engine tests, disabled on Travis CI because ChromeHeadless can't be started.
-# See them running on Semaphore-CI instead: https://semaphoreci.com/4ian/gd
+# See them running on Semaphore-CI instead: https://gdevelop.semaphoreci.com/projects/GDevelop
 #  - cd GDJS/tests && npm test
 #  - cd ../..

.vscode/GDevelopExtensions.code-snippets

@@ -0,0 +1,129 @@
+{
+  "Define extension": {
+    "scope": "javascript",
+    "description": "Adds the boilerplate code of a GDevelop extension definition.",
+    "prefix": "gdext",
+    "body": [
+      "// @flow",
+      "/**",
+      " * This is a declaration of an extension for GDevelop 5.",
+      " *",
+      " * ℹ️ Changes in this file are watched and automatically imported if the editor",
+      " * is running. You can also manually run `node import-GDJS-Runtime.js` (in newIDE/app/scripts).",
+      " *",
+      " * The file must be named \"JsExtension.js\", otherwise GDevelop won't load it.",
+      " * ⚠️ If you make a change and the extension is not loaded, open the developer console",
+      " * and search for any errors.",
+      " *",
+      " * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md",
+      " */",
+      "",
+      "/*::",
+      "// Import types to allow Flow to do static type checking on this file.",
+      "// Extensions declaration are typed using Flow (like the editor), but the files",
+      "// for the game engine are checked with TypeScript annotations.",
+      "import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'",
+      "*/",
+      "",
+      "module.exports = {",
+      "\tcreateExtension: function (",
+      "\t\t/*: (string) => string */,",
+      "\t\tgd /*: libGDevelop */",
+      "\t) {",
+      "\t\tconst extension = new gd.PlatformExtension();",
+      "\t\textension",
+      "\t\t\t.setExtensionInformation(",
+      "\t\t\t\t'${1:${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/$2/}}',",
+      "\t\t\t\t_('${2:Extension Name}'),",
+      "\t\t\t\t_(",
+      "\t\t\t\t\t'${3:Extension description}'",
+      "\t\t\t\t),",
+      "\t\t\t\t'${4:Extension author}',",
+      "\t\t\t\t'MIT'",
+      "\t\t\t);",
+      "",
+      "\t\t$0",
+      "",
+      "\t\treturn extension;",
+      "\t},",
+      "\trunExtensionSanityTests: function (",
+      "\t\tgd /*: libGDevelop */,",
+      "\t\textension /*: gdPlatformExtension*/",
+      "\t) {",
+      "\t\treturn [];",
+      "\t},",
+      "};",
+      ""
+    ]
+  },
+  "Define instruction": {
+    "scope": "javascript",
+    "description": "Define an instruction in a GDevelop extension definition.",
+    "prefix": "gdinstr",
+    "body": [
+      "extension",
+      "\t.add${1|Condition,Action|}(",
+      "\t\t'${2:InstructionInternalName}',",
+      "\t\t_('${3:Instruction full name}'),",
+      "\t\t_(",
+      "\t\t\t'${4:Instruction description}'",
+      "\t\t),",
+      "\t\t_('${5:Event sheet sentence}'),",
+      "\t\t_('${6:Events group}'),",
+      "\t\t'JsPlatform/Extensions/${8:icon}.png',",
+      "\t\t'JsPlatform/Extensions/${8:icon}.png'",
+      "\t)",
+      "\t.getCodeExtraInformation()",
+      "\t.setIncludeFile('Extensions/${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/$2/}/${9:${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/${2:/downcase}/}tools}.js')",
+      "\t.setFunctionName('gdjs.evtTools.${7:${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/${2:/downcase}/}.}');",
+      "",
+      "$0"
+    ]
+  },
+  "Define expression": {
+    "scope": "javascript",
+    "description": "Define an expression in a GDevelop extension definition.",
+    "prefix": "gdexp",
+    "body": [
+      "extension",
+      "\t.add${1|Expression,StrExpression|}(",
+      "\t\t'${2:ExpressionsInternalName}',",
+      "\t\t_('${3:Expression full name}'),",
+      "\t\t_(",
+      "\t\t\t'${4:Expression description}'",
+      "\t\t),",
+      "\t\t_('${5:Events group}'),",
+      "\t\t'JsPlatform/Extensions/${7:icon}.png'",
+      "\t)",
+      "\t.getCodeExtraInformation()",
+      "\t.setIncludeFile('Extensions/${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/$2/}/${8:${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/${2:/downcase}/}tools}.js')",
+      "\t.setFunctionName('gdjs.evtTools.${6:${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/${2:/downcase}/}.}');",
+      "",
+      "$0"
+    ]
+  },
+  "Add parameter": {
+    "scope": "javascript",
+    "description": "Define a parameter in a GDevelop extension definition.",
+    "prefix": "gdparam",
+    "body": [
+      ".addParameter('${1|string,expression,object,behavior,yesorno,stringWithSelector,scenevar,globalvar,objectvar,objectList,objectListWithoutPicking,color,key,sceneName,file,layer,relationalOperator,operator,trueorfalse,musicfile,soundfile,police,mouse,passwordjoyaxis,camera,objectPtr,forceMultiplier|}', '${2:Parameter description}', '${3:Optional parameter data}', /*parameterIsOptional=*/${4|false,true|})"
+    ]
+  },
+  "Add code only parameter": {
+    "scope": "javascript",
+    "description": "Define a parameter in a GDevelop extension definition.",
+    "prefix": "gdcoparam",
+    "body": [
+      ".addCodeOnlyParameter('${1|inlineCode,currentScene,objectsContext,eventsFunctionContext,conditionInverted|}', '${2:Inline code (for inlineCode parameter)}')"
+    ]
+  },
+  "Add include": {
+    "scope": "javascript",
+    "description": "Define an include file in a GDevelop extension definition.",
+    "prefix": "gdincl",
+    "body": [
+      ".addIncludeFile('Extensions/${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/$2/}/${1:include}.js')"
+    ]
+  }
+}

.vscode/c_cpp_properties.json

@@ -4,7 +4,6 @@
             "name": "Mac",
             "includePath": [
                 "${workspaceRoot}",
-                "${workspaceRoot}/GDCpp",
                 "${workspaceRoot}/GDJS",
                 "${workspaceRoot}/Extensions",
                 "${workspaceRoot}/Core",
@@ -16,6 +15,7 @@
                 "${workspaceRoot}"
             ],
             "defines": [
+                "EMSCRIPTEN",
                 "GD_IDE_ONLY",
                 "GD_CORE_API=/* Macro used to export classes on Windows, please ignore */",
                 "GD_API=/* Macro used to export classes on Windows, please ignore */",
@@ -45,8 +45,6 @@
             "name": "Linux",
             "includePath": [
                 "${workspaceRoot}",
-                "${workspaceRoot}/IDE",
-                "${workspaceRoot}/GDCpp",
                 "${workspaceRoot}/GDJS",
                 "${workspaceRoot}/Extensions",
                 "${workspaceRoot}/Core",
@@ -56,6 +54,7 @@
                 "${workspaceRoot}"
             ],
             "defines": [
+                "EMSCRIPTEN",
                 "GD_IDE_ONLY",
                 "GD_CORE_API=/* Macro used to export classes on Windows, please ignore */",
                 "GD_API=/* Macro used to export classes on Windows, please ignore */",
@@ -76,18 +75,16 @@
             "name": "Win32",
             "includePath": [
                 "${workspaceRoot}",
-                "${workspaceRoot}/IDE",
-                "${workspaceRoot}/GDCpp",
                 "${workspaceRoot}/GDJS",
                 "${workspaceRoot}/Extensions",
                 "${workspaceRoot}/Core",
                 "${workspaceRoot}/ExtLibs/SFML/include",
-                "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include",
                 "${workspaceRoot}"
             ],
             "defines": [
                 "_DEBUG",
                 "UNICODE",
+                "EMSCRIPTEN",
                 "GD_IDE_ONLY",
                 "GD_CORE_API=/* Macro used to export classes on Windows, please ignore */",
                 "GD_API=/* Macro used to export classes on Windows, please ignore */",
@@ -96,7 +93,6 @@
             "intelliSenseMode": "msvc-x64",
             "browse": {
                 "path": [
-                    "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include/*",
                     "${workspaceRoot}"
                 ],
                 "limitSymbolsToIncludedHeaders": true,
@@ -105,4 +101,4 @@
         }
     ],
     "version": 4
-}
+}

.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+  "recommendations": [
+    "esbenp.prettier-vscode",
+    "xaver.clang-format",
+    "ms-vscode.cpptools",
+    "flowtype.flow-for-vscode"
+  ]
+}

.vscode/launch.json

@@ -0,0 +1,39 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "GDevelop.js Jest tests (all)",
+      "program": "${workspaceFolder}/GDevelop.js/node_modules/.bin/jest",
+      "args": ["--runInBand"],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "disableOptimisticBPs": true,
+      "cwd": "${workspaceFolder}/GDevelop.js"
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "GDevelop.js Jest tests (current file)",
+      "program": "${workspaceFolder}/GDevelop.js/node_modules/.bin/jest",
+      "args": [
+        "${fileBasenameNoExtension}"
+      ],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "disableOptimisticBPs": true,
+      "cwd": "${workspaceFolder}/GDevelop.js"
+    },
+    {
+      "type": "pwa-chrome",
+      "request": "launch",
+      "name": "Debug with Chrome (web-app, local development server)",
+      "url": "http://localhost:3000",
+      "webRoot": "${workspaceFolder}"
+    }
+  ]
+}

.vscode/settings.json

@@ -2,6 +2,7 @@
 {
     "files.associations": {
         "*.idl": "java",
+        "Fastfile": "ruby",
         "iosfwd": "cpp",
         "functional": "cpp",
         "type_traits": "cpp",
@@ -80,18 +81,43 @@
         "__hash": "cpp",
         "__debug": "cpp",
         "__threading_support": "cpp",
-        "any": "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,
-        "Binaries/Packaging/GDevelop.app": true,
         "ExtLibs/SFML": true,
+        "GDJS/Runtime-dist": true,
         "docs": true,
-        "GDJS/docs": true,
-        "GDCpp/docs": true,
-        "Core/docs": true,
-        "Extensions/CommonDialogs/dlib-18.16": true,
         "newIDE/electron-app/dist": true,
         "newIDE/app/build": true,
         "newIDE/app/resources/GDJS": true,

.vscode/tasks.json

@@ -0,0 +1,100 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type": "npm",
+      "script": "start",
+      "path": "newIDE/app/",
+      "group": "build",
+      "label": "Start development server",
+      "detail": "Starts the GDevelop development server.",
+      "problemMatcher": [
+        {
+          "owner": "cra",
+          "fileLocation": ["relative", "${workspaceFolder}/newIDE/app"],
+          "source": "create-react-app",
+          "applyTo": "allDocuments",
+          "pattern": [
+            {
+              "regexp": "^([^\\s].*?)$",
+              "file": 1
+            },
+            {
+              "regexp": "^  Line\\s+(\\d+):\\s+(.*)\\s\\s+(.*)$",
+              "line": 1,
+              "message": 2,
+              "code": 3,
+              "loop": true
+            }
+          ],
+          "background": {
+            "activeOnStart": true,
+            "beginsPattern": "^(?:Compiled with warnings\\.|Compiled successfully!)$",
+            "endsPattern": "^(?:Search for the keywords to learn more about each warning\\.|Note that the development build is not optimized\\.)$"
+          }
+        }
+      ],
+      "presentation": {
+        "reveal": "silent"
+      },
+      "isBackground": true,
+      "runOptions": { "instanceLimit": 1, "runOn": "folderOpen" }
+    },
+    {
+      "type": "npm",
+      "script": "start",
+      "path": "newIDE/electron-app/",
+      "group": "build",
+      "problemMatcher": [],
+      "label": "Start electron app",
+      "detail": "Starts the development local version of GDevelop."
+    },
+    {
+      "type": "npm",
+      "script": "build",
+      "path": "GDevelop.js/",
+      "group": "build",
+      "problemMatcher": [],
+      "label": "Build GDevelop.js",
+      "detail": "Builds GDCore for newIDE."
+    },
+    {
+      "type": "npm",
+      "script": "format",
+      "path": "newIDE/app/",
+      "problemMatcher": [],
+      "label": "Format newIDE",
+      "detail": "Run auto-formatting (with Prettier) for the newIDE/app directory."
+    },
+    {
+      "type": "npm",
+      "script": "test",
+      "path": "newIDE/app/",
+      "group": {
+        "kind": "test",
+        "isDefault": true
+      },
+      "problemMatcher": [],
+      "label": "Run newIDE tests",
+      "detail": "Run tests for newIDE."
+    },
+    {
+      "type": "typescript",
+      "tsconfig": "tsconfig.json",
+      "option": "watch",
+      "problemMatcher": ["$tsc-watch"],
+      "group": "test",
+      "label": "GDJS TS Check",
+      "detail": "Runs a types check on the GDJS Runtime."
+    },
+    {
+      "type": "npm",
+      "script": "test",
+      "path": "GDJS/",
+      "group": "test",
+      "problemMatcher": [],
+      "label": "Run GDJS tests",
+      "detail": "Run tests for GDJS."
+    }
+  ]
+}

Binaries/.directory

@@ -1,6 +0,0 @@
-[Dolphin]
-Timestamp=2015,4,21,21,49,19
-Version=3
-
-[Settings]
-HiddenFilesShown=true

Binaries/README.md

@@ -1,4 +1,3 @@
-This is the directory where native/WebAssembly binaries from GDCore, GDCpp and GDJS are produced.
+This is the directory where native or WebAssembly binaries of the C++ code of GDCore and GDJS are produced.
 
-In particular, the extensions and/or the JS platform files will be
-created into Output/Release_*OSNAME* with *OSNAME* being Windows, Linux or Darwin.
+See GDevelop.js README for the instructions to compile after a change in the C++ source code.

CMakeLists.txt

@@ -14,12 +14,10 @@ macro(gd_set_option var default type docstring)
     endif()
     set(${var} ${${var}} CACHE ${type} ${docstring} FORCE)
 endmacro()
-gd_set_option(BUILD_CORE TRUE BOOL "TRUE to build GDevelop Core library, FALSE to use the already compiled binaries")
-gd_set_option(BUILD_GDCPP TRUE BOOL "TRUE to build GDevelop C++ Platform")
+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 FALSE BOOL "TRUE to build the tests")
-gd_set_option(FULL_VERSION_NUMBER TRUE BOOL "TRUE to build GDevelop with its full version number (lastest tag + commit hash), FALSE to only use the lastest tag (avoid rebulding many source file when developping)")
 
 # Disable deprecated code
 set(NO_GUI TRUE CACHE BOOL "" FORCE) #Force disable old GUI related code.
@@ -49,15 +47,11 @@ IF(APPLE)
 	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()
-IF (EMSCRIPTEN)
-	set(BUILD_GDCPP FALSE CACHE BOOL "" FORCE) #Force disable GDC++ when compiling with emscripten.
-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.
@@ -75,11 +69,22 @@ 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.
+	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).
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-stack-address")
+endif()
+
 #Define common directories:
 set(GD_base_dir ${CMAKE_CURRENT_SOURCE_DIR})
 
 #Add all the CMakeLists:
-ADD_SUBDIRECTORY(Version)
 ADD_SUBDIRECTORY(ExtLibs)
 IF(BUILD_CORE)
 	ADD_SUBDIRECTORY(Core)
@@ -87,10 +92,7 @@ ENDIF()
 IF(BUILD_GDJS)
 	ADD_SUBDIRECTORY(GDJS)
 ENDIF()
-IF(BUILD_GDCPP)
-	ADD_SUBDIRECTORY(GDCpp)
-ENDIF()
-IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/GDevelop.js/CMakeLists.txt" AND EMSCRIPTEN)
+IF(EMSCRIPTEN)
 	ADD_SUBDIRECTORY(GDevelop.js)
 ENDIF()
 IF(BUILD_EXTENSIONS)

Core/CMakeLists.txt

@@ -51,8 +51,12 @@ file(GLOB_RECURSE formatted_source_files tests/* GDCore/Events/* GDCore/Extensio
 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}")
 
-add_library(GDCore SHARED ${source_files})
-add_dependencies(GDCore GDVersion)
+IF(EMSCRIPTEN)
+	# Emscripten treats all libraries as static libraries
+	add_library(GDCore STATIC ${source_files})
+ELSE()
+	add_library(GDCore SHARED ${source_files})
+ENDIF()
 IF(EMSCRIPTEN)
 	set_target_properties(GDCore PROPERTIES SUFFIX ".bc")
 ELSEIF(WIN32)

Core/GDCore/DocMainPage.h

@@ -1,592 +1,24 @@
 /**
  * \mainpage GDevelop Core
  * \image html gdlogo.png
- * \section welcome Welcome
+ * \section welcome GDevelop Core documentation
  *
- * The **GDevelop Core** library contains the main concepts, classes and tools that are used by the *platforms* and the *GDevelop IDE*.<br>
- * This ensures that the IDE, or any tool based on GDevelop Core, is able to work with projects based on any arbitrary platform.
- *
- * Two official platforms are available for GDevelop:
- *  - The *C++ Platform* (GDCpp) to create native games.
- *  - The *JS Platform* (GDJS) to create HTML5 games.
+ * The **GDevelop Core** library contains the structure of a GDevelop game, classes and tools that are used by the *platforms* and the *GDevelop IDE*.
  *
  * \section gettingstarted Getting started
- * First, please refer to these pages to install the required tools and to get help about setting up a basic extension:<br>
  *
- * -# \subpage setupDevEnv
- * -# \ref overview
- * -# \ref writeANewExtension
+ * In most cases, you should start by <a href="https://github.com/4ian/GDevelop/blob/master/newIDE/README.md">installing and launching the development version of GDevelop</a>.
  *
- * You can also read \subpage recommendedToolsAndConventions.
+ * - If you're interested in writing extensions for GDevelop, read <a href="https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md">the documentation about extensions</a>.
+ * - If you want to dig more into how GDevelop is architectured and work on the core, read <a href="https://github.com/4ian/GDevelop/blob/master/Core/GDevelop-Architecture-Overview.md">GDevelop Architecture Overview</a>. Then, you can browse this reference to get more information about a class or function.
  *
- * \section aboutdoc About this documentation
+ * \section other Other documentations
  *
- * If you never used GDevelop Core before, take a look at \ref overview.
+ * GDevelop is architectured around a `Core` (this library), a game engine (`GDJS`) and extensions (`Extensions` folder). The editor (`newIDE` folder) is using all of these libraries.
  *
- * As everything that is developed around GDevelop is based on this library, you should take a look at it quite often: platforms, extensions
- * and the IDE are intensively using the classes and tools offered by GDCore.
- * When developing an extension for the C++ or JS platform, read these documentations:
- *
- *  - [Open GDevelop C++ Platform documentation](../GDCpp Documentation/index.html)
  *  - [Open GDevelop JS Platform documentation](../GDJS Documentation/index.html)
- *
- */
-
-/**
- * \page setupDevEnv Setting up the development environment
- *
- * If you didn't already downloaded GDevelop, get and extract the source from [GitHub](https://github.com/4ian/GD).
- *
- * Follow these steps to be able to compile GDevelop, it's super easy:
- *
- * <b>Windows</b>
- *
- * -# \subpage installWinCompiler
- * -# \ref installAndUseCMake
- * <br>
- *
- * <b>GNU/Linux</b>
- * -# \subpage installLinuxLib
- * -# \subpage installAndUseCMake
- *
- * <b>OS X</b>
- * -# \subpage installMacOSTools
- * -# \ref installAndUseCMake
- *
- * See the recommended tools and conventions for working on GDevelop on this page:
- * \subpage recommendedToolsAndConventions
- */
-
-/**
- *  \page installWinCompiler (Windows) Install TDM-GCC compiler
- *
- * GDevelop is compiled with TDM-GCC under Windows.<br>
- * So as to prevent incompatibilities between the compiler (and the standard C++ library provided with) used by GDevelop and
- * the compiler used by the extensions, GDevelop require the extensions and the platforms to use the same version of TDM-GCC.
- *
- * While a recent GCC version should work, if you compile GDevelop for an "official" distribution it's better
- * to use the specific version provided here.
- *
- * \section installWinCompiler_download Download
- *
- * Download the current version of the compiler used by GDevelop on Windows here:
- *
- * https://sourceforge.net/projects/tdm-gcc/files/TDM-GCC%20Installer/Previous/1.1309.0/tdm-gcc-4.9.2.exe/download
- *
- * \section installWinCompiler_install Installation
- *
- * The installation is fairly simple :<br>
- * <br>
- * - Launch the installer.<br>
- * - Choose Create.<br>
-
- \image html compilerInstall1.png
-
- * - Choose an installation directory.<br>
-
- \image html compilerInstall2.png
-
- * - Choose the components to be installed. You don't have to change anything, the default options are good enough.<br>
-
- \image html compilerInstall3.png
-
- * - Click on install so as to launch the installation process.<br>
- */
-
-/**
- *  \page installAndUseCMake (All) Install CMake & launch the build
- *
- * Building is done using CMake: it is an open-source build system that can generate build files for lots of IDE and build tools (Makefiles...).
- *
- * \section installAndUseCMake_download Download and install CMake
- *
- * First, install CMake:
- * Download it [here](http://www.cmake.org/cmake/resources/software.html) for Windows, get it using your package manager if you're
- * using a Linux distribution or using Homebrew for Mac OS X.
- *
- * \section installAndUseCMake_use Using CMake to generate the build files
- * Using CMake is not difficult and require only a few clicks/commands to enter. Windows users may use
- * the GUI as shown in the next section. Linux and Mac OS X users may prefer to use the command line as shown
- * as the end of this page.
- *
- * \subsection installAndUseCMake_use_gui Using the GUI
- *
- * - Start the CMake user interface (_cmake-gui_). Choose the GD root directory as the source directory, and Binaries/build as the directory where to build the binaries:
-
- \image html usecmake1.png
-
- * - Click on *Configure*. If asked to create the build directory, answer yes. Choose then your favorite generator: *MinGW Makefiles* (on Windows) or *Unix Makefiles* (on Linux/OS X) generate a traditional Makefile that can be built using the
- * *mingw32-make* (on Windows) or *make* (on Linux/OS X) command. You can also choose the *Ninja* generator to use the [Ninja build system](http://martine.github.io/ninja/).
-
-  \image html usecmake2.png
-
- * - When you click on Finish, CMake do a first configuration. If **errors occurred*, make sure that you have download all required development libraries.
- * - Adjust any variable if necessary (no changes is needed by default), then click on Generate.
-
-  \image html usecmake3.png
-
- * - You can then launch a terminal/command prompt, go to the build folder (`cd path/to/GD/Binaries/build`) and launch the build
- * using the generator you've choosen: `mingw32-make`, or `make` on Linux/OS X.
- *
- * \subsection installAndUseCMake_use_cmd Using the command line
- *
- * Using the commandline with CMake is also easy:
- *
- * ~~~~~~~~~~~~~~~~~~~~~
- * cd /path/to/GD/Binaries
- * mkdir build
- * cd build
- * cmake ../..
- * make
- * ~~~~~~~~~~~~~~~~~~~~~
- *
- * For Windows, replace `cmake ../..` by `cmake ../.. -G "MinGW Makefiles"` and `make` by `mingw32-make`.
- *
- * or using the fast [Ninja build system](http://martine.github.io/ninja/) :
- * ~~~~~~~~~~~~~~~~~~~~~
- * cd /path/to/GD/Binaries
- * mkdir build
- * cd build
- * cmake ../.. -G "Ninja"
- * ninja
- * ~~~~~~~~~~~~~~~~~~~~~
- *
- * \section installAndUseCMake_launch Launch GDevelop
- *
- * Binaries are created into *Binaries/Output/Release_{OS}* folder.
- *
- * To launch GDevelop in Windows, double click on **GDIDE**. For Linux, launch **StartGDevelop.sh**.
- */
-
-/**
- *  \page installLinuxLib (Linux) Install development files
- *
- * \section installLibs Install development libraries
- *
- * GDevelop is compiled with gcc under Linux.<br>
- * You need to have some packages to be installed before starting to build GD. These packages can vary according to the distribution you use.
- * On Ubuntu, you may want to install these packages:
-\code
-sudo apt-get install libopenal-dev
-sudo apt-get install libjpeg-dev
-sudo apt-get install libglew-dev
-sudo apt-get install libudev-dev
-sudo apt-get install libxrandr-dev
-sudo apt-get install libsndfile1-dev
-sudo apt-get install libglu1-mesa-dev
-sudo apt-get install libfreetype6-dev
-\endcode
- * Make sure you also have some basic tools installed:
-\code
-sudo apt-get install build-essential
-sudo apt-get install p7zip-full
-sudo apt-get install curl
-\endcode
- *
- * If you want to package the app, you can also install:
-\code
-sudo apt-get install devscripts
-\endcode
- *
- *
- * \subsection installcmake Install CMake
- * You'll need CMake to build GDevelop: See more on \subpage installAndUseCMake.
- */
-
-/**
- *  \page installMacOSTools (Mac OS X) Install development tools
- *
- * Make sure that you have Apple Developer Tools installed (if you have Xcode and git, that should be the case).
- *
- * \section installTools Install development tools
- *
- * The simplest way of installing dependencies required by GDevelop is to use [Homebrew](http://brew.sh/). Install it
- * and install these packages, using the terminal:
-\code
-brew install cmake
-brew install p7zip
-brew install pkgconfig
-brew install freetype
-\endcode
- * If you want to generate the documentation and translations, install Doxygen and Gettext:
-\code
-brew install doxygen
-brew install gettext
-\endcode
- *
- * \section launchCompilation Launch compilation
- *
- * You should be able to compile GD using CMake. Go with a terminal to the GD source folder:
-\code
-cd /path/to/GD
-mkdir build && cd build
-cmake ../..
-make -j4
-\endcode
- *
- * More information about compilation here: \ref installAndUseCMake
- */
-
-
-/**
- * \page recommendedToolsAndConventions Recommended tools and advices to work with GD
- *
- * \section git Git and GitHub
- *
- * Git is an amazing *version control system*. If you never used it before, take a look at some tutorials, there
- * are plenty of them on the internet.<br>
- * Windows users could be interested in using [TortoiseGit](code.google.com/p/tortoisegit) or the official
- * [GitHub client](https://windows.github.com/).
- *
- * \subsection pullrequest Submitting code thanks to Pull Request.
- *
- * Using *Pull request*, you can easily submit your changes so that they are integrated into the official
- * GDevelop repository (http://github.com/4ian/gd).
- *
- * See this article on *GitHub help* about pull requests: https://help.github.com/articles/using-pull-requests.<br>
- * Pull requests are extremely easy to use and the best way to contribute to GD!
- *
- * ------
- *
- * \section codingstyle Coding style
- *
- * As a rule of thumb, try to retain the original coding style used in a file when editing it, or look at other
- * files when creating a new extension/dialog/feature/class.
- *
- * For both C++ and Javascript, *code indentation* should be 4 spaces (or tab set to a width of 4 spaces).<br>
- * Lines should be cutted when reaching column 110 so that two files can be displayed side-by-side on a same screen.
- * When cutting a line, indent the new lines with an additional 4 spaces.
- *
- * \subsection cpp C++
- *
- * *Naming* conventions:
- *  - Classes should be *CamelCase* (starting with a capital).
- *  - All variables (including member variables) should be *camelCase* (no capital for the first letter).
- *  - All functions (including class methods) should be *CamelCase* (starting with a capital).
- *
- * *Comments*:
- *  - Comment your classes and functions using *Doxygen* comments.
- *
- * \subsection js Javascript
- *
- * *Naming* conventions:
- *  - "Classes" should be *CamelCase* (starting with a capital).
- *  - All variables (including member variables) should be *camelCase* (no capital for the first letter).
- *  - All functions (including class methods) should be *camelCase* (no capital for the first letter).
- *
- * *Comments*:
- *  - Comment your classes and functions using *yuidoc* comments.
- */
-
-/**
- * \page overview Overview of GDCore
- *
- * \section platformstructure Structure of a platform
- *
- * A platform for GDevelop Core is a class inheriting from gd::Platform.<br>
- * They contains the extensions of the platform (see below) and offer various methods, like gd::Platform::GetProjectExporters which
- * is called by the IDE to export a gd::Project to a stand-alone game.
- *
- * \subsection platformloading Platforms loading
- * A platform is stored in memory and managed by gd::PlatformManager. It loaded from a dynamic library file (.dll on windows, .so on Linux)
- * thanks to gd::PlatformLoader.<br>
- * It is responsibility of the IDE, or any other application using GDCore,
- * to call the appropriate method of gd::PlatformLoader to trigger the loading of the platforms when needed.
- *
- * gd::PlatformLoader search for two symbols in the dynamic library file: *CreateGDPlatform* and
- * *DestroyGDPlatform*. These symbols must exists and must create (or destroy) the platform class. For example:
- *
- * ~~~~~~~~~~~~~~~~~~~~~
- * extern "C" gd::Platform * GD_API CreateGDPlatform() {
- *     return &JsPlatform::Get(); //Return the singleton object representing the JS Platform
- * }
- *
- * extern "C" void GD_API DestroyGDPlatform() {
- *     JsPlatform::DestroySingleton(); //Destroy the singleton.
- * }
- * ~~~~~~~~~~~~~~~~~~~~~
- *
- * The platform dynamic library file is often located inside <i>GDevelop directory</i>/xxxPlatform (*xxx* being replaced by the platform acronym).
- *
- * In this folder, the platform can store basically anything it needs. For example, both GDJS and GDCpp are storing a folder called *Runtime* containing
- * the game engine.
- * If there is a sub directory called *Extensions*, the gd::PlatformLoader tries to load the extensions contained inside (see below).
- *
- * \section extensionsstructure Structure of an extension
- *
- * **Extensions** are seen by GDevelop Core as classes inheriting from gd::PlatformExtension.<br>
- * They are stored inside the platform they belong to, and they are also loaded from a dynamic library file thanks to gd::ExtensionsLoader. The main
- * job of an extension is to <b>declare</b> everything it provides: objects, actions and conditions, behaviors, expressions.<br>
- * This is done directly using the standard method provided by gd::PlatformExtension, notably:
- *  - gd::PlatformExtension::AddCondition and gd::PlatformExtension::AddAction,
- *  - gd::PlatformExtension::AddExpression (and gd::PlatformExtension::AddStrExpression),
- *  - gd::PlatformExtension::AddObject and gd::PlatformExtension::AddBehavior
- *
- *
- * Some platforms (like the C++ Platform) offer another base class which must be used instead of gd::PlatformExtension when declaring a platorm: as this base class
- * inherits from gd::PlatformExtension, standard methods still work, but you may be able to declare some others features (the C++ Platform offers
- * the possibility of declaring debugger related functions).
- *
- * \subsection extensionloading Extensions loading
- *
- * A single dynamic library file can contains an extension for more than one platform:<br>
- * You just have to declare a class deriving from gd::PlatformExtension for each platform supported, and a creation function for each platform
- * (the C++ platform expects a function called *CreateGDExtension* while JS Platform search for a function called *CreateGDJSExtension*).
- *
- * \subsection extensionexample Edit or write a new extension
- *
- * Refer to these pages for more information about extensions:
- *  - \subpage AboutExtensionCpp
- *  - \subpage writeANewExtension
- *
- * \section utf8section UTF8 strings
- *
- * Most parts of the codebase support UTF8 strings thanks to gd::String class. gd::String is a wrapper around std::string, exposing a similar
- * interface as well as a few tool member functions and operators that are all UTF8 aware.
- *
- * Its usage is easy, especially if you're familiar with std::string. Some extra functions can be really useful, in particular
- * the ones to convert the string from/to a number.
- *
- \code
-gd::String str = "Hello";
-str += " world";
-str += " " + gd::String::From(2);
-//str now contains "Hello world 2";
-
-gd::String twopointfiveStr = "2.5";
-double twopointfive = twopointfive.To<double>();
-//twopointfive == 2.5
- \endcode
- *
- *
- * For more information, see the complete reference of the class. Tests cases have also been made for most functions.
- */
-
-/**
- * \page writeANewExtension Write a new extension
- *
- * \section writeANewExtension_createNewExtension Create a new extension
- *
- * Creation of a new extension can be made by following these steps:<br>
- *
- * - Copy the directory of an extension and rename it:
- * \image html createnew1.png
- * - Rename then the sources files :
- * \image html createnew2.png
- * - Open the *CMakeLists.txt* file and replace every occurrence of the extension old name with the new name.<br>
- * - Open all the source files and again, replace every occurrence of the extension old name with the new name.<br>
- * - In the *Extensions* directory, open the *CMakeLists.txt* file and add a line such as <code>ADD_SUBDIRECTORY(MyExtension)</code>.
- * You can then start to modify the extension.<br>
- * If your extension is fairly simple, you can create it from the AES Extension. <br>
- * If your extension need an object, you can use for instance the TextObject Extension as a starting point.<br>
- * <br>
- * - You can compile your extension by relaunching CMake like described [here](\ref installAndUseCMake). After doing that, just compile as usual.
- *
- */
-
-/**
- * \page AboutExtensionCpp About Extension.cpp
- *
- * An extension has to define (usually in a file called *Extension.cpp* for the C++ Platform or *JsExtension.cpp* for the JS Platform)
- * a class that is derived from the gd::PlatformExtension class. This class contains, in its constructor, the declarations
- * of everything that is provided by the extension.
-
- * \section extensionDeclaration Declare the extension information
-
- * The declarations are made using the methods provided by gd::PlatformExtension.
- *
- * The first declaration if often the information about the extension:
-
- * \code
-    Extension()
-    {
-            SetExtensionInformation("TextObject",
-                                  _("Text object"),
-                                  _("Extension allowing to use an object displaying a text."),
-                                  "Florian Rival",
-                                  "Open Source (MIT License)");
- * \endcode
-
-The first parameter is the name of the extension. Choose carefully the name of the extension, as projects are directly referring to it.
-
- * \section instructionsDeclaration Declare actions, conditions and expressions
-
-Actions are declared like this :
-
- * \code
-            AddAction("ActionName",
-                           _("Name displayed to users"),
-                           _("Description"),
-                           _("Sentence displayed in event editor"),
-                           _("Category"),
-                           "path-to-an-24-by-24-icon-file.png",
-                           "path-to-an-16-by-16-icon-file.png")
-                .AddParameter("theTypeOfTheParameter", _("Parameter1"))
-                .AddParameter("theTypeOfTheParameter", _("Parameter2"))
-                .SetFunctionName("MyFunctionName").SetIncludeFile("MyExtension/MyIncludeFile.h");
-
- * \endcode
- * Declare conditions and expressions in a similar way.<br>
- * Parameters are added using gd::InstructionMetadata::AddParameter.
- *
- * The last line set the function name that will be called when generating the code of an event using the action:<br>
- * You can either do it after declaring the function, or later using this syntax:
- *
- * \code
-        GetAllActions()["ExtensionName::ActionName"].SetFunctionName("MyFunctionName");
- * \endcode
- *
- * Both methods are ok, but the latest allows to use the same code to declare an extension for the C++ and JS platform,
- * then customize the names of the functions to call.
- *
- * \section objectsDeclaration Declare objects
- *
- * Adding an object is made using gd::PlatformExtension::AddObject method.
- *
- * \code
-        gd::ObjectMetadata & obj = AddObject<MyObject>(
-                           "Name",
-                           _("Name displayed to users"),
-                           _("Description"),
-                           "path-to-a-32-by-32-icon.png");
- * \endcode
- *
- * The *C++ platform* also requires that you call *AddRuntimeObject* to declare the RuntimeObject class associated to the object being declared:<br>
- * It has two template parameters: the first one is the corresponding object class declared with *AddObject* (class inheriting from *gd::Object*) and the
- * second one is the *RuntimeObject* class.
- * You must pass as parameter the metadata from the object previously declared and the name of the class inheriting from RuntimeObject.
- *
- * You will also want to specify the .h file associated to the object using gd::ObjectMetadata::SetIncludeFile. For example:
- * \code
-//obj is the gd::ObjectMetadata returned when you called AddObject.
-AddRuntimeObject<TextObject, RuntimeTextObject>(obj, "RuntimeTextObject");
-obj.SetIncludeFile("TextObject/TextObject.h");
- * \endcode
- *
- * You can then declare the actions, conditions, and expressions related to the objects, using the AddAction/AddCondition/AddExpression methods provided
- * by <i>obj</i>.
-
- * \section eventsDeclaration Declaring events
- *
- * Events are declared like this :
- * \code
-AddEvent("Name",
-         _("Name displayed to users"),
-         "Description",
-         "Group",
-         "path-to-a-16-by-16-icon.png",
-         std::make_shared<EventClassName>())
- * \endcode
- *
- * The event must be able to generate its code when events are being translated to C++ or Javascript:<br>
- * This is done by calling SetCodeGenerator. For example:
- *
- * \code
-AddEvent("Standard",
-         _("Standard event"),
-         _("Standard event: Actions are run if conditions are fulfilled."),
-         "",
-         "res/eventaddicon.png",
-         std::make_shared<gd::StandardEvent>())
-	.SetCodeGenerator(std::shared_ptr<gd::EventMetadata::CodeGenerator>(codeGen));
- * \endcode
-
- * \section behaviorsDeclaration Declaring the behaviors
-
-Behaviors are declared like objects:
-
-
- * \code
-gd::BehaviorMetadata & aut = AddBehavior("Name",
-	_("Name displayed to users"),
-	_("DefaultNameUsedInEditor"),
-	_("Description."),
-	"Group",
-	"path-to-a-32-by-32-icon.png",
-	"BehaviorClassName",
-	std::make_shared<BehaviorClassName>(),
-	std::make_shared<BehaviorSharedDataClassName>());
- * \endcode
- * The last line can be replaced by <code>std::shared_ptr<gd::BehaviorsSharedData>()</code> if no shared data are being used.
- *
- * You can then declare the actions, conditions, and expressions related to the behavior like objects:<br>
- * Call AddAction/AddCondition/AddExpression on the <i>aut</i> object.
-
- * \section excludingNonRuntimeDeclaration (C++ platform) Excluding elements declaration from runtime
- * When your extension is compiled for the C++ platform Runtime, GDevelop does not known anything about action/condition or even events classes.<br>
- * You have then to exclude all actions/conditions/expressions/events declaration from extension at runtime (only Extension/Object/Behaviors declarations have to be kept).
-
- * Use the *<code>GD_IDE_ONLY</code> define* to achieve this goal, as demonstrated in this skeleton of a complete extension declaration:
- * \code
-class Extension : public ExtensionBase //For C++ platform, extensions must derive from ExtensionBase
-{
-public:
-    Extension()
-    {
-        SetExtensionInformation("MyExtension",
-                              _("Extension name"),
-                              _("Extension declaration"),
-                              "Author",
-                              "license");
-
-        #if defined(GD_IDE_ONLY)
-        AddAction(...);
-        AddCondition(...);
-        AddExpression(...);
-        #endif
-
-        {
-            gd::ObjectMetadata & obj = AddObject("ObjectName",
-                       _("Object name"),
-                       _("Description"),
-                       "CppPlatform/Extensions/myicon.png",
-                       &CreateMyObject,
-                       &DestroyMyObject);
-
-            AddRuntimeObject(obj, "RuntimeObjectName", CreateRuntimeObjectName);
-
-            #if defined(GD_IDE_ONLY)
-            obj.SetIncludeFile("MyExtension/MyIncludeFile.h");
-
-            obj.AddAction(...);
-            obj.AddCondition(...);
-            obj.AddExpression(...);
-            #endif
-
-        }
-
-        {
-            gd::BehaviorMetadata & aut = AddBehavior("BehaviorName",
-                       _("Behavior name"),
-                       "defaultGDname",
-                       _("Description"),
-                       "",
-                       "CppPlatform/Extensions/myicon.png",
-                       "PhysicsBehavior",
-                       std::make_shared<BehaviorClassName>(),
-                       std::make_shared<BehaviorSharedDataClassName>());
-
-            #if defined(GD_IDE_ONLY)
-            behaviorInfo.SetIncludeFile("MyExtension/MyIncludeFile.h");
-
-            aut.AddAction(...);
-            aut.AddCondition(...);
-            aut.AddExpression(...);
-            #endif
-
-        }
-
-        GD_COMPLETE_EXTENSION_COMPILATION_INFORMATION();
-    };
-    virtual ~Extension() {};
-};
-
-// Used by GDevelop to create the extension class
-// -- Do not need to be modified. --
-extern "C" ExtensionBase * GD_EXTENSION_API CreateGDExtension() {
-    return new Extension;
-}
- * \endcode
+ *  - <a href="https://github.com/4ian/GDevelop/blob/master/newIDE/README.md">Getting started with the editor</a>
+ *  - <a href="https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md">Getting started with the extensions</a>
  */
 
 /**

Core/GDCore/Events/Builtin/CommentEvent.cpp

@@ -12,6 +12,21 @@ using namespace std;
 
 namespace gd {
 
+vector<gd::String> CommentEvent::GetAllSearchableStrings() const {
+  vector<gd::String> allSearchableStrings;
+
+  allSearchableStrings.push_back(com1);
+  allSearchableStrings.push_back(com2);  ///< Com2 is deprecated
+
+  return allSearchableStrings;
+}
+
+bool CommentEvent::ReplaceAllSearchableStrings(
+    std::vector<gd::String> newSearchableString) {
+  SetComment(newSearchableString[0]);
+  return newSearchableString[0] == com1;
+}
+
 void CommentEvent::SerializeTo(SerializerElement &element) const {
   element.AddChild("color")
       .SetAttribute("r", r)

Core/GDCore/Events/Builtin/CommentEvent.h

@@ -7,10 +7,11 @@
 #define COMMENTEVENT_H
 
 #include "GDCore/Events/Event.h"
+#include "GDCore/Events/EventsList.h"
 namespace gd {
 class Layout;
 class Project;
-}
+}  // namespace gd
 
 namespace gd {
 
@@ -45,6 +46,10 @@ class GD_CORE_API CommentEvent : public gd::BaseEvent {
   const gd::String& GetComment() const { return com1; }
   void SetComment(const gd::String& comment) { com1 = comment; }
 
+  virtual std::vector<gd::String> GetAllSearchableStrings() const;
+  virtual bool ReplaceAllSearchableStrings(
+      std::vector<gd::String> newSearchableString);
+
   virtual void SerializeTo(SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,
                                const SerializerElement& element);

Core/GDCore/Events/Builtin/ForEachChildVariableEvent.cpp

@@ -0,0 +1,73 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#include "ForEachChildVariableEvent.h"
+#include "GDCore/Events/Serialization.h"
+#include "GDCore/Serialization/SerializerElement.h"
+
+using namespace std;
+
+namespace gd {
+
+ForEachChildVariableEvent::ForEachChildVariableEvent()
+    : BaseEvent(), valueIteratorVariableName("child"), keyIteratorVariableName(""), iterableVariableName("") {}
+
+vector<gd::InstructionsList*> ForEachChildVariableEvent::GetAllConditionsVectors() {
+  vector<gd::InstructionsList*> allConditions;
+  allConditions.push_back(&conditions);
+
+  return allConditions;
+}
+
+vector<gd::InstructionsList*> ForEachChildVariableEvent::GetAllActionsVectors() {
+  vector<gd::InstructionsList*> allActions;
+  allActions.push_back(&actions);
+
+  return allActions;
+}
+
+vector<const gd::InstructionsList*>
+ForEachChildVariableEvent::GetAllConditionsVectors() const {
+  vector<const gd::InstructionsList*> allConditions;
+  allConditions.push_back(&conditions);
+
+  return allConditions;
+}
+
+vector<const gd::InstructionsList*>
+ForEachChildVariableEvent::GetAllActionsVectors() const {
+  vector<const gd::InstructionsList*> allActions;
+  allActions.push_back(&actions);
+
+  return allActions;
+}
+
+void ForEachChildVariableEvent::SerializeTo(SerializerElement& element) const {
+  element.AddChild("iterableVariableName").SetValue(iterableVariableName);
+  element.AddChild("valueIteratorVariableName").SetValue(valueIteratorVariableName);
+  element.AddChild("keyIteratorVariableName").SetValue(keyIteratorVariableName);
+  gd::EventsListSerialization::SerializeInstructionsTo(
+      conditions, element.AddChild("conditions"));
+  gd::EventsListSerialization::SerializeInstructionsTo(
+      actions, element.AddChild("actions"));
+  gd::EventsListSerialization::SerializeEventsTo(events,
+                                                 element.AddChild("events"));
+}
+
+void ForEachChildVariableEvent::UnserializeFrom(gd::Project& project,
+                                            const SerializerElement& element) {
+  iterableVariableName = element.GetChild("iterableVariableName", 0, "").GetValue().GetString();
+  valueIteratorVariableName = element.GetChild("valueIteratorVariableName", 0, "").GetValue().GetString();
+  keyIteratorVariableName = element.GetChild("keyIteratorVariableName", 0, "").GetValue().GetString();
+  gd::EventsListSerialization::UnserializeInstructionsFrom(
+      project, conditions, element.GetChild("conditions", 0, "Conditions"));
+  gd::EventsListSerialization::UnserializeInstructionsFrom(
+      project, actions, element.GetChild("actions", 0, "Actions"));
+  gd::EventsListSerialization::UnserializeEventsFrom(
+      project, events, element.GetChild("events", 0, "Events"));
+}
+
+}  // namespace gd

Core/GDCore/Events/Builtin/ForEachChildVariableEvent.h

@@ -0,0 +1,110 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#ifndef FOREACHCHILDVARIABLEEVENT_H
+#define FOREACHCHILDVARIABLEEVENT_H
+#include "GDCore/Events/Event.h"
+#include "GDCore/Events/EventsList.h"
+namespace gd {
+class Instruction;
+class Project;
+class Layout;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Event repeated for each every child of a structure variable.
+ */
+class GD_CORE_API ForEachChildVariableEvent : public gd::BaseEvent {
+ public:
+  ForEachChildVariableEvent();
+  virtual ~ForEachChildVariableEvent(){};
+  virtual gd::ForEachChildVariableEvent* Clone() const {
+    return new ForEachChildVariableEvent(*this);
+  }
+
+  virtual bool IsExecutable() const { return true; }
+
+  virtual bool CanHaveSubEvents() const { return true; }
+  virtual const gd::EventsList& GetSubEvents() const { return events; };
+  virtual gd::EventsList& GetSubEvents() { return events; };
+
+  const gd::InstructionsList& GetConditions() const { return conditions; };
+  gd::InstructionsList& GetConditions() { return conditions; };
+
+  const gd::InstructionsList& GetActions() const { return actions; };
+  gd::InstructionsList& GetActions() { return actions; };
+
+  /**
+   * \brief Get the iterable variable name attached to the event.
+   *
+   * It is the structure variable that will be iterated on.
+   */
+  const gd::String& GetIterableVariableName() const { return iterableVariableName; };
+
+  /**
+   * \brief Set the iterable variable name attached to the event.
+   *
+   * It is the structure variable that will be iterated on.
+   */
+  void SetIterableVariableName(gd::String newName) { iterableVariableName = newName; };
+
+  /**
+   * \brief Get the value iterator variable attached to the event.
+   *
+   * It is the variable that will contain the value of the 
+   * iterable's child being iterated on.
+   */
+  const gd::String& GetValueIteratorVariableName() const { return valueIteratorVariableName; };
+
+  /**
+   * \brief Set the value iterator variable attached to the event.
+   *
+   * It is the variable that will contain the value of the 
+   * iterable's child being iterated on.
+   */
+  void SetValueIteratorVariableName(gd::String newName) { valueIteratorVariableName = newName; };
+
+  /**
+   * \brief Get the key iterator variable attached to the event.
+   *
+   * It is the variable that will contain the name of the 
+   * iterable's child being iterated on.
+   */
+  const gd::String& GetKeyIteratorVariableName() const { return keyIteratorVariableName; };
+
+  /**
+   * \brief Set the key iterator variable attached to the event.
+   *
+   * It is the variable that will contain the name of the 
+   * iterable's child being iterated on.
+   */
+  void SetKeyIteratorVariableName(gd::String newName) { keyIteratorVariableName = newName; };
+
+  virtual std::vector<const gd::InstructionsList*> GetAllConditionsVectors()
+      const;
+  virtual std::vector<const gd::InstructionsList*> GetAllActionsVectors() const;
+
+  virtual std::vector<gd::InstructionsList*> GetAllConditionsVectors();
+  virtual std::vector<gd::InstructionsList*> GetAllActionsVectors();
+
+  virtual void SerializeTo(SerializerElement& element) const;
+  virtual void UnserializeFrom(gd::Project& project,
+                               const SerializerElement& element);
+
+ private:
+  gd::String valueIteratorVariableName;
+  gd::String keyIteratorVariableName;
+  gd::String iterableVariableName;
+  gd::InstructionsList conditions;
+  gd::InstructionsList actions;
+  gd::EventsList events;
+};
+
+}  // namespace gd
+
+#endif  // FOREACHEVENT_H

Core/GDCore/Events/Builtin/ForEachEvent.cpp

@@ -5,10 +5,6 @@
  */
 
 #include "ForEachEvent.h"
-#include <iostream>
-#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
-#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
-#include "GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.h"
 #include "GDCore/Events/Serialization.h"
 #include "GDCore/Events/Tools/EventsCodeNameMangler.h"
 #include "GDCore/Serialization/SerializerElement.h"
@@ -35,12 +31,17 @@ vector<gd::InstructionsList*> ForEachEvent::GetAllActionsVectors() {
   return allActions;
 }
 
-vector<gd::Expression*> ForEachEvent::GetAllExpressions() {
-  vector<gd::Expression*> allExpressions;
-  allExpressions.push_back(&objectsToPick);
+vector<pair<gd::Expression*, gd::ParameterMetadata> >
+    ForEachEvent::GetAllExpressionsWithMetadata() {
+  vector<pair<gd::Expression*, gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("object");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&objectsToPick, metadata));
 
-  return allExpressions;
+  return allExpressionsWithMetadata;
 }
+
 vector<const gd::InstructionsList*> ForEachEvent::GetAllConditionsVectors()
     const {
   vector<const gd::InstructionsList*> allConditions;
@@ -56,11 +57,15 @@ vector<const gd::InstructionsList*> ForEachEvent::GetAllActionsVectors() const {
   return allActions;
 }
 
-vector<const gd::Expression*> ForEachEvent::GetAllExpressions() const {
-  vector<const gd::Expression*> allExpressions;
-  allExpressions.push_back(&objectsToPick);
+vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+    ForEachEvent::GetAllExpressionsWithMetadata() const {
+  vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("object");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&objectsToPick, metadata));
 
-  return allExpressions;
+  return allExpressionsWithMetadata;
 }
 
 void ForEachEvent::SerializeTo(SerializerElement& element) const {

Core/GDCore/Events/Builtin/ForEachEvent.h

@@ -50,10 +50,13 @@ class GD_CORE_API ForEachEvent : public gd::BaseEvent {
   virtual std::vector<const gd::InstructionsList*> GetAllConditionsVectors()
       const;
   virtual std::vector<const gd::InstructionsList*> GetAllActionsVectors() const;
-  virtual std::vector<const gd::Expression*> GetAllExpressions() const;
+  virtual std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata() const;
+
   virtual std::vector<gd::InstructionsList*> GetAllConditionsVectors();
   virtual std::vector<gd::InstructionsList*> GetAllActionsVectors();
-  virtual std::vector<gd::Expression*> GetAllExpressions();
+  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata();
 
   virtual void SerializeTo(SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,

Core/GDCore/Events/Builtin/GroupEvent.cpp

@@ -19,6 +19,20 @@ namespace gd {
 GroupEvent::GroupEvent()
     : BaseEvent(), creationTime(0), colorR(74), colorG(176), colorB(228) {}
 
+vector<gd::String> GroupEvent::GetAllSearchableStrings() const {
+  vector<gd::String> allSearchableStrings;
+
+  allSearchableStrings.push_back(name);
+
+  return allSearchableStrings;
+}
+
+bool GroupEvent::ReplaceAllSearchableStrings(
+    std::vector<gd::String> newSearchableString) {
+  SetName(newSearchableString[0]);
+  return newSearchableString[0] == name;
+}
+
 void GroupEvent::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", name);
   element.SetAttribute("source", source);
@@ -61,5 +75,4 @@ void GroupEvent::SetBackgroundColor(unsigned int colorR_,
   colorB = colorB_;
 }
 
-
 }  // namespace gd

Core/GDCore/Events/Builtin/GroupEvent.h

@@ -106,6 +106,10 @@ class GD_CORE_API GroupEvent : public gd::BaseEvent {
   virtual const gd::EventsList& GetSubEvents() const { return events; };
   virtual gd::EventsList& GetSubEvents() { return events; };
 
+  virtual std::vector<gd::String> GetAllSearchableStrings() const;
+  virtual bool ReplaceAllSearchableStrings(
+      std::vector<gd::String> newSearchableString);
+
   virtual void SerializeTo(SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,
                                const SerializerElement& element);

Core/GDCore/Events/Builtin/RepeatEvent.cpp

@@ -5,9 +5,6 @@
  */
 
 #include "RepeatEvent.h"
-#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
-#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
-#include "GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.h"
 #include "GDCore/Events/Serialization.h"
 #include "GDCore/Serialization/SerializerElement.h"
 
@@ -34,11 +31,15 @@ vector<gd::InstructionsList*> RepeatEvent::GetAllActionsVectors() {
   return allActions;
 }
 
-vector<gd::Expression*> RepeatEvent::GetAllExpressions() {
-  vector<gd::Expression*> allExpressions;
-  allExpressions.push_back(&repeatNumberExpression);
+vector<pair<gd::Expression*, gd::ParameterMetadata> >
+    RepeatEvent::GetAllExpressionsWithMetadata() {
+  vector<pair<gd::Expression*, gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("expression");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&repeatNumberExpression, metadata));
 
-  return allExpressions;
+  return allExpressionsWithMetadata;
 }
 
 vector<const gd::InstructionsList*> RepeatEvent::GetAllConditionsVectors()
@@ -56,11 +57,15 @@ vector<const gd::InstructionsList*> RepeatEvent::GetAllActionsVectors() const {
   return allActions;
 }
 
-vector<const gd::Expression*> RepeatEvent::GetAllExpressions() const {
-  vector<const gd::Expression*> allExpressions;
-  allExpressions.push_back(&repeatNumberExpression);
+vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+    RepeatEvent::GetAllExpressionsWithMetadata() const {
+  vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("expression");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&repeatNumberExpression, metadata));
 
-  return allExpressions;
+  return allExpressionsWithMetadata;
 }
 
 void RepeatEvent::SerializeTo(SerializerElement& element) const {

Core/GDCore/Events/Builtin/RepeatEvent.h

@@ -45,11 +45,14 @@ class GD_CORE_API RepeatEvent : public gd::BaseEvent {
 
   virtual std::vector<gd::InstructionsList*> GetAllConditionsVectors();
   virtual std::vector<gd::InstructionsList*> GetAllActionsVectors();
-  virtual std::vector<gd::Expression*> GetAllExpressions();
+  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata();
+
   virtual std::vector<const gd::InstructionsList*> GetAllConditionsVectors()
       const;
   virtual std::vector<const gd::InstructionsList*> GetAllActionsVectors() const;
-  virtual std::vector<const gd::Expression*> GetAllExpressions() const;
+  virtual std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata() const;
 
   virtual void SerializeTo(SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,

Core/GDCore/Events/Builtin/WhileEvent.cpp

@@ -6,9 +6,6 @@
 
 #if defined(GD_IDE_ONLY)
 #include "WhileEvent.h"
-#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
-#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
-#include "GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.h"
 #include "GDCore/Events/Serialization.h"
 #include "GDCore/Serialization/SerializerElement.h"
 

Core/GDCore/Events/CodeGeneration/EffectsCodeGenerator.cpp

@@ -0,0 +1,79 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "EffectsCodeGenerator.h"
+
+#include <iostream>
+
+#include "GDCore/Extensions/Metadata/EffectMetadata.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Project/Effect.h"
+#include "GDCore/Project/EffectsContainer.h"
+#include "GDCore/Project/Layer.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+
+namespace gd {
+
+void ExposeProjectEffects(
+    const gd::Project& project,
+    const std::function<void(const gd::Effect& effect)>& worker) {
+  // See also gd::Project::ExposeResources for a method that traverse the whole
+  // project (this time for resources) and
+  // WholeProjectRefactorer::ExposeProjectEvents.
+
+  // Add layouts effects
+  for (std::size_t s = 0; s < project.GetLayoutsCount(); s++) {
+    auto& layout = project.GetLayout(s);
+
+    for (std::size_t l = 0; l < layout.GetLayersCount(); ++l) {
+      auto& effects = layout.GetLayer(l).GetEffects();
+      for (std::size_t e = 0; e < effects.GetEffectsCount(); ++e) {
+        auto& effect = effects.GetEffect(e);
+        worker(effect);
+      }
+    }
+
+    for (std::size_t i = 0; i < layout.GetObjectsCount(); i++) {
+      auto& object = layout.GetObject(i);
+      auto& effects = object.GetEffects();
+      for (std::size_t e = 0; e < effects.GetEffectsCount(); e++) {
+        auto& effect = effects.GetEffect(e);
+        worker(effect);
+      }
+    }
+  }
+
+  // Add global object effects
+  for (std::size_t s = 0; s < project.GetObjectsCount(); s++) {
+    auto& effects = project.GetObject(s).GetEffects();
+    for (std::size_t e = 0; e < effects.GetEffectsCount(); e++) {
+      auto& effect = effects.GetEffect(e);
+      worker(effect);
+    }
+  }
+}
+
+void EffectsCodeGenerator::GenerateEffectsIncludeFiles(
+    const gd::Platform& platform,
+    const gd::Project& project,
+    std::set<gd::String>& includeFiles) {
+  ExposeProjectEffects(
+      project, [&platform, &includeFiles](const gd::Effect& effect) {
+        // TODO: this browse all the extensions every time we're trying to find
+        // a new effect. Might be a good idea to rework MetadataProvider to be
+        // faster (not sure if it is a bottleneck at all though - but could be
+        // for events code generation).
+        const gd::EffectMetadata& effectMetadata =
+            MetadataProvider::GetEffectMetadata(platform,
+                                                effect.GetEffectType());
+
+        for (auto& includeFile : effectMetadata.GetIncludeFiles())
+          includeFiles.insert(includeFile);
+      });
+}
+
+}  // namespace gd

Core/GDCore/Events/CodeGeneration/EffectsCodeGenerator.h

@@ -0,0 +1,35 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_EffectsCodeGenerator_H
+#define GDCORE_EffectsCodeGenerator_H
+
+#include <set>
+#include <utility>
+#include <vector>
+#include "GDCore/String.h"
+namespace gd {
+class Project;
+class Platform;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Internal class used to generate code from events
+ */
+class GD_CORE_API EffectsCodeGenerator {
+ public:
+  /**
+   * \brief Add all the include files required by the project effects.
+   */
+  static void GenerateEffectsIncludeFiles(const gd::Platform& platform,
+                                          const gd::Project& project,
+                                          std::set<gd::String>& includeFiles);
+};
+
+}  // namespace gd
+
+#endif  // GDCORE_EffectsCodeGenerator_H

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -1,11 +1,11 @@
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
+
 #include <algorithm>
 #include <utility>
+
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
 #include "GDCore/Events/CodeGeneration/ExpressionCodeGenerator.h"
-#include "GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.h"
-#include "GDCore/Events/Parsers/ExpressionParser.h"
 #include "GDCore/Events/Tools/EventsCodeNameMangler.h"
 #include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
@@ -261,8 +261,11 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
     EventsCodeGenerationContext& context) {
   gd::String conditionCode;
 
-  gd::InstructionMetadata instrInfos =
+  const gd::InstructionMetadata& instrInfos =
       MetadataProvider::GetConditionMetadata(platform, condition.GetType());
+  if (MetadataProvider::IsBadInstructionMetadata(instrInfos)) {
+    return "/* Unknown instruction - skipped. */";
+  }
 
   AddIncludeFiles(instrInfos.codeExtraInformation.GetIncludeFiles());
   maxConditionsListsSize =
@@ -288,7 +291,7 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
     condition.SetParameters(parameters);
   }
 
-  // Verify that there are not mismatch 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].type)) {
       gd::String objectInParameter =
@@ -299,22 +302,87 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
           !GetObjectsAndGroups().GetObjectGroups().Has(objectInParameter) &&
           !GetGlobalObjectsAndGroups().GetObjectGroups().Has(
               objectInParameter)) {
-        condition.SetParameter(pNb, gd::Expression(""));
-        condition.SetType("");
+        return "/* Unknown object - skipped. */";
       } else if (!instrInfos.parameters[pNb].supplementaryInformation.empty() &&
                  gd::GetTypeOfObject(GetGlobalObjectsAndGroups(),
                                      GetObjectsAndGroups(),
                                      objectInParameter) !=
                      instrInfos.parameters[pNb].supplementaryInformation) {
-        condition.SetParameter(pNb, gd::Expression(""));
-        condition.SetType("");
+        return "/* Mismatched object type - skipped. */";
       }
     }
   }
 
-  // Generate static condition if available
-  if (MetadataProvider::HasCondition(platform, condition.GetType())) {
-    // Prepare arguments
+  if (instrInfos.IsObjectInstruction()) {
+    gd::String objectName = condition.GetParameter(0).GetPlainString();
+    if (!objectName.empty() && !instrInfos.parameters.empty()) {
+      std::vector<gd::String> realObjects =
+          ExpandObjectsName(objectName, context);
+      for (std::size_t i = 0; i < realObjects.size(); ++i) {
+        // Set up the context
+        gd::String objectType = gd::GetTypeOfObject(
+            GetGlobalObjectsAndGroups(), GetObjectsAndGroups(), realObjects[i]);
+        const ObjectMetadata& objInfo =
+            MetadataProvider::GetObjectMetadata(platform, objectType);
+
+        if (objInfo.IsUnsupportedBaseObjectCapability(
+                instrInfos.GetRequiredBaseObjectCapability())) {
+          conditionCode +=
+              "/* Object with unsupported capability - skipped. */\n";
+        } else {
+          AddIncludeFiles(objInfo.includeFiles);
+          context.SetCurrentObject(realObjects[i]);
+          context.ObjectsListNeeded(realObjects[i]);
+
+          // Prepare arguments and generate the condition whole code
+          vector<gd::String> arguments = GenerateParametersCodes(
+              condition.GetParameters(), instrInfos.parameters, context);
+          conditionCode += GenerateObjectCondition(realObjects[i],
+                                                   objInfo,
+                                                   arguments,
+                                                   instrInfos,
+                                                   returnBoolean,
+                                                   condition.IsInverted(),
+                                                   context);
+
+          context.SetNoCurrentObject();
+        }
+      }
+    }
+  } else if (instrInfos.IsBehaviorInstruction()) {
+    gd::String objectName = condition.GetParameter(0).GetPlainString();
+    gd::String behaviorType =
+        gd::GetTypeOfBehavior(GetGlobalObjectsAndGroups(),
+                              GetObjectsAndGroups(),
+                              condition.GetParameter(1).GetPlainString());
+    if (instrInfos.parameters.size() >= 2) {
+      std::vector<gd::String> realObjects =
+          ExpandObjectsName(objectName, context);
+      for (std::size_t i = 0; i < realObjects.size(); ++i) {
+        // Setup context
+        const BehaviorMetadata& autoInfo =
+            MetadataProvider::GetBehaviorMetadata(platform, behaviorType);
+        AddIncludeFiles(autoInfo.includeFiles);
+        context.SetCurrentObject(realObjects[i]);
+        context.ObjectsListNeeded(realObjects[i]);
+
+        // Prepare arguments and generate the whole condition code
+        vector<gd::String> arguments = GenerateParametersCodes(
+            condition.GetParameters(), instrInfos.parameters, context);
+        conditionCode += GenerateBehaviorCondition(
+            realObjects[i],
+            condition.GetParameter(1).GetPlainString(),
+            autoInfo,
+            arguments,
+            instrInfos,
+            returnBoolean,
+            condition.IsInverted(),
+            context);
+
+        context.SetNoCurrentObject();
+      }
+    }
+  } else {
     std::vector<std::pair<gd::String, gd::String> >
         supplementaryParametersTypes;
     supplementaryParametersTypes.push_back(std::make_pair(
@@ -329,78 +397,6 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
         arguments, instrInfos, returnBoolean, condition.IsInverted(), context);
   }
 
-  // Generate object condition if available
-  gd::String objectName = condition.GetParameters().empty()
-                              ? ""
-                              : condition.GetParameter(0).GetPlainString();
-  gd::String objectType = gd::GetTypeOfObject(
-      GetGlobalObjectsAndGroups(), GetObjectsAndGroups(), objectName);
-  if (!objectName.empty() &&
-      MetadataProvider::HasObjectCondition(
-          platform, objectType, condition.GetType()) &&
-      !instrInfos.parameters.empty()) {
-    std::vector<gd::String> realObjects =
-        ExpandObjectsName(objectName, context);
-    for (std::size_t i = 0; i < realObjects.size(); ++i) {
-      // Set up the context
-      const ObjectMetadata& objInfo =
-          MetadataProvider::GetObjectMetadata(platform, objectType);
-      AddIncludeFiles(objInfo.includeFiles);
-      context.SetCurrentObject(realObjects[i]);
-      context.ObjectsListNeeded(realObjects[i]);
-
-      // Prepare arguments and generate the condition whole code
-      vector<gd::String> arguments = GenerateParametersCodes(
-          condition.GetParameters(), instrInfos.parameters, context);
-      conditionCode += GenerateObjectCondition(realObjects[i],
-                                               objInfo,
-                                               arguments,
-                                               instrInfos,
-                                               returnBoolean,
-                                               condition.IsInverted(),
-                                               context);
-
-      context.SetNoCurrentObject();
-    }
-  }
-
-  // Generate behavior condition if available
-  gd::String behaviorType =
-      gd::GetTypeOfBehavior(GetGlobalObjectsAndGroups(),
-                            GetObjectsAndGroups(),
-                            condition.GetParameters().size() < 2
-                                ? ""
-                                : condition.GetParameter(1).GetPlainString());
-  if (MetadataProvider::HasBehaviorCondition(
-          platform, behaviorType, condition.GetType()) &&
-      instrInfos.parameters.size() >= 2) {
-    std::vector<gd::String> realObjects =
-        ExpandObjectsName(objectName, context);
-    for (std::size_t i = 0; i < realObjects.size(); ++i) {
-      // Setup context
-      const BehaviorMetadata& autoInfo =
-          MetadataProvider::GetBehaviorMetadata(platform, behaviorType);
-      AddIncludeFiles(autoInfo.includeFiles);
-      context.SetCurrentObject(realObjects[i]);
-      context.ObjectsListNeeded(realObjects[i]);
-
-      // Prepare arguments and generate the whole condition code
-      vector<gd::String> arguments = GenerateParametersCodes(
-          condition.GetParameters(), instrInfos.parameters, context);
-      conditionCode +=
-          GenerateBehaviorCondition(realObjects[i],
-                                    condition.GetParameter(1).GetPlainString(),
-                                    autoInfo,
-                                    arguments,
-                                    instrInfos,
-                                    returnBoolean,
-                                    condition.IsInverted(),
-                                    context);
-
-      context.SetNoCurrentObject();
-    }
-  }
-
   return conditionCode;
 }
 
@@ -417,9 +413,6 @@ gd::String EventsCodeGenerator::GenerateConditionsListCode(
         "condition" + gd::String::From(i) + "IsTrue", context);
 
   for (std::size_t cId = 0; cId < conditions.size(); ++cId) {
-    gd::InstructionMetadata instrInfos = MetadataProvider::GetConditionMetadata(
-        platform, conditions[cId].GetType());
-
     gd::String conditionCode =
         GenerateConditionCode(conditions[cId],
                               "condition" + gd::String::From(cId) + "IsTrue",
@@ -440,6 +433,11 @@ gd::String EventsCodeGenerator::GenerateConditionsListCode(
       outputCode += "{\n";
       outputCode += conditionCode;
       outputCode += "}";
+    } else {
+      // Deprecated way to cancel code generation - but still honor it.
+      // Can be removed once condition is passed by const reference to
+      // GenerateConditionCode.
+      outputCode += "/* Skipped condition (empty type) */";
     }
   }
 
@@ -455,8 +453,11 @@ gd::String EventsCodeGenerator::GenerateActionCode(
     gd::Instruction& action, EventsCodeGenerationContext& context) {
   gd::String actionCode;
 
-  gd::InstructionMetadata instrInfos =
+  const gd::InstructionMetadata& instrInfos =
       MetadataProvider::GetActionMetadata(platform, action.GetType());
+  if (MetadataProvider::IsBadInstructionMetadata(instrInfos)) {
+    return "/* Unknown instruction - skipped. */";
+  }
 
   AddIncludeFiles(instrInfos.codeExtraInformation.GetIncludeFiles());
 
@@ -472,7 +473,7 @@ gd::String EventsCodeGenerator::GenerateActionCode(
     action.SetParameters(parameters);
   }
 
-  // Verify that there are not mismatch 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].type)) {
       gd::String objectInParameter = action.GetParameter(pNb).GetPlainString();
@@ -481,91 +482,87 @@ gd::String EventsCodeGenerator::GenerateActionCode(
           !GetObjectsAndGroups().GetObjectGroups().Has(objectInParameter) &&
           !GetGlobalObjectsAndGroups().GetObjectGroups().Has(
               objectInParameter)) {
-        action.SetParameter(pNb, gd::Expression(""));
-        action.SetType("");
+        return "/* Unknown object - skipped. */";
       } else if (!instrInfos.parameters[pNb].supplementaryInformation.empty() &&
                  gd::GetTypeOfObject(GetGlobalObjectsAndGroups(),
                                      GetObjectsAndGroups(),
                                      objectInParameter) !=
                      instrInfos.parameters[pNb].supplementaryInformation) {
-        action.SetParameter(pNb, gd::Expression(""));
-        action.SetType("");
+        return "/* Mismatched object type - skipped. */";
       }
     }
   }
 
   // Call free function first if available
-  if (MetadataProvider::HasAction(platform, action.GetType())) {
+  if (instrInfos.IsObjectInstruction()) {
+    gd::String objectName = action.GetParameter(0).GetPlainString();
+
+    if (!instrInfos.parameters.empty()) {
+      std::vector<gd::String> realObjects =
+          ExpandObjectsName(objectName, context);
+      for (std::size_t i = 0; i < realObjects.size(); ++i) {
+        // Setup context
+        gd::String objectType = gd::GetTypeOfObject(
+            GetGlobalObjectsAndGroups(), GetObjectsAndGroups(), realObjects[i]);
+        const ObjectMetadata& objInfo =
+            MetadataProvider::GetObjectMetadata(platform, objectType);
+
+        if (objInfo.IsUnsupportedBaseObjectCapability(
+                instrInfos.GetRequiredBaseObjectCapability())) {
+          actionCode += "/* Object with unsupported capability - skipped. */\n";
+        } else {
+          AddIncludeFiles(objInfo.includeFiles);
+          context.SetCurrentObject(realObjects[i]);
+          context.ObjectsListNeeded(realObjects[i]);
+
+          // Prepare arguments and generate the whole action code
+          vector<gd::String> arguments = GenerateParametersCodes(
+              action.GetParameters(), instrInfos.parameters, context);
+          actionCode += GenerateObjectAction(
+              realObjects[i], objInfo, arguments, instrInfos, context);
+
+          context.SetNoCurrentObject();
+        }
+      }
+    }
+  } else if (instrInfos.IsBehaviorInstruction()) {
+    gd::String objectName = action.GetParameter(0).GetPlainString();
+    gd::String behaviorType =
+        gd::GetTypeOfBehavior(GetGlobalObjectsAndGroups(),
+                              GetObjectsAndGroups(),
+                              action.GetParameter(1).GetPlainString());
+
+    if (instrInfos.parameters.size() >= 2) {
+      std::vector<gd::String> realObjects =
+          ExpandObjectsName(objectName, context);
+      for (std::size_t i = 0; i < realObjects.size(); ++i) {
+        // Setup context
+        const BehaviorMetadata& autoInfo =
+            MetadataProvider::GetBehaviorMetadata(platform, behaviorType);
+        AddIncludeFiles(autoInfo.includeFiles);
+        context.SetCurrentObject(realObjects[i]);
+        context.ObjectsListNeeded(realObjects[i]);
+
+        // Prepare arguments and generate the whole action code
+        vector<gd::String> arguments = GenerateParametersCodes(
+            action.GetParameters(), instrInfos.parameters, context);
+        actionCode +=
+            GenerateBehaviorAction(realObjects[i],
+                                   action.GetParameter(1).GetPlainString(),
+                                   autoInfo,
+                                   arguments,
+                                   instrInfos,
+                                   context);
+
+        context.SetNoCurrentObject();
+      }
+    }
+  } else {
     vector<gd::String> arguments = GenerateParametersCodes(
         action.GetParameters(), instrInfos.parameters, context);
     actionCode += GenerateFreeAction(arguments, instrInfos, context);
   }
 
-  // Call object function if available
-  gd::String objectName = action.GetParameters().empty()
-                              ? ""
-                              : action.GetParameter(0).GetPlainString();
-  gd::String objectType = gd::GetTypeOfObject(
-      GetGlobalObjectsAndGroups(), GetObjectsAndGroups(), objectName);
-  if (MetadataProvider::HasObjectAction(
-          platform, objectType, action.GetType()) &&
-      !instrInfos.parameters.empty()) {
-    std::vector<gd::String> realObjects =
-        ExpandObjectsName(objectName, context);
-    for (std::size_t i = 0; i < realObjects.size(); ++i) {
-      // Setup context
-      const ObjectMetadata& objInfo =
-          MetadataProvider::GetObjectMetadata(platform, objectType);
-      AddIncludeFiles(objInfo.includeFiles);
-      context.SetCurrentObject(realObjects[i]);
-      context.ObjectsListNeeded(realObjects[i]);
-
-      // Prepare arguments and generate the whole action code
-      vector<gd::String> arguments = GenerateParametersCodes(
-          action.GetParameters(), instrInfos.parameters, context);
-      actionCode += GenerateObjectAction(
-          realObjects[i], objInfo, arguments, instrInfos, context);
-
-      context.SetNoCurrentObject();
-    }
-  }
-
-  // Assign to a behavior member function if found
-  gd::String behaviorType =
-      gd::GetTypeOfBehavior(GetGlobalObjectsAndGroups(),
-                            GetObjectsAndGroups(),
-                            action.GetParameters().size() < 2
-                                ? ""
-                                : action.GetParameter(1).GetPlainString());
-
-  if (MetadataProvider::HasBehaviorAction(
-          platform, behaviorType, action.GetType()) &&
-      instrInfos.parameters.size() >= 2) {
-    std::vector<gd::String> realObjects =
-        ExpandObjectsName(objectName, context);
-    for (std::size_t i = 0; i < realObjects.size(); ++i) {
-      // Setup context
-      const BehaviorMetadata& autoInfo =
-          MetadataProvider::GetBehaviorMetadata(platform, behaviorType);
-      AddIncludeFiles(autoInfo.includeFiles);
-      context.SetCurrentObject(realObjects[i]);
-      context.ObjectsListNeeded(realObjects[i]);
-
-      // Prepare arguments and generate the whole action code
-      vector<gd::String> arguments = GenerateParametersCodes(
-          action.GetParameters(), instrInfos.parameters, context);
-      actionCode +=
-          GenerateBehaviorAction(realObjects[i],
-                                 action.GetParameter(1).GetPlainString(),
-                                 autoInfo,
-                                 arguments,
-                                 instrInfos,
-                                 context);
-
-      context.SetNoCurrentObject();
-    }
-  }
-
   return actionCode;
 }
 
@@ -576,13 +573,17 @@ gd::String EventsCodeGenerator::GenerateActionsListCode(
     gd::InstructionsList& actions, EventsCodeGenerationContext& context) {
   gd::String outputCode;
   for (std::size_t aId = 0; aId < actions.size(); ++aId) {
-    gd::InstructionMetadata instrInfos =
-        MetadataProvider::GetActionMetadata(platform, actions[aId].GetType());
-
     gd::String actionCode = GenerateActionCode(actions[aId], context);
 
     outputCode += "{";
-    if (!actions[aId].GetType().empty()) outputCode += actionCode;
+    if (actions[aId].GetType().empty()) {
+      // Deprecated way to cancel code generation - but still honor it.
+      // Can be removed once action is passed by const reference to
+      // GenerateActionCode.
+      outputCode += "/* Skipped action (empty type) */";
+    } else {
+      outputCode += actionCode;
+    }
     outputCode += "}";
   }
 
@@ -630,10 +631,17 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
 
     argOutput = "\"" + argOutput + "\"";
   } else if (ParameterMetadata::IsBehavior(metadata.type)) {
-    argOutput = "\"" + ConvertToString(parameter) + "\"";
+    argOutput = GenerateGetBehaviorNameCode(parameter);
   } else if (metadata.type == "key") {
     argOutput = "\"" + ConvertToString(parameter) + "\"";
-  } else if (metadata.type == "password" || metadata.type == "musicfile" ||
+  } else if (metadata.type == "audioResource" ||
+             metadata.type == "bitmapFontResource" ||
+             metadata.type == "fontResource" ||
+             metadata.type == "imageResource" ||
+             metadata.type == "jsonResource" ||
+             metadata.type == "videoResource" ||
+             // Deprecated, old parameter names:
+             metadata.type == "password" || metadata.type == "musicfile" ||
              metadata.type == "soundfile" || metadata.type == "police") {
     argOutput = "\"" + ConvertToString(parameter) + "\"";
   } else if (metadata.type == "mouse") {
@@ -662,7 +670,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
     if (argOutput.empty()) {
       if (!metadata.type.empty())
         cout << "Warning: Unknown type of parameter \"" << metadata.type
-             << "\".";
+             << "\"." << std::endl;
       argOutput += "\"" + ConvertToString(parameter) + "\"";
     }
   }
@@ -1111,6 +1119,34 @@ gd::String EventsCodeGenerator::GenerateBehaviorAction(
   }
 }
 
+size_t EventsCodeGenerator::GenerateSingleUsageUniqueIdForEventsList() {
+  return eventsListNextUniqueId++;
+}
+
+size_t EventsCodeGenerator::GenerateSingleUsageUniqueIdFor(
+    const Instruction* instruction) {
+  if (!instruction) {
+    std::cout << "ERROR: During code generation, a null pointer was passed to "
+                 "GenerateSingleUsageUniqueIdFor."
+              << std::endl;
+  }
+
+  // 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;
+
+  // While in most case this function is called a single time for each
+  // instruction, it's possible for an instruction to be appearing more than
+  // once in the events, if we used links. In this case, simply increment the
+  // unique id to be sure that ids are effectively uniques, and stay stable
+  // (given the same order of links).
+  while (instructionUniqueIds.find(uniqueId) != instructionUniqueIds.end()) {
+    uniqueId++;
+  }
+  instructionUniqueIds.insert(uniqueId);
+  return uniqueId;
+}
+
 gd::String EventsCodeGenerator::GetObjectListName(
     const gd::String& name, const gd::EventsCodeGenerationContext& context) {
   return ManObjListName(name);
@@ -1139,7 +1175,8 @@ EventsCodeGenerator::EventsCodeGenerator(gd::Project& project_,
       errorOccurred(false),
       compilationForRuntime(false),
       maxCustomConditionsDepth(0),
-      maxConditionsListsSize(0){};
+      maxConditionsListsSize(0),
+      eventsListNextUniqueId(0){};
 
 EventsCodeGenerator::EventsCodeGenerator(
     const gd::Platform& platform_,
@@ -1154,6 +1191,7 @@ EventsCodeGenerator::EventsCodeGenerator(
       errorOccurred(false),
       compilationForRuntime(false),
       maxCustomConditionsDepth(0),
-      maxConditionsListsSize(0){};
+      maxConditionsListsSize(0),
+      eventsListNextUniqueId(0){};
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -9,6 +9,7 @@
 #include <set>
 #include <utility>
 #include <vector>
+
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/String.h"
@@ -35,10 +36,6 @@ namespace gd {
  * \brief Internal class used to generate code from events
  */
 class GD_CORE_API EventsCodeGenerator {
-  // Compatiblity with old ExpressionParser
-  friend class CallbacksForGeneratingExpressionCode;
-  friend class VariableCodeGenerationCallbacks;
-  // end of compatibility code
   friend class ExpressionCodeGenerator;
 
  public:
@@ -127,7 +124,7 @@ class GD_CORE_API EventsCodeGenerator {
    *
    */
   std::vector<gd::String> GenerateParametersCodes(
-      const std::vector<gd::Expression> & parameters,
+      const std::vector<gd::Expression>& parameters,
       const std::vector<gd::ParameterMetadata>& parametersInfo,
       EventsCodeGenerationContext& context,
       std::vector<std::pair<gd::String, gd::String> >*
@@ -325,7 +322,7 @@ class GD_CORE_API EventsCodeGenerator {
    * group.
    *
    * Get a list containing the "real" objects name when the events refers to \a
-   * objectName :<br> If \a objectName if really an object, the list will only
+   * objectName :<br> If \a objectName is really an object, the list will only
    * contains \a objectName unchanged.<br> If \a objectName is a group, the list
    * will contains all the objects of the group.<br> If \a objectName is the
    * "current" object in the context ( i.e: The object being used for launching
@@ -415,6 +412,29 @@ class GD_CORE_API EventsCodeGenerator {
 
   enum VariableScope { LAYOUT_VARIABLE = 0, PROJECT_VARIABLE, OBJECT_VARIABLE };
 
+  /**
+   * Generate a single unique number for the specified instruction.
+   *
+   * This is useful for instructions that need to identify themselves in the
+   * generated code like the "Trigger Once" conditions. The id is stable across
+   * code generations if the instructions are the same objects in memory.
+   *
+   * Note that if this function is called multiple times with the same
+   * instruction, the unique number returned will be *different*. This is
+   * because a single instruction might appear at multiple places in events due
+   * to the usage of links.
+   */
+  size_t GenerateSingleUsageUniqueIdFor(const gd::Instruction* instruction);
+
+  /**
+   * Generate a single unique number for an events list.
+   *
+   * This is useful to create unique function names for events list, that are
+   * stable across code generation given the exact same list of events. They are
+   * *not* stable if events are moved/reorganized.
+   */
+  size_t GenerateSingleUsageUniqueIdForEventsList();
+
  protected:
   /**
    * \brief Generate the code for a single parameter.
@@ -442,24 +462,21 @@ class GD_CORE_API EventsCodeGenerator {
    * Other standard parameters type that should be implemented by platforms:
    * - currentScene: Reference to the current runtime scene.
    * - objectList : a map containing lists of objects which are specified by the
-  object name in another parameter. (C++: std::map <gd::String,
-  std::vector<RuntimeObject*> *>). Example:
+  object name in another parameter. Example:
    * \code
       AddExpression("Count", _("Object count"), _("Count the number of picked
   objects"), _("Objects"), "res/conditions/nbObjet.png")
       .AddParameter("objectList", _("Object"))
-      .SetFunctionName("PickedObjectsCount").SetIncludeFile("GDCpp/Extensions/Builtin/ObjectTools.h");
+      .SetFunctionName("getPickedObjectsCount");
 
    * \endcode
    * - objectListWithoutPicking : Same as objectList but do not pick object if
   they are not already picked.
-   * - objectPtr : Return a pointer to object specified by the object name in
-  another parameter ( C++: RuntimeObject* ). Example:
+   * - objectPtr : Return a reference to the object specified by the object name in
+  another parameter. Example:
    * \code
   .AddParameter("object", _("Object"))
   .AddParameter("objectPtr", _("Target object"))
-  //The called function will be called with this signature on the C++ platform:
-  Function(gd::String, RuntimeObject*)
    * \endcode
    */
   virtual gd::String GenerateParameterCodes(
@@ -708,7 +725,8 @@ class GD_CORE_API EventsCodeGenerator {
   /**
    * Generate the getter to get the name of the specified behavior.
    */
-  virtual gd::String GenerateGetBehaviorNameCode(const gd::String& behaviorName);
+  virtual gd::String GenerateGetBehaviorNameCode(
+      const gd::String& behaviorName);
 
   const gd::Platform& platform;  ///< The platform being used.
 
@@ -736,6 +754,11 @@ class GD_CORE_API EventsCodeGenerator {
   size_t maxCustomConditionsDepth;  ///< The maximum depth value for all the
                                     ///< custom conditions created.
   size_t maxConditionsListsSize;  ///< The maximum size of a list of conditions.
+
+  std::set<size_t>
+      instructionUniqueIds;  ///< The unique ids generated for instructions.
+  size_t eventsListNextUniqueId;  ///< The next identifier to use for an events
+                                  ///< list function name.
 };
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp

@@ -4,8 +4,10 @@
  * reserved. This project is released under the MIT License.
  */
 #include "ExpressionCodeGenerator.h"
+
 #include <memory>
 #include <vector>
+
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
@@ -24,125 +26,29 @@
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
 
-// Compatibility with old ExpressionParser
-#include "GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.h"
-#include "GDCore/Events/CodeGeneration/VariableParserCallbacks.h"
-#include "GDCore/Events/Parsers/ExpressionParser.h"
-#include "GDCore/Events/Parsers/VariableParser.h"
-// end of compatibility code
-
 namespace gd {
 
-bool ExpressionCodeGenerator::useOldExpressionParser = false;
-
 gd::String ExpressionCodeGenerator::GenerateExpressionCode(
     EventsCodeGenerator& codeGenerator,
     EventsCodeGenerationContext& context,
     const gd::String& type,
     const gd::String& expression,
     const gd::String& objectName) {
-  // Compatibility with old ExpressionParser
-  if (useOldExpressionParser) {
-    if (type == "number") {
-      gd::String code = "";
-      gd::CallbacksForGeneratingExpressionCode callbacks(
-          code, codeGenerator, context);
-      gd::ExpressionParser parser(expression);
-      if (!parser.ParseMathExpression(codeGenerator.GetPlatform(),
-                                      codeGenerator.GetGlobalObjectsAndGroups(),
-                                      codeGenerator.GetObjectsAndGroups(),
-                                      callbacks) ||
-          code.empty()) {
-        std::cout << "Error (old ExpressionParser): \""
-                  << parser.GetFirstError() << "\" in: \"" << expression
-                  << "\" (number)" << std::endl;
-        code = "0";
-      }
-
-      return code;
-    } else if (type == "string") {
-      gd::String code = "";
-      gd::CallbacksForGeneratingExpressionCode callbacks(
-          code, codeGenerator, context);
-      gd::ExpressionParser parser(expression);
-      if (!parser.ParseStringExpression(
-              codeGenerator.GetPlatform(),
-              codeGenerator.GetGlobalObjectsAndGroups(),
-              codeGenerator.GetObjectsAndGroups(),
-              callbacks) ||
-          code.empty()) {
-        std::cout << "Error (old ExpressionParser): \""
-                  << parser.GetFirstError() << "\" in: \"" << expression
-                  << "\" (string)" << std::endl;
-        code = "\"\"";
-      }
-
-      return code;
-    } else if (type == "scenevar") {
-      gd::String code = "";
-      gd::VariableCodeGenerationCallbacks callbacks(
-          code,
-          codeGenerator,
-          context,
-          gd::EventsCodeGenerator::LAYOUT_VARIABLE);
-
-      gd::VariableParser parser(expression);
-      if (!parser.Parse(callbacks)) {
-        std::cout << "Error (old VariableParser) :" << parser.GetFirstError()
-                  << " in: " << expression << std::endl;
-        code = codeGenerator.GenerateBadVariable();
-      }
-      return code;
-    } else if (type == "globalvar") {
-      gd::String code = "";
-      gd::VariableCodeGenerationCallbacks callbacks(
-          code,
-          codeGenerator,
-          context,
-          gd::EventsCodeGenerator::PROJECT_VARIABLE);
-
-      gd::VariableParser parser(expression);
-      if (!parser.Parse(callbacks)) {
-        std::cout << "Error (old VariableParser) :" << parser.GetFirstError()
-                  << " in: " << expression << std::endl;
-        code = codeGenerator.GenerateBadVariable();
-      }
-      return code;
-    } else if (type == "objectvar") {
-      gd::String code = "";
-
-      // Object is either the object of the previous parameter or, if it is
-      // empty, the object being picked by the instruction.
-      gd::String object =
-          objectName.empty() ? context.GetCurrentObject() : objectName;
-
-      gd::VariableCodeGenerationCallbacks callbacks(
-          code, codeGenerator, context, object);
-
-      gd::VariableParser parser(expression);
-      if (!parser.Parse(callbacks)) {
-        std::cout << "Error (old VariableParser) :" << parser.GetFirstError()
-                  << " in: " << expression << std::endl;
-        code = codeGenerator.GenerateBadVariable();
-      }
-      return code;
-    }
-
-    std::cout << "Type error (old ExpressionParser): type \"" << type
-              << "\" is not supported" << std::endl;
-    return "/* Error during code generation: type " + type +
-           " is not supported for old ExpressionParser. */ 0";
-  }
-  // end of compatibility code
-
   gd::ExpressionParser2 parser(codeGenerator.GetPlatform(),
                                codeGenerator.GetGlobalObjectsAndGroups(),
                                codeGenerator.GetObjectsAndGroups());
+  ExpressionCodeGenerator generator(codeGenerator, context);
+
   auto node = parser.ParseExpression(type, expression, objectName);
+  if (!node) {
+    std::cout << "Error: error while parsing: \"" << expression << "\" ("
+              << type << ")" << std::endl;
+
+    return generator.GenerateDefaultValue(type);
+  }
+
   gd::ExpressionValidator validator;
   node->Visit(validator);
-
-  ExpressionCodeGenerator generator(codeGenerator, context);
   if (!validator.GetErrors().empty()) {
     std::cout << "Error: \"" << validator.GetErrors()[0]->GetMessage()
               << "\" in: \"" << expression << "\" (" << type << ")"
@@ -230,11 +136,11 @@ void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
   }
 }
 
-void ExpressionCodeGenerator::OnVisitFunctionNode(FunctionNode& node) {
+void ExpressionCodeGenerator::OnVisitFunctionCallNode(FunctionCallNode& node) {
   if (gd::MetadataProvider::IsBadExpressionMetadata(node.expressionMetadata)) {
     output += "/* Error during generation, function not found: " +
-              codeGenerator.ConvertToString(node.functionName) + " for type " +
-              node.type + " */ " + GenerateDefaultValue(node.type);
+              codeGenerator.ConvertToString(node.functionName) + " */ " +
+              GenerateDefaultValue(node.type);
     return;
   }
 
@@ -313,14 +219,20 @@ gd::String ExpressionCodeGenerator::GenerateObjectFunctionCode(
     const ObjectMetadata& objInfo = MetadataProvider::GetObjectMetadata(
         codeGenerator.GetPlatform(), objectType);
 
-    codeGenerator.AddIncludeFiles(objInfo.includeFiles);
-    functionOutput = codeGenerator.GenerateObjectFunctionCall(
-        realObjects[i],
-        objInfo,
-        expressionMetadata.codeExtraInformation,
-        parametersCode,
-        functionOutput,
-        context);
+    if (objInfo.IsUnsupportedBaseObjectCapability(
+            expressionMetadata.GetRequiredBaseObjectCapability())) {
+      // Do nothing, skipping objects not supporting the capability required by
+      // this expression.
+    } else {
+      codeGenerator.AddIncludeFiles(objInfo.includeFiles);
+      functionOutput = codeGenerator.GenerateObjectFunctionCall(
+          realObjects[i],
+          objInfo,
+          expressionMetadata.codeExtraInformation,
+          parametersCode,
+          functionOutput,
+          context);
+    }
   }
 
   return functionOutput;
@@ -454,12 +366,20 @@ gd::String ExpressionCodeGenerator::GenerateDefaultValue(
   if (gd::ParameterMetadata::IsObject(type)) {
     return codeGenerator.GenerateBadObject();
   }
+  if (gd::ParameterMetadata::IsExpression("string", type)) {
+    return "\"\"";
+  }
 
-  return (type == "string") ? "\"\"" : "0";
+  return "0";
 }
 
 void ExpressionCodeGenerator::OnVisitEmptyNode(EmptyNode& node) {
   output += GenerateDefaultValue(node.type);
 }
 
+void ExpressionCodeGenerator::OnVisitObjectFunctionNameNode(
+    ObjectFunctionNameNode& node) {
+  output += GenerateDefaultValue(node.type);
+}
+
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.h

@@ -60,11 +60,6 @@ class GD_CORE_API ExpressionCodeGenerator : public ExpressionParser2NodeWorker {
                                            const gd::String& expression,
                                            const gd::String& objectName = "");
 
-  static void UseOldExpressionParser(bool enable) {
-    useOldExpressionParser = enable;
-  };
-  static bool IsUsingOldExpressionParser() { return useOldExpressionParser; };
-
   const gd::String& GetOutput() { return output; };
 
  protected:
@@ -78,7 +73,8 @@ class GD_CORE_API ExpressionCodeGenerator : public ExpressionParser2NodeWorker {
   void OnVisitVariableBracketAccessorNode(
       VariableBracketAccessorNode& node) override;
   void OnVisitIdentifierNode(IdentifierNode& node) override;
-  void OnVisitFunctionNode(FunctionNode& node) override;
+  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override;
+  void OnVisitFunctionCallNode(FunctionCallNode& node) override;
   void OnVisitEmptyNode(EmptyNode& node) override;
 
  private:
@@ -107,11 +103,9 @@ class GD_CORE_API ExpressionCodeGenerator : public ExpressionParser2NodeWorker {
   gd::String output;
   EventsCodeGenerator& codeGenerator;
   EventsCodeGenerationContext& context;
-
-  static bool useOldExpressionParser;
 };
 
 }  // namespace gd
 
 #endif  // GDCORE_ExpressionCodeGenerator_H
-#endif
+#endif

Core/GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.cpp

@@ -1,229 +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 "ExpressionsCodeGeneration.h"
-#include "GDCore/CommonTools.h"
-#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
-#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
-#include "GDCore/Events/Parsers/ExpressionParser.h"
-#include "GDCore/Events/Tools/EventsCodeNameMangler.h"
-#include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
-#include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Metadata/ObjectMetadata.h"
-#include "GDCore/Extensions/Platform.h"
-#include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Project.h"
-
-using namespace std;
-
-namespace gd {
-
-CallbacksForGeneratingExpressionCode::CallbacksForGeneratingExpressionCode(
-    gd::String& plainExpression_,
-    EventsCodeGenerator& codeGenerator_,
-    EventsCodeGenerationContext& context_)
-    : plainExpression(plainExpression_),
-      codeGenerator(codeGenerator_),
-      context(context_) {}
-
-void CallbacksForGeneratingExpressionCode::OnConstantToken(gd::String text) {
-  plainExpression += text;
-};
-
-void CallbacksForGeneratingExpressionCode::OnStaticFunction(
-    gd::String functionName,
-    const std::vector<gd::Expression>& parameters,
-    const gd::ExpressionMetadata& expressionInfo) {
-  codeGenerator.AddIncludeFiles(
-      expressionInfo.codeExtraInformation.GetIncludeFiles());
-
-  // Launch custom code generator if needed
-  if (expressionInfo.codeExtraInformation.HasCustomCodeGenerator()) {
-    plainExpression += expressionInfo.codeExtraInformation.customCodeGenerator(
-        parameters, codeGenerator, context);
-    return;
-  }
-
-  // Special case: For strings expressions, function without name is a string.
-  if (GetReturnType() == "string" && functionName.empty()) {
-    if (parameters.empty()) return;
-    plainExpression +=
-        codeGenerator.ConvertToStringExplicit(parameters[0].GetPlainString());
-
-    return;
-  }
-
-  // Prepare parameters
-  std::vector<gd::String> parametersCode =
-      codeGenerator.GenerateParametersCodes(
-          parameters, expressionInfo.parameters, context);
-  gd::String parametersStr;
-  for (std::size_t i = 0; i < parametersCode.size(); ++i) {
-    if (i != 0) parametersStr += ", ";
-    parametersStr += parametersCode[i];
-  }
-
-  plainExpression += expressionInfo.codeExtraInformation.functionCallName +
-                     "(" + parametersStr + ")";
-};
-
-void CallbacksForGeneratingExpressionCode::OnObjectFunction(
-    gd::String functionName,
-    const std::vector<gd::Expression>& parameters,
-    const gd::ExpressionMetadata& expressionInfo) {
-  const gd::ObjectsContainer& globalObjectsAndGroups = codeGenerator.GetGlobalObjectsAndGroups();
-  const gd::ObjectsContainer& objectsAndGroups = codeGenerator.GetObjectsAndGroups();
-
-  codeGenerator.AddIncludeFiles(
-      expressionInfo.codeExtraInformation.GetIncludeFiles());
-  if (parameters.empty()) return;
-
-  // Launch custom code generator if needed
-  if (expressionInfo.codeExtraInformation.HasCustomCodeGenerator()) {
-    plainExpression += expressionInfo.codeExtraInformation.customCodeGenerator(
-        parameters, codeGenerator, context);
-    return;
-  }
-
-  // Prepare parameters
-  std::vector<gd::String> parametersCode =
-      codeGenerator.GenerateParametersCodes(
-          parameters, expressionInfo.parameters, context);
-  gd::String parametersStr;
-  for (std::size_t i = 1; i < parametersCode.size(); ++i) {
-    if (i != 1) parametersStr += ", ";
-    parametersStr += parametersCode[i];
-  }
-
-  gd::String output = GetReturnType() == "string" ? "\"\"" : "0";
-
-  // Get object(s) concerned by function call
-  std::vector<gd::String> realObjects =
-      codeGenerator.ExpandObjectsName(parameters[0].GetPlainString(), context);
-  for (std::size_t i = 0; i < realObjects.size(); ++i) {
-    context.ObjectsListNeeded(realObjects[i]);
-
-    gd::String objectType = gd::GetTypeOfObject(globalObjectsAndGroups, objectsAndGroups, realObjects[i]);
-    const ObjectMetadata& objInfo = MetadataProvider::GetObjectMetadata(
-        codeGenerator.GetPlatform(), objectType);
-
-    // Build gd::String to access the object
-    codeGenerator.AddIncludeFiles(objInfo.includeFiles);
-    output = codeGenerator.GenerateObjectFunctionCall(
-        realObjects[i],
-        objInfo,
-        expressionInfo.codeExtraInformation,
-        parametersStr,
-        output,
-        context);
-  }
-
-  plainExpression += output;
-};
-
-void CallbacksForGeneratingExpressionCode::OnObjectBehaviorFunction(
-    gd::String functionName,
-    const std::vector<gd::Expression>& parameters,
-    const gd::ExpressionMetadata& expressionInfo) {
-  const gd::ObjectsContainer& globalObjectsAndGroups = codeGenerator.GetGlobalObjectsAndGroups();
-  const gd::ObjectsContainer& objectsAndGroups = codeGenerator.GetObjectsAndGroups();
-
-  codeGenerator.AddIncludeFiles(
-      expressionInfo.codeExtraInformation.GetIncludeFiles());
-  if (parameters.size() < 2) return;
-
-  // Launch custom code generator if needed
-  if (expressionInfo.codeExtraInformation.HasCustomCodeGenerator()) {
-    plainExpression += expressionInfo.codeExtraInformation.customCodeGenerator(
-        parameters, codeGenerator, context);
-    return;
-  }
-
-  // Prepare parameters
-  std::vector<gd::String> parametersCode =
-      codeGenerator.GenerateParametersCodes(
-          parameters, expressionInfo.parameters, context);
-  gd::String parametersStr;
-  for (std::size_t i = 2; i < parametersCode.size(); ++i) {
-    if (i != 2) parametersStr += ", ";
-    parametersStr += parametersCode[i];
-  }
-
-  // Get object(s) concerned by function call
-  std::vector<gd::String> realObjects =
-      codeGenerator.ExpandObjectsName(parameters[0].GetPlainString(), context);
-
-  gd::String output = GetReturnType() == "string" ? "\"\"" : "0";
-  for (std::size_t i = 0; i < realObjects.size(); ++i) {
-    context.ObjectsListNeeded(realObjects[i]);
-
-    // Cast the object if needed
-    gd::String behaviorType =
-        gd::GetTypeOfBehavior(globalObjectsAndGroups, objectsAndGroups, parameters[1].GetPlainString());
-    const BehaviorMetadata& autoInfo = MetadataProvider::GetBehaviorMetadata(
-        codeGenerator.GetPlatform(), behaviorType);
-
-    // Build gd::String to access the behavior
-    codeGenerator.AddIncludeFiles(autoInfo.includeFiles);
-    output = codeGenerator.GenerateObjectBehaviorFunctionCall(
-        realObjects[i],
-        parameters[1].GetPlainString(),
-        autoInfo,
-        expressionInfo.codeExtraInformation,
-        parametersStr,
-        output,
-        context);
-  }
-
-  plainExpression += output;
-};
-
-bool CallbacksForGeneratingExpressionCode::OnSubMathExpression(
-    const gd::Platform& platform,
-    const gd::ObjectsContainer& globalObjectsAndGroups,
-    const gd::ObjectsContainer& objectsAndGroups,
-    gd::Expression& expression) {
-  gd::String newExpression;
-
-  CallbacksForGeneratingExpressionCode callbacks(
-      newExpression, codeGenerator, context);
-
-  gd::ExpressionParser parser(expression.GetPlainString());
-  if (!parser.ParseMathExpression(platform, globalObjectsAndGroups, objectsAndGroups, callbacks)) {
-#if defined(GD_IDE_ONLY)
-    firstErrorStr = callbacks.GetFirstError();
-    firstErrorPos = callbacks.GetFirstErrorPosition();
-#endif
-    return false;
-  }
-
-  return true;
-}
-
-bool CallbacksForGeneratingExpressionCode::OnSubTextExpression(
-    const gd::Platform& platform,
-    const gd::ObjectsContainer& globalObjectsAndGroups,
-    const gd::ObjectsContainer& objectsAndGroups,
-    gd::Expression& expression) {
-  gd::String newExpression;
-
-  CallbacksForGeneratingExpressionCode callbacks(
-      newExpression, codeGenerator, context);
-
-  gd::ExpressionParser parser(expression.GetPlainString());
-  if (!parser.ParseStringExpression(platform, globalObjectsAndGroups, objectsAndGroups, callbacks)) {
-#if defined(GD_IDE_ONLY)
-    firstErrorStr = callbacks.GetFirstError();
-    firstErrorPos = callbacks.GetFirstErrorPosition();
-#endif
-    return false;
-  }
-
-  return true;
-}
-
-}  // namespace gd

Core/GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.h

@@ -1,77 +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 EXPRESSIONSCODEGENERATION_H
-#define EXPRESSIONSCODEGENERATION_H
-
-#include <vector>
-#include "GDCore/Events/Parsers/ExpressionParser.h"
-#include "GDCore/String.h"
-namespace gd {
-class ExpressionMetadata;
-class Expression;
-class Project;
-class Layout;
-class Layout;
-class EventsCodeGenerationContext;
-class EventsCodeGenerator;
-}
-
-namespace gd {
-
-// TODO: Replace and remove (ExpressionCodeGenerator)
-
-/**
- * \brief Used to generate code from expressions.
- *
- * Usage example :
- * \code
- *   gd::String expressionOutputCppCode;
- *
- *   CallbacksForGeneratingExpressionCode callbacks(expressionOutputCppCode,
- * codeGenerator, context); gd::ExpressionParser
- * parser(theOriginalGameDevelopExpression);
- *   parser.ParseStringExpression(platform, project, scene, callbacks);
- *
- *   if (expressionOutputCppCode.empty()) expressionOutputCppCode = "\"\""; //If
- * generation failed, we make sure output code is not empty. \endcode \see
- * EventsCodeGenerator
- */
-class GD_CORE_API CallbacksForGeneratingExpressionCode
-    : public gd::ParserCallbacks {
- public:
-  CallbacksForGeneratingExpressionCode(gd::String& output,
-                                       EventsCodeGenerator& codeGenerator_,
-                                       EventsCodeGenerationContext& context_);
-  virtual ~CallbacksForGeneratingExpressionCode(){};
-
-  void OnConstantToken(gd::String text);
-  void OnStaticFunction(gd::String functionName,
-                        const std::vector<gd::Expression>& parameters,
-                        const gd::ExpressionMetadata& expressionInfo);
-  void OnObjectFunction(gd::String functionName,
-                        const std::vector<gd::Expression>& parameters,
-                        const gd::ExpressionMetadata& expressionInfo);
-  void OnObjectBehaviorFunction(gd::String functionName,
-                                const std::vector<gd::Expression>& parameters,
-                                const gd::ExpressionMetadata& expressionInfo);
-  bool OnSubMathExpression(const gd::Platform& platform,
-                           const gd::ObjectsContainer& project,
-                           const gd::ObjectsContainer& layout,
-                           gd::Expression& expression);
-  bool OnSubTextExpression(const gd::Platform& platform,
-                           const gd::ObjectsContainer& project,
-                           const gd::ObjectsContainer& layout,
-                           gd::Expression& expression);
-
- private:
-  gd::String& plainExpression;
-  EventsCodeGenerator& codeGenerator;
-  EventsCodeGenerationContext& context;
-};
-
-}  // namespace gd
-
-#endif  // EXPRESSIONSCODEGENERATION_H

Core/GDCore/Events/CodeGeneration/VariableParserCallbacks.cpp

@@ -1,68 +0,0 @@
-/*
- * GDevelop C++ Platform
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#if defined(GD_IDE_ONLY)
-#include "VariableParserCallbacks.h"
-#include <string>
-#include <vector>
-#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
-#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
-#include "GDCore/Events/CodeGeneration/ExpressionCodeGenerator.h"
-#include "GDCore/Events/Parsers/VariableParser.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Metadata/ObjectMetadata.h"
-#include "GDCore/Extensions/Platform.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-
-using namespace std;
-
-namespace gd {
-
-VariableCodeGenerationCallbacks::VariableCodeGenerationCallbacks(
-    gd::String& output_,
-    gd::EventsCodeGenerator& codeGenerator_,
-    gd::EventsCodeGenerationContext& context_,
-    const gd::EventsCodeGenerator::VariableScope& scope_)
-    : output(output_),
-      codeGenerator(codeGenerator_),
-      context(context_),
-      scope(scope_) {
-  if (scope == gd::EventsCodeGenerator::OBJECT_VARIABLE) {
-    std::cout << "ERROR: Initializing VariableCodeGenerationCallbacks with "
-                 "OBJECT_VARIABLE without object.";
-  }
-}
-
-VariableCodeGenerationCallbacks::VariableCodeGenerationCallbacks(
-    gd::String& output_,
-    gd::EventsCodeGenerator& codeGenerator_,
-    gd::EventsCodeGenerationContext& context_,
-    const gd::String& object_)
-    : output(output_),
-      codeGenerator(codeGenerator_),
-      context(context_),
-      scope(gd::EventsCodeGenerator::OBJECT_VARIABLE),
-      object(object_) {}
-
-void VariableCodeGenerationCallbacks::OnRootVariable(gd::String variableName) {
-  output += codeGenerator.GenerateGetVariable(variableName, scope, context, object);
-}
-
-void VariableCodeGenerationCallbacks::OnChildVariable(gd::String variableName) {
-  output += codeGenerator.GenerateVariableAccessor(variableName);
-}
-
-void VariableCodeGenerationCallbacks::OnChildSubscript(
-    gd::String stringExpression) {
-  gd::String argumentCode = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-      codeGenerator, context, "string", stringExpression);
-
-  output += codeGenerator.GenerateVariableBracketAccessor(argumentCode);
-}
-
-}
-#endif

Core/GDCore/Events/CodeGeneration/VariableParserCallbacks.h

@@ -1,97 +0,0 @@
-/*
- * GDevelop C++ Platform
- * 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 VARIABLEPARSERCALLBACKS_H
-#define VARIABLEPARSERCALLBACKS_H
-
-#include <string>
-#include <vector>
-#include "GDCore/Events/Parsers/VariableParser.h"
-#include "GDCore/String.h"
-#include "EventsCodeGenerator.h"
-namespace gd {
-class EventsCodeGenerationContext;
-}  // namespace gd
-
-// TODO: Replace and remove (ExpressionCodeGenerator)
-namespace gd {
-
-/**
- * \brief Callbacks called to generate the code for getting a variable.
- *
- * Usage example:
- \code
-    VariableCodeGenerationCallbacks callbacks(output, eventsCodeGenerator,
- context, VariableCodeGenerationCallbacks::LAYOUT_VARIABLE);
-
-    gd::VariableParser parser(parameter);
-    if ( !parser.Parse(callbacks) )
-    {
-        //Error during parsing the variable name:
-        output = "runtimeContext->GetSceneVariables().GetBadVariable()";
-    }
-
-    //"output" now contains the C++ code to return the variable.
- \endcode
- */
-class VariableCodeGenerationCallbacks : public gd::VariableParserCallbacks {
- public:
-  /**
-   * \brief Default constructor for generating code for a layout/global
-   * variable. \param output The string in which the code will be generated.
-   * \param codeGenerator The code generator being used.
-   * \param context The current code generation context.
-   * \param scope The scope of the variable being accessed: LAYOUT_VARIABLE,
-   * PROJECT_VARIABLE.
-   */
-  VariableCodeGenerationCallbacks(gd::String& output,
-                                  gd::EventsCodeGenerator& codeGenerator_,
-                                  gd::EventsCodeGenerationContext& context_,
-                                  const gd::EventsCodeGenerator::VariableScope& scope_);
-  /**
-
-   * \brief Default constructor for generating code for an object variable.
-   * \param output The string in which the code will be generated.
-   * \param codeGenerator The code generator being used.
-   * \param context The current code generation context.
-   * \param object The name of the object
-   */
-  VariableCodeGenerationCallbacks(gd::String& output,
-                                  gd::EventsCodeGenerator& codeGenerator_,
-                                  gd::EventsCodeGenerationContext& context_,
-                                  const gd::String& object);
-
-  /**
-   * \brief Called when the first variable has been parsed.
-   * \param variableName The variable name.
-   */
-  virtual void OnRootVariable(gd::String variableName);
-
-  /**
-   * \brief Called when accessing the child of a structure variable.
-   * \param variableName The child variable name.
-   */
-  virtual void OnChildVariable(gd::String variableName);
-
-  /**
-   * \brief Called when accessing the child of a structure variable using a
-   * string expression in square brackets. \param variableName The expression
-   * used to access the child variable.
-   */
-  virtual void OnChildSubscript(gd::String stringExpression);
-
- private:
-  gd::String& output;
-  gd::EventsCodeGenerator& codeGenerator;
-  gd::EventsCodeGenerationContext& context;
-  gd::EventsCodeGenerator::VariableScope scope;
-  const gd::String object;  ///< The object name, when scope == OBJECT_VARIABLE.
-};
-
-}
-
-#endif  // VARIABLEPARSERCALLBACKS_H
-#endif

Core/GDCore/Events/Event.h

@@ -12,10 +12,10 @@
 #include <vector>
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Events/InstructionsList.h"
+#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/String.h"
 namespace gd {
 class EventsList;
-class MainFrameWrapper;
 class Project;
 class Layout;
 class EventsCodeGenerator;
@@ -90,8 +90,8 @@ class GD_CORE_API BaseEvent {
   bool HasSubEvents() const;
 
   /**
-   * Event must be able to return all conditions std::vector they have.
-   * Used to preprocess the conditions.
+   * \brief Return a list of all conditions of the event.
+   * \note Used to preprocess or search in the conditions.
    */
   virtual std::vector<gd::InstructionsList*> GetAllConditionsVectors() {
     std::vector<gd::InstructionsList*> noConditions;
@@ -104,8 +104,8 @@ class GD_CORE_API BaseEvent {
   };
 
   /**
-   * Event must be able to return all actions std::vector they have.
-   * Used to preprocess the actions.
+   * \brief Return a list of all actions of the event.
+   * \note Used to preprocess or search in the actions.
    */
   virtual std::vector<gd::InstructionsList*> GetAllActionsVectors() {
     std::vector<gd::InstructionsList*> noActions;
@@ -118,15 +118,31 @@ class GD_CORE_API BaseEvent {
   };
 
   /**
-   * Event must be able to return all expressions they have.
-   * Used to preprocess the expressions.
+   * \brief Return a list of all strings of the event.
+   * \note Used to preprocess or search in the event strings.
    */
-  virtual std::vector<gd::Expression*> GetAllExpressions() {
-    std::vector<gd::Expression*> noExpr;
+  virtual std::vector<gd::String> GetAllSearchableStrings() const {
+    std::vector<gd::String> noSearchableStrings;
+    return noSearchableStrings;
+  };
+
+  virtual bool ReplaceAllSearchableStrings(
+      std::vector<gd::String> newSearchableString) {
+    return false;
+  };
+
+  /**
+   * \brief Return a list of all expressions of the event, each with their associated metadata.
+   * \note Used to preprocess or search in the expressions of the event.
+   */
+  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata() {
+    std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> > noExpr;
     return noExpr;
   };
-  virtual std::vector<const gd::Expression*> GetAllExpressions() const {
-    std::vector<const gd::Expression*> noExpr;
+  virtual std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata() const {
+    std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> > noExpr;
     return noExpr;
   };
 

Core/GDCore/Events/EventsList.cpp

@@ -99,6 +99,23 @@ bool EventsList::Contains(const gd::BaseEvent& eventToSearch,
   return false;
 }
 
+bool EventsList::MoveEventToAnotherEventsList(const gd::BaseEvent& eventToMove,
+                                  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];
+      events.erase(events.begin() + i);
+
+      newEventsList.InsertEvent(event, newPosition);
+      return true;
+    }
+  }
+
+  return false;
+}
+
 EventsList::EventsList(const EventsList& other) { Init(other); }
 
 EventsList& EventsList::operator=(const EventsList& other) {

Core/GDCore/Events/EventsList.h

@@ -52,7 +52,8 @@ class GD_CORE_API EventsList {
    * \brief Insert the specified event to the list.
    * \note The event passed by parameter is not copied.
    * \param event The smart pointer to the event that must be inserted into the
-   * list \param position Insertion position. If the position is invalid, the
+   * list
+   * \param position Insertion position. If the position is invalid, the
    * object is inserted at the end of the objects list.
    */
   void InsertEvent(std::shared_ptr<gd::BaseEvent> event,
@@ -142,6 +143,25 @@ class GD_CORE_API EventsList {
    */
   bool Contains(const gd::BaseEvent& eventToSearch,
                 bool recursive = true) const;
+
+  /**
+   * Move the specified event, that must be in the events list, to another
+   * events list *without* invalidating the event (i.e: without
+   * destroying/cloning it) in memory.
+   *
+   * \warning newEventsList is supposed not to be contained inside the event
+   * (you should not try
+   * to move an event inside one of its children/grand children events).
+   *
+   * \param eventToMove The event to be moved
+   * \param newEventsList The new events list
+   * \param newPosition The position in the new events list
+   * \return true if the move was made, false otherwise (for example, if
+   * eventToMove is not found in the list)
+   */
+  bool MoveEventToAnotherEventsList(const gd::BaseEvent& eventToMove,
+                                    gd::EventsList& newEventsList,
+                                    std::size_t newPosition);
   ///@}
 
   /** \name std::vector API compatibility

Core/GDCore/Events/Instruction.cpp

@@ -4,9 +4,12 @@
  * reserved. This project is released under the MIT License.
  */
 #include "GDCore/Events/Instruction.h"
+
 #include <assert.h>
+
 #include <iostream>
 #include <vector>
+
 #include "GDCore/Events/Expression.h"
 #include "GDCore/Events/InstructionsList.h"
 #include "GDCore/String.h"
@@ -15,18 +18,14 @@ namespace gd {
 
 gd::Expression Instruction::badExpression("");
 
-Instruction::Instruction(gd::String type_)
-    : type(type_),
-      inverted(false) {
+Instruction::Instruction(gd::String type_) : type(type_), inverted(false) {
   parameters.reserve(8);
 }
 
 Instruction::Instruction(gd::String type_,
                          const std::vector<gd::Expression>& parameters_,
                          bool inverted_)
-    : type(type_),
-      inverted(inverted_),
-      parameters(parameters_) {
+    : type(type_), inverted(inverted_), parameters(parameters_) {
   parameters.reserve(8);
 }
 
@@ -56,4 +55,17 @@ void Instruction::SetParameter(std::size_t nb, const gd::Expression& val) {
   parameters[nb] = val;
 }
 
+std::shared_ptr<Instruction> GD_CORE_API
+CloneRememberingOriginalElement(std::shared_ptr<Instruction> instruction) {
+  std::shared_ptr<Instruction> copy =
+      std::make_shared<Instruction>(*instruction);
+  // Original instruction is either the original instruction of the copied
+  // instruction, or the instruction copied.
+  copy->originalInstruction = instruction->originalInstruction.expired()
+                                  ? instruction
+                                  : instruction->originalInstruction;
+
+  return copy;
+}
+
 }  // namespace gd

Core/GDCore/Events/Instruction.h

@@ -5,7 +5,9 @@
  */
 #ifndef INSTRUCTION_H
 #define INSTRUCTION_H
+#include <memory>
 #include <vector>
+
 #include "GDCore/Events/Expression.h"
 #include "GDCore/Events/InstructionsList.h"
 #include "GDCore/String.h"
@@ -131,6 +133,17 @@ class GD_CORE_API Instruction {
    */
   inline gd::InstructionsList& GetSubInstructions() { return subInstructions; };
 
+  /**
+   * \brief Return the original instruction this instruction was copied from.
+   *
+   * Useful to get reference to the original instruction in memory during code
+   * generation, to ensure stable unique identifiers.
+   */
+  std::weak_ptr<Instruction> GetOriginalInstruction() { return originalInstruction; };
+
+  friend std::shared_ptr<Instruction> CloneRememberingOriginalElement(
+      std::shared_ptr<Instruction> instruction);
+
  private:
   gd::String type;  ///< Instruction type
   bool inverted;  ///< True if the instruction if inverted. Only applicable for
@@ -139,9 +152,23 @@ class GD_CORE_API Instruction {
       parameters;                        ///< Vector containing the parameters
   gd::InstructionsList subInstructions;  ///< Sub instructions, if applicable.
 
+  std::weak_ptr<Instruction>
+      originalInstruction;  ///< Pointer used to remember which gd::Instruction
+                            ///< this instruction was copied from. Useful to
+                            ///< ensure the stability of code generation (as
+                            ///< some part of code generation uses the pointer
+                            ///< to the instruction as a unique identifier).
+
   static gd::Expression badExpression;
 };
 
+/**
+ * Clone the given instruction, returning an instruction for which
+ * `GetOriginalInstruction()` returns the originally copied instruction.
+ */
+std::shared_ptr<Instruction> GD_CORE_API
+CloneRememberingOriginalElement(std::shared_ptr<Instruction> instruction);
+
 }  // namespace gd
 
 #endif  // INSTRUCTION_H

Core/GDCore/Events/Parsers/ExpressionParser.cpp

@@ -1,897 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "GDCore/Events/Parsers/ExpressionParser.h"
-#include <algorithm>
-#include <iostream>
-#include "GDCore/CommonTools.h"
-#include "GDCore/Events/Expression.h"
-#include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
-#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Platform.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Tools/Localization.h"
-
-using namespace std;
-
-namespace gd {
-
-gd::String ExpressionParser::parserSeparators = " ,+-*/%.<>=&|;()#^![]{}";
-
-size_t ExpressionParser::GetMinimalParametersNumber(
-    const std::vector<gd::ParameterMetadata>& parametersInfos) {
-  size_t nb = 0;
-  for (std::size_t i = 0; i < parametersInfos.size(); ++i) {
-    if (!parametersInfos[i].optional && !parametersInfos[i].codeOnly) nb++;
-  }
-
-  return nb;
-}
-
-size_t ExpressionParser::GetMaximalParametersNumber(
-    const std::vector<gd::ParameterMetadata>& parametersInfos) {
-  size_t nb = 0;
-  for (std::size_t i = 0; i < parametersInfos.size(); ++i) {
-    if (!parametersInfos[i].codeOnly) nb++;
-  }
-
-  return nb;
-}
-
-/**
- * Add blank parameters when code-only parameters are expected.
- * \param Parameters information
- * \param vector of parameters without code only parameters.
- */
-std::vector<gd::Expression> CompleteParameters(
-    const std::vector<gd::ParameterMetadata>& parametersInfo,
-    const std::vector<gd::Expression>& parameters) {
-  std::vector<gd::Expression> completeParameters = parameters;
-  for (std::size_t i = 0; i < parametersInfo.size();
-       ++i)  // Code only parameters are not included in expressions parameters.
-  {
-    if (parametersInfo[i].codeOnly) {
-      if (i > completeParameters.size()) {
-        cout << "Bad parameter count in expression.";
-      }
-
-      if (i >= completeParameters.size())
-        completeParameters.push_back(gd::Expression(""));
-      else
-        completeParameters.insert(completeParameters.begin() + i,
-                                  gd::Expression(""));
-    } else {
-      if (i >= completeParameters.size()) {
-        completeParameters.push_back(gd::Expression(""));
-      }
-    }
-  }
-  return completeParameters;
-}
-
-bool ExpressionParser::ValidSyntax(const gd::String& str) {
-  static const gd::String numerics = "0123456789.e";
-  static const gd::String operators = "+/*-%";
-
-  size_t parenthesisLevel = 0;
-  gd::String lastOperator;
-
-  bool parsingNumber = false;
-  bool parsingScientificNotationNumber = false;
-  bool parsingDecimalNumber = false;
-  bool requestNumber = false;
-  gd::String lastNumber;
-  bool numberWasParsedLast = false;
-
-  for (auto it = str.begin(); it != str.end(); ++it) {
-    char32_t currentChar = *it;
-    if (currentChar == U' ' || currentChar == U'\n') {
-      if (requestNumber) {
-        firstErrorStr = _("Number expected");
-
-        return false;
-      }
-
-      if (parsingNumber) {
-        parsingNumber = false;
-        parsingScientificNotationNumber = false;
-        parsingDecimalNumber = false;
-        requestNumber = false;
-        lastNumber.clear();
-        numberWasParsedLast = true;
-      }
-    } else if (numerics.find(currentChar) != gd::String::npos) {
-      requestNumber = false;
-
-      if (currentChar == U'.') {
-        if (!parsingNumber) {
-          firstErrorStr = _("Syntax error");
-
-          return false;
-        }
-
-        if (parsingDecimalNumber) {
-          firstErrorStr = _("Syntax error in a number.");
-
-          return false;
-        }
-
-        parsingDecimalNumber = true;
-      }
-
-      if (currentChar == U'e') {
-        if (parsingScientificNotationNumber) {
-          firstErrorStr = _("Syntax error in a number.");
-
-          return false;
-        }
-
-        parsingScientificNotationNumber = true;
-        requestNumber = true;
-      }
-
-      if (numberWasParsedLast) {
-        firstErrorStr = _("Operator missing before a number");
-
-        return false;
-      }
-
-      parsingNumber = true;
-      lastNumber += currentChar;
-    } else if (currentChar == U')') {
-      if (requestNumber) {
-        firstErrorStr = _("Number expected");
-
-        return false;
-      }
-
-      if (parsingNumber) {
-        parsingNumber = false;
-        parsingScientificNotationNumber = false;
-        parsingDecimalNumber = false;
-        lastNumber.clear();
-        numberWasParsedLast = true;
-      }
-
-      if (!numberWasParsedLast) {
-        firstErrorStr = _("Superfluous operator before a paranthesis");
-
-        return false;
-      }
-
-      if (parenthesisLevel > 0)
-        parenthesisLevel--;
-      else {
-        firstErrorStr = _("Bad closing paranthesis");
-
-        return false;
-      }
-
-      auto previousIt = it;
-      --previousIt;
-      if (*previousIt == U'(') {
-        firstErrorStr = _("Empty paranthesis");
-
-        return false;
-      }
-    } else if (currentChar == U'(') {
-      if (requestNumber) {
-        firstErrorStr = _("Number expected");
-
-        return false;
-      }
-
-      if (parsingNumber) {
-        parsingNumber = false;
-        parsingScientificNotationNumber = false;
-        parsingDecimalNumber = false;
-        lastNumber.clear();
-        numberWasParsedLast = true;
-      }
-
-      if (numberWasParsedLast) {
-        firstErrorStr = _("Operator missing before a paranthesis");
-
-        return false;
-      }
-
-      parenthesisLevel++;
-      numberWasParsedLast = false;
-    } else if (operators.find(currentChar) != gd::String::npos) {
-      if (currentChar == U'-' && parsingNumber &&
-          parsingScientificNotationNumber) {
-        lastNumber += currentChar;
-        requestNumber = true;
-      } else {
-        if (requestNumber) {
-          firstErrorStr = _("Number expected");
-
-          return false;
-        }
-
-        if (parsingNumber) {
-          parsingNumber = false;
-          parsingScientificNotationNumber = false;
-          parsingDecimalNumber = false;
-          lastNumber.clear();
-          numberWasParsedLast = true;
-        }
-
-        if (currentChar != U'-' && currentChar != U'+' &&
-            !numberWasParsedLast) {
-          firstErrorStr = _("Operators without any number between them");
-
-          return false;
-        }
-
-        numberWasParsedLast = false;
-      }
-    } else {
-      firstErrorStr = _("Syntax error");
-
-      return false;
-    }
-  }
-
-  if (parsingNumber) {
-    parsingNumber = false;
-    parsingScientificNotationNumber = false;
-    parsingDecimalNumber = false;
-    lastNumber.clear();
-    numberWasParsedLast = true;
-  } else if (requestNumber) {
-    firstErrorStr = _("Number expected");
-
-    return false;
-  }
-
-  if (parenthesisLevel != 0) {
-    firstErrorStr = _("Paranthesis mismatch");
-
-    return false;
-  }
-
-  if (!numberWasParsedLast) {
-    firstErrorStr = _("Alone operator at the end of the expression");
-
-    return false;
-  }
-
-  return true;
-}
-
-bool ExpressionParser::ParseMathExpression(const gd::Platform& platform,
-                                           const gd::ObjectsContainer& project,
-                                           const gd::ObjectsContainer& layout,
-                                           gd::ParserCallbacks& callbacks) {
-  callbacks.SetReturnType("expression");
-  gd::String expression = expressionPlainString;
-
-  size_t parsePosition = 0;
-
-  size_t firstPointPos = expression.find(".");
-  size_t firstParPos = expression.find("(");
-
-  gd::String expressionWithoutFunctions;
-  gd::String nonFunctionToken;
-  size_t nonFunctionTokenStartPos = gd::String::npos;
-
-  while (firstPointPos != string::npos || firstParPos != string::npos) {
-    // Identify name
-    size_t nameEnd = firstPointPos < firstParPos ? firstPointPos : firstParPos;
-    size_t nameStart = expression.find_last_of(parserSeparators, nameEnd - 1);
-    nameStart++;
-
-    gd::String nameBefore = expression.substr(nameStart, nameEnd - nameStart);
-    gd::String objectName = nameBefore.FindAndReplace("~", " ");
-
-    // Identify function name
-    gd::String functionName = nameBefore;
-    size_t functionNameEnd = nameEnd;
-    vector<gd::Expression> parameters;
-
-    bool nameIsFunction = firstPointPos > firstParPos;
-    if (!nameIsFunction) {
-      parameters.push_back(gd::Expression(objectName));
-      functionNameEnd = expression.find_first_of(" (", nameEnd);
-      if (nameEnd + 1 < expression.length())
-        functionName =
-            expression.substr(nameEnd + 1, functionNameEnd - (nameEnd + 1));
-      if (functionNameEnd == string::npos) {
-        functionName = "";
-        functionNameEnd = expression.length() - 1;
-      }
-    }
-
-    // Now we're going to identify the expression
-    gd::ExpressionMetadata instructionInfos;
-
-    if (functionName.substr(0, functionName.length() - 1)
-            .find_first_of(parserSeparators) == string::npos) {
-      bool functionFound = false;
-      bool staticFunctionFound = false;
-      bool objectFunctionFound = false;
-      bool behaviorFunctionFound = false;
-
-      // First try to bind to a static expression
-      if (nameIsFunction &&
-          MetadataProvider::HasExpression(platform, functionName)) {
-        functionFound = true;
-        staticFunctionFound = true;
-        instructionInfos =
-            MetadataProvider::GetExpressionMetadata(platform, functionName);
-      }
-      // Then search in object expression
-      else if (!nameIsFunction &&
-               MetadataProvider::HasObjectExpression(
-                   platform,
-                   gd::GetTypeOfObject(project, layout, objectName),
-                   functionName)) {
-        functionFound = true;
-        objectFunctionFound = true;
-        instructionInfos = MetadataProvider::GetObjectExpressionMetadata(
-            platform,
-            gd::GetTypeOfObject(project, layout, objectName),
-            functionName);
-      }
-      // And in behaviors expressions
-      else if (!nameIsFunction) {
-        size_t firstDoublePoints = functionName.find("::");
-        if (firstDoublePoints != string::npos) {
-          gd::String autoName = functionName.substr(0, firstDoublePoints);
-          if (firstDoublePoints + 2 < functionName.length())
-            functionName = functionName.substr(firstDoublePoints + 2,
-                                               functionName.length());
-          else
-            functionName = "";
-
-          if (MetadataProvider::HasBehaviorExpression(
-                  platform,
-                  gd::GetTypeOfBehavior(project, layout, autoName),
-                  functionName)) {
-            parameters.push_back(gd::Expression(autoName));
-            functionFound = true;
-            behaviorFunctionFound = true;
-
-            instructionInfos = MetadataProvider::GetBehaviorExpressionMetadata(
-                platform,
-                gd::GetTypeOfBehavior(project, layout, autoName),
-                functionName);
-
-            // Verify that object has behavior.
-            vector<gd::String> behaviors =
-                gd::GetBehaviorsOfObject(project, layout, objectName);
-            if (find(behaviors.begin(), behaviors.end(), autoName) ==
-                behaviors.end()) {
-              cout << "Bad behavior requested" << endl;
-              functionFound = false;
-            }
-          }
-        }
-      }
-
-      if (functionFound)  // Add the function
-      {
-        // Identify parameters
-        size_t parametersEnd = expression.find_first_of("(", functionNameEnd);
-        gd::String currentParameterStr;
-        char32_t previousChar = '(';
-        bool takeSymbolsInAccount = true;
-        if (parametersEnd != string::npos) {
-          size_t level = 0;
-          parametersEnd++;
-
-          while (parametersEnd < expression.length() &&
-                 !(expression[parametersEnd] == ')' && level == 0)) {
-            // Be sure we are not in quotes
-            if (expression[parametersEnd] == U'\"' && previousChar != U'\\')
-              takeSymbolsInAccount = !takeSymbolsInAccount;
-
-            // So as to be sure paranthesis don't belong to a parameter
-            if (expression[parametersEnd] == U'(' && takeSymbolsInAccount)
-              level++;
-            if (expression[parametersEnd] == U')' && takeSymbolsInAccount)
-              level--;
-
-            // Add the character to the current parameter or terminate the
-            // latter
-            if ((expression[parametersEnd] == U',' && level == 0) &&
-                takeSymbolsInAccount) {
-              parameters.push_back(currentParameterStr);
-              currentParameterStr.clear();
-            } else
-              currentParameterStr += expression[parametersEnd];
-
-            previousChar = expression[parametersEnd];
-            parametersEnd++;
-          }
-          if (currentParameterStr.find_first_not_of(" ") !=
-              string::npos)  // Add last parameter if needed
-          {
-            parameters.push_back(currentParameterStr);
-          }
-
-          // Testing function call is properly closed
-          if (parametersEnd == expression.length() ||
-              expression[parametersEnd] != U')') {
-            firstErrorStr = _("Paranthesis not closed");
-            firstErrorPos = parametersEnd - 1;
-
-            return false;
-          }
-
-          // Testing the number of parameters
-          if (parameters.size() >
-                  GetMaximalParametersNumber(instructionInfos.parameters) ||
-              parameters.size() <
-                  GetMinimalParametersNumber(instructionInfos.parameters)) {
-            firstErrorPos = functionNameEnd;
-            firstErrorStr = _("Incorrect number of parameters");
-            firstErrorStr += " ";
-            firstErrorStr += _("Expected (maximum) :");
-            firstErrorStr += gd::String::From(
-                GetMaximalParametersNumber(instructionInfos.parameters));
-
-            return false;
-          }
-
-          // Preparing parameters
-          parameters =
-              CompleteParameters(instructionInfos.parameters, parameters);
-          for (std::size_t i = 0; i < instructionInfos.parameters.size(); ++i) {
-            if (!PrepareParameter(platform,
-                                  project,
-                                  layout,
-                                  callbacks,
-                                  parameters[i],
-                                  instructionInfos.parameters[i],
-                                  functionNameEnd))
-              return false;
-          }
-        } else {
-          firstErrorPos = functionNameEnd;
-          firstErrorStr = _("Parameters' parenthesis missing");
-
-          return false;
-        }
-
-        callbacks.OnConstantToken(
-            nonFunctionToken +
-            expression.substr(parsePosition, nameStart - parsePosition));
-        expressionWithoutFunctions +=
-            expression.substr(parsePosition, nameStart - parsePosition);
-        nonFunctionToken.clear();
-        nonFunctionTokenStartPos = gd::String::npos;
-
-        if (objectFunctionFound)
-          callbacks.OnObjectFunction(
-              functionName, parameters, instructionInfos);
-        else if (behaviorFunctionFound)
-          callbacks.OnObjectBehaviorFunction(
-              functionName, parameters, instructionInfos);
-        else if (staticFunctionFound)
-          callbacks.OnStaticFunction(
-              functionName, parameters, instructionInfos);
-
-        if (objectFunctionFound || behaviorFunctionFound || staticFunctionFound)
-          expressionWithoutFunctions += "0";
-
-        parsePosition = parametersEnd + 1;
-        firstPointPos = expression.find(".", parametersEnd + 1);
-        firstParPos = expression.find("(", parametersEnd + 1);
-      } else  // Math function or math constant : Pass it.
-      {
-        nonFunctionToken += expression.substr(
-            parsePosition, functionNameEnd + 1 - parsePosition);
-        expressionWithoutFunctions += expression.substr(
-            parsePosition, functionNameEnd + 1 - parsePosition);
-        nonFunctionTokenStartPos = (nonFunctionTokenStartPos != gd::String::npos
-                                        ? nonFunctionTokenStartPos
-                                        : parsePosition);
-        parsePosition = functionNameEnd + 1;
-        firstPointPos = expression.find(".", functionNameEnd + 1);
-        firstParPos = expression.find("(", functionNameEnd + 1);
-      }
-    } else  // Not a function call : Pass it
-    {
-      nonFunctionToken +=
-          expression.substr(parsePosition, nameEnd + 1 - parsePosition);
-      expressionWithoutFunctions +=
-          expression.substr(parsePosition, nameEnd + 1 - parsePosition);
-      nonFunctionTokenStartPos = (nonFunctionTokenStartPos != gd::String::npos
-                                      ? nonFunctionTokenStartPos
-                                      : parsePosition);
-      parsePosition = nameEnd + 1;
-      firstPointPos = expression.find(".", nameEnd + 1);
-      firstParPos = expression.find("(", nameEnd + 1);
-    }
-  }
-
-  if (parsePosition < expression.length() || !nonFunctionToken.empty())
-    callbacks.OnConstantToken(
-        nonFunctionToken +
-        expression.substr(parsePosition, expression.length()));
-
-  expressionWithoutFunctions +=
-      expression.substr(parsePosition, expression.length());
-
-  return ValidSyntax(expressionWithoutFunctions);
-}
-
-bool ExpressionParser::ParseStringExpression(const gd::Platform& platform,
-                                             const gd::ObjectsContainer& project,
-                                             const gd::ObjectsContainer& layout,
-                                             gd::ParserCallbacks& callbacks) {
-  callbacks.SetReturnType("string");
-  gd::String expression = expressionPlainString;
-
-  size_t parsePosition = 0;
-
-  // Searching for first token.
-  size_t firstPointPos = expression.find(".");
-  size_t firstParPos = expression.find("(");
-  size_t firstQuotePos = expression.find("\"");
-
-  if (firstPointPos == string::npos && firstParPos == string::npos &&
-      firstQuotePos == string::npos) {
-    firstErrorPos = 0;
-    firstErrorStr =
-        _("The expression is invalid or empty. Enter a text ( surrounded by "
-          "quotes ) or a function.");
-
-    return false;
-  }
-
-  while (firstPointPos != string::npos || firstParPos != string::npos ||
-         firstQuotePos != string::npos) {
-    if (firstQuotePos < firstPointPos &&
-        firstQuotePos < firstParPos)  // Adding a constant text
-    {
-      callbacks.OnConstantToken(
-          expression.substr(parsePosition, firstQuotePos - parsePosition));
-
-      // Finding start and end of quotes
-      size_t finalQuotePosition = expression.find("\"", firstQuotePos + 1);
-      while (finalQuotePosition ==
-             expression.find("\\\"", finalQuotePosition - 1) + 1)
-        finalQuotePosition = expression.find("\"", finalQuotePosition + 1);
-
-      if (finalQuotePosition == string::npos) {
-        firstErrorPos = firstQuotePos;
-        firstErrorStr = _("Quotes not closed.");
-
-        return false;
-      }
-
-      // Generating final text, by replacing \" by quotes
-      gd::String finalText = expression.substr(
-          firstQuotePos + 1, finalQuotePosition - (firstQuotePos + 1));
-
-      size_t foundPos = finalText.find("\\\"");
-      while (foundPos != string::npos) {
-        if (foundPos != string::npos) finalText.replace(foundPos, 2, "\"");
-        foundPos = finalText.find("\\\"", foundPos);
-      }
-
-      // Adding constant text instruction
-      //(Function without name is considered as a constant text)
-      vector<gd::Expression> parameters;
-      parameters.push_back(finalText);
-      gd::ExpressionMetadata noParametersInfo;
-
-      callbacks.OnStaticFunction("", parameters, noParametersInfo);
-
-      parsePosition = finalQuotePosition + 1;
-    } else  // Adding a function
-    {
-      // Identify name
-      size_t nameEnd =
-          firstPointPos < firstParPos ? firstPointPos : firstParPos;
-      size_t nameStart = expression.find_last_of(parserSeparators, nameEnd - 1);
-      nameStart++;
-
-      callbacks.OnConstantToken(
-          expression.substr(parsePosition, nameStart - parsePosition));
-
-      gd::String nameBefore = expression.substr(nameStart, nameEnd - nameStart);
-      gd::String objectName = nameBefore.FindAndReplace("~", " ");
-
-      // Identify function name
-      gd::String functionName = nameBefore;
-      size_t functionNameEnd = nameEnd;
-      vector<gd::Expression> parameters;
-
-      bool nameIsFunction = firstPointPos > firstParPos;
-      if (!nameIsFunction) {
-        parameters.push_back(gd::Expression(objectName));
-        functionNameEnd = expression.find_first_of("( ", nameEnd);
-        if (nameEnd + 1 < expression.length())
-          functionName =
-              expression.substr(nameEnd + 1, functionNameEnd - (nameEnd + 1));
-      }
-
-      // Identify parameters
-      size_t parametersEnd = expression.find_first_of("(", functionNameEnd) + 1;
-      char32_t previousChar = U'(';
-      bool takeSymbolsInAccount = true;
-      size_t level = 0;
-      gd::String currentParameterStr;
-      while (parametersEnd < expression.length() &&
-             !(expression[parametersEnd] == U')' && level == 0)) {
-        // Be sure we are not in quotes
-        if (expression[parametersEnd] == U'\"' && previousChar != U'\\')
-          takeSymbolsInAccount = !takeSymbolsInAccount;
-
-        // So as to be sure paranthesis don't belong to a parameter
-        if (expression[parametersEnd] == U'(' && takeSymbolsInAccount) level++;
-        if (expression[parametersEnd] == U')' && takeSymbolsInAccount) level--;
-
-        // Add the character to the current parameter or terminate the latter
-        if ((expression[parametersEnd] == ',' && level == 0) &&
-            takeSymbolsInAccount) {
-          gd::Expression currentParameter(currentParameterStr);
-          parameters.push_back(currentParameter);
-
-          currentParameterStr.clear();
-        } else
-          currentParameterStr += expression[parametersEnd];
-
-        previousChar = expression[parametersEnd];
-        parametersEnd++;
-      }
-
-      if (parametersEnd == expression.length() ||
-          expression[parametersEnd] != U')') {
-        firstErrorPos = parametersEnd - 1;
-        firstErrorStr = _("Paranthesis not closed");
-
-        return false;
-      }
-
-      if (currentParameterStr.find_first_not_of(" ") !=
-          string::npos)  // Add last parameter if needed
-      {
-        gd::Expression lastParameter(currentParameterStr);
-        parameters.push_back(lastParameter);
-      }
-
-      bool functionFound = false;
-
-      // First try to bind to a static str expression
-      if (nameIsFunction &&
-          MetadataProvider::HasStrExpression(platform, functionName)) {
-        functionFound = true;
-        const gd::ExpressionMetadata& expressionInfo =
-            MetadataProvider::GetStrExpressionMetadata(platform, functionName);
-
-        // Testing the number of parameters
-        if (parameters.size() >
-                GetMaximalParametersNumber(expressionInfo.parameters) ||
-            parameters.size() <
-                GetMinimalParametersNumber(expressionInfo.parameters)) {
-          firstErrorPos = functionNameEnd;
-          firstErrorStr = _("Incorrect number of parameters");
-
-          return false;
-        }
-
-        // Preparing parameters
-        parameters = CompleteParameters(expressionInfo.parameters, parameters);
-        for (std::size_t i = 0;
-             i < parameters.size() && i < expressionInfo.parameters.size();
-             ++i) {
-          if (!PrepareParameter(platform,
-                                project,
-                                layout,
-                                callbacks,
-                                parameters[i],
-                                expressionInfo.parameters[i],
-                                functionNameEnd))
-            return false;
-        }
-
-        callbacks.OnStaticFunction(functionName, parameters, expressionInfo);
-      }
-      // Then an object member expression
-      else if (!nameIsFunction &&
-               MetadataProvider::HasObjectStrExpression(
-                   platform,
-                   gd::GetTypeOfObject(project, layout, objectName),
-                   functionName)) {
-        functionFound = true;
-        const gd::ExpressionMetadata& expressionInfo =
-            MetadataProvider::GetObjectStrExpressionMetadata(
-                platform,
-                gd::GetTypeOfObject(project, layout, nameBefore),
-                functionName);
-
-        // Testing the number of parameters
-        if (parameters.size() >
-                GetMaximalParametersNumber(expressionInfo.parameters) ||
-            parameters.size() <
-                GetMinimalParametersNumber(expressionInfo.parameters)) {
-          firstErrorPos = functionNameEnd;
-          firstErrorStr = _("Incorrect number of parameters");
-
-          return false;
-        }
-
-        // Preparing parameters
-        parameters = CompleteParameters(expressionInfo.parameters, parameters);
-        for (std::size_t i = 0;
-             i < parameters.size() && i < expressionInfo.parameters.size();
-             ++i) {
-          if (!PrepareParameter(platform,
-                                project,
-                                layout,
-                                callbacks,
-                                parameters[i],
-                                expressionInfo.parameters[i],
-                                functionNameEnd))
-            return false;
-        }
-
-        callbacks.OnObjectFunction(functionName, parameters, expressionInfo);
-      }
-      // And search behaviors expressions
-      else {
-        size_t firstDoublePoints = functionName.find("::");
-        if (firstDoublePoints != string::npos) {
-          gd::String autoName = functionName.substr(0, firstDoublePoints);
-          if (firstDoublePoints + 2 < functionName.length())
-            functionName = functionName.substr(firstDoublePoints + 2,
-                                               functionName.length());
-          else
-            functionName = "";
-
-          if (MetadataProvider::HasBehaviorStrExpression(
-                  platform,
-                  gd::GetTypeOfBehavior(project, layout, autoName),
-                  functionName)) {
-            parameters.push_back(gd::Expression(autoName));
-            functionFound = true;
-
-            const gd::ExpressionMetadata& expressionInfo =
-                MetadataProvider::GetBehaviorStrExpressionMetadata(
-                    platform,
-                    gd::GetTypeOfBehavior(project, layout, autoName),
-                    functionName);
-
-            // Verify that object has behavior.
-            vector<gd::String> behaviors =
-                gd::GetBehaviorsOfObject(project, layout, objectName);
-            if (find(behaviors.begin(), behaviors.end(), autoName) ==
-                behaviors.end()) {
-              cout << "Bad behavior requested" << endl;
-              functionFound = false;
-            } else {
-              // Testing the number of parameters
-              if (parameters.size() >
-                      GetMaximalParametersNumber(expressionInfo.parameters) ||
-                  parameters.size() <
-                      GetMinimalParametersNumber(expressionInfo.parameters)) {
-                firstErrorPos = functionNameEnd;
-                firstErrorStr = _("Incorrect number of parameters");
-
-                return false;
-              }
-
-              // Preparing parameters
-              parameters =
-                  CompleteParameters(expressionInfo.parameters, parameters);
-              for (std::size_t i = 0; i < parameters.size() &&
-                                      i < expressionInfo.parameters.size();
-                   ++i) {
-                if (!PrepareParameter(platform,
-                                      project,
-                                      layout,
-                                      callbacks,
-                                      parameters[i],
-                                      expressionInfo.parameters[i],
-                                      functionNameEnd))
-                  return false;
-              }
-
-              callbacks.OnObjectBehaviorFunction(
-                  functionName, parameters, expressionInfo);
-            }
-          }
-        }
-      }
-
-      // Note : _No_ support for implicit conversion from math result to string
-
-      if (!functionFound)  // Function was not found
-      {
-        firstErrorPos = nameStart;
-        firstErrorStr = _("Function not recognized.");
-
-        return false;
-      }
-
-      parsePosition = parametersEnd + 1;
-    }
-
-    // Searching for next token
-    size_t firstPlusPos = expression.find("+", parsePosition);
-    firstPointPos = expression.find(".", parsePosition);
-    firstParPos = expression.find("(", parsePosition);
-    firstQuotePos = expression.find("\"", parsePosition);
-
-    // Checking for a + between token
-    if ((firstPointPos != string::npos || firstParPos != string::npos ||
-         firstQuotePos != string::npos)) {
-      size_t nextTokenPos = firstPointPos;
-      if (firstParPos < nextTokenPos) nextTokenPos = firstParPos;
-      if (firstQuotePos < nextTokenPos) nextTokenPos = firstQuotePos;
-
-      if (nextTokenPos < firstPlusPos) {
-        firstErrorPos = nextTokenPos;
-        firstErrorStr = _("Symbol missing between two +.");
-
-        return false;
-      } else if (expression.find("+", firstPlusPos + 1) < nextTokenPos) {
-        firstErrorPos = firstPlusPos;
-        firstErrorStr = _("Symbol missing between two +.");
-
-        return false;
-      }
-    }
-  }
-
-  if (expression.substr(parsePosition, expression.length())
-          .find_first_not_of(" \n") != gd::String::npos) {
-    firstErrorPos = parsePosition;
-    firstErrorStr = _("Bad symbol at the end of the expression.");
-
-    return false;
-  }
-
-  return true;
-}
-
-bool ExpressionParser::PrepareParameter(
-    const gd::Platform& platform,
-    const gd::ObjectsContainer& project,
-    const gd::ObjectsContainer& layout,
-    ParserCallbacks& callbacks,
-    gd::Expression& parameter,
-    const gd::ParameterMetadata& parametersInfo,
-    const size_t positionInExpression) {
-  if (ParameterMetadata::IsExpression("number", parametersInfo.type)) {
-    if (parametersInfo.optional && parameter.GetPlainString().empty())
-      parameter = parametersInfo.defaultValue.empty()
-                      ? gd::Expression("0")
-                      : gd::Expression(parametersInfo.defaultValue);
-
-    if (!callbacks.OnSubMathExpression(platform, project, layout, parameter)) {
-      firstErrorStr = callbacks.firstErrorStr;
-      firstErrorPos = callbacks.firstErrorPos + positionInExpression;
-
-      return false;
-    }
-  } else if (ParameterMetadata::IsExpression("string", parametersInfo.type)) {
-    if (parametersInfo.optional && parameter.GetPlainString().empty())
-      parameter = parametersInfo.defaultValue.empty()
-                      ? gd::Expression("\"\"")
-                      : gd::Expression(parametersInfo.defaultValue);
-
-    if (!callbacks.OnSubTextExpression(platform, project, layout, parameter)) {
-      firstErrorStr = callbacks.firstErrorStr;
-      firstErrorPos = callbacks.firstErrorPos + positionInExpression;
-
-      return false;
-    }
-  }
-
-  return true;
-}
-
-ExpressionParser::ExpressionParser(const gd::String& expressionPlainString_)
-    : expressionPlainString(expressionPlainString_) {}
-
-}  // namespace gd

Core/GDCore/Events/Parsers/ExpressionParser.h

@@ -1,179 +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_EXPRESSIONPARSER_H
-#define GDCORE_EXPRESSIONPARSER_H
-
-#include <vector>
-#include "GDCore/String.h"
-namespace gd {
-class Expression;
-class ParserCallbacks;
-class ObjectsContainer;
-class Platform;
-class ParameterMetadata;
-class ExpressionMetadata;
-}
-
-namespace gd {
-
-/** \brief Parse an expression
- *
- * Parse an expression, calling callbacks when a token is reached
- * \see gd::ParserCallbacks
- */
-class GD_CORE_API ExpressionParser {
- public:
-  ExpressionParser(const gd::String &expressionPlainString_);
-  virtual ~ExpressionParser(){};
-
-  /**
-   * \brief Parse the expression, calling each functor when necessary
-   * \return True if expression was correctly parsed.
-   */
-  bool ParseMathExpression(const gd::Platform &platform,
-                           const gd::ObjectsContainer &project,
-                           const gd::ObjectsContainer &layout,
-                           gd::ParserCallbacks &callbacks);
-
-  /**
-   * \brief Parse the expression, calling each functor when necessary
-   * \return True if expression was correctly parsed.
-   */
-  bool ParseStringExpression(const gd::Platform &platform,
-                             const gd::ObjectsContainer &project,
-                             const gd::ObjectsContainer &layout,
-                             gd::ParserCallbacks &callbacks);
-
-  /**
-   * \brief Return the description of the error that was found
-   */
-  const gd::String &GetFirstError() { return firstErrorStr; }
-
-  /**
-   * \brief Return the position of the error that was found
-   * \return The position, or gd::String::npos if no error is found
-   */
-  size_t GetFirstErrorPosition() { return firstErrorPos; }
-
- private:
-  gd::String firstErrorStr;
-  size_t firstErrorPos;
-
-  /**
-   * Tool function to add a parameter
-   */
-  bool AddParameterToList(const gd::ObjectsContainer &project,
-                          const gd::ObjectsContainer &layout,
-                          ParserCallbacks &,
-                          std::vector<gd::Expression> &parameters,
-                          gd::String parameterStr,
-                          std::vector<gd::ParameterMetadata> parametersInfos,
-                          const size_t positionInExpression);
-
-  /**
-   * Tool function to prepare a parameter
-   */
-  bool PrepareParameter(const gd::Platform &platform,
-                        const gd::ObjectsContainer &project,
-                        const gd::ObjectsContainer &layout,
-                        ParserCallbacks &,
-                        gd::Expression &parameter,
-                        const gd::ParameterMetadata &parametersInfo,
-                        const size_t positionInExpression);
-
-  /**
-   * Return the minimal number of parameters which can be used when calling an
-   * expression ( i.e. ParametersCount-OptionalParameters-CodeOnlyParameters )
-   */
-  size_t GetMinimalParametersNumber(
-      const std::vector<gd::ParameterMetadata> &parametersInfos);
-
-  /**
-   * Return the maximal number of parameters which can be used when calling an
-   * expression ( i.e. ParametersCount-CodeOnlyParameters )
-   */
-  size_t GetMaximalParametersNumber(
-      const std::vector<gd::ParameterMetadata> &parametersInfos);
-
-  bool ValidSyntax(const gd::String &str);
-
-  gd::String expressionPlainString;
-  static gd::String parserSeparators;
-};
-
-/** \brief Callbacks called by parser during parsing
- *
- * Parser will call the appropriate functions during parsing, allowing to do
- * special works. \see gd::ExpressionParser
- */
-class GD_CORE_API ParserCallbacks {
-  friend class ExpressionParser;
-
- public:
-  ParserCallbacks() : returnType("expression"){};
-  virtual ~ParserCallbacks(){};
-
-  /**
-   * \brief Get the type of the expression for which callbacks are used:
-   * "expression" or "string".
-   */
-  const gd::String &GetReturnType() { return returnType; }
-
-  virtual void OnConstantToken(gd::String text) = 0;
-
-  virtual void OnStaticFunction(
-      gd::String functionName,
-      const std::vector<gd::Expression> &parameters,
-      const gd::ExpressionMetadata &expressionInfo) = 0;
-
-  virtual void OnObjectFunction(
-      gd::String functionName,
-      const std::vector<gd::Expression> &parameters,
-      const gd::ExpressionMetadata &expressionInfo) = 0;
-
-  virtual void OnObjectBehaviorFunction(
-      gd::String functionName,
-      const std::vector<gd::Expression> &parameters,
-      const gd::ExpressionMetadata &expressionInfo) = 0;
-
-  virtual bool OnSubMathExpression(const gd::Platform &platform,
-                                   const gd::ObjectsContainer &project,
-                                   const gd::ObjectsContainer &layout,
-                                   gd::Expression &expression) = 0;
-  virtual bool OnSubTextExpression(const gd::Platform &platform,
-                                   const gd::ObjectsContainer &project,
-                                   const gd::ObjectsContainer &layout,
-                                   gd::Expression &expression) = 0;
-
-  /**
-   * \brief Return the description of the error that was found
-   */
-  const gd::String &GetFirstError() { return firstErrorStr; }
-
-  /**
-   * \brief Return the position of the error that was found
-   * \return The position, or gd::String::npos if no error is found
-   */
-  size_t GetFirstErrorPosition() { return firstErrorPos; }
-
- protected:
-  gd::String firstErrorStr;
-  size_t firstErrorPos;
-
- private:
-  /**
-   * \brief Set the return type of the expression: Done by ExpressionParser
-   * according to which Parse* method is called. \see gd::ExpressionParser
-   */
-  void SetReturnType(gd::String type) { returnType = type; }
-
-  gd::String returnType;  // The type of the expression ("expression" (default),
-                          // "string"...)
-};
-
-}  // namespace gd
-
-#endif  // GDEXPRESSIONPARSER_H

Core/GDCore/Events/Parsers/ExpressionParser2.cpp

@@ -4,9 +4,11 @@
  * reserved. This project is released under the MIT License.
  */
 #include "GDCore/Events/Parsers/ExpressionParser2.h"
+
 #include <algorithm>
 #include <memory>
 #include <vector>
+
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/Expression.h"
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
@@ -22,15 +24,6 @@ using namespace std;
 
 namespace gd {
 
-gd::String ExpressionParser2::NUMBER_FIRST_CHAR = ".0123456789";
-gd::String ExpressionParser2::DOT = ".";
-gd::String ExpressionParser2::PARAMETERS_SEPARATOR = ",";
-gd::String ExpressionParser2::QUOTE = "\"";
-gd::String ExpressionParser2::BRACKETS = "()[]{}";
-gd::String ExpressionParser2::EXPRESSION_OPERATORS = "+-<>?^=\\:!";
-gd::String ExpressionParser2::TERM_OPERATORS = "/*";
-gd::String ExpressionParser2::UNARY_OPERATORS = "+-";
-gd::String ExpressionParser2::WHITESPACES = " \n\r";
 gd::String ExpressionParser2::NAMESPACE_SEPARATOR = "::";
 
 ExpressionParser2::ExpressionParser2(
@@ -76,7 +69,9 @@ size_t GetMaximumParametersNumber(
 }  // namespace
 
 std::unique_ptr<ExpressionParserDiagnostic> ExpressionParser2::ValidateFunction(
-    const gd::FunctionNode& function, size_t functionStartPosition) {
+    const gd::String& type,
+    const gd::FunctionCallNode& function,
+    size_t functionStartPosition) {
   if (gd::MetadataProvider::IsBadExpressionMetadata(
           function.expressionMetadata)) {
     return gd::make_unique<ExpressionParserError>(
@@ -88,6 +83,41 @@ std::unique_ptr<ExpressionParserDiagnostic> ExpressionParser2::ValidateFunction(
         GetCurrentPosition());
   }
 
+  // Validate the type of the function
+  const gd::String& returnType = function.expressionMetadata.GetReturnType();
+  if (returnType == "number") {
+    if (type == "string")
+      return RaiseTypeError(
+          _("You tried to use an expression that returns a number, but a "
+            "string is expected. Use `ToString` if you need to convert a "
+            "number to a string."),
+          functionStartPosition);
+    else if (type != "number" && type != "number|string")
+      return RaiseTypeError(_("You tried to use an expression that returns a "
+                              "number, but another type is expected:") +
+                              " " + type,
+                            functionStartPosition);
+  } else if (returnType == "string") {
+    if (type == "number")
+      return RaiseTypeError(
+          _("You tried to use an expression that returns a string, but a "
+            "number is expected. Use `ToNumber` if you need to convert a "
+            "string to a number."),
+          functionStartPosition);
+    else if (type != "string" && type != "number|string")
+      return RaiseTypeError(_("You tried to use an expression that returns a "
+                              "string, but another type is expected:") +
+                              " " + type,
+                            functionStartPosition);
+  } else {
+    if (type != returnType)
+      return RaiseTypeError(
+          _("You tried to use an expression with the wrong return type:") + " " +
+            returnType,
+          functionStartPosition);
+  }
+
+  // Validate parameters count
   size_t minParametersCount = GetMinimumParametersNumber(
       function.expressionMetadata.parameters,
       WrittenParametersFirstIndex(function.objectName, function.behaviorName));
@@ -118,11 +148,14 @@ std::unique_ptr<ExpressionParserDiagnostic> ExpressionParser2::ValidateFunction(
 }
 
 std::unique_ptr<TextNode> ExpressionParser2::ReadText() {
-  SkipWhitespace();
-  if (!IsAnyChar("\"")) {
+  size_t textStartPosition = GetCurrentPosition();
+  SkipAllWhitespaces();
+  if (!CheckIfChar(IsQuote)) {
     auto text = gd::make_unique<TextNode>("");
     text->diagnostic =
         RaiseSyntaxError(_("A text must start with a double quote (\")."));
+    text->location =
+        ExpressionParserLocation(textStartPosition, GetCurrentPosition());
     return text;
   }
   SkipChar();
@@ -157,6 +190,8 @@ std::unique_ptr<TextNode> ExpressionParser2::ReadText() {
   }
 
   auto text = gd::make_unique<TextNode>(parsedText);
+  text->location =
+      ExpressionParserLocation(textStartPosition, GetCurrentPosition());
   if (!textParsingHasEnded) {
     text->diagnostic =
         RaiseSyntaxError(_("A text must end with a double quote (\"). Add a "
@@ -167,28 +202,30 @@ std::unique_ptr<TextNode> ExpressionParser2::ReadText() {
 }
 
 std::unique_ptr<NumberNode> ExpressionParser2::ReadNumber() {
-  SkipWhitespace();
+  size_t numberStartPosition = GetCurrentPosition();
+  SkipAllWhitespaces();
   gd::String parsedNumber;
 
   bool numberHasStarted = false;
   bool digitFound = false;
   bool dotFound = false;
   while (!IsEndReached()) {
-    if (IsAnyChar("0")) {
+    if (CheckIfChar(IsZeroDigit)) {
       numberHasStarted = true;
       digitFound = true;
-      if (!parsedNumber.empty()) { // Ignore leading 0s.
+      if (!parsedNumber.empty()) {  // Ignore leading 0s.
         parsedNumber += GetCurrentChar();
       }
-    } else if (IsAnyChar("123456789")) {
+    } else if (CheckIfChar(IsNonZeroDigit)) {
       numberHasStarted = true;
       digitFound = true;
       parsedNumber += GetCurrentChar();
-    } else if (IsAnyChar(".") && !dotFound) {
+    } else if (CheckIfChar(IsDot) && !dotFound) {
       numberHasStarted = true;
       dotFound = true;
       if (parsedNumber == "") {
-        parsedNumber += "0."; //Normalize by adding a leading 0, only in this case.
+        parsedNumber +=
+            "0.";  // Normalize by adding a leading 0, only in this case.
       } else {
         parsedNumber += ".";
       }
@@ -209,6 +246,8 @@ std::unique_ptr<NumberNode> ExpressionParser2::ReadNumber() {
   // valid in most languages so we allow this.
 
   auto number = gd::make_unique<NumberNode>(parsedNumber);
+  number->location =
+      ExpressionParserLocation(numberStartPosition, GetCurrentPosition());
   if (!numberHasStarted || !digitFound) {
     number->diagnostic = RaiseSyntaxError(
         _("A number was expected. You must enter a number here."));

Core/GDCore/Events/Parsers/ExpressionParser2Node.h

@@ -8,6 +8,7 @@
 
 #include <memory>
 #include <vector>
+
 #include "ExpressionParser2NodeWorker.h"
 #include "GDCore/String.h"
 namespace gd {
@@ -20,10 +21,29 @@ class ExpressionMetadata;
 
 namespace gd {
 
+struct GD_CORE_API ExpressionParserLocation {
+  ExpressionParserLocation() : isValid(false){};
+  ExpressionParserLocation(size_t position)
+      : isValid(true), startPosition(position), endPosition(position){};
+  ExpressionParserLocation(size_t startPosition_, size_t endPosition_)
+      : isValid(true),
+        startPosition(startPosition_),
+        endPosition(endPosition_){};
+  size_t GetStartPosition() const { return startPosition; }
+  size_t GetEndPosition() const { return endPosition; }
+  bool IsValid() const { return isValid; }
+
+ private:
+  bool isValid;
+  size_t startPosition;
+  size_t endPosition;
+};
+
 /**
  * \brief A diagnostic that can be attached to a gd::ExpressionNode.
  */
-struct ExpressionParserDiagnostic {
+struct GD_CORE_API ExpressionParserDiagnostic {
+  virtual ~ExpressionParserDiagnostic() = default;
   virtual bool IsError() { return false; }
   virtual const gd::String &GetMessage() { return noMessage; }
   virtual size_t GetStartPosition() { return 0; }
@@ -36,50 +56,58 @@ struct ExpressionParserDiagnostic {
 /**
  * \brief An error that can be attached to a gd::ExpressionNode.
  */
-struct ExpressionParserError : public ExpressionParserDiagnostic {
+struct GD_CORE_API ExpressionParserError : public ExpressionParserDiagnostic {
   ExpressionParserError(const gd::String &type_,
                         const gd::String &message_,
                         size_t position_)
-      : type(type_),
-        message(message_),
-        startPosition(position_),
-        endPosition(position_){};
+      : type(type_), message(message_), location(position_){};
   ExpressionParserError(const gd::String &type_,
                         const gd::String &message_,
                         size_t startPosition_,
                         size_t endPosition_)
       : type(type_),
         message(message_),
-        startPosition(startPosition_),
-        endPosition(endPosition_){};
+        location(startPosition_, endPosition_){};
   virtual ~ExpressionParserError(){};
 
   bool IsError() override { return true; }
   const gd::String &GetMessage() override { return message; }
-  size_t GetStartPosition() override { return startPosition; }
-  size_t GetEndPosition() override { return endPosition; }
+  size_t GetStartPosition() override { return location.GetStartPosition(); }
+  size_t GetEndPosition() override { return location.GetEndPosition(); }
 
  private:
   gd::String type;
   gd::String message;
-  size_t startPosition;
-  size_t endPosition;
+  ExpressionParserLocation location;
 };
 
 /**
  * \brief The base node, from which all nodes in the tree of
  * an expression inherits from.
  */
-struct ExpressionNode {
+struct GD_CORE_API ExpressionNode {
+  ExpressionNode(const gd::String &type_) : type(type_){};
   virtual ~ExpressionNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker){};
 
   std::unique_ptr<ExpressionParserDiagnostic> diagnostic;
+  ExpressionParserLocation location;  ///< The location of the entire node. Some
+                                      /// nodes might have other locations
+                                      /// stored inside them. For example, a
+                                      /// function can store the position of the
+                                      /// object name, the dot, the function
+                                      /// name, etc...
+
+  gd::String type;  // Actual type of the node.
+                    // "string", "number", type supported by
+                    // gd::ParameterMetadata::IsObject, types supported by
+                    // gd::ParameterMetadata::IsExpression or "unknown".
 };
 
-struct SubExpressionNode : public ExpressionNode {
-  SubExpressionNode(std::unique_ptr<ExpressionNode> expression_)
-      : expression(std::move(expression_)){};
+struct GD_CORE_API SubExpressionNode : public ExpressionNode {
+  SubExpressionNode(const gd::String &type_,
+                    std::unique_ptr<ExpressionNode> expression_)
+      : ExpressionNode(type_), expression(std::move(expression_)){};
   virtual ~SubExpressionNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitSubExpressionNode(*this);
@@ -91,7 +119,9 @@ struct SubExpressionNode : public ExpressionNode {
 /**
  * \brief An operator node. For example: "lhs + rhs".
  */
-struct OperatorNode : public ExpressionNode {
+struct GD_CORE_API OperatorNode : public ExpressionNode {
+  OperatorNode(const gd::String &type_, gd::String::value_type op_)
+      : ExpressionNode(type_), op(op_){};
   virtual ~OperatorNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitOperatorNode(*this);
@@ -105,8 +135,9 @@ struct OperatorNode : public ExpressionNode {
 /**
  * \brief A unary operator node. For example: "-2".
  */
-struct UnaryOperatorNode : public ExpressionNode {
-  UnaryOperatorNode(gd::String::value_type op_) : op(op_){};
+struct GD_CORE_API UnaryOperatorNode : public ExpressionNode {
+  UnaryOperatorNode(const gd::String &type_, gd::String::value_type op_)
+      : ExpressionNode(type_), op(op_){};
   virtual ~UnaryOperatorNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitUnaryOperatorNode(*this);
@@ -118,22 +149,26 @@ struct UnaryOperatorNode : public ExpressionNode {
 
 /**
  * \brief A number node. For example: "123".
+ * Its `type` is always "number".
  */
-struct NumberNode : public ExpressionNode {
-  NumberNode(const gd::String &number_) : number(number_){};
+struct GD_CORE_API NumberNode : public ExpressionNode {
+  NumberNode(const gd::String &number_)
+      : ExpressionNode("number"), number(number_){};
   virtual ~NumberNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitNumberNode(*this);
   };
 
+  //
   gd::String number;
 };
 
 /**
  * \brief A text node. For example: "Hello World".
+ * Its `type` is always "string".
  */
-struct TextNode : public ExpressionNode {
-  TextNode(const gd::String &text_) : text(text_){};
+struct GD_CORE_API TextNode : public ExpressionNode {
+  TextNode(const gd::String &text_) : ExpressionNode("string"), text(text_){};
   virtual ~TextNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitTextNode(*this);
@@ -142,7 +177,9 @@ struct TextNode : public ExpressionNode {
   gd::String text;
 };
 
-struct VariableAccessorOrVariableBracketAccessorNode : public ExpressionNode {
+struct GD_CORE_API VariableAccessorOrVariableBracketAccessorNode : public ExpressionNode {
+  VariableAccessorOrVariableBracketAccessorNode() : ExpressionNode(""){};
+
   std::unique_ptr<VariableAccessorOrVariableBracketAccessorNode> child;
 };
 
@@ -154,29 +191,30 @@ struct VariableAccessorOrVariableBracketAccessorNode : public ExpressionNode {
  * \see gd::VariableAccessorNode
  * \see gd::VariableBracketAccessorNode
  */
-struct VariableNode : public ExpressionNode {
+struct GD_CORE_API VariableNode : public ExpressionNode {
   VariableNode(const gd::String &type_,
                const gd::String &name_,
                const gd::String &objectName_)
-      : type(type_), name(name_), objectName(objectName_){};
+      : ExpressionNode(type_), name(name_), objectName(objectName_){};
   virtual ~VariableNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitVariableNode(*this);
   };
 
-  gd::String type;
   gd::String name;
   gd::String objectName;
 
   std::unique_ptr<VariableAccessorOrVariableBracketAccessorNode>
       child;  // Can be nullptr if no accessor
+
+  ExpressionParserLocation nameLocation;
 };
 
 /**
  * \brief A bracket accessor of a variable. Example: MyChild
  * in MyVariable.MyChild
  */
-struct VariableAccessorNode
+struct GD_CORE_API VariableAccessorNode
     : public VariableAccessorOrVariableBracketAccessorNode {
   VariableAccessorNode(const gd::String &name_) : name(name_){};
   virtual ~VariableAccessorNode(){};
@@ -185,13 +223,15 @@ struct VariableAccessorNode
   };
 
   gd::String name;
+  ExpressionParserLocation nameLocation;
+  ExpressionParserLocation dotLocation;
 };
 
 /**
  * \brief A bracket accessor of a variable. Example: ["MyChild"]
  * (in MyVariable["MyChild"]).
  */
-struct VariableBracketAccessorNode
+struct GD_CORE_API VariableBracketAccessorNode
     : public VariableAccessorOrVariableBracketAccessorNode {
   VariableBracketAccessorNode(std::unique_ptr<ExpressionNode> expression_)
       : expression(std::move(expression_)){};
@@ -203,92 +243,174 @@ struct VariableBracketAccessorNode
   std::unique_ptr<ExpressionNode> expression;
 };
 
-struct IdentifierOrFunctionOrEmptyNode : public ExpressionNode {};
+struct GD_CORE_API IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode
+    : public ExpressionNode {
+  IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(
+      const gd::String &type)
+      : ExpressionNode(type){};
+};
 
 /**
- * \brief An identifier node, usually representing an object.
+ * \brief An identifier node, usually representing an object or a function name.
  */
-struct IdentifierNode : public IdentifierOrFunctionOrEmptyNode {
+struct GD_CORE_API IdentifierNode
+    : public IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode {
   IdentifierNode(const gd::String &identifierName_, const gd::String &type_)
-      : identifierName(identifierName_), type(type_){};
+      : IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(type_),
+        identifierName(identifierName_){};
   virtual ~IdentifierNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitIdentifierNode(*this);
   };
 
   gd::String identifierName;
-  gd::String type;
 };
 
-struct FunctionOrEmptyNode : public IdentifierOrFunctionOrEmptyNode {
-  virtual ~FunctionOrEmptyNode(){};
+struct GD_CORE_API FunctionCallOrObjectFunctionNameOrEmptyNode
+    : public IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode {
+  FunctionCallOrObjectFunctionNameOrEmptyNode(const gd::String &type)
+      : IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(type){};
+  virtual ~FunctionCallOrObjectFunctionNameOrEmptyNode(){};
   void Visit(ExpressionParser2NodeWorker &worker) override{};
 };
 
 /**
- * \brief A function node. For example: "MyExtension::MyFunction(1, 2)".
+ * \brief The name of a function to call on an object or the behavior
+ * For example: "MyObject.Function" or "MyObject.Physics" or
+ * "MyObject.Physics::LinearVelocity".
  */
-struct FunctionNode : public FunctionOrEmptyNode {
-  FunctionNode(const gd::String &type_,
-               std::vector<std::unique_ptr<ExpressionNode>> parameters_,
-               const ExpressionMetadata &expressionMetadata_,
-               const gd::String &functionName_)
-      : type(type_),
+struct GD_CORE_API ObjectFunctionNameNode
+    : public FunctionCallOrObjectFunctionNameOrEmptyNode {
+  ObjectFunctionNameNode(const gd::String &type_,
+                         const gd::String &objectName_,
+                         const gd::String &objectFunctionOrBehaviorName_)
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
+        objectName(objectName_),
+        objectFunctionOrBehaviorName(objectFunctionOrBehaviorName_) {}
+  ObjectFunctionNameNode(const gd::String &type_,
+                         const gd::String &objectName_,
+                         const gd::String &behaviorName_,
+                         const gd::String &behaviorFunctionName_)
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
+        objectName(objectName_),
+        objectFunctionOrBehaviorName(behaviorName_),
+        behaviorFunctionName(behaviorFunctionName_) {}
+  virtual ~ObjectFunctionNameNode(){};
+  virtual void Visit(ExpressionParser2NodeWorker &worker) {
+    worker.OnVisitObjectFunctionNameNode(*this);
+  };
+
+  gd::String objectName;
+  gd::String objectFunctionOrBehaviorName;  ///< Behavior name if
+                                            ///`behaviorFunctionName` is not
+                                            /// empty.
+  gd::String behaviorFunctionName;          ///< If empty, then
+                                    /// objectFunctionOrBehaviorName is filled
+                                    /// with the behavior name.
+
+  ExpressionParserLocation
+      objectNameLocation;  ///< Location of the object name.
+  ExpressionParserLocation
+      objectNameDotLocation;  ///< Location of the "." after the object name.
+  ExpressionParserLocation objectFunctionOrBehaviorNameLocation;  ///< Location
+                                                                  /// of object
+                                                                  /// function
+                                                                  /// name or
+                                                                  /// behavior
+                                                                  /// name.
+  ExpressionParserLocation
+      behaviorNameNamespaceSeparatorLocation;  ///< Location of the "::"
+                                               /// separator, if any.
+  ExpressionParserLocation behaviorFunctionNameLocation;  ///< Location of the
+                                                          /// behavior function
+                                                          /// name, if any.
+};
+
+/**
+ * \brief A function call node (either free function, object function or object
+ * behavior function).
+ * For example: "MyExtension::MyFunction(1, 2)", "MyObject.Function()" or
+ * "MyObject.Physics::LinearVelocity()".
+ */
+struct GD_CORE_API FunctionCallNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
+  /** \brief Construct a free function call node. */
+  FunctionCallNode(const gd::String &type_,
+                   std::vector<std::unique_ptr<ExpressionNode>> parameters_,
+                   const ExpressionMetadata &expressionMetadata_,
+                   const gd::String &functionName_)
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
         parameters(std::move(parameters_)),
         expressionMetadata(expressionMetadata_),
         functionName(functionName_){};
-  FunctionNode(const gd::String &type_,
-               const gd::String &objectName_,
-               std::vector<std::unique_ptr<ExpressionNode>> parameters_,
-               const ExpressionMetadata &expressionMetadata_,
-               const gd::String &functionName_)
-      : type(type_),
+
+  /** \brief Construct an object function call node. */
+  FunctionCallNode(const gd::String &type_,
+                   const gd::String &objectName_,
+                   std::vector<std::unique_ptr<ExpressionNode>> parameters_,
+                   const ExpressionMetadata &expressionMetadata_,
+                   const gd::String &functionName_)
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
         objectName(objectName_),
         parameters(std::move(parameters_)),
         expressionMetadata(expressionMetadata_),
         functionName(functionName_){};
-  FunctionNode(const gd::String &type_,
-               const gd::String &objectName_,
-               const gd::String &behaviorName_,
-               std::vector<std::unique_ptr<ExpressionNode>> parameters_,
-               const ExpressionMetadata &expressionMetadata_,
-               const gd::String &functionName_)
-      : type(type_),
+
+  /** \brief Construct a behavior function call node. */
+  FunctionCallNode(const gd::String &type_,
+                   const gd::String &objectName_,
+                   const gd::String &behaviorName_,
+                   std::vector<std::unique_ptr<ExpressionNode>> parameters_,
+                   const ExpressionMetadata &expressionMetadata_,
+                   const gd::String &functionName_)
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
         objectName(objectName_),
         behaviorName(behaviorName_),
         parameters(std::move(parameters_)),
         expressionMetadata(expressionMetadata_),
         functionName(functionName_){};
-  virtual ~FunctionNode(){};
+  virtual ~FunctionCallNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
-    worker.OnVisitFunctionNode(*this);
+    worker.OnVisitFunctionCallNode(*this);
   };
 
-  gd::String type;  // This could be removed if the type ("string" or "number")
-                    // was stored in ExpressionMetadata.
   gd::String objectName;
   gd::String behaviorName;
   std::vector<std::unique_ptr<ExpressionNode>> parameters;
   const ExpressionMetadata &expressionMetadata;
   gd::String functionName;
+
+  ExpressionParserLocation
+      functionNameLocation;  ///< Location of the function name.
+  ExpressionParserLocation
+      objectNameLocation;  ///< Location of the object name, if any.
+  ExpressionParserLocation
+      objectNameDotLocation;  ///< Location of the "." after the object name.
+  ExpressionParserLocation
+      behaviorNameLocation;  ///< Location of the behavior name, if any.
+  ExpressionParserLocation
+      behaviorNameNamespaceSeparatorLocation;  ///< Location of the "::"
+                                               /// separator, if any.
+  ExpressionParserLocation
+      openingParenthesisLocation;  ///< Location of the "(".
+  ExpressionParserLocation
+      closingParenthesisLocation;  ///< Location of the ")".
 };
 
 /**
  * \brief An empty node, used when parsing failed/a syntax error was
  * encountered and any other node could not make sense.
  */
-struct EmptyNode : public FunctionOrEmptyNode {
+struct GD_CORE_API EmptyNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
   EmptyNode(const gd::String &type_, const gd::String &text_ = "")
-      : type(type_), text(text_){};
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_), text(text_){};
   virtual ~EmptyNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitEmptyNode(*this);
   };
 
-  gd::String type;
   gd::String text;
 };
 
 }  // namespace gd
 
-#endif
+#endif

Core/GDCore/Events/Parsers/ExpressionParser2NodePrinter.h

@@ -92,7 +92,15 @@ class GD_CORE_API ExpressionParser2NodePrinter
   void OnVisitIdentifierNode(IdentifierNode& node) override {
     output += node.identifierName;
   }
-  void OnVisitFunctionNode(FunctionNode& node) override {
+  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {
+    if (!node.behaviorFunctionName.empty()) {
+      output +=
+          node.objectName + "." + node.objectFunctionOrBehaviorName + "::" + node.behaviorFunctionName;
+    } else {
+      output += node.objectName + "." + node.objectFunctionOrBehaviorName;
+    }
+  };
+  void OnVisitFunctionCallNode(FunctionCallNode& node) override {
     if (!node.behaviorName.empty()) {
       output +=
           node.objectName + "." + node.behaviorName + "::" + node.functionName;

Core/GDCore/Events/Parsers/ExpressionParser2NodeWorker.h

@@ -7,20 +7,21 @@
 #define GDCORE_EXPRESSIONPARSER2NODEWORKER_H
 
 namespace gd {
-class ExpressionNode;
-class SubExpressionNode;
-class OperatorNode;
-class UnaryOperatorNode;
-class NumberNode;
-class TextNode;
-class VariableNode;
-class VariableAccessorNode;
-class VariableBracketAccessorNode;
-class IdentifierOrFunctionOrEmptyNode;
-class IdentifierNode;
-class FunctionOrEmptyNode;
-class FunctionNode;
-class EmptyNode;
+struct ExpressionNode;
+struct SubExpressionNode;
+struct OperatorNode;
+struct UnaryOperatorNode;
+struct NumberNode;
+struct TextNode;
+struct VariableNode;
+struct VariableAccessorNode;
+struct VariableBracketAccessorNode;
+struct IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode;
+struct IdentifierNode;
+struct FunctionCallOrObjectFunctionNameOrEmptyNode;
+struct ObjectFunctionNameNode;
+struct FunctionCallNode;
+struct EmptyNode;
 }  // namespace gd
 
 namespace gd {
@@ -33,20 +34,21 @@ namespace gd {
  * \see gd::ExpressionNode
  */
 class GD_CORE_API ExpressionParser2NodeWorker {
-  friend class ExpressionNode;
-  friend class SubExpressionNode;
-  friend class OperatorNode;
-  friend class UnaryOperatorNode;
-  friend class NumberNode;
-  friend class TextNode;
-  friend class VariableNode;
-  friend class VariableAccessorNode;
-  friend class VariableBracketAccessorNode;
-  friend class IdentifierOrFunctionOrEmptyNode;
-  friend class IdentifierNode;
-  friend class FunctionOrEmptyNode;
-  friend class FunctionNode;
-  friend class EmptyNode;
+  friend struct ExpressionNode;
+  friend struct SubExpressionNode;
+  friend struct OperatorNode;
+  friend struct UnaryOperatorNode;
+  friend struct NumberNode;
+  friend struct TextNode;
+  friend struct VariableNode;
+  friend struct VariableAccessorNode;
+  friend struct VariableBracketAccessorNode;
+  friend struct IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode;
+  friend struct IdentifierNode;
+  friend struct FunctionCallOrObjectFunctionNameOrEmptyNode;
+  friend struct ObjectFunctionNameNode;
+  friend struct FunctionCallNode;
+  friend struct EmptyNode;
 
  public:
   virtual ~ExpressionParser2NodeWorker();
@@ -62,10 +64,11 @@ class GD_CORE_API ExpressionParser2NodeWorker {
   virtual void OnVisitVariableBracketAccessorNode(
       VariableBracketAccessorNode& node) = 0;
   virtual void OnVisitIdentifierNode(IdentifierNode& node) = 0;
-  virtual void OnVisitFunctionNode(FunctionNode& node) = 0;
+  virtual void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) = 0;
+  virtual void OnVisitFunctionCallNode(FunctionCallNode& node) = 0;
   virtual void OnVisitEmptyNode(EmptyNode& node) = 0;
 };
 
 }  // namespace gd
 
-#endif
+#endif

Core/GDCore/Events/Parsers/VariableParser.cpp

@@ -1,141 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "GDCore/Events/Parsers/VariableParser.h"
-#include <vector>
-#include "GDCore/String.h"
-namespace gd {
-class Layout;
-}
-namespace gd {
-class Project;
-}
-namespace gd {
-class Platform;
-}
-#include "GDCore/Tools/Localization.h"
-
-namespace gd {
-
-VariableParser::~VariableParser() {}
-
-bool VariableParser::Parse(VariableParserCallbacks& callbacks_) {
-  callbacks = &callbacks_;
-  rootVariableParsed = false;
-  firstErrorStr.clear();
-  firstErrorPos = 0;
-  currentPositionIt = expression.begin();
-  currentTokenType = TS_INVALID;
-  currentToken.clear();
-  S();
-
-  return firstErrorStr == "";
-}
-
-void VariableParser::ReadToken() {
-  currentTokenType = TS_INVALID;
-  currentToken.clear();
-  while (currentPositionIt != expression.end()) {
-    char32_t currentChar = *currentPositionIt;
-    if (currentChar == U'[' || currentChar == U']' || currentChar == U'.') {
-      if (currentTokenType == TS_VARNAME)
-        return;  // We've parsed a variable name.
-    }
-
-    if (currentChar == U'[') {
-      currentTokenType = TS_OPENING_BRACKET;
-      currentToken.clear();
-      ++currentPositionIt;
-      return;
-    } else if (currentChar == U']') {
-      currentTokenType = TS_CLOSING_BRACKET;
-      currentToken.clear();
-      ++currentPositionIt;
-      return;
-    } else if (currentChar == U'.') {
-      currentTokenType = TS_PERIOD;
-      currentToken.clear();
-      ++currentPositionIt;
-      return;
-    }
-
-    currentTokenType = TS_VARNAME;  // We're parsing a variable name.
-    currentToken.push_back(currentChar);
-    ++currentPositionIt;
-  }
-
-  // Can be reached if we are at the end of the expression. In this case,
-  // currentTokenType will be either TS_VARNAME or TS_INVALID.
-}
-
-void VariableParser::S() {
-  ReadToken();
-  if (currentTokenType != TS_VARNAME) {
-    firstErrorStr = _("Expecting a variable name.");
-    firstErrorPos = std::distance<gd::String::const_iterator>(
-        expression.begin(), currentPositionIt);
-    return;
-  }
-
-  if (!rootVariableParsed) {
-    rootVariableParsed = true;
-    if (callbacks) callbacks->OnRootVariable(currentToken);
-  } else if (callbacks)
-    callbacks->OnChildVariable(currentToken);
-
-  X();
-}
-
-void VariableParser::X() {
-  ReadToken();
-  if (currentTokenType == TS_INVALID)
-    return;  // Ended parsing.
-  else if (currentTokenType == TS_PERIOD)
-    S();
-  else if (currentTokenType == TS_OPENING_BRACKET) {
-    gd::String strExpr = SkipStringExpression();
-
-    ReadToken();
-    if (currentTokenType != TS_CLOSING_BRACKET) {
-      firstErrorStr = _("Expecting ]");
-      firstErrorPos = std::distance<gd::String::const_iterator>(
-          expression.begin(), currentPositionIt);
-      return;
-    }
-    if (callbacks) callbacks->OnChildSubscript(strExpr);
-    X();
-  }
-}
-
-gd::String VariableParser::SkipStringExpression() {
-  gd::String stringExpression;
-  bool insideStringLiteral = false;
-  bool lastCharacterWasBackslash = false;
-  unsigned int nestedBracket = 0;
-  while (currentPositionIt != expression.end()) {
-    char32_t currentChar = *currentPositionIt;
-    if (currentChar == U'\"') {
-      if (!insideStringLiteral)
-        insideStringLiteral = true;
-      else if (!lastCharacterWasBackslash)
-        insideStringLiteral = false;
-    } else if (currentChar == U'[' && !insideStringLiteral) {
-      nestedBracket++;
-    } else if (currentChar == U']' && !insideStringLiteral) {
-      if (nestedBracket == 0)
-        return stringExpression;  // Found the end of the string litteral.
-      nestedBracket--;
-    }
-
-    lastCharacterWasBackslash = currentChar == U'\\';
-    stringExpression.push_back(currentChar);
-    ++currentPositionIt;
-  }
-
-  // End of the expression reached (so expression is invalid by the way)
-  return stringExpression;
-}
-
-}  // namespace gd

Core/GDCore/Events/Parsers/VariableParser.h

@@ -1,148 +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_VARIABLEPARSER_H
-#define GDCORE_VARIABLEPARSER_H
-
-#include <vector>
-#include "GDCore/String.h"
-namespace gd {
-class Layout;
-}
-namespace gd {
-class Project;
-}
-namespace gd {
-class Platform;
-}
-namespace gd {
-class VariableParserCallbacks;
-}
-
-namespace gd {
-
-/** \brief Parse a variable expression.
- *
- * Parse an variable expression ( like
-myVariable.child["subchild"+ToString(i)].subsubchild ),
- * calling callbacks when a token is reached.
- *
- * Usage example:
-\code
-    //...
-
-    //VariableCodeGenerationCallbacks is a class inheriting from
-gd::VariableParserCallbacks VariableCodeGenerationCallbacks callbacks(output,
-*this, context, VariableCodeGenerationCallbacks::PROJECT_VARIABLE);
-
-    gd::VariableParser parser(parameter);
-    if ( !parser.Parse(callbacks) )
-        cout << "Error :" << parser.GetFirstError() << " in: "<< parameter <<
-endl;
-\endcode
- *
- * Here is the parsed grammar:   <br>
- * S -> VarName X  <br>
- * X -> e | . S | [StringExpression] X   <br>
- *
- * where e = nothing (end of expression), StringExpression = A valid string
-expression and
- * S is the start.
- *
- * \see gd::VariableParserCallbacks
- */
-class GD_CORE_API VariableParser {
- public:
-  /**
-   * \brief Default constructor
-   * \param expressionPlainString The string representing the expression to be
-   * parsed.
-   */
-  VariableParser(const gd::String& expressionPlainString_)
-      : currentPositionIt(), expression(expressionPlainString_){};
-  virtual ~VariableParser();
-
-  /**
-   * Parse the expression, calling each callback when necessary.
-   * \param callbacks The callbacks to be called.
-   * \return true if expression was correctly parsed.
-   * \see gd::VariableParserCallbacks
-   */
-  bool Parse(VariableParserCallbacks& callbacks);
-
-  /**
-   * \brief Return the description of the error that was found
-   */
-  const gd::String& GetFirstError() { return firstErrorStr; }
-
-  /**
-   * \brief Return the position of the error that was found
-   * \return The position, or gd::String::npos if no error is found
-   */
-  size_t GetFirstErrorPosition() { return firstErrorPos; }
-
-  gd::String firstErrorStr;
-  size_t firstErrorPos;
-
- private:
-  void S();
-  void X();
-
-  /**
-   * \brief Skip the string expression, starting from the current position.
-   * \return The string expression skipped. currentPosition is now put on the
-   * closing bracket.
-   */
-  gd::String SkipStringExpression();
-
-  void ReadToken();
-
-  enum TokenType {
-    TS_PERIOD,
-    TS_OPENING_BRACKET,
-    TS_CLOSING_BRACKET,
-    TS_VARNAME,
-    TS_INVALID
-  };
-
-  TokenType currentTokenType;
-  gd::String currentToken;
-  gd::String::const_iterator currentPositionIt;
-  gd::String expression;
-
-  VariableParserCallbacks* callbacks;
-  bool rootVariableParsed;
-};
-
-/**
- * \brief Callbacks called by VariableParser when parsing a variable expression.
- */
-class GD_CORE_API VariableParserCallbacks {
- public:
-  /**
-   * \brief Called when the first variable has been parsed. ( varName1 in
-   * varName1.child for example. ) \param variableName The variable name.
-   */
-  virtual void OnRootVariable(gd::String variableName) = 0;
-
-  /**
-   * \brief Called when accessing the child of a structure variable. ( child in
-   * varName1.child for example. ) \param variableName The child variable name.
-   */
-  virtual void OnChildVariable(gd::String variableName) = 0;
-
-  /**
-   * \brief Called when accessing the child of a structure variable using a
-   * string expression in square brackets. ( "subscript" in
-   * varName1["subscript"] for example. )
-   *
-   * \param variableName The expression used to access the child variable.
-   */
-  virtual void OnChildSubscript(gd::String stringExpression) = 0;
-};
-
-}  // namespace gd
-
-#endif  // GDEXPRESSIONPARSER_H

Core/GDCore/Events/Tools/EventsCodeNameMangler.cpp

@@ -8,10 +8,15 @@
 #include "GDCore/CommonTools.h"
 #include "GDCore/String.h"
 
-EventsCodeNameMangler *EventsCodeNameMangler::_singleton = NULL;
+EventsCodeNameMangler *EventsCodeNameMangler::_singleton = nullptr;
 
-gd::String EventsCodeNameMangler::GetMangledObjectsListName(
+const gd::String& EventsCodeNameMangler::GetMangledObjectsListName(
     const gd::String &originalObjectName) {
+  auto it = mangledObjectNames.find(originalObjectName);
+  if (it != mangledObjectNames.end()) {
+    return it->second;
+  }
+
   gd::String partiallyMangledName = originalObjectName;
   static const gd::String allowedCharacters =
       "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
@@ -27,11 +32,17 @@ gd::String EventsCodeNameMangler::GetMangledObjectsListName(
     }
   }
 
-  return "GD" + partiallyMangledName + "Objects";
+  mangledObjectNames[originalObjectName] = "GD" + partiallyMangledName + "Objects";
+  return mangledObjectNames[originalObjectName];
 }
 
-gd::String EventsCodeNameMangler::GetExternalEventsFunctionMangledName(
+const gd::String& EventsCodeNameMangler::GetExternalEventsFunctionMangledName(
     const gd::String &externalEventsName) {
+  auto it = mangledExternalEventsNames.find(externalEventsName);
+  if (it != mangledExternalEventsNames.end()) {
+    return it->second;
+  }
+
   gd::String partiallyMangledName = externalEventsName;
   static const gd::String allowedCharacters =
       "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
@@ -47,23 +58,24 @@ gd::String EventsCodeNameMangler::GetExternalEventsFunctionMangledName(
     }
   }
 
-  return "GDExternalEvents" + partiallyMangledName;
+  mangledExternalEventsNames[externalEventsName] = "GDExternalEvents" + partiallyMangledName;
+  return mangledExternalEventsNames[externalEventsName];
 }
 
-gd::String ManObjListName(const gd::String &objectName) {
+const gd::String& ManObjListName(const gd::String &objectName) {
   return EventsCodeNameMangler::Get()->GetMangledObjectsListName(objectName);
 }
 
 EventsCodeNameMangler *EventsCodeNameMangler::Get() {
-  if (NULL == _singleton) _singleton = new EventsCodeNameMangler;
+  if (nullptr == _singleton) _singleton = new EventsCodeNameMangler;
 
   return (static_cast<EventsCodeNameMangler *>(_singleton));
 }
 
 void EventsCodeNameMangler::DestroySingleton() {
-  if (NULL != _singleton) {
+  if (nullptr != _singleton) {
     delete _singleton;
-    _singleton = NULL;
+    _singleton = nullptr;
   }
 }
 

Core/GDCore/Events/Tools/EventsCodeNameMangler.h

@@ -6,26 +6,34 @@
 #if defined(GD_IDE_ONLY)
 #ifndef EVENTSCODENAMEMANGLER_H
 #define EVENTSCODENAMEMANGLER_H
+#include <unordered_map>
 #include "GDCore/String.h"
 
 /**
- * Manage name mangling, so as to ensure all names used in code are valid.
+ * \brief Mangle object names, so as to ensure all names used in code are valid.
  *
  * \see ManObjListName
  */
 class GD_CORE_API EventsCodeNameMangler {
  public:
   /**
-   * Get the mangled name from a name : All characters that are not 0-9, a-z,
+   * Get the mangled name from a name: All characters that are not 0-9, a-z,
    * A-Z or _ are replaced by "_"+AsciiCodeOfTheCharacter.
+   *
+   * The mangled name is memoized as this is intensively used during project
+   * export and events code generation.
    */
-  gd::String GetMangledObjectsListName(const gd::String &originalObjectName);
+  const gd::String &GetMangledObjectsListName(
+      const gd::String &originalObjectName);
 
   /**
    * Get the mangled function name to be used to call external events named \a
    * externalEventsName.
+   *
+   * The mangled name is memoized as this is intensively used during project
+   * export and events code generation.
    */
-  gd::String GetExternalEventsFunctionMangledName(
+  const gd::String &GetExternalEventsFunctionMangledName(
       const gd::String &externalEventsName);
 
   static EventsCodeNameMangler *Get();
@@ -35,14 +43,22 @@ class GD_CORE_API EventsCodeNameMangler {
   EventsCodeNameMangler(){};
   virtual ~EventsCodeNameMangler(){};
   static EventsCodeNameMangler *_singleton;
+
+  std::unordered_map<gd::String, gd::String>
+      mangledObjectNames;  ///< Memoized results of mangling for objects
+  std::unordered_map<gd::String, gd::String>
+      mangledExternalEventsNames;  ///< Memoized results of mangling for
+                                   /// external events
 };
 
 /**
- * Shortcut to
- * EventsCodeNameMangler::Get()->GetMangledObjectsListName(objectName). \see
- * EventsCodeNameMangler \return Mangled object name
+ * Shortcut for
+ * `EventsCodeNameMangler::Get()->GetMangledObjectsListName(objectName)`.
+ *
+ * \see EventsCodeNameMangler
+ * \return Mangled object name
  */
-gd::String GD_CORE_API ManObjListName(const gd::String &objectName);
+const gd::String &GD_CORE_API ManObjListName(const gd::String &objectName);
 
 #endif  // EVENTSCODENAMEMANGLER_H
 #endif

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -11,26 +11,16 @@ namespace gd {
 
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
     gd::PlatformExtension& extension) {
-  extension.SetExtensionInformation(
-      "BuiltinAdvanced",
-      _("Advanced control features"),
-      _("Built-in extension providing advanced control features."),
-      "Florian Rival",
-      "Open source (MIT License)");
-
-#if defined(GD_IDE_ONLY)
   extension
-      .AddCondition("Toujours",
-                    _("Always"),
-                    _("This condition always returns true (or always false, if "
-                      "the condition is inverted)."),
-                    _("Always"),
-                    _("Other"),
-                    "res/conditions/toujours24.png",
-                    "res/conditions/toujours.png")
-      .SetHelpPath("/all-features/advanced-conditions")
-      .AddCodeOnlyParameter("conditionInverted", "")
-      .MarkAsAdvanced();
+      .SetExtensionInformation(
+          "BuiltinAdvanced",
+          _("Event functions"),
+          _("Advanced control features for functions made with events."),
+          "Florian Rival",
+          "Open source (MIT License)")
+      .SetCategory("Advanced");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Event functions"))
+      .SetIcon("res/function32.png");
 
   extension
       .AddAction(
@@ -39,9 +29,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           _("Set the return value of the events function to the specified "
             "number (to be used with \"Expression\" functions)."),
           _("Set return value to number _PARAM0_"),
-          _("Functions"),
-          "res/function24.png",
-          "res/function16.png")
+          "",
+          "res/function32.png",
+          "res/function32.png")
       .SetHelpPath("/events/functions/return")
       .AddParameter("expression", "The number to be returned")
       .MarkAsAdvanced();
@@ -53,9 +43,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           _("Set the return value of the events function to the specified text "
             "(to be used with \"String Expression\" functions)."),
           _("Set return value to text _PARAM0_"),
-          _("Functions"),
-          "res/function24.png",
-          "res/function16.png")
+          "",
+          "res/function32.png",
+          "res/function32.png")
       .SetHelpPath("/events/functions/return")
       .AddParameter("string", "The text to be returned")
       .MarkAsAdvanced();
@@ -66,31 +56,44 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                  _("Set the return value of the Condition events function to "
                    "either true (condition will pass) or false."),
                  _("Set return value of the condition to _PARAM0_"),
-                 _("Functions"),
-                 "res/function24.png",
-                 "res/function16.png")
+                 "",
+                 "res/function32.png",
+                 "res/function32.png")
       .SetHelpPath("/events/functions/return")
       .AddParameter("trueorfalse", "Should the condition be true or false?")
       .MarkAsAdvanced();
 
+  extension
+      .AddCondition("GetArgumentAsBoolean",
+                    _("Check if a function parameter is set to true (or yes)"),
+                    _("Check if the specified function parameter (also called "
+                      "\"argument\") is set to True or Yes. If the argument is "
+                      "a string, an empty string is considered as \"false\". "
+                      "If it's a number, 0 is considered as \"false\"."),
+                    _("Parameter _PARAM0_ is true"),
+                    "",
+                    "res/function32.png",
+                    "res/function32.png")
+      .AddParameter("functionParameterName", "Parameter name")
+      .MarkAsAdvanced();
+
   extension
       .AddExpression(
           "GetArgumentAsNumber",
           _("Get function parameter value"),
           _("Get function parameter (also called \"argument\") value"),
-          _("Functions"),
+          "",
           "res/function16.png")
-      .AddParameter("string", "Parameter name");
+      .AddParameter("functionParameterName", "Parameter name");
 
   extension
       .AddStrExpression(
           "GetArgumentAsString",
           _("Get function parameter text"),
           _("Get function parameter (also called \"argument\") text "),
-          _("Functions"),
+          "",
           "res/function16.png")
-      .AddParameter("string", "Parameter name");
-#endif
+      .AddParameter("functionParameterName", "Parameter name");
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/AllBuiltinExtensions.h

@@ -15,8 +15,6 @@ namespace gd {
  * so that it provides standards events, objects or instructions of an
  * extension.
  *
- * TOOD: Usage example.
- *
  * \ingroup BuiltinExtensions
  */
 class GD_CORE_API BuiltinExtensionsImplementer {
@@ -32,7 +30,6 @@ class GD_CORE_API BuiltinExtensionsImplementer {
   static void ImplementsExternalLayoutsExtension(
       gd::PlatformExtension& extension);
   static void ImplementsFileExtension(gd::PlatformExtension& extension);
-  static void ImplementsJoystickExtension(gd::PlatformExtension& extension);
   static void ImplementsKeyboardExtension(gd::PlatformExtension& extension);
   static void ImplementsMathematicalToolsExtension(
       gd::PlatformExtension& extension);

Core/GDCore/Extensions/Builtin/AudioExtension.cpp

@@ -12,14 +12,18 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation("BuiltinAudio",
-                               _("Audio"),
-                               _("Builtin audio extension"),
-                               "Florian Rival",
-                               "Open source (MIT License)")
-      .SetExtensionHelpPath("/all-features/audio");
+      .SetExtensionInformation(
+          "BuiltinAudio",
+          _("Sounds and musics"),
+          _("GDevelop provides several conditions and actions to play audio "
+            "files. They can be either long musics or short sound effects."),
+          "Florian Rival",
+          "Open source (MIT License)")
+      .SetExtensionHelpPath("/all-features/audio")
+      .SetCategory("Audio");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Sounds and musics"))
+      .SetIcon("res/actions/music24.png");
 
-#if defined(GD_IDE_ONLY)
   extension
       .AddAction("PlaySoundCanal",
                  _("Play a sound on a channel"),
@@ -27,7 +31,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                    "you'll be able to manipulate it."),
                  _("Play the sound _PARAM1_ on the channel _PARAM2_, vol.: "
                    "_PARAM4_, loop: _PARAM3_"),
-                 _("Audio/Sounds on channels"),
+                 _("Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -35,10 +39,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
       .AddParameter("expression", _("Channel identifier"))
       .AddParameter("yesorno", _("Repeat the sound"), "", true)
       .SetDefaultValue("no")
-      .AddParameter(
-          "expression", _("Volume (from 0 to 100, 100 by default)"), "", true)
+      .AddParameter("expression", _("Volume"), "", true)
+      .SetParameterLongDescription(_("From 0 to 100, 100 by default."))
       .SetDefaultValue("100")
-      .AddParameter("expression", _("Pitch (speed) (1 by default)"), "", true)
+      .AddParameter("expression", _("Pitch (speed)"), "", true)
+      .SetParameterLongDescription(_("1 by default."))
       .SetDefaultValue("1")
       .MarkAsAdvanced();
 
@@ -47,7 +52,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Stop the sound of a channel"),
                  _("Stop the sound on the specified channel."),
                  _("Stop the sound of channel _PARAM1_"),
-                 _("Audio/Sounds on channels"),
+                 _("Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -59,7 +64,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Pause the sound of a channel"),
                  _("Pause the sound played on the specified channel."),
                  _("Pause the sound of channel _PARAM1_"),
-                 _("Audio/Sounds on channels"),
+                 _("Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -71,7 +76,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Play the sound of a channel"),
                  _("Play the sound of the channel."),
                  _("Play the sound of channel _PARAM1_"),
-                 _("Audio/Sounds on channels"),
+                 _("Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -85,7 +90,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                    "able to interact with it later."),
                  _("Play the music _PARAM1_ on channel _PARAM2_, vol.: "
                    "_PARAM4_, loop: _PARAM3_"),
-                 _("Audio/Music on channels"),
+                 _("Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -93,10 +98,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
       .AddParameter("expression", _("Channel identifier"))
       .AddParameter("yesorno", _("Repeat the sound"), "", true)
       .SetDefaultValue("no")
-      .AddParameter(
-          "expression", _("Volume (from 0 to 100, 100 by default)"), "", true)
+      .AddParameter("expression", _("Volume"), "", true)
+      .SetParameterLongDescription(_("From 0 to 100, 100 by default."))
       .SetDefaultValue("100")
-      .AddParameter("expression", _("Pitch (speed) (1 by default)"), "", true)
+      .AddParameter("expression", _("Pitch (speed)"), "", true)
+      .SetParameterLongDescription(_("1 by default."))
       .SetDefaultValue("1")
       .MarkAsAdvanced();
 
@@ -105,7 +111,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Stop the music on a channel"),
                  _("Stop the music on the specified channel"),
                  _("Stop the music of channel _PARAM1_"),
-                 _("Audio/Music on channels"),
+                 _("Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -117,7 +123,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Pause the music of a channel"),
                  _("Pause the music on the specified channel."),
                  _("Pause the music of channel _PARAM1_"),
-                 _("Audio/Music on channels"),
+                 _("Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -129,7 +135,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Play the music of a channel"),
                  _("Play the music of the channel."),
                  _("Play the music of channel _PARAM1_"),
-                 _("Audio/Music on channels"),
+                 _("Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -141,134 +147,115 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Volume of the sound on a channel"),
                  _("This action modifies the volume of the sound on the "
                    "specified channel. The volume is between 0 and 100."),
-                 _("Do _PARAM2__PARAM3_ to the volume of the sound on channel "
-                   "_PARAM1_"),
-                 _("Audio/Sounds on channels"),
+                 _("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"))
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .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. The volume is between 0 and 100."),
-                 _("Do _PARAM2__PARAM3_ to the volume of the music on channel "
-                   "_PARAM1_"),
-                 _("Audio/Music on channels"),
+                 _("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"))
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardOperatorParameters("number")
+      .MarkAsAdvanced();
 
   extension
       .AddAction("ModGlobalVolume",
                  _("Game global volume"),
                  _("This action modifies the global volume of the game. The "
                    "volume is between 0 and 100."),
-                 _("Do _PARAM1__PARAM2_ to global sound level"),
-                 _("Audio"),
+                 _("the global sound level"),
+                 "",
                  "res/actions/volume24.png",
                  "res/actions/volume.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
-      .MarkAsSimple()
-      .SetManipulatedType("number");
+      .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.\n1 is the default pitch."),
-                 _("Do _PARAM2__PARAM3_ to the pitch of the sound on channel "
-                   "_PARAM1_"),
-                 _("Audio/Sounds on channels"),
+                 _("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"))
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .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. 1 is the default pitch"),
-                 _("Do _PARAM2__PARAM3_ to the pitch of the music on channel "
-                   "_PARAM1_"),
-                 _("Audio/Music on channels"),
+                 _("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"))
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardOperatorParameters("number")
+      .MarkAsAdvanced();
 
   extension
       .AddAction("ModPlayingOffsetSoundChannel",
                  _("Playing offset of the sound on a channel"),
                  _("This action modifies the playing offset of the sound on a "
                    "channel"),
-                 _("Do _PARAM2__PARAM3_ to the playing offset of the sound on "
-                   "channel _PARAM1_"),
-                 _("Audio/Sounds on channels"),
+                 _("the playing offset of the sound on channel _PARAM1_"),
+                 _("Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardOperatorParameters("number")
+      .MarkAsAdvanced();
 
   extension
       .AddAction("ModPlayingOffsetMusicChannel",
                  _("Playing offset of the music on a channel"),
                  _("This action modifies the playing offset of the music on "
                    "the specified channel"),
-                 _("Do _PARAM2__PARAM3_ to the playing offset of the music on "
-                   "channel _PARAM1_"),
-                 _("Audio/Music on channels"),
+                 _("the playing offset of the music on channel _PARAM1_"),
+                 _("Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardOperatorParameters("number")
+      .MarkAsAdvanced();
 
   extension
       .AddAction("PlaySound",
                  _("Play a sound"),
                  _("Play a sound."),
                  _("Play the sound _PARAM1_, vol.: _PARAM3_, loop: _PARAM2_"),
-                 _("Audio"),
+                 "",
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("soundfile", _("Audio file (or audio resource name)"))
       .AddParameter("yesorno", _("Repeat the sound"), "", true)
       .SetDefaultValue("no")
-      .AddParameter(
-          "expression", _("Volume (from 0 to 100, 100 by default)"), "", true)
+      .AddParameter("expression", _("Volume"), "", true)
+      .SetParameterLongDescription(_("From 0 to 100, 100 by default."))
       .SetDefaultValue("100")
-      .AddParameter("expression", _("Pitch (speed) (1 by default)"), "", true)
+      .AddParameter("expression", _("Pitch (speed)"), "", true)
+      .SetParameterLongDescription(_("1 by default."))
       .SetDefaultValue("1")
       .MarkAsSimple();
 
@@ -277,26 +264,92 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Play a music file"),
                  _("Play a music file."),
                  _("Play the music _PARAM1_, vol.: _PARAM3_, loop: _PARAM2_"),
-                 _("Audio"),
+                 "",
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("musicfile", _("Audio file (or audio resource name)"))
       .AddParameter("yesorno", _("Repeat the sound"), "", true)
       .SetDefaultValue("no")
-      .AddParameter(
-          "expression", _("Volume (from 0 to 100, 100 by default)"), "", true)
+      .AddParameter("expression", _("Volume"), "", true)
+      .SetParameterLongDescription(_("From 0 to 100, 100 by default."))
       .SetDefaultValue("100")
-      .AddParameter("expression", _("Pitch (speed) (1 by default)"), "", true)
+      .AddParameter("expression", _("Pitch (speed)"), "", true)
+      .SetParameterLongDescription(_("1 by default."))
       .SetDefaultValue("1")
       .MarkAsSimple();
 
+  extension
+      .AddAction("PreloadMusic",
+                 _("Preload a music file"),
+                 _("Preload a music file in memory."),
+                 _("Preload the music file _PARAM1_"),
+                 _("Loading"),
+                 "res/actions/music24.png",
+                 "res/actions/music.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("musicfile", _("Audio file (or audio resource name)"))
+      .MarkAsComplex();
+
+  extension
+      .AddAction("PreloadSound",
+                 _("Preload a sound file"),
+                 _("Preload a sound file in memory."),
+                 _("Preload the sound file _PARAM1_"),
+                 _("Loading"),
+                 "res/actions/son24.png",
+                 "res/actions/son.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("soundfile", _("Sound file (or sound resource name)"))
+      .MarkAsComplex();
+
+  extension
+      .AddAction(
+          "UnloadMusic",
+          _("Unload a music file"),
+          _("Unload a music file from memory. "
+            "Unloading a music file will cause any music playing it to stop."),
+          _("Unload the music file _PARAM1_"),
+          _("Loading"),
+          "res/actions/music24.png",
+          "res/actions/music.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("musicfile", _("Audio file (or audio resource name)"))
+      .MarkAsComplex();
+
+  extension
+      .AddAction(
+          "UnloadSound",
+          _("Unload a sound file"),
+          _("Unload a sound file from memory. "
+            "Unloading a sound file will cause any sounds playing it to stop."),
+          _("Unload the sound file _PARAM1_"),
+          _("Loading"),
+          "res/actions/son24.png",
+          "res/actions/son.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("soundfile", _("Sound file (or sound resource name)"))
+      .MarkAsComplex();
+
+  extension
+      .AddAction(
+          "UnloadAllAudio",
+          _("Unload all audio"),
+          _("Unload all the audio in memory. "
+            "This will cause every sound and music of the game to stop."),
+          _("Unload all audio files"),
+          _("Loading"),
+          "res/actions/music24.png",
+          "res/actions/music.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .MarkAsComplex();
+
   extension
       .AddCondition("MusicPlaying",
                     _("A music file is being played"),
                     _("Test if the music on a channel is being played"),
                     _("Music on channel _PARAM1_ is being played"),
-                    _("Audio/Music on channels"),
+                    _("Music on channels"),
                     "res/conditions/musicplaying24.png",
                     "res/conditions/musicplaying.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -308,7 +361,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                     _("A music file is paused"),
                     _("Test if the music on the specified channel is paused."),
                     _("Music on channel _PARAM1_ is paused"),
-                    _("Audio/Music on channels"),
+                    _("Music on channels"),
                     "res/conditions/musicpaused24.png",
                     "res/conditions/musicpaused.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -320,7 +373,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                     _("A music file is stopped"),
                     _("Test if the music on the specified channel is stopped."),
                     _("Music on channel _PARAM1_ is stopped"),
-                    _("Audio/Music on channels"),
+                    _("Music on channels"),
                     "res/conditions/musicstopped24.png",
                     "res/conditions/musicstopped.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -332,7 +385,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                     _("A sound is being played"),
                     _("Test if the sound on a channel is being played."),
                     _("Sound on channel _PARAM1_ is being played"),
-                    _("Audio/Sounds on channels"),
+                    _("Sounds on channels"),
                     "res/conditions/sonplaying24.png",
                     "res/conditions/sonplaying.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -344,7 +397,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                     _("A sound is paused"),
                     _("Test if the sound on the specified channel is paused."),
                     _("Sound on channel _PARAM1_ is paused"),
-                    _("Audio/Sounds on channels"),
+                    _("Sounds on channels"),
                     "res/conditions/sonpaused24.png",
                     "res/conditions/sonpaused.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -356,7 +409,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                     _("A sound is stopped"),
                     _("Test if the sound on the specified channel is stopped."),
                     _("Sound on channel _PARAM1_ is stopped"),
-                    _("Audio/Sounds on channels"),
+                    _("Sounds on channels"),
                     "res/conditions/sonstopped24.png",
                     "res/conditions/sonstopped.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -369,16 +422,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("Volume of the sound on a 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_ is _PARAM2__PARAM3_"),
-          _("Audio/Sounds on channels"),
+          _("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"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Volume to test"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();
 
   extension
       .AddCondition(
@@ -386,30 +437,26 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("Volume of the music on a channel"),
           _("Test the volume of the music on a specified channel. The volume "
             "is between 0 and 100."),
-          _("The volume of the music on channel _PARAM1_ is _PARAM2__PARAM3_"),
-          _("Audio/Music on channels"),
+          _("the volume of the music on channel _PARAM1_"),
+          _("Music on channels"),
           "res/conditions/musicVolume24.png",
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Volume to test"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();
 
   extension
       .AddCondition(
           "GlobalVolume",
           _("Global volume"),
           _("Test the global sound level. The volume is between 0 and 100."),
-          _("The global game volume is _PARAM1__PARAM2_"),
-          _("Audio"),
+          _("the global game volume"),
+          "",
           "res/conditions/volume24.png",
           "res/conditions/volume.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Volume to test"))
-      .SetManipulatedType("number");
+      .UseStandardRelationalOperatorParameters("number");
 
   extension
       .AddCondition(
@@ -417,16 +464,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("Pitch of the sound of a channel"),
           _("Test the pitch of the sound on the specified channel. 1 is the "
             "default pitch."),
-          _("The pitch of the sound on channel _PARAM1_ is _PARAM2__PARAM3_"),
-          _("Audio/Sounds on channels"),
+          _("the pitch of the sound on channel _PARAM1_"),
+          _("Sounds on channels"),
           "res/conditions/sonVolume24.png",
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Pitch to test"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();
 
   extension
       .AddCondition(
@@ -434,50 +479,42 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("Pitch of the music on a 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_ is _PARAM2__PARAM3_"),
-          _("Audio/Music on channels"),
+          _("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"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Pitch to test"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();
 
   extension
       .AddCondition(
           "SoundChannelPlayingOffset",
           _("Playing offset of the sound on a channel"),
           _("Test the playing offset of the sound on the specified channel."),
-          _("The playing offset of the sound on channel _PARAM1_ is "
-            "_PARAM2__PARAM3_"),
-          _("Audio/Sounds on channels"),
+          _("the playing offset of the sound on channel _PARAM1_"),
+          _("Sounds on channels"),
           "res/conditions/sonVolume24.png",
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Playing position (in seconds)"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();
 
   extension
       .AddCondition(
           "MusicChannelPlayingOffset",
           _("Playing offset of the music on a channel"),
           _("Test the playing offset of the music on the specified channel."),
-          _("The playing offset of the music on channel _PARAM1_ is "
-            "_PARAM2__PARAM3_"),
-          _("Audio/Music on channels"),
+          _("the playing offset of the music on channel _PARAM1_"),
+          _("Music on channels"),
           "res/conditions/musicVolume24.png",
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Playing position (in seconds)"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();
 
   extension
       .AddExpression("SoundChannelPlayingOffset",
@@ -540,8 +577,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                      _("Sound level"),
                      "res/conditions/volume.png")
       .AddCodeOnlyParameter("currentScene", "");
-
-#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -4,6 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 #include "GDCore/Tools/Localization.h"
 
 using namespace std;
@@ -12,172 +13,123 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation("BuiltinCamera",
-                               _("Cameras and layers features"),
-                               _("Built-in camera extension"),
-                               "Florian Rival",
-                               "Open source (MIT License)")
+      .SetExtensionInformation(
+          "BuiltinCamera",
+          _("Layers and cameras"),
+          "Each scene can be composed of multiple layers. These conditions "
+          "and actions allow to manipulate them during the game. In "
+          "particular, you can move the camera of a layer to center it on an "
+          "object or a position.",
+          "Florian Rival",
+          "Open source (MIT License)")
       .SetExtensionHelpPath("/interface/scene-editor/layers-and-cameras");
-
-#if defined(GD_IDE_ONLY)
-  extension
-      .AddCondition("CameraX",
-                    _("Camera center X position"),
-                    _("Compare the X position of the center of a camera."),
-                    _("X position of camera _PARAM4_ is _PARAM1__PARAM2_ "
-                      "(layer: _PARAM3_)"),
-                    _("Layers and cameras"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Value to compare"))
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0")
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Layers and cameras"))
+      .SetIcon("res/conditions/camera24.png");
 
   extension
-      .AddCondition("CameraY",
-                    _("Camera center Y position"),
-                    _("Compare the Y position of the center of a camera."),
-                    _("The Y position of camera _PARAM4_ is _PARAM1__PARAM2_ "
-                      "(layer: _PARAM3_)"),
-                    _("Layers and cameras"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Value to compare"))
-      .AddParameter("layer", _("Layer (base layer if empty)"))
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"))
-      .SetDefaultValue("0")
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
-
-  extension
-      .AddAction(
+      .AddExpressionAndConditionAndAction(
+          "number",
           "CameraX",
           _("Camera center X position"),
-          _("Change the X position of the center of the specified camera."),
-          _("Do _PARAM1__PARAM2_ to X position of camera _PARAM4_ (layer: "
-            "_PARAM3_)"),
-          _("Layers and cameras"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          _("the X position of the center of a camera"),
+          _("the X position of camera _PARAM4_ (layer: _PARAM3_)"),
+          "",
+          "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
+      .UseStandardParameters("number")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .MarkAsAdvanced();
+
+  extension.AddDuplicatedAction("CameraX", "SetCameraX")
+      .SetHidden();  // Deprecated
+  extension.AddDuplicatedExpression("VueX", "CameraX")
+      .SetHidden();  // Deprecated
 
   extension
-      .AddAction(
+      .AddExpressionAndConditionAndAction(
+          "number",
           "CameraY",
           _("Camera center Y position"),
-          _("Change the Y position of the center of the specified camera."),
-          _("Do _PARAM1__PARAM2_ to Y position of camera _PARAM4_ (layer: "
-            "_PARAM3_)"),
-          _("Layers and cameras"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          _("the Y position of the center of a camera"),
+          _("the Y position of camera _PARAM4_ (layer: _PARAM3_)"),
+          "",
+          "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
+      .UseStandardParameters("number")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .MarkAsAdvanced();
+
+  extension.AddDuplicatedAction("CameraY", "SetCameraY")
+      .SetHidden();  // Deprecated
+  extension.AddDuplicatedExpression("VueY", "CameraY")
+      .SetHidden();  // Deprecated
 
   extension
-      .AddCondition("CameraWidth",
-                    _("Width of a camera"),
-                    _("Test the width of a camera of a layer"),
-                    _("The width of camera _PARAM2_ of layer _PARAM1_ is "
-                      "_PARAM3__PARAM4_"),
-                    _("Layers and cameras"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Value to compare"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
-
-  extension
-      .AddCondition("CameraHeight",
-                    _("Height of a camera"),
-                    _("Test the height of a camera of a layer"),
-                    _("The height of camera _PARAM2_ of layer _PARAM1_ is "
-                      "_PARAM3__PARAM4_"),
-                    _("Layers and cameras"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
+      .AddExpressionAndCondition(
+          "number",
+          "CameraWidth",
+          _("Width of a camera"),
+          _("the width of a camera of a layer"),
+          _("the width of camera _PARAM2_ of layer _PARAM1_"),
+          "",
+          "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Value to compare"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardParameters("number")
+      .MarkAsAdvanced();
 
   extension
-      .AddCondition("CameraAngle",
-                    _("Angle of a camera of a layer"),
-                    _("Test a camera angle."),
-                    _("Angle of camera is _PARAM1__PARAM2_ (layer: _PARAM3_, "
-                      "camera: _PARAM4_)"),
-                    _("Layers and cameras"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
+      .AddExpressionAndCondition(
+          "number",
+          "CameraHeight",
+          _("Height of a camera"),
+          _("the height of a camera of a layer"),
+          _("the height of camera _PARAM2_ of layer _PARAM1_"),
+          "",
+          "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Value to compare"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number"))
+      .UseStandardParameters("number")
+      .MarkAsAdvanced();
+
+  extension
+      .AddExpressionAndConditionAndAction(
+          "number",
+          "CameraAngle",
+          _("Angle of a camera of a layer"),
+          _("the angle of rotation of a camera"),
+          _("the angle of camera (layer: _PARAM3_, camera: _PARAM4_)"),
+          "",
+          "res/conditions/camera24.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .UseStandardParameters("number")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .MarkAsAdvanced();
 
-  extension
-      .AddAction("RotateCamera",
-                 _("Change camera angle"),
-                 _("This action modifies the angle of a camera in the "
-                   "specified layer."),
-                 _("Do _PARAM1__PARAM2_ to angle of camera (layer: _PARAM3_, "
-                   "camera: _PARAM4_)"),
-                 _("Layers and cameras"),
-                 "res/actions/camera24.png",
-                 "res/actions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0")
-      .SetManipulatedType("number");
+  extension.AddDuplicatedAction("RotateCamera", "SetCameraAngle").SetHidden();
+  extension.AddDuplicatedExpression("CameraRotation", "CameraAngle")
+      .SetHidden();
+  extension.AddDuplicatedExpression("VueRotation", "CameraAngle").SetHidden();
 
   extension
       .AddAction("AddCamera",
                  _("Add a camera to a layer"),
                  _("This action adds a camera to a layer"),
                  _("Add a camera to layer _PARAM1_"),
-                 _("Layers and cameras"),
+                 "",
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -212,7 +164,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Delete a camera of a layer"),
                  _("Remove the specified camera from a layer"),
                  _("Delete camera _PARAM2_ from layer _PARAM1_"),
-                 _("Layers and cameras"),
+                 "",
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -228,7 +180,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                    "layer. The zoom will be reset."),
                  _("Change the size of camera _PARAM2_ of _PARAM1_ to "
                    "_PARAM3_*_PARAM4_"),
-                 _("Layers and cameras"),
+                 "",
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -246,7 +198,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                    "specified layer."),
                  _("Set the render zone of camera _PARAM2_ from layer _PARAM1_ "
                    "to _PARAM3_;_PARAM4_ _PARAM5_;_PARAM6_"),
-                 _("Layers and cameras"),
+                 "",
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -269,11 +221,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
 
   extension
       .AddAction("ZoomCamera",
+                 _("Change camera zoom"),
                  _("Change camera zoom."),
-                 _("Change camera zoom."),
-                 _("Change camera zoom to _PARAM1_ (layer : _PARAM2_, camera : "
+                 _("Change camera zoom to _PARAM1_ (layer: _PARAM2_, camera: "
                    "_PARAM3_)"),
-                 _("Layers and cameras"),
+                 "",
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -284,6 +236,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
+  // TODO Deprecated: hide this action in a future release.
   extension
       .AddAction(
           "FixCamera",
@@ -292,7 +245,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
             "specified limits."),
           _("Center the camera on _PARAM1_ (limit : from _PARAM2_;_PARAM3_ to "
             "_PARAM4_;_PARAM5_) (layer: _PARAM7_, camera: _PARAM8_)"),
-          _("Layers and cameras"),
+          "",
           "res/actions/camera24.png",
           "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -316,13 +269,38 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .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")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("expression",
+                    _("Left bound X Position"))
+      .AddParameter("expression",
+                    _("Top bound Y Position"))
+      .AddParameter("expression",
+                    _("Right bound X Position"))
+      .AddParameter("expression",
+                    _("Bottom bound Y Position"))
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .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_, camera: _PARAM4_)"),
-          _("Layers and cameras"),
+          _("Center camera on _PARAM1_ (layer: _PARAM3_)"),
+          "",
           "res/actions/camera24.png",
           "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -343,7 +321,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Show a layer"),
                  _("Show a layer."),
                  _("Show layer _PARAM1_"),
-                 _("Layers and cameras"),
+                 "",
                  "res/actions/layer24.png",
                  "res/actions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -356,7 +334,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Hide a layer"),
                  _("Hide a layer."),
                  _("Hide layer _PARAM1_"),
-                 _("Layers and cameras"),
+                 "",
                  "res/actions/layer24.png",
                  "res/actions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -369,7 +347,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     _("Visibility of a layer"),
                     _("Test if a layer is set as visible."),
                     _("Layer _PARAM1_ is visible"),
-                    _("Layers and cameras"),
+                    "",
                     "res/conditions/layer24.png",
                     "res/conditions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -380,48 +358,86 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
   extension
       .AddAction(
           "SetLayerEffectParameter",
-          _("Effect parameter"),
-          _("Change the parameter of an effect"),
+          _("Effect parameter (number)"),
+          _("Change the value of a parameter of an effect.") + "\n" +
+              _("You can find the parameter names (and change the effect "
+                "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
-          _("Layers and cameras/Effects"),
+          _("Effects"),
           "res/conditions/camera24.png",
           "res/conditions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
-      .AddParameter("string", _("Effect"))
-      .AddParameter("string", _("Parameter name"))
+      .AddParameter("layerEffectName", _("Effect name"))
+      .AddParameter("layerEffectParameterName", _("Parameter name"))
       .AddParameter("expression", _("New value"))
       .MarkAsAdvanced();
 
   extension
-      .AddCondition(
-          "LayerEffectEnabled",
-          _("Layer effect is enabled"),
-          _("The effect on a layer is enabled"),
-          _("Effect _PARAM2_ on layer _PARAM1_ is enabled"),
-          _("Layers and cameras/Effects"),
+      .AddAction(
+          "SetLayerEffectStringParameter",
+          _("Effect parameter (string)"),
+          _("Change the value (string) of a parameter of an effect.") + "\n" +
+              _("You can find the parameter names (and change the effect "
+                "names) in the effects window."),
+          _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
+          _("Effects"),
           "res/conditions/camera24.png",
           "res/conditions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
-      .AddParameter("string", _("Effect"))
+      .AddParameter("layerEffectName", _("Effect name"))
+      .AddParameter("layerEffectParameterName", _("Parameter name"))
+      .AddParameter("string", _("New value"))
       .MarkAsAdvanced();
 
   extension
       .AddAction(
-          "EnableLayerEffect",
-          _("Enable layer effect"),
-          _("Enable an effect on a layer"),
-          _("Enable effect _PARAM2_ on layer _PARAM1_: _PARAM3_"),
-          _("Layers and cameras/Effects"),
+          "SetLayerEffectBooleanParameter",
+          _("Effect parameter (enable or disable)"),
+          _("Enable or disable a parameter of an effect.") + "\n" +
+              _("You can find the parameter names (and change the effect "
+                "names) in the effects window."),
+          _("Enable _PARAM3_ for effect _PARAM2_ of layer _PARAM1_: _PARAM4_"),
+          _("Effects"),
           "res/conditions/camera24.png",
           "res/conditions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
-      .AddParameter("string", _("Effect"))
+      .AddParameter("layerEffectName", _("Effect name"))
+      .AddParameter("layerEffectParameterName", _("Parameter name"))
+      .AddParameter("yesorno", _("Enable this parameter"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddCondition("LayerEffectEnabled",
+                    _("Layer effect is enabled"),
+                    _("The effect on a layer is enabled"),
+                    _("Effect _PARAM2_ on layer _PARAM1_ is enabled"),
+                    _("Effects"),
+                    "res/conditions/camera24.png",
+                    "res/conditions/camera.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("layerEffectName", _("Effect name"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("EnableLayerEffect",
+                 _("Enable layer effect"),
+                 _("Enable an effect on a layer"),
+                 _("Enable effect _PARAM2_ on layer _PARAM1_: _PARAM3_"),
+                 _("Effects"),
+                 "res/conditions/camera24.png",
+                 "res/conditions/camera.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("layerEffectName", _("Effect name"))
       .AddParameter("yesorno", _("Enable"), "", true)
       .MarkAsAdvanced();
 
@@ -430,25 +446,23 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "LayerTimeScale",
           _("Layer time scale"),
           _("Compare the time scale applied to the objects of the layer."),
-          _("The time scale of layer _PARAM1_ is _PARAM2__PARAM3_"),
-          _("Layers and cameras/Time"),
+          _("the time scale of layer _PARAM1_"),
+          "",
           "res/conditions/time24.png",
           "res/conditions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Value to compare"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();
 
   extension
       .AddAction(
           "ChangeLayerTimeScale",
           _("Change layer time scale"),
           _("Change the time scale applied to the objects of the layer."),
-          _("Set time scale of layer _PARAM1_ to _PARAM2_"),
-          _("Layers and cameras/Time"),
+          _("Set the time scale of layer _PARAM1_ to _PARAM2_"),
+          "",
           "res/actions/time24.png",
           "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -458,33 +472,57 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     _("Scale (1: Default, 2: 2x faster, 0.5: 2x slower...)"));
 
   extension
-      .AddExpression("CameraWidth",
-                     _("Width of a camera of a layer"),
-                     _("Width of a camera of a layer"),
-                     _("Layers and cameras"),
-                     "res/actions/camera.png")
+      .AddCondition("LayerDefaultZOrder",
+                    _("Layer default Z order"),
+                    _("Compare the default Z order set to objects when they "
+                      "are created on a layer."),
+                    _("the default Z order of objects created on _PARAM1_"),
+                    "",
+                    "res/conditions/layer24.png",
+                    "res/conditions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
-      .AddParameter("expression", _("Camera number (default : 0)"))
-      .SetDefaultValue("0");
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .SetDefaultValue("\"\"")
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();
 
   extension
-      .AddExpression("CameraHeight",
-                     _("Height of a camera of a layer"),
-                     _("Height of a camera of a layer"),
-                     _("Layers and cameras"),
-                     "res/actions/camera.png")
+      .AddAction("SetLayerDefaultZOrder",
+                 _("Change layer default Z order"),
+                 _("Change the default Z order set to objects when they are "
+                   "created on a layer."),
+                 _("Set the default Z order of objects created on _PARAM1_ to "
+                   "_PARAM2_"),
+                 "",
+                 "res/actions/layer24.png",
+                 "res/actions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
-      .AddParameter("expression", _("Camera number (default : 0)"))
-      .SetDefaultValue("0");
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("New default Z order"));
+
+  extension
+      .AddAction(
+          "SetLayerAmbientLightColor",
+          _("Set the ambient light color"),
+          _("Set the ambient light color of the lighting layer in format "
+            "\"R;G;B\" string."),
+          _("Set the ambient color of the lighting layer _PARAM1_ to _PARAM2_"),
+          _("Lighting"),
+          "res/actions/color24.png",
+          "res/actions/color.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .SetDefaultValue("\"Lighting\"")
+      .AddParameter("color", _("Color"))
+      .MarkAsAdvanced();
 
   extension
       .AddExpression(
           "CameraViewportLeft",
           _("X position of the top left side point of a render zone"),
           _("X position of the top left side point of a render zone"),
-          _("Layers and cameras"),
+          "",
           "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"))
@@ -496,7 +534,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "CameraViewportTop",
           _("Y position of the top left side point of a render zone"),
           _("Y position of the top left side point of a render zone"),
-          _("Layers and cameras"),
+          "",
           "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"))
@@ -508,7 +546,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "CameraViewportRight",
           _("X position of the bottom right side point of a render zone"),
           _("X position of the bottom right side point of a render zone"),
-          _("Layers and cameras"),
+          "",
           "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"))
@@ -520,7 +558,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "CameraViewportBottom",
           _("Y position of the bottom right side point of a render zone"),
           _("Y position of the bottom right side point of a render zone"),
-          _("Layers and cameras"),
+          "",
           "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"))
@@ -528,10 +566,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .SetDefaultValue("0");
 
   extension
-      .AddExpression("CameraX",
-                     _("Camera X position"),
-                     _("Camera X position"),
-                     _("Layers and cameras"),
+      .AddExpression("CameraZoom",
+                     _("Zoom of a camera of a layer"),
+                     _("Zoom of a camera of a layer"),
+                     "",
                      "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
@@ -539,78 +577,23 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
-  extension
-      .AddExpression("VueX",
-                     _("Camera X position"),
-                     _("Camera X position"),
-                     _("Layers and cameras"),
-                     "res/actions/camera.png")
-      .SetHidden()
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0");
-
-  extension
-      .AddExpression("CameraY",
-                     _("Camera Y position"),
-                     _("Camera Y position"),
-                     _("Layers and cameras"),
-                     "res/actions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0");
-
-  extension
-      .AddExpression("VueY",
-                     _("Camera Y position"),
-                     _("Camera Y position"),
-                     _("Layers and cameras"),
-                     "res/actions/camera.png")
-      .SetHidden()
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0");
-
-  extension
-      .AddExpression("CameraRotation",
-                     _("Angle of a camera of a layer"),
-                     _("Angle of a camera of a layer"),
-                     _("Layers and cameras"),
-                     "res/actions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0");
-
-  extension
-      .AddExpression("VueRotation",
-                     _("Angle of a camera of a layer"),
-                     _("Angle of a camera of a layer"),
-                     _("Layers and cameras"),
-                     "res/actions/camera.png")
-      .SetHidden()
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0");
-
   extension
       .AddExpression("LayerTimeScale",
-                     _("Time scale"),
-                     _("Time scale"),
-                     _("Layers and cameras"),
+                     _("Layer time scale"),
+                     _("Returns the time scale of the specified layer."),
+                     "",
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"));
-#endif
+
+  extension
+      .AddExpression("LayerDefaultZOrder",
+                     _("Default Z Order for a layer"),
+                     _("Default Z Order for a layer"),
+                     "",
+                     "res/actions/camera.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer"));
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp

@@ -15,19 +15,19 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
   extension
       .SetExtensionInformation(
           "BuiltinCommonConversions",
-          _("Standard Conversions"),
-          _("Built-in extension providing standard conversions expressions."),
+          _("Conversion"),
+          "Expressions to convert number, texts and quantities.",
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/common-conversions");
-
-#if defined(GD_IDE_ONLY)
+  extension.AddInstructionOrExpressionGroupMetadata(_("Conversion"))
+      .SetIcon("res/conditions/toujours24.png");
 
   extension
       .AddExpression("ToNumber",
                      _("Text > Number"),
                      _("Convert the text to a number"),
-                     _("Conversion"),
+                     "",
                      "res/conditions/toujours24.png")
       .AddParameter("string", _("Text to convert to a number"));
 
@@ -35,7 +35,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
       .AddStrExpression("ToString",
                         _("Number > Text"),
                         _("Convert the result of the expression to text"),
-                        _("Conversion"),
+                        "",
                         "res/conditions/toujours24.png")
       .AddParameter("expression", _("Expression to be converted to text"));
 
@@ -44,7 +44,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                         _("Number > Text ( without scientific notation )"),
                         _("Convert the result of the expression to text, "
                           "without using the scientific notation"),
-                        _("Conversion"),
+                        "",
                         "res/conditions/toujours24.png")
       .AddParameter("expression", _("Expression to be converted to text"));
 
@@ -53,7 +53,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
           "ToRad",
           _("Degrees > Radians"),
           _("Converts the angle, expressed in degrees, into radians"),
-          _("Conversion"),
+          "",
           "res/conditions/toujours24.png")
       .AddParameter("expression", _("Angle, in degrees"));
 
@@ -62,10 +62,76 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
           "ToDeg",
           _("Radians > Degrees"),
           _("Converts the angle, expressed in radians, into degrees"),
-          _("Conversion"),
+          "",
           "res/conditions/toujours24.png")
       .AddParameter("expression", _("Angle, in radians"));
-#endif
+
+  extension
+      .AddStrExpression("ToJSON",
+                        _("Convert scene variable to JSON"),
+                        _("Convert a scene variable to JSON"),
+                        _("JSON"),
+                        "res/conditions/toujours24.png")
+      .AddParameter("scenevar", _("Scene variable to be stringified"));
+
+  extension
+      .AddStrExpression("GlobalVarToJSON",
+                        _("Convert global variable to JSON"),
+                        _("Convert a global variable to JSON"),
+                        _("JSON"),
+                        "res/conditions/toujours24.png")
+      .AddParameter("globalvar", _("The global variable to be stringified"));
+
+  extension
+      .AddStrExpression("ObjectVarToJSON",
+                        _("Convert object variable to JSON"),
+                        _("Convert an object variable to JSON"),
+                        _("JSON"),
+                        "res/conditions/toujours24.png")
+      .AddParameter("objectPtr", _("The object with the variable"))
+      .AddParameter("objectvar", _("The object variable to be stringified"));
+
+  extension
+      .AddAction(
+          "JSONToVariableStructure",
+          _("Convert JSON to a scene variable"),
+          _("Parse a JSON object and store it into a scene variable"),
+          _("Parse JSON string _PARAM0_ and store it into variable _PARAM1_"),
+          "",
+          "res/actions/net24.png",
+          "res/actions/net.png")
+      .AddParameter("string", _("JSON string"))
+      .AddParameter("scenevar", _("Variable where store the JSON object"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("JSONToGlobalVariableStructure",
+                 _("Convert JSON to global variable"),
+                 _("Parse a JSON object and store it into a global variable"),
+                 _("Parse JSON string _PARAM0_ and store it into global "
+                   "variable _PARAM1_"),
+                 "",
+                 "res/actions/net24.png",
+                 "res/actions/net.png")
+      .AddParameter("string", _("JSON string"))
+      .AddParameter("globalvar",
+                    _("Global variable where store the JSON object"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("JSONToObjectVariableStructure",
+                 _("Convert JSON to object variable"),
+                 _("Parse a JSON object and store it into an object variable"),
+                 _("Parse JSON string _PARAM0_ and store it into variable "
+                   "_PARAM2_ of _PARAM1_"),
+                 "",
+                 "res/actions/net24.png",
+                 "res/actions/net.png")
+      .AddParameter("string", _("JSON string"))
+      .AddParameter("objectPtr", _("Object"))
+      .AddParameter("objectvar",
+                    _("Object variable where store the JSON object"))
+      .MarkAsAdvanced();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp

@@ -4,9 +4,8 @@
  * reserved. This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"
-#include "GDCore/Tools/Localization.h"
-#if defined(GD_IDE_ONLY)
 #include "GDCore/Events/Builtin/CommentEvent.h"
+#include "GDCore/Events/Builtin/ForEachChildVariableEvent.h"
 #include "GDCore/Events/Builtin/ForEachEvent.h"
 #include "GDCore/Events/Builtin/GroupEvent.h"
 #include "GDCore/Events/Builtin/LinkEvent.h"
@@ -14,7 +13,7 @@
 #include "GDCore/Events/Builtin/StandardEvent.h"
 #include "GDCore/Events/Builtin/WhileEvent.h"
 #include "GDCore/Events/Event.h"
-#endif
+#include "GDCore/Tools/Localization.h"
 
 using namespace std;
 namespace gd {
@@ -25,19 +24,43 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
   extension
       .SetExtensionInformation(
           "BuiltinCommonInstructions",
-          _("Standard events"),
-          _("Built-in extension providing standard events."),
+          _("Events and control flow"),
+          "GDevelop comes with a set of events and conditions that allow to "
+          "express the game logic and rules.",
           "Florian Rival",
           "Open source (MIT License)")
+      .SetCategory("Advanced")
       .SetExtensionHelpPath("/all-features/advanced-conditions");
+  extension
+      .AddInstructionOrExpressionGroupMetadata(_("Events and control flow"))
+      .SetIcon("res/conditions/toujours24.png");
+
+  extension
+      .AddCondition("Always",
+                    _("Always"),
+                    _("This condition always returns true (or always false, if "
+                      "the condition is inverted)."),
+                    _("Always"),
+                    "",
+                    "res/conditions/toujours24.png",
+                    "res/conditions/toujours.png")
+      .SetHelpPath("/all-features/advanced-conditions")
+      .AddCodeOnlyParameter("conditionInverted", "")
+      .MarkAsAdvanced();
+
+  // Compatibility with GD <= 5.0.127
+  extension
+      .AddDuplicatedCondition(
+          "Toujours", "BuiltinCommonInstructions::Always", {.unscoped = true})
+      .SetHidden();
+  // end of compatibility code
 
-#if defined(GD_IDE_ONLY)
   extension
       .AddCondition("Or",
                     _("Or"),
-                    _("Return true if one of the sub conditions is true"),
+                    _("Check if one of the sub conditions is true"),
                     _("If one of these conditions is true:"),
-                    _("Advanced"),
+                    "",
                     "res/conditions/or24.png",
                     "res/conditions/or.png")
       .SetCanHaveSubInstructions()
@@ -46,9 +69,9 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
   extension
       .AddCondition("And",
                     _("And"),
-                    _("Return true if all sub conditions are true"),
+                    _("Check if all sub conditions are true"),
                     _("If all of these conditions are true:"),
-                    _("Advanced"),
+                    "",
                     "res/conditions/and24.png",
                     "res/conditions/and.png")
       .SetCanHaveSubInstructions()
@@ -60,7 +83,7 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
           _("Not"),
           _("Return the contrary of the result of the sub conditions"),
           _("Invert the logical result of these conditions:"),
-          _("Advanced"),
+          "",
           "res/conditions/not24.png",
           "res/conditions/not.png")
       .SetCanHaveSubInstructions()
@@ -71,10 +94,52 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
       _("Trigger once while true"),
       _("Run actions only once, for each time the conditions have been met."),
       _("Trigger once"),
-      _("Advanced"),
+      "",
       "res/conditions/once24.png",
       "res/conditions/once.png");
 
+  extension
+      .AddCondition("CompareNumbers",
+                    _("Compare two numbers"),
+                    _("Compare the two numbers."),
+                    _("_PARAM0_ _PARAM1_ _PARAM2_"),
+                    "",
+                    "res/conditions/egal24.png",
+                    "res/conditions/egal.png")
+      .SetHelpPath("/all-features/advanced-conditions")
+      .AddParameter("expression", _("First expression"))
+      .AddParameter("relationalOperator", _("Sign of the test"), "number")
+      .AddParameter("expression", _("Second expression"))
+      .MarkAsAdvanced();
+
+  // Compatibility with GD <= 5.0.127
+  extension
+      .AddDuplicatedCondition(
+          "Egal", "BuiltinCommonInstructions::CompareNumbers", {.unscoped = true})
+      .SetHidden();
+  // end of compatibility code
+
+  extension
+      .AddCondition("CompareStrings",
+                    _("Compare two strings"),
+                    _("Compare the two strings."),
+                    _("_PARAM0_ _PARAM1_ _PARAM2_"),
+                    "",
+                    "res/conditions/egal24.png",
+                    "res/conditions/egal.png")
+      .SetHelpPath("/all-features/advanced-conditions")
+      .AddParameter("string", _("First string expression"))
+      .AddParameter("relationalOperator", _("Sign of the test"), "string")
+      .AddParameter("string", _("Second string expression"))
+      .MarkAsAdvanced();
+
+  // Compatibility with GD <= 5.0.127
+  extension
+      .AddDuplicatedCondition(
+          "StrEqual", "BuiltinCommonInstructions::CompareStrings", {.unscoped = true})
+      .SetHidden();
+  // end of compatibility code
+
   extension.AddEvent(
       "Standard",
       _("Standard event"),
@@ -84,29 +149,29 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
       std::make_shared<gd::StandardEvent>());
 
   extension.AddEvent("Link",
-                     _("Link"),
-                     _("Link to some external events"),
+                     _("Link external events"),
+                     _("Link to external events."),
                      "",
                      "res/lienaddicon.png",
                      std::make_shared<gd::LinkEvent>());
 
   extension.AddEvent("Comment",
                      _("Comment"),
-                     _("Event displaying a text in the events editor"),
+                     _("Event displaying a text in the events editor."),
                      "",
                      "res/comment.png",
                      std::make_shared<gd::CommentEvent>());
 
   extension.AddEvent("While",
                      _("While"),
-                     _("The event is repeated while the conditions are true"),
+                     _("Repeat the event while the conditions are true."),
                      "",
                      "res/while.png",
                      std::make_shared<gd::WhileEvent>());
 
   extension.AddEvent("Repeat",
                      _("Repeat"),
-                     _("Event repeated a number of times"),
+                     _("Repeat the event for a specified number of times."),
                      "",
                      "res/repeat.png",
                      std::make_shared<gd::RepeatEvent>());
@@ -118,13 +183,20 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                      "res/foreach.png",
                      std::make_shared<gd::ForEachEvent>());
 
+  extension.AddEvent(
+      "ForEachChildVariable",
+      _("For each child variable (of a structure or array)"),
+      _("Repeat the event for each child variable of a structure or array."),
+      "",
+      "res/foreach.png",
+      std::make_shared<gd::ForEachChildVariableEvent>());
+
   extension.AddEvent("Group",
-                     _("Group"),
-                     _("Group containing events"),
+                     _("Event group"),
+                     _("Group containing events."),
                      "",
                      "res/foreach.png",
                      std::make_shared<gd::GroupEvent>());
-#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/ExternalLayoutsExtension.cpp

@@ -13,32 +13,32 @@ void GD_CORE_API
 BuiltinExtensionsImplementer::ImplementsExternalLayoutsExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation(
-          "BuiltinExternalLayouts",
-          _("External layouts"),
-          _("Built-in extension providing actions and conditions related to "
-            "external layouts"),
-          "Florian Rival",
-          "Open source (MIT License)")
-      .SetExtensionHelpPath("/interface/scene-editor/external-layouts");
+      .SetExtensionInformation("BuiltinExternalLayouts",
+                               _("External layouts"),
+                               "Provides actions and conditions related to "
+                               "external layouts.",
+                               "Florian Rival",
+                               "Open source (MIT License)")
+      .SetExtensionHelpPath("/interface/scene-editor/external-layouts")
+      .SetCategory("Advanced");
+  extension.AddInstructionOrExpressionGroupMetadata(_("External layouts"))
+      .SetIcon("res/ribbon_default/externallayout32.png");
 
-#if defined(GD_IDE_ONLY)
   extension
       .AddAction("CreateObjectsFromExternalLayout",
                  _("Create objects from an external layout"),
                  _("Create objects from an external layout."),
                  _("Create objects from the external layout named _PARAM1_"),
-                 _("External layouts"),
-                 "res/conditions/fichier24.png",
-                 "res/conditions/fichier.png")
+                 "",
+                 "res/ribbon_default/externallayout32.png",
+                 "res/ribbon_default/externallayout32.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Name of the external layout"))
+      .AddParameter("externalLayoutName", _("Name of the external layout"))
       .AddParameter("expression", _("X position of the origin"), "", true)
       .SetDefaultValue("0")
       .AddParameter("expression", _("Y position of the origin"), "", true)
       .SetDefaultValue("0")
       .MarkAsAdvanced();
-#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/FileExtension.cpp

@@ -12,15 +12,19 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation("BuiltinFile",
-                               _("Storage"),
-                               _("Built-in extension providing functions "
-                                 "to store data."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
-      .SetExtensionHelpPath("/all-features/storage");
+      .SetExtensionInformation(
+          "BuiltinFile",
+          _("Storage"),
+          "Actions and conditions to store data (like the player progress or "
+          "anything else to be persisted across game sessions). Data are "
+          "stored on the device and erased when the game is uninstalled.",
+          "Florian Rival",
+          "Open source (MIT License)")
+      .SetExtensionHelpPath("/all-features/storage")
+      .SetCategory("Device");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Storage"))
+      .SetIcon("res/conditions/fichier24.png");
 
-#if defined(GD_IDE_ONLY)
   extension
       .AddCondition(
           "GroupExists",
@@ -28,7 +32,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
           _("Check if an element (example : PlayerState/CurrentLevel) exists "
             "in the stored data.\nSpaces are forbidden in element names."),
           _("_PARAM1_ exists in storage _PARAM0_"),
-          _("Storage"),
+          "",
           "res/conditions/fichier24.png",
           "res/conditions/fichier.png")
       .AddParameter("string", _("Storage name"))
@@ -44,7 +48,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
             "action, but it will be slower.\nIf you use this action, do not "
             "forget to unload the storage from memory."),
           _("Load storage _PARAM0_ in memory"),
-          _("Storage"),
+          "",
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))
@@ -56,7 +60,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
                  _("This action closes the structured data previously loaded "
                    "in memory, saving all changes made."),
                  _("Close structured data _PARAM0_"),
-                 _("Storage"),
+                 "",
                  "res/actions/fichier24.png",
                  "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))
@@ -71,7 +75,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
             "element using / (example : Root/Level/Current)\nSpaces are "
             "forbidden in element names."),
           _("Write _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
-          _("Storage"),
+          "",
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))
@@ -87,7 +91,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
             "the structure leading to the element using / (example : "
             "Root/Level/Current)\nSpaces are forbidden in element names."),
           _("Write _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
-          _("Storage"),
+          "",
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))
@@ -99,11 +103,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
           "LireFichierExp",
           _("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."),
           _("Read _PARAM1_ from storage _PARAM0_ and store value in _PARAM3_"),
-          _("Storage"),
+          "",
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))
@@ -116,12 +121,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
           "LireFichierTxt",
           _("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."),
           _("Read _PARAM1_ from storage _PARAM0_ and store as text in "
             "_PARAM3_"),
-          _("Storage"),
+          "",
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))
@@ -137,7 +143,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
                    "element using / (example : Root/Level/Current)\nSpaces are "
                    "forbidden in element names."),
                  _("Delete _PARAM1_ from storage _PARAM0_"),
-                 _("Storage"),
+                 "",
                  "res/actions/delete24.png",
                  "res/actions/delete.png")
       .AddParameter("string", _("Storage name"))
@@ -150,7 +156,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
           _("Clear a storage"),
           _("Clear the specified storage, removing all data saved in it."),
           _("Delete storage _PARAM0_"),
-          _("Storage"),
+          "",
           "res/actions/delete24.png",
           "res/actions/delete.png")
       .AddParameter("string", _("Storage name"));
@@ -160,37 +166,22 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
                     _("A storage exists"),
                     _("Test if the specified storage exists."),
                     _("Storage _PARAM0_ exists"),
-                    _("Storage"),
+                    "",
                     "res/conditions/fichier24.png",
                     "res/conditions/fichier.png")
       .AddParameter("string", _("Storage name"))
       .MarkAsAdvanced();
 
-  extension
-      .AddAction("LaunchFile",
-                 _("Open a URL or a file"),
-                 _("This action launches the specified file or URL, in a "
-                   "browser (or in a new tab if the game is using the Web "
-                   "platform and is launched inside a browser)."),
-                 _("Open URL (or file) _PARAM0_"),
-                 _("Files"),
-                 "res/actions/launchFile24.png",
-                 "res/actions/launchFile.png")
-      .AddParameter("string", _("URL (or filename)"))
-      .AddCodeOnlyParameter("currentScene", "")
-      .MarkAsAdvanced();
-
   extension
       .AddAction("ExecuteCmd",
                  _("Execute a command"),
                  _("This action executes the specified command."),
                  _("Execute _PARAM0_"),
-                 _("Files"),
+                 _("Network"),
                  "res/actions/launchFile24.png",
                  "res/actions/launchFile.png")
       .AddParameter("string", _("Command"))
       .MarkAsAdvanced();
-#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/JoystickExtension.cpp

@@ -1,80 +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 "AllBuiltinExtensions.h"
-#include "GDCore/Tools/Localization.h"
-
-using namespace std;
-namespace gd {
-
-void GD_CORE_API BuiltinExtensionsImplementer::ImplementsJoystickExtension(
-    gd::PlatformExtension& extension) {
-  extension
-      .SetExtensionInformation(
-          "BuiltinJoystick",
-          _("Joysticks features"),
-          _("Built-in extension that enables the use of joysticks"),
-          "Florian Rival",
-          "Open source (MIT License)")
-      .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
-
-#if defined(GD_IDE_ONLY)
-  extension
-      .AddCondition("JoystickButtonDown",
-                    _("A button on a joystick is pressed"),
-                    _("Test if a button on a joystick is pressed."),
-                    _("The button _PARAM2_ of joystick _PARAM1_ is pressed"),
-                    _("Joystick"),
-                    "res/conditions/joystick24.png",
-                    "res/conditions/joystick.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Joystick number (first joystick: 0)"))
-      .AddParameter("expression", _("Button"));
-
-  extension
-      .AddCondition("JoystickAxis",
-                    _("Value of an axis of a joystick"),
-                    _("Test the value of an axis of a joystick."),
-                    _("The value of the axis _PARAM2_ of joystick _PARAM1_ is "
-                      "_PARAM3__PARAM4_"),
-                    _("Joystick"),
-                    "res/conditions/joystick24.png",
-                    "res/conditions/joystick.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Joystick number (first joystick: 0)"))
-      .AddParameter("joyaxis", _("Axis"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Value to compare"))
-      .SetManipulatedType("number");
-
-  extension
-      .AddAction(
-          "GetJoystickAxis",
-          _("Get the value of the axis of a joystick"),
-          _("Save the value of the axis of the joystick (from -100 to 100)."),
-          _("Save in _PARAM3_ the value of axis _PARAM2_ of joystick _PARAM1_"),
-          _("Joystick"),
-          "res/actions/joystick24.png",
-          "res/actions/joystick.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Joystick number (first joystick: 0)"))
-      .AddParameter("joyaxis", _("Axis"))
-      .AddParameter("scenevar", _("Save the result to the scene variable"))
-      .SetManipulatedType("number");
-
-  extension
-      .AddExpression("GetJoystickAxis",
-                     _("Joystick axis"),
-                     _("Value of an axis of a joystick"),
-                     _("Joystick"),
-                     "res/conditions/joystick.png")
-
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Joystick number (first joystick: 0)"))
-      .AddParameter("joyaxis", _("Axis"));
-#endif
-}
-
-}  // namespace gd

Core/GDCore/Extensions/Builtin/KeyboardExtension.cpp

@@ -14,19 +14,24 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
   extension
       .SetExtensionInformation(
           "BuiltinKeyboard",
-          _("Keyboard features"),
-          _("Built-in extension that enables the use of a keyboard"),
+          _("Keyboard"),
+          _("Allows your game to respond to keyboard input. Note that this "
+            "does not work with on-screen keyboard on touch devices: use "
+            "instead conditions related to touch when making a game for "
+            "mobile/touchscreen devices."),
           "Florian Rival",
           "Open source (MIT License)")
-      .SetExtensionHelpPath("/all-features/keyboard");
+      .SetExtensionHelpPath("/all-features/keyboard")
+      .SetCategory("Input");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Keyboard"))
+      .SetIcon("res/conditions/keyboard24.png");
 
-#if defined(GD_IDE_ONLY)
   extension
       .AddCondition("KeyPressed",
                     _("Key pressed"),
-                    _("Test if a key is pressed"),
+                    _("Check if a key is pressed"),
                     _("_PARAM1_ key is pressed"),
-                    _("Keyboard"),
+                    "",
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -35,9 +40,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
   extension
       .AddCondition("KeyReleased",
                     _("Key released"),
-                    _("Test if a key was just released"),
+                    _("Check if a key was just released"),
                     _("_PARAM1_ key is released"),
-                    _("Keyboard"),
+                    "",
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -46,35 +51,45 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
   extension
       .AddCondition("KeyFromTextPressed",
                     _("Key pressed (text expression)"),
-                    _("Test if a key, retrieved from the result of the "
+                    _("Check if a key, retrieved from the result of the "
                       "expression, is pressed"),
                     _("_PARAM1_ key is pressed"),
-                    _("Keyboard"),
+                    "",
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Expression generating the key to test"))
+      .AddParameter("string", _("Expression generating the key to check"))
       .MarkAsAdvanced();
 
   extension
       .AddCondition("KeyFromTextReleased",
                     _("Key released (text expression)"),
-                    _("Test if a key, retrieved from the result of the "
+                    _("Check if a key, retrieved from the result of the "
                       "expression, was just released"),
                     _("_PARAM1_ key is released"),
-                    _("Keyboard"),
+                    "",
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Expression generating the key to test"))
+      .AddParameter("string", _("Expression generating the key to check"))
       .MarkAsAdvanced();
 
   extension
       .AddCondition("AnyKeyPressed",
                     _("Any key pressed"),
-                    _("Test if any key is pressed"),
+                    _("Check if any key is pressed"),
                     _("Any key is pressed"),
-                    _("Keyboard"),
+                    "",
+                    "res/conditions/keyboard24.png",
+                    "res/conditions/keyboard.png")
+      .AddCodeOnlyParameter("currentScene", "");
+
+ extension
+      .AddCondition("AnyKeyReleased",
+                    _("Any key released"),
+                    _("Check if any key is released"),
+                    _("Any key is released"),
+                    "",
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "");
@@ -84,10 +99,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
           "LastPressedKey",
           _("Last pressed key"),
           _("Get the name of the latest key pressed on the keyboard"),
-          _("Keyboard"),
+          "",
           "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "");
-#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp

@@ -15,26 +15,117 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension.SetExtensionInformation(
       "BuiltinMathematicalTools",
       _("Mathematical tools"),
-      _("Built-in extension providing mathematical tools"),
+      "A set of mathematical functions that can be used in expressions.",
       "Florian Rival",
       "Open source (MIT License)");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Mathematical tools"))
+      .SetIcon("res/mathfunction.png");
 
-#if defined(GD_IDE_ONLY)
+  extension
+      .AddExpression("Random",
+                     _("Random integer"),
+                     _("Random integer"),
+                     "",
+                     "res/dice-6.svg")
+      .SetHelpPath("/all-features/expressions")
+      .AddParameter("expression", _("Maximum value"));
+
+  extension
+      .AddExpression("RandomInRange",
+                     _("Random integer in range"),
+                     _("Random integer in range"),
+                     "",
+                     "res/dice-6.svg")
+      .SetHelpPath("/all-features/expressions")
+      .AddParameter("expression", _("Minimum value"))
+      .AddParameter("expression", _("Maximum value"));
+
+  extension
+      .AddExpression("RandomFloat",
+                     _("Random float"),
+                     _("Random float"),
+                     "",
+                     "res/dice-6.svg")
+      .SetHelpPath("/all-features/expressions")
+      .AddParameter("expression", _("Maximum value"));
+
+  extension
+      .AddExpression("RandomFloatInRange",
+                     _("Random float in range"),
+                     _("Random float in range"),
+                     "",
+                     "res/dice-6.svg")
+      .SetHelpPath("/all-features/expressions")
+      .AddParameter("expression", _("Minimum value"))
+      .AddParameter("expression", _("Maximum value"));
+
+  extension
+      .AddExpression("RandomWithStep",
+                     _("Random value in steps"),
+                     _("Random value in steps"),
+                     "",
+                     "res/dice-6.svg")
+      .SetHelpPath("/all-features/expressions")
+      .AddParameter("expression", _("Minimum value"))
+      .AddParameter("expression", _("Maximum value"))
+      .AddParameter("expression", _("Step"));
+
+  extension
+      .AddExpression("normalize",
+                     _("Normalize a value between `min` and `max` to a value between 0 and 1."),
+                     _("Remap a value between 0 and 1."),
+                     "",
+                     "res/mathfunction.png")
+      .AddParameter("expression", _("Value"))
+      .AddParameter("expression", _("Min"))
+      .AddParameter("expression", _("Max"));
+
+  extension
+      .AddExpression("clamp",
+                     _("Clamp (restrict a value to a given range)"),
+                     _("Restrict a value to a given range"),
+                     "",
+                     "res/mathfunction.png")
+      .AddParameter("expression", _("Value"))
+      .AddParameter("expression", _("Min"))
+      .AddParameter("expression", _("Max"));
 
   extension
       .AddExpression("AngleDifference",
                      _("Difference between two angles"),
                      _("Difference between two angles"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("First angle"))
       .AddParameter("expression", _("Second angle"));
 
+  extension
+      .AddExpression("AngleBetweenPositions",
+                     _("Angle between two positions"),
+                     _("Compute the angle between two positions."),
+                     "",
+                     "res/mathfunction.png")
+      .AddParameter("expression", _("First point X position"))
+      .AddParameter("expression", _("First point Y position"))
+      .AddParameter("expression", _("Second point X position"))
+      .AddParameter("expression", _("Second point Y position"));
+
+  extension
+      .AddExpression("DistanceBetweenPositions",
+                     _("Distance between two positions"),
+                     _("Compute the distance between two positions."),
+                     "",
+                     "res/mathfunction.png")
+      .AddParameter("expression", _("First point X position"))
+      .AddParameter("expression", _("First point Y position"))
+      .AddParameter("expression", _("Second point X position"))
+      .AddParameter("expression", _("Second point Y position"));
+
   extension
       .AddExpression("mod",
                      _("Modulo"),
                      _("x mod y"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("x (as in x mod y)"))
       .AddParameter("expression", _("y (as in x mod y)"));
@@ -43,7 +134,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("min",
                      _("Minimum of two numbers"),
                      _("Minimum of two numbers"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("First expression"))
       .AddParameter("expression", _("Second expression"));
@@ -52,7 +143,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("max",
                      _("Maximum of two numbers"),
                      _("Maximum of two numbers"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("First expression"))
       .AddParameter("expression", _("Second expression"));
@@ -61,7 +152,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("abs",
                      _("Absolute value"),
                      _("Absolute value"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -69,7 +160,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("acos",
                      _("Arccosine"),
                      _("Arccosine"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -77,7 +168,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("acosh",
                      _("Hyperbolic arccosine"),
                      _("Hyperbolic arccosine"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -85,7 +176,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("asin",
                      _("Arcsine"),
                      _("Arcsine"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -93,7 +184,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("asinh",
                      _("Arcsine"),
                      _("Arcsine"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -101,7 +192,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("atan",
                      _("Arctangent"),
                      _("Arctangent"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -109,7 +200,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("atan2",
                      _("2 argument arctangent"),
                      _("2 argument arctangent (atan2)"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Y"))
       .AddParameter("expression", _("X"));
@@ -118,7 +209,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("atanh",
                      _("Hyperbolic arctangent"),
                      _("Hyperbolic arctangent"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -126,7 +217,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("cbrt",
                      _("Cube root"),
                      _("Cube root"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -134,7 +225,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("ceil",
                      _("Ceil (round up)"),
                      _("Round number up to an integer"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -142,7 +233,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("floor",
                      _("Floor (round down)"),
                      _("Round number down to an integer"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -150,7 +241,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("cos",
                      _("Cosine"),
                      _("Cosine of a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -158,7 +249,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("cosh",
                      _("Hyperbolic cosine"),
                      _("Hyperbolic cosine"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -166,7 +257,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("cot",
                      _("Cotangent"),
                      _("Cotangent of a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -174,7 +265,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("csc",
                      _("Cosecant"),
                      _("Cosecant of a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -182,7 +273,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("int",
                      _("Round"),
                      _("Round a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .SetHidden()
       .AddParameter("expression", _("Expression"));
@@ -191,7 +282,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("rint",
                      _("Round"),
                      _("Round a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .SetHidden()
       .AddParameter("expression", _("Expression"));
@@ -200,7 +291,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("round",
                      _("Round"),
                      _("Round a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -208,7 +299,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("exp",
                      _("Exponential"),
                      _("Exponential of a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -216,7 +307,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("log",
                      _("Logarithm"),
                      _("Logarithm"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -224,7 +315,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("ln",
                      _("Logarithm"),
                      _("Logarithm"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .SetHidden()
       .AddParameter("expression", _("Expression"));
@@ -233,7 +324,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("log2",
                      _("Base-2 logarithm"),
                      _("Base 2 Logarithm"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -241,7 +332,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("log10",
                      _("Base-10 logarithm"),
                      _("Base-10 logarithm"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -249,7 +340,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("nthroot",
                      _("Nth root"),
                      _("Nth root of a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Number"))
       .AddParameter("expression", _("N"));
@@ -258,7 +349,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("pow",
                      _("Power"),
                      _("Raise a number to power n"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Number"))
       .AddParameter("expression", _("The exponent (n in x^n)"));
@@ -267,7 +358,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("sec",
                      _("Secant"),
                      _("Secant"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -275,7 +366,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("sign",
                      _("Sign of a number"),
                      _("Return the sign of a number (1,-1 or 0)"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -283,7 +374,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("sin",
                      _("Sine"),
                      _("Sine of a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -291,7 +382,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("sinh",
                      _("Hyperbolic sine"),
                      _("Hyperbolic sine"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -299,7 +390,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("sqrt",
                      _("Square root"),
                      _("Square root of a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -307,7 +398,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("tan",
                      _("Tangent"),
                      _("Tangent of a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -315,15 +406,15 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("tanh",
                      _("Hyperbolic tangent"),
                      _("Hyperbolic tangent"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
       .AddExpression("trunc",
                      _("Truncation"),
-                     _("Troncate a number"),
-                     _("Mathematical tools"),
+                     _("Truncate a number"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -331,13 +422,36 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("lerp",
                      _("Lerp (Linear interpolation)"),
                      _("Linearly interpolate a to b by x"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("a (in a+(b-a)*x)"))
       .AddParameter("expression", _("b (in a+(b-a)*x)"))
       .AddParameter("expression", _("x (in a+(b-a)*x)"));
 
-#endif
+  extension
+      .AddExpression("XFromAngleAndDistance",
+                     _("X position from angle and distance"),
+                     _("Compute the X position when given an angle and distance "
+                      "relative to the origin (0;0). This is also known as "
+                      "getting the cartesian coordinates of a 2D vector, using "
+                      "its polar coordinates."),
+                     "",
+                     "res/mathfunction.png")
+      .AddParameter("expression", _("Angle, in degrees"))
+      .AddParameter("expression", _("Distance"));
+
+  extension
+      .AddExpression("YFromAngleAndDistance",
+                     _("Y position from angle and distance"),
+                     _("Compute the Y position when given an angle and distance "
+                      "relative to the origin (0;0). This is also known as "
+                      "getting the cartesian coordinates of a 2D vector, using "
+                      "its polar coordinates."),
+                     "",
+                     "res/mathfunction.png")
+      .AddParameter("expression", _("Angle, in degrees"))
+      .AddParameter("expression", _("Distance"));
+
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/MouseExtension.cpp

@@ -4,6 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 #include "GDCore/Tools/Localization.h"
 
 using namespace std;
@@ -14,29 +15,18 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
   extension
       .SetExtensionInformation(
           "BuiltinMouse",
-          _("Mouse features"),
-          _("Built-in extension that enables the use of a mouse"),
+          _("Mouse and touch"),
+          "Conditions and actions to handle either the mouse or touches on "
+          "touchscreen. By default, conditions related to the mouse will also "
+          "handle the touches - so that it's easier to handle both in your "
+          "game. You can disable this behavior if you want to handle them "
+          "separately in different events.",
           "Florian Rival",
           "Open source (MIT License)")
-      .SetExtensionHelpPath("/all-features/mouse-touch");
-
-#if defined(GD_IDE_ONLY)
-  extension
-      .AddCondition("SourisSurObjet",
-                    _("The cursor/touch is on an object"),
-                    _("Test if the cursor is over an object, or if the object "
-                      "is being touched."),
-                    _("The cursor/touch is on _PARAM0_"),
-                    _("Mouse and touch"),
-                    "res/conditions/surObjet24.png",
-                    "res/conditions/surObjet.png")
-
-      .AddParameter("objectList", _("Object"))
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("yesorno", _("Accurate test (yes by default)"), "", true)
-      .SetDefaultValue("yes")
-      .AddCodeOnlyParameter("conditionInverted", "")
-      .MarkAsSimple();
+      .SetExtensionHelpPath("/all-features/mouse-touch")
+      .SetCategory("Input");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Mouse and touch"))
+      .SetIcon("res/actions/mouse24.png");
 
   extension
       .AddCondition(
@@ -45,7 +35,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
           _("Check if the mouse wheel is scrolling up. Use MouseWheelDelta "
             "expression if you want to know the amount that was scrolled."),
           _("The mouse wheel is scrolling up"),
-          _("Mouse and touch"),
+          "",
           "res/actions/mouse24.png",
           "res/actions/mouse.png")
 
@@ -59,7 +49,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
           _("Check if the mouse wheel is scrolling down. Use MouseWheelDelta "
             "expression if you want to know the amount that was scrolled."),
           _("The mouse wheel is scrolling down"),
-          _("Mouse and touch"),
+          "",
           "res/actions/mouse24.png",
           "res/actions/mouse.png")
 
@@ -77,7 +67,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
             "touchscreens. If you want to have multitouch and differentiate "
             "mouse movement and touches, just deactivate it with this action."),
           _("Move mouse cursor when touching screen: _PARAM1_"),
-          _("Mouse and touch"),
+          "",
           "res/conditions/touch24.png",
           "res/conditions/touch.png")
 
@@ -92,7 +82,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                  _("Center cursor horizontally"),
                  _("Put the cursor in the middle of the screen horizontally."),
                  _("Center cursor horizontally"),
-                 _("Mouse and touch"),
+                 "",
                  "res/actions/mouse24.png",
                  "res/actions/mouse.png")
 
@@ -104,7 +94,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                  _("Center cursor vertically"),
                  _("Put the cursor in the middle of the screen vertically."),
                  _("Center cursor vertically"),
-                 _("Mouse and touch"),
+                 "",
                  "res/actions/mouse24.png",
                  "res/actions/mouse.png")
 
@@ -116,7 +106,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                  _("Hide the cursor"),
                  _("Hide the cursor."),
                  _("Hide the cursor"),
-                 _("Mouse and touch"),
+                 "",
                  "res/actions/mouse24.png",
                  "res/actions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -127,7 +117,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                  _("Show the cursor"),
                  _("Show the cursor."),
                  _("Show the cursor"),
-                 _("Mouse and touch"),
+                 "",
                  "res/actions/mouse24.png",
                  "res/actions/mouse.png")
 
@@ -139,7 +129,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                  _("Position the cursor of the mouse"),
                  _("Position the cursor at the given coordinates."),
                  _("Position cursor at _PARAM1_;_PARAM2_"),
-                 _("Mouse and touch"),
+                 "",
                  "res/actions/mouse24.png",
                  "res/actions/mouse.png")
 
@@ -153,7 +143,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                  _("Center the cursor"),
                  _("Center the cursor on the screen."),
                  _("Center the cursor"),
-                 _("Mouse and touch"),
+                 "",
                  "res/actions/mouse24.png",
                  "res/actions/mouse.png")
 
@@ -161,112 +151,153 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .MarkAsAdvanced();
 
   extension
-      .AddCondition("SourisX",
-                    _("Cursor X position"),
-                    _("Compare the X position of the cursor or of a touch."),
-                    _("Cursor X position is _PARAM1__PARAM2_"),
-                    _("Mouse and touch"),
-                    "res/conditions/mouse24.png",
-                    "res/conditions/mouse.png")
+      .AddExpressionAndCondition(
+          "number",
+          "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", "")
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("X position"))
+      .UseStandardParameters("number")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0")
-      .SetManipulatedType("number");
+      .SetDefaultValue("0");
+
+  // Support for deprecated names:
+  extension.AddDuplicatedCondition("SourisX", "MouseX").SetHidden();
+  extension.AddDuplicatedExpression("SourisX", "MouseX").SetHidden();
 
   extension
-      .AddCondition("SourisY",
-                    _("Cursor Y position"),
-                    _("Compare the Y position of the cursor or of a touch."),
-                    _("Cursor Y position is _PARAM1__PARAM2_"),
-                    _("Mouse and touch"),
-                    "res/conditions/mouse24.png",
-                    "res/conditions/mouse.png")
+      .AddExpressionAndCondition(
+          "number",
+          "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", "")
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Y position"))
+      .UseStandardParameters("number")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0")
-      .SetManipulatedType("number");
+      .SetDefaultValue("0");
+
+  // Support for deprecated names:
+  extension.AddDuplicatedCondition("SourisY", "MouseY").SetHidden();
+  extension.AddDuplicatedExpression("SourisY", "MouseY").SetHidden();
 
   extension
-      .AddCondition("SourisBouton",
+      .AddCondition("MouseButtonPressed",
                     _("Mouse button pressed or touch held"),
-                    _("Return true if the specified mouse button is pressed or "
+                    _("Check if the specified mouse button is pressed or "
                       "if a touch is in contact with the screen."),
                     _("Touch or _PARAM1_ mouse button is down"),
-                    _("Mouse and touch"),
+                    "",
                     "res/conditions/mouse24.png",
                     "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("mouse", _("Button to test"))
+      .AddParameter("mouse", _("Button to check"))
+      .MarkAsSimple();
+
+  // Support for deprecated names:
+  extension.AddDuplicatedCondition("SourisBouton", "MouseButtonPressed")
+      .SetHidden();
+
+  extension
+      .AddCondition("MouseButtonReleased",
+                    _("Mouse button released"),
+                    _("Check if the specified mouse button was released."),
+                    _("_PARAM1_ mouse button was released"),
+                    "",
+                    "res/conditions/mouse24.png",
+                    "res/conditions/mouse.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("mouse", _("Button to check"))
       .MarkAsSimple();
 
   extension
       .AddCondition(
-          "MouseButtonReleased",
-          _("Mouse button released"),
-          _("Return true if the specified mouse button was released."),
-          _("_PARAM1_ mouse button was released"),
-          _("Mouse and touch"),
+          "MouseButtonFromTextPressed",
+          _("Mouse button pressed or touch held (text expression)"),
+          _("Check if a mouse button, retrieved from the result of the "
+            "expression, is pressed."),
+          _("_PARAM1_ mouse button is pressed"),
+          "",
           "res/conditions/mouse24.png",
           "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("mouse", _("Button to test"))
-      .MarkAsSimple();
+      .AddParameter("stringWithSelector",
+                    _("Expression generating the mouse button to check"),
+                    "[\"Left\", \"Right\", \"Middle\"]")
+      .SetParameterLongDescription(
+          _("Possible values are Left, Right and Middle."))
+      .MarkAsAdvanced();
 
   extension
-      .AddCondition("TouchX",
-                    _("Touch X position"),
-                    _("Compare the X position of a specific touch."),
-                    _("Touch #_PARAM1_ X position is _PARAM2__PARAM3_"),
-                    _("Mouse and touch/Multitouch"),
-                    "res/conditions/touch24.png",
-                    "res/conditions/touch.png")
+      .AddCondition(
+          "MouseButtonFromTextReleased",
+          _("Mouse button released (text expression)"),
+          _("Check if a mouse button, retrieved from the result of the "
+            "expression, was just released."),
+          _("_PARAM1_ mouse button is released"),
+          "",
+          "res/conditions/mouse24.png",
+          "res/conditions/mouse.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("stringWithSelector",
+                    _("Expression generating the mouse button to check"),
+                    "[\"Left\", \"Right\", \"Middle\"]")
+      .SetParameterLongDescription(
+          _("Possible values are Left, Right and Middle."))
+      .MarkAsAdvanced();
+
+  extension
+      .AddExpressionAndCondition("number",
+                                 "TouchX",
+                                 _("Touch X position"),
+                                 _("the X position of a specific touch"),
+                                 _("the touch #_PARAM1_ X position"),
+                                 _("Multitouch"),
+                                 "res/conditions/touch24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("X position"))
+      .UseStandardParameters("number")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0")
-      .SetManipulatedType("number");
+      .SetDefaultValue("0");
 
   extension
-      .AddCondition("TouchY",
-                    _("Touch Y position"),
-                    _("Compare the Y position of a specific touch."),
-                    _("Touch #_PARAM1_ Y position is _PARAM2__PARAM3_"),
-                    _("Mouse and touch/Multitouch"),
-                    "res/conditions/touch24.png",
-                    "res/conditions/touch.png")
+      .AddExpressionAndCondition("number",
+                                 "TouchY",
+                                 _("Touch Y position"),
+                                 _("the Y position of a specific touch"),
+                                 _("the touch #_PARAM1_ Y position"),
+                                 _("Multitouch"),
+                                 "res/conditions/touch24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Y position"))
+      .UseStandardParameters("number")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0")
-      .SetManipulatedType("number");
+      .SetDefaultValue("0");
 
   extension
       .AddCondition(
           "PopStartedTouch",
           _("A new touch has started"),
-          _("Return true if a touch has started. The touch identifier can be "
+          _("Check if a touch has started. The touch identifier can be "
             "accessed using LastTouchId().\nAs more than one touch can be "
             "started, this condition is only true once for each touch: the "
             "next time you use it, it will be for a new touch, or it will "
             "return false if no more touches have just started."),
           _("A new touch has started"),
-          _("Mouse and touch/Multitouch"),
+          _("Multitouch"),
           "res/conditions/touch24.png",
           "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "");
@@ -275,101 +306,25 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddCondition(
           "PopEndedTouch",
           _("A touch has ended"),
-          _("Return true if a touch has ended. The touch identifier can be "
+          _("Check if a touch has ended. The touch identifier can be "
             "accessed using LastEndedTouchId().\nAs more than one touch can be "
             "ended, this condition is only true once for each touch: the next "
             "time you use it, it will be for a new touch, or it will return "
             "false if no more touches have just ended."),
           _("A touch has ended"),
-          _("Mouse and touch/Multitouch"),
+          _("Multitouch"),
           "res/conditions/touch24.png",
           "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "");
 
-  extension
-      .AddExpression("MouseX",
-                     _("Cursor X position"),
-                     _("Cursor X position"),
-                     _("Mouse cursor"),
-                     "res/actions/mouse.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("camera", _("Camera"), "", true)
-      .SetDefaultValue("0");
-
-  extension
-      .AddExpression("SourisX",
-                     _("Cursor X position"),
-                     _("Cursor X position"),
-                     _("Mouse cursor"),
-                     "res/actions/mouse.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("camera", _("Camera"), "", true)
-      .SetDefaultValue("0")
-      .SetHidden();
-
-  extension
-      .AddExpression("MouseY",
-                     _("Cursor Y position"),
-                     _("Cursor Y position"),
-                     _("Mouse cursor"),
-                     "res/actions/mouse.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("camera", _("Camera"), "", true)
-      .SetDefaultValue("0");
-
-  extension
-      .AddExpression("SourisY",
-                     _("Cursor Y position"),
-                     _("Cursor Y position"),
-                     _("Mouse cursor"),
-                     "res/actions/mouse.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("camera", _("Camera"), "", true)
-      .SetDefaultValue("0")
-      .SetHidden();
-
   extension
       .AddExpression("MouseWheelDelta",
                      _("Mouse wheel: Displacement"),
                      _("Mouse wheel displacement"),
-                     _("Mouse cursor"),
+                     _("Mouse and touch"),
                      "res/actions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "");
 
-  extension
-      .AddExpression("TouchX",
-                     _("Touch X position"),
-                     _("Touch X position"),
-                     _("Multitouch"),
-                     "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Touch identifier"))
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("camera", _("Camera"), "", true)
-      .SetDefaultValue("0");
-
-  extension
-      .AddExpression("TouchY",
-                     _("Touch Y position"),
-                     _("Touch Y position"),
-                     _("Multitouch"),
-                     "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Touch identifier"))
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("camera", _("Camera"), "", true)
-      .SetDefaultValue("0");
-
   extension
       .AddExpression("LastTouchId",
                      _("Identifier of the last touch"),
@@ -385,8 +340,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                      _("Multitouch"),
                      "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "");
-
-#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/NetworkExtension.cpp

@@ -14,50 +14,118 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
   extension
       .SetExtensionInformation(
           "BuiltinNetwork",
-          _("Basic internet features"),
-          _("Built-in extension providing network features."),
+          _("Network"),
+          _("Features to send web requests, communicate with external \"APIs\" "
+            "and other network related tasks."),
           "Florian Rival",
           "Open source (MIT License)")
-      .SetExtensionHelpPath("/all-features/network");
+      .SetExtensionHelpPath("/all-features/network")
+      .SetCategory("Network");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Network"))
+      .SetIcon("res/actions/net24.png");
 
-#if defined(GD_IDE_ONLY)
   extension
       .AddAction(
           "SendRequest",
-          _("Send a request to a web page"),
-          _("Send a request to the specified web page.\n\nPlease note that for "
-            "the web platform games, the game must be hosted on the same host "
-            "as specified below, except if the server is configured to answer "
-            "to all requests (cross-domain requests)."),
-          _("Send _PARAM3_ request to _PARAM0__PARAM1_ with body: _PARAM2_"),
-          _("Network"),
+          "Send a request to a web page",
+          "Send a request to the specified web page.\n\nPlease note that for "
+          "the web games, the game must be hosted on the same host "
+          "as specified below, except if the server is configured to answer "
+          "to all requests (cross-domain requests).",
+          "Send _PARAM3_ request to _PARAM0__PARAM1_ with body: _PARAM2_",
+          "",
           "res/actions/net24.png",
           "res/actions/net.png")
-      .AddParameter("string", _("Host (example: http://www.some-server.org/)"))
-      .AddParameter("string", _("Path to page (Example: /page.php)"))
-      .AddParameter("string", _("Request body content"))
-      .AddParameter(
-          "string",
-          _("Method: \"POST\" or \"GET\" (if empty, GET will be used)"),
-          "",
-          true)
+      .AddParameter("string", "Host, with protocol")
+      .SetParameterLongDescription("Example: \"http://example.com/\".")
+      .AddParameter("string", "Path")
+      .SetParameterLongDescription(
+          "Example: \"/user/123\" or \"/some-page.php\".")
+      .AddParameter("string", "Request body content")
+      .AddParameter("string", "Method: \"POST\" or \"GET\"", "", true)
+      .SetParameterLongDescription("If empty, \"GET\" will be used.")
       .SetDefaultValue("\"GET\"")
-      .AddParameter(
-          "string",
-          _("Content type (application/x-www-form-urlencoded by default)"),
+      .AddParameter("string", "Content type", "", true)
+      .SetParameterLongDescription(
+          "If empty, \"application/x-www-form-urlencoded\" will be used.")
+      .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 "
+          "action \"Convert JSON to a scene variable\" afterwards, to "
+          "explore the results with a *structure variable*.")
+      .MarkAsComplex()
+      .SetHidden();
+
+  extension
+      .AddAction(
+          "SendAsyncRequest",
+          _("Send a request to a web page"),
+          _("Send an asynchronous request to the specified web page.\n\nPlease "
+            "note that for "
+            "the web games, the game must be hosted on the same host "
+            "as specified below, except if the server is configured to answer "
+            "to all requests (cross-domain requests)."),
+          _("Send a _PARAM2_ request to _PARAM0_ with body: _PARAM1_, and "
+            "store the result in _PARAM4_ (or in _PARAM5_ in case of error)"),
           "",
-          true)
+          "res/actions/net24.png",
+          "res/actions/net.png")
+      .AddParameter("string", _("URL (API or web-page address)"))
+      .SetParameterLongDescription(
+          _("Example: \"https://example.com/user/123\". Using *https* is "
+            "highly recommended."))
+      .AddParameter("string", _("Request body content"))
+      .AddParameter("stringWithSelector",
+                    _("Request method"),
+                    "[\"GET\", \"POST\", \"PUT\", \"HEAD\", \"DELETE\", "
+                    "\"PATCH\", \"OPTIONS\"]",
+                    false)
+      .SetParameterLongDescription(_("If empty, \"GET\" will be used."))
+      .SetDefaultValue("\"GET\"")
+      .AddParameter("string", _("Content type"), "", true)
+      .SetParameterLongDescription(
+          _("If empty, \"application/x-www-form-urlencoded\" will be used."))
       .AddParameter(
-          "scenevar", _("Store the response in this variable"), "", true)
+          "scenevar", _("Variable where to store the response"), "", 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 "
+            "action \"Convert JSON to a scene variable\" afterwards, to "
+            "explore the results with a *structure variable*."))
+      .AddParameter(
+          "scenevar", _("Variable where to store the error message"), "", true)
+      .SetParameterLongDescription(_(
+          "Optional, only used if an error occurs. This will contain the "
+          "[\"status "
+          "code\"](https://en.wikipedia.org/wiki/List_of_HTTP_status_codes) "
+          "if the server returns a status >= 400. If the request was not sent "
+          "at all (e.g. no internet or CORS issues), the variable will be set "
+          "to "
+          "\"REQUEST_NOT_SENT\"."))
       .MarkAsComplex();
 
+  extension
+      .AddAction("LaunchFile",
+                 _("Open a URL (web page) or a file"),
+                 _("This action launches the specified file or URL, in a "
+                   "browser (or in a new tab if the game is using the Web "
+                   "platform and is launched inside a browser)."),
+                 _("Open URL _PARAM0_ in a browser (or new tab)"),
+                 "",
+                 "res/actions/net24.png",
+                 "res/actions/net.png")
+      .AddParameter("string", _("URL (or filename)"))
+      .AddCodeOnlyParameter("currentScene", "")
+      .MarkAsAdvanced();
+
   extension
       .AddAction(
           "DownloadFile",
           _("Download a file"),
           _("Download a file from a web site"),
           _("Download file _PARAM1_ from _PARAM0_ under the name of _PARAM2_"),
-          _("Network"),
+          "",
           "res/actions/net24.png",
           "res/actions/net.png")
       .AddParameter("string", _("Host (for example : http://www.website.com)"))
@@ -67,71 +135,19 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
 
   extension
       .AddAction(
-          "JSONToVariableStructure",
-          _("Convert JSON to a variable"),
-          _("Parse a JSON object and store it into a variable"),
-          _("Parse JSON string _PARAM0_ and store it into variable _PARAM1_"),
-          _("Network"),
+          "EnableMetrics",
+          _("Enable (or disable) metrics collection"),
+          _("Enable, or disable, the sending of anonymous data used to compute "
+            "the number of sessions and other metrics from your game "
+            "players.\nBe sure to only send metrics if in accordance with the "
+            "terms of service of your game and if they player gave their "
+            "consent, depending on how your game/company handles this."),
+          _("Enable analytics metrics: _PARAM1_"),
+          "",
           "res/actions/net24.png",
           "res/actions/net.png")
-      .AddParameter("string", _("JSON string"))
-      .AddParameter("scenevar", _("Variable where store the JSON object"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("JSONToGlobalVariableStructure",
-                 _("Convert JSON to global variable"),
-                 _("Parse a JSON object and store it into a global variable"),
-                 _("Parse JSON string _PARAM0_ and store it into global "
-                   "variable _PARAM1_"),
-                 _("Network"),
-                 "res/actions/net24.png",
-                 "res/actions/net.png")
-      .AddParameter("string", _("JSON string"))
-      .AddParameter("globalvar",
-                    _("Global variable where store the JSON object"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("JSONToObjectVariableStructure",
-                 _("Convert JSON to object variable"),
-                 _("Parse a JSON object and store it into an object variable"),
-                 _("Parse JSON string _PARAM0_ and store it into variable "
-                   "_PARAM2_ of _PARAM1_"),
-                 _("Network"),
-                 "res/actions/net24.png",
-                 "res/actions/net.png")
-      .AddParameter("string", _("JSON string"))
-      .AddParameter("objectPtr", _("Object"))
-      .AddParameter("objectvar",
-                    _("Object variable where store the JSON object"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddStrExpression("ToJSON",
-                        _("Convert variable to JSON"),
-                        _("Convert a variable to JSON"),
-                        _("Conversion"),
-                        "res/conditions/toujours24.png")
-      .AddParameter("scenevar", _("The variable to be stringified"));
-
-  extension
-      .AddStrExpression("GlobalVarToJSON",
-                        _("Convert global variable to JSON"),
-                        _("Convert a global variable to JSON"),
-                        _("Conversion"),
-                        "res/conditions/toujours24.png")
-      .AddParameter("globalvar", _("The global variable to be stringified"));
-
-  extension
-      .AddStrExpression("ObjectVarToJSON",
-                        _("Convert object variable to JSON"),
-                        _("Convert an object variable to JSON"),
-                        _("Conversion"),
-                        "res/conditions/toujours24.png")
-      .AddParameter("objectPtr", _("The object with the variable"))
-      .AddParameter("objectvar", _("The object variable to be stringified"));
-#endif
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("yesorno", _("Enable the metrics?"));
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -14,68 +14,19 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
   extension
       .SetExtensionInformation(
           "BuiltinScene",
-          _("Scene management features"),
-          _("Built-in extension allowing to manipulate scenes and providing common features"),
+          _("Scene"),
+          _("Actions and conditions to manipulate the scenes during the game."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
-
-#if defined(GD_IDE_ONLY)
-
-  extension
-      .AddExpression("Random",
-                     _("Random integer"),
-                     _("Random integer"),
-                     _("Random"),
-                     "res/actions/position.png")
-      .SetHelpPath("/all-features/expressions")
-      .AddParameter("expression", _("Maximum value"));
-
-  extension
-      .AddExpression("RandomInRange",
-                     _("Random integer in range"),
-                     _("Random integer in range"),
-                     _("Random"),
-                     "res/actions/position.png")
-      .SetHelpPath("/all-features/expressions")
-      .AddParameter("expression", _("Minimum value"))
-      .AddParameter("expression", _("Maximum value"));
-
-  extension
-      .AddExpression("RandomFloat",
-                     _("Random float"),
-                     _("Random float"),
-                     _("Random"),
-                     "res/actions/position.png")
-      .SetHelpPath("/all-features/expressions")
-      .AddParameter("expression", _("Maximum value"));
-
-  extension
-      .AddExpression("RandomFloatInRange",
-                     _("Random float in range"),
-                     _("Random float in range"),
-                     _("Random"),
-                     "res/actions/position.png")
-      .SetHelpPath("/all-features/expressions")
-      .AddParameter("expression", _("Minimum value"))
-      .AddParameter("expression", _("Maximum value"));
-
-  extension
-      .AddExpression("RandomWithStep",
-                     _("Random value in steps"),
-                     _("Random value in steps"),
-                     _("Random"),
-                     "res/actions/position.png")
-      .SetHelpPath("/all-features/expressions")
-      .AddParameter("expression", _("Minimum value"))
-      .AddParameter("expression", _("Maximum value"))
-      .AddParameter("expression", _("Step"));
+  extension.AddInstructionOrExpressionGroupMetadata(_("Scene"))
+      .SetIcon("res/conditions/depart24.png");
 
   extension
       .AddStrExpression("CurrentSceneName",
                         _("Current scene name"),
                         _("Name of the current scene"),
-                        _("Scene"),
+                        "",
                         "res/actions/texte.png")
       .AddCodeOnlyParameter("currentScene", "");
 
@@ -84,7 +35,19 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
                     _("At the beginning of the scene"),
                     _("Is true only when scene just begins."),
                     _("At the beginning of the scene"),
-                    _("Scene"),
+                    "",
+                    "res/conditions/depart24.png",
+                    "res/conditions/depart.png")
+      .SetHelpPath("/interface/scene-editor/events")
+      .AddCodeOnlyParameter("currentScene", "")
+      .MarkAsSimple();
+
+  extension
+      .AddCondition("SceneJustResumed",
+                    _("Scene just resumed"),
+                    _("The scene has just resumed after being paused."),
+                    _("Scene just resumed"),
+                    "",
                     "res/conditions/depart24.png",
                     "res/conditions/depart.png")
       .SetHelpPath("/interface/scene-editor/events")
@@ -96,7 +59,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
                  _("Change the scene"),
                  _("Stop this scene and start the specified one instead."),
                  _("Change to scene _PARAM1_"),
-                 _("Scene"),
+                 "",
                  "res/actions/replaceScene24.png",
                  "res/actions/replaceScene.png")
       .SetHelpPath("/interface/scene-editor/events")
@@ -113,7 +76,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
                    "can use the \"Stop and go back to previous scene\" action "
                    "to go back to this scene."),
                  _("Pause the scene and start _PARAM1_"),
-                 _("Scene"),
+                 "",
                  "res/actions/pushScene24.png",
                  "res/actions/pushScene.png")
       .SetHelpPath("/interface/scene-editor/events")
@@ -128,7 +91,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
           _("Stop this scene and go back to the previous paused one.\nTo pause "
             "a scene, use the \"Pause and start a new scene\" action."),
           _("Stop the scene and go back to the previous paused one"),
-          _("Scene"),
+          "",
           "res/actions/popScene24.png",
           "res/actions/popScene.png")
       .SetHelpPath("/interface/scene-editor/events")
@@ -140,7 +103,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
                  _("Quit the game"),
                  _("Quit the game"),
                  _("Quit the game"),
-                 _("Scene"),
+                 "",
                  "res/actions/quit24.png",
                  "res/actions/quit.png")
       .SetHelpPath("/interface/scene-editor/events")
@@ -152,7 +115,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
                  _("Change background color"),
                  _("Change the background color of the scene."),
                  _("Set background color to _PARAM1_"),
-                 _("Scene"),
+                 "",
                  "res/actions/background24.png",
                  "res/actions/background.png")
       .SetHelpPath("/interface/scene-editor/events")
@@ -166,42 +129,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
                  _("mouse buttons must be taken "
                    "into account even\nif the window is not active."),
                  _("Disable input when focus is lost: _PARAM1_"),
-                 _("Scene"),
+                 "",
                  "res/actions/window24.png",
                  "res/actions/window.png")
       .SetHelpPath("/interface/scene-editor/events")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("yesorno", _("Deactivate input when focus is lost"))
       .MarkAsAdvanced();
-
-  extension
-      .AddCondition("Egal",
-                    _("Compare two numbers"),
-                    _("Compare the two numbers."),
-                    _("_PARAM0_ _PARAM1_ _PARAM2_"),
-                    _("Other"),
-                    "res/conditions/egal24.png",
-                    "res/conditions/egal.png")
-      .SetHelpPath("/all-features/advanced-conditions")
-      .AddParameter("expression", _("First expression"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Second expression"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddCondition("StrEqual",
-                    _("Compare two strings"),
-                    _("Compare the two strings."),
-                    _("_PARAM0_ _PARAM1_ _PARAM2_"),
-                    _("Other"),
-                    "res/conditions/egal24.png",
-                    "res/conditions/egal.png")
-      .SetHelpPath("/all-features/advanced-conditions")
-      .AddParameter("string", _("First string expression"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("string", _("Second string expression"))
-      .MarkAsAdvanced();
-#endif
 }
 
 }  // namespace gd

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

@@ -21,7 +21,7 @@ Direction::~Direction(){};
 
 void Direction::SetLoop(bool loop_) { loop = loop_; }
 
-void Direction::SetTimeBetweenFrames(float time) { timeBetweenFrame = time; }
+void Direction::SetTimeBetweenFrames(double time) { timeBetweenFrame = time; }
 
 void Direction::AddSprite(const Sprite& sprite) { sprites.push_back(sprite); }
 
@@ -75,11 +75,9 @@ void Direction::UnserializeFrom(const gd::SerializerElement& element) {
   SetTimeBetweenFrames(
       element.GetDoubleAttribute("timeBetweenFrames", 1, "tempsEntre"));
   SetLoop(element.GetBoolAttribute("looping", false, "boucle"));
-#if defined(GD_IDE_ONLY)
   SetMetadata(element.HasAttribute("metadata") || element.HasChild("metadata")
                   ? element.GetStringAttribute("metadata")
                   : "");
-#endif
 
   const gd::SerializerElement& spritesElement =
       element.GetChild("sprites", 0, "Sprites");
@@ -135,7 +133,6 @@ void Direction::UnserializeFrom(const gd::SerializerElement& element) {
   }
 };
 
-#if defined(GD_IDE_ONLY)
 void SavePoint(const Point& point, gd::SerializerElement& element) {
   element.SetAttribute("name", point.GetName());
   element.SetAttribute("x", point.GetX());
@@ -190,6 +187,5 @@ void Direction::SerializeTo(gd::SerializerElement& element) const {
   if (!GetMetadata().empty()) element.SetAttribute("metadata", GetMetadata());
   SaveSpritesDirection(sprites, element.AddChild("sprites"));
 }
-#endif
 
 }  // namespace gd

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

@@ -43,14 +43,14 @@ class GD_CORE_API Direction {
   /**
    * \brief Get the time between each sprite
    */
-  inline float GetTimeBetweenFrames() const { return timeBetweenFrame; }
+  inline double GetTimeBetweenFrames() const { return timeBetweenFrame; }
 
   /**
    * \brief Set the time between each sprite
    *
    * \param time Time between each sprite, in seconds.
    */
-  void SetTimeBetweenFrames(float time);
+  void SetTimeBetweenFrames(double time);
 
   /**
    * \brief Return a reference to a sprite of the direction.
@@ -113,7 +113,6 @@ class GD_CORE_API Direction {
    */
   void MoveSprite(std::size_t oldIndex, std::size_t newIndex);
 
-#if defined(GD_IDE_ONLY)
   /**
    * \brief Set the metadata (any string) associated to the Direction.
    * \note Can be used by external editors to store extra information.
@@ -124,20 +123,15 @@ class GD_CORE_API Direction {
    * \brief Return the (optional) metadata associated to the Direction.
    */
   virtual const gd::String& GetMetadata() const { return metadata; }
-#endif
 
   void UnserializeFrom(const gd::SerializerElement& element);
-#if defined(GD_IDE_ONLY)
   void SerializeTo(gd::SerializerElement& element) const;
-#endif
 
  private:
   bool loop;               ///< true if the animation must loop.
-  float timeBetweenFrame;  ///< The time between each sprite of the animation.
+  double timeBetweenFrame;  ///< The time between each sprite of the animation.
   std::vector<Sprite> sprites;  ///< The sprites of the direction.
-#if defined(GD_IDE_ONLY)
   gd::String metadata;
-#endif
 };
 
 }  // namespace gd

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

@@ -7,7 +7,6 @@
 #include <SFML/Graphics/Sprite.hpp>
 #include <iostream>
 #include "GDCore/Extensions/Builtin/SpriteExtension/Polygon2d.h"
-#include "GDCore/Project/ImageManager.h"
 
 using namespace std;
 
@@ -16,11 +15,7 @@ namespace gd {
 Point Sprite::badPoint("");
 
 Sprite::Sprite()
-    :
-#if !defined(EMSCRIPTEN)
-      hasItsOwnImage(false),
-#endif
-      automaticCollisionMask(true),
+    : automaticCollisionMask(true),
       origine("origine"),
       centre("centre"),
       automaticCentre(true) {
@@ -73,36 +68,10 @@ Point& Sprite::GetPoint(const gd::String& name) {
 
 bool Sprite::SetDefaultCenterPoint(bool enabled) {
   automaticCentre = enabled;
-
-#if !defined(EMSCRIPTEN)
-  if (automaticCentre)
-    centre.SetXY(sfmlSprite.getLocalBounds().width / 2,
-                 sfmlSprite.getLocalBounds().height / 2);
-#endif
-
   return true;
 }
 
 std::vector<Polygon2d> Sprite::GetCollisionMask() const {
-  // TODO(perf): Cache to avoid re-creating a mask at every call
-#if !defined(EMSCRIPTEN)
-  if (automaticCollisionMask) {
-    std::vector<Polygon2d> mask;
-
-    Polygon2d rectangle;
-    rectangle.vertices.push_back(sf::Vector2f(0, 0));
-    rectangle.vertices.push_back(
-        sf::Vector2f(sfmlSprite.getLocalBounds().width, 0));
-    rectangle.vertices.push_back(sf::Vector2f(
-        sfmlSprite.getLocalBounds().width, sfmlSprite.getLocalBounds().height));
-    rectangle.vertices.push_back(
-        sf::Vector2f(0, sfmlSprite.getLocalBounds().height));
-
-    mask.push_back(rectangle);
-    return mask;
-  }
-#endif
-
   return customCollisionMask;
 }
 
@@ -111,25 +80,4 @@ void Sprite::SetCustomCollisionMask(
   customCollisionMask = collisionMask;
 }
 
-#if !defined(EMSCRIPTEN)
-void Sprite::LoadImage(std::shared_ptr<SFMLTextureWrapper> image_) {
-  sfmlImage = image_;
-  sfmlSprite.setTexture(sfmlImage->texture, true);
-  hasItsOwnImage = false;
-
-  if (automaticCentre)
-    centre.SetXY(sfmlSprite.getLocalBounds().width / 2,
-                 sfmlSprite.getLocalBounds().height / 2);
-}
-
-void Sprite::MakeSpriteOwnsItsImage() {
-  if (!hasItsOwnImage || sfmlImage == std::shared_ptr<SFMLTextureWrapper>()) {
-    sfmlImage = std::make_shared<SFMLTextureWrapper>(
-        sfmlImage->texture);  // Copy the texture.
-    sfmlSprite.setTexture(sfmlImage->texture);
-    hasItsOwnImage = true;
-  }
-}
-#endif
-
 }  // namespace gd

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

@@ -11,7 +11,6 @@
 #include "GDCore/Extensions/Builtin/SpriteExtension/Point.h"
 #include "GDCore/Extensions/Builtin/SpriteExtension/Polygon2d.h"
 #include "GDCore/String.h"
-class SFMLTextureWrapper;
 #undef LoadImage  // prevent windows.h to be polluting everything
 
 namespace gd {
@@ -19,9 +18,6 @@ namespace gd {
 /**
  * \brief Represents a sprite to be displayed on the screen.
  *
- * A sprite contains a SFML sprite to be displayed, some points,
- * and can also have its own texture (rather than a texture from ImageManager).
- *
  * \see Direction
  * \see SpriteObject
  * \ingroup SpriteObjectExtension
@@ -163,53 +159,7 @@ class GD_CORE_API Sprite {
    */
   bool SetDefaultCenterPoint(bool enabled);
 
-#if !defined(EMSCRIPTEN)
-  /** \name Sprite runtime management
-   * Functions used by the C++ game engine.
-   */
-  ///@{
-  /**
-   * \brief Get the SFML sprite associated with the sprite
-   */
-  inline const sf::Sprite& GetSFMLSprite() const { return sfmlSprite; }
-
-  /**
-   * \brief Get the SFML sprite associated with the sprite
-   */
-  inline sf::Sprite& GetSFMLSprite() { return sfmlSprite; }
-
-  /**
-   * \brief Set the SFML texture of the sprite
-   */
-  void LoadImage(std::shared_ptr<SFMLTextureWrapper> image);
-
-  /**
-   * \brief Get SFML texture used by the sprite
-   */
-  std::shared_ptr<SFMLTextureWrapper> GetSFMLTexture() { return sfmlImage; };
-
-  /**
-   * \brief Get SFML texture used by the sprite
-   */
-  const std::shared_ptr<SFMLTextureWrapper> GetSFMLTexture() const {
-    return sfmlImage;
-  };
-
-  /**
-   * \brief Make the sprite, if it uses a texture from ImageManager,
-   * copy this texture and take ownership of it.
-   */
-  void MakeSpriteOwnsItsImage();
-///@}
-#endif
-
  private:
-#if !defined(EMSCRIPTEN)
-  sf::Sprite sfmlSprite;  ///< Displayed SFML sprite
-  std::shared_ptr<SFMLTextureWrapper>
-      sfmlImage;        ///< Pointer to the image displayed by the sprite.
-  bool hasItsOwnImage;  ///< True if sfmlImage is only owned by this Sprite.
-#endif
   gd::String image;  ///< Name of the image to be loaded in Image Manager.
 
   bool automaticCollisionMask;  ///< True to use the custom collision mask.

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

@@ -23,43 +23,40 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects/sprite");
 
-  gd::ObjectMetadata& obj = extension.AddObject<SpriteObject>(
-      "Sprite",
-      _("Sprite"),
-      _("Animated object which can be used for most elements of a game"),
-      "CppPlatform/Extensions/spriteicon.png");
+  gd::ObjectMetadata& obj =
+      extension
+          .AddObject<SpriteObject>("Sprite",
+                                   _("Sprite"),
+                                   _("Animated object which can be used for "
+                                     "most elements of a game"),
+                                   "CppPlatform/Extensions/spriteicon.png")
+          .SetCategoryFullName(_("General"));
 
-#if defined(GD_IDE_ONLY)
   obj.AddAction("Opacity",
-                _("Change Sprite opacity"),
+                _("Change sprite opacity"),
                 _("Change the opacity of a Sprite. 0 is fully transparent, 255 "
                   "is opaque (default)."),
-                _("Do _PARAM1__PARAM2_ to the opacity of _PARAM0_"),
+                _("the opacity"),
                 _("Visibility"),
                 "res/actions/opacity24.png",
                 "res/actions/opacity.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value (between 0 and 255)"))
-      .MarkAsSimple()
-      .SetManipulatedType("number");
+      .UseStandardOperatorParameters("number")
+      .MarkAsSimple();
 
   obj.AddAction("ChangeAnimation",
                 _("Change the animation"),
                 _("Change the animation of the object, using the animation "
                   "number in the animations list."),
-                _("Do _PARAM1__PARAM2_ to the number of current animation of "
-                  "_PARAM0_"),
+                _("the number of the animation"),
                 _("Animations and images"),
                 "res/actions/animation24.png",
                 "res/actions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
-      .MarkAsSimple()
-      .SetManipulatedType("number");
+      .UseStandardOperatorParameters("number")
+      .MarkAsSimple();
 
   obj.AddAction("SetAnimationName",
                 _("Change the animation (by name)"),
@@ -71,7 +68,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "res/actions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("string", _("Animation name"))
+      .AddParameter("objectAnimationName", _("Animation name"))
       .MarkAsAdvanced();
 
   obj.AddAction(
@@ -80,35 +77,32 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          _("Change the direction of the object.\nIf the object is set to "
            "automatically rotate, the direction is its angle.\nIf the object "
            "is in 8 directions mode, the valid directions are 0..7"),
-         _("Do _PARAM1__PARAM2_ to the direction of _PARAM0_"),
+         _("the direction"),
          _("Direction"),
          "res/actions/direction24.png",
          "res/actions/direction.png")
-
+      .SetHidden()  // Hide as 8 direction is not supported officially in the
+                    // interface.
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardOperatorParameters("number")
+      .MarkAsAdvanced();
 
   obj.AddAction("ChangeSprite",
                 _("Current frame"),
                 _("Modify the current frame of the object"),
-                _("Do _PARAM1__PARAM2_ to animation frame of _PARAM0_"),
+                _("the animation frame"),
                 _("Animations and images"),
                 "res/actions/sprite24.png",
                 "res/actions/sprite.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardOperatorParameters("number")
+      .MarkAsAdvanced();
 
   obj.AddAction("PauseAnimation",
                 _("Pause the animation"),
-                _("Pause the current animation of the object"),
-                _("Pause the current animation of _PARAM0_"),
+                _("Pause the animation of the object"),
+                _("Pause the animation of _PARAM0_"),
                 _("Animations and images"),
                 "res/actions/animation24.png",
                 "res/actions/animation.png")
@@ -118,8 +112,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
 
   obj.AddAction("PlayAnimation",
                 _("Play the animation"),
-                _("Play the current animation of the object"),
-                _("Play the current animation of _PARAM0_"),
+                _("Play the animation of the object"),
+                _("Play the animation of _PARAM0_"),
                 _("Animations and images"),
                 "res/actions/animation24.png",
                 "res/actions/animation.png")
@@ -132,21 +126,19 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          _("Animation speed scale"),
          _("Modify the animation speed scale (1 = the default speed, >1 = "
            "faster and <1 = slower)."),
-         _("Do _PARAM1__PARAM2_ to the animation speed scale of _PARAM0_"),
+         _("the animation speed scale"),
          _("Animations and images"),
          "res/actions/animation24.png",
          "res/actions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
-      .MarkAsSimple()
-      .SetManipulatedType("number");
+      .UseStandardOperatorParameters("number")
+      .MarkAsSimple();
 
   obj.AddAction("TourneVersPos",
-                _("Rotate an object toward a position"),
-                _("Rotate an object towards a position."),
-                _("Rotate _PARAM0_ towards _PARAM1_;_PARAM2_"),
+                "Rotate an object toward a position",
+                "Rotate an object towards a position.",
+                "Rotate _PARAM0_ towards _PARAM1_;_PARAM2_",
                 _("Direction"),
                 "res/actions/direction24.png",
                 "res/actions/direction.png")
@@ -162,98 +154,123 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
   obj.AddAction("ChangeScale",
                 _("Scale"),
                 _("Modify the scale of the specified object."),
-                _("Do _PARAM1__PARAM2_ to the scale of _PARAM0_"),
+                _("the scale"),
                 _("Size"),
                 "res/actions/scale24.png",
                 "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeScaleWidth",
                 _("Scale on X axis"),
                 _("Modify the scale of the width of an object."),
-                _("Do _PARAM1__PARAM2_ to the width's scale of _PARAM0_"),
+                _("the width's scale"),
                 _("Size"),
                 "res/actions/scale24.png",
                 "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardOperatorParameters("number")
+      .MarkAsAdvanced();
 
   obj.AddAction("ChangeScaleHeight",
                 _("Scale on Y axis"),
                 _("Modify the scale of the height of an object."),
-                _("Do _PARAM1__PARAM2_ to the height's scale of _PARAM0_"),
+                _("the height's scale"),
                 _("Size"),
                 "res/actions/scale24.png",
                 "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardOperatorParameters("number")
+      .MarkAsAdvanced();
 
   obj.AddAction("ChangeWidth",
                 _("Width"),
                 _("Change the width of a Sprite object."),
-                _("Do _PARAM1__PARAM2_ to the width of _PARAM0_"),
+                _("the width"),
                 _("Size"),
                 "res/actions/scale24.png",
                 "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardOperatorParameters("number")
+      .MarkAsAdvanced();
+
+  obj.AddCondition("Width",
+                   _("Width"),
+                   _("Compare the width of a Sprite object."),
+                   _("the width"),
+                   _("Size"),
+                   "res/conditions/scaleWidth24.png",
+                   "res/conditions/scaleWidth.png")
+
+      .AddParameter("object", _("Object"), "Sprite")
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();
 
   obj.AddAction("ChangeHeight",
                 _("Height"),
                 _("Change the height of a Sprite object."),
-                _("Do _PARAM1__PARAM2_ to the height of _PARAM0_"),
+                _("the height"),
                 _("Size"),
                 "res/actions/scale24.png",
                 "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardOperatorParameters("number")
+      .MarkAsAdvanced();
+
+  obj.AddCondition("Height",
+                   _("Height"),
+                   _("Compare the height of a Sprite object."),
+                   _("the height"),
+                   _("Size"),
+                   "res/conditions/scaleHeight24.png",
+                   "res/conditions/scaleHeight.png")
+
+      .AddParameter("object", _("Object"), "Sprite")
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();
+
+  obj.AddAction("SetSize",
+                _("Size"),
+                _("Change the size of an object."),
+                _("Change the size of _PARAM0_: set to _PARAM1_x_PARAM2_"),
+                _("Size"),
+                "res/actions/scale24.png",
+                "res/actions/scale.png")
+
+      .AddParameter("object", _("Object"))
+      .AddParameter("expression", _("Width"))
+      .AddParameter("expression", _("Height"))
+      .MarkAsAdvanced();
 
   obj.AddCondition(
          "Animation",
          _("Current animation"),
-         _("Compare the number of the current animation of the object."),
-         _("The number of the current animation of _PARAM0_ is "
-           "_PARAM1__PARAM2_"),
+         _("Compare the number of the animation played by the object."),
+         _("the number of the animation"),
          _("Animations and images"),
          "res/conditions/animation24.png",
          "res/conditions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Number to test"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();
 
   obj.AddCondition("AnimationName",
                    _("Current animation name"),
-                   _("Check the current animation of the object."),
+                   _("Check the animation by played by the object."),
                    _("The animation of _PARAM0_ is _PARAM1_"),
                    _("Animations and images"),
                    "res/conditions/animation24.png",
                    "res/conditions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("string", _("Animation name"))
+      .AddParameter("objectAnimationName", _("Animation name"))
       .MarkAsAdvanced();
 
   obj.AddCondition(
@@ -262,33 +279,32 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          _("Compare the direction of the object. If 8 direction mode is "
            "activated for the sprite, the value taken for direction will be "
            "from 0 to 7. Otherwise, the direction is in degrees."),
-         _("Direction of _PARAM0_ is _PARAM1__PARAM2_"),
+         _("the direction"),
          _("Direction"),
          "res/conditions/direction24.png",
          "res/conditions/direction.png")
-
+      .SetHidden()  // Hide as 8 direction is not supported officially in the
+                    // interface.
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Direction to test"))
-      .SetManipulatedType("number");
+      .UseStandardRelationalOperatorParameters("number");
 
   obj.AddCondition("Sprite",
                    _("Current frame"),
-                   _("Test the number of the current animation frame."),
-                   _("The animation frame of _PARAM0_ is _PARAM1__PARAM2_"),
+                   _("Compare the index of the current frame in the animation "
+                     "displayed by the specified object. The first frame in an "
+                     "animation starts at index 0."),
+                   _("the animation frame"),
                    _("Animations and images"),
                    "res/conditions/sprite24.png",
                    "res/conditions/sprite.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Animation frame to test"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();
 
   obj.AddCondition("AnimStopped",
                    _("Animation paused"),
-                   _("Test if the animation of an object is paused"),
+                   _("Check if the animation of an object is paused."),
                    _("The animation of _PARAM0_ is paused"),
                    _("Animations and images"),
                    "res/conditions/animation24.png",
@@ -312,112 +328,68 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
   obj.AddCondition("ScaleWidth",
                    _("Scale on X axis"),
                    _("Compare the scale of the width of an object."),
-                   _("The width's scale of _PARAM0_ is _PARAM1__PARAM2_"),
+                   _("the width's scale"),
                    _("Size"),
                    "res/conditions/scaleWidth24.png",
                    "res/conditions/scaleWidth.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Value to compare"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();
 
   obj.AddCondition("ScaleHeight",
                    _("Scale on Y axis"),
                    _("Compare the scale of the height of an object."),
-                   _("The height's scale of _PARAM0_ is _PARAM1__PARAM2_"),
+                   _("the height's scale"),
                    _("Size"),
                    "res/conditions/scaleHeight24.png",
                    "res/conditions/scaleHeight.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Value to compare"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();
 
   obj.AddCondition("Opacity",
                    _("Opacity"),
                    _("Compare the opacity of a Sprite, between 0 (fully "
                      "transparent) to 255 (opaque)."),
-                   _("The opacity of _PARAM0_ is _PARAM1__PARAM2_"),
+                   _("the opacity"),
                    _("Visibility"),
                    "res/conditions/opacity24.png",
                    "res/conditions/opacity.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Value to compare"))
-      .MarkAsSimple()
-      .SetManipulatedType("number");
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsSimple();
 
   obj.AddCondition(
          "BlendMode",
          _("Blend mode"),
          _("Compare the number of the blend mode currently used by an object"),
-         _("The number of the current blend mode of _PARAM0_ is "
-           "_PARAM1__PARAM2_"),
+         _("the number of the current blend mode"),
          _("Effects"),
          "res/conditions/opacity24.png",
          "res/conditions/opacity.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression",
-                    _("Value to compare (0: Alpha, 1: Add, 2: Multiply, 3: None)"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();
 
-  obj.AddAction("CopyImageOnImageOfSprite",
-                _("Copy an image on the current one of an object"),
-                _("Copy an image on the current image of an object.\nNote that "
-                  "the source image must be preferably kept loaded in memory."),
-                _("Copy image _PARAM2_ on the current of _PARAM0_ at "
-                  "_PARAM3_;_PARAM4_"),
+  obj.AddAction("ChangeColor",
+                _("Tint color"),
+                _("Change the tint of an object. The default color is white."),
+                _("Change tint of _PARAM0_ to _PARAM1_"),
                 _("Effects"),
-                "res/copy24.png",
-                "res/copyicon.png")
+                "res/actions/color24.png",
+                "res/actions/color.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Name of the source image"))
-      .AddParameter("expression", _("X position"))
-      .AddParameter("expression", _("Y position"))
-      .AddParameter(
-          "yesorno",
-          _("Should the copy take in account the source transparency\?"));
-
-  obj.AddAction(
-         "CreateMaskFromColorOnActualImage",  // Actual is indeed a mistake :
-                                              // Current should have been
-                                              // chosen.
-         _("Make a color of the image of an object transparent"),
-         _("Make a color of the image of an object transparent."),
-         _("Make color _PARAM1_ of the current image of _PARAM0_ transparent"),
-         _("Effects"),
-         "res/actions/opacity24.png",
-         "res/actions/opacity.png")
-
-      .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("color", _("Color to make transparent"));
-
-  obj.AddAction(
-         "ChangeColor",
-         _("Global color"),
-         _("Change the global color of an object. The default color is white."),
-         _("Change color of _PARAM0_ to _PARAM1_"),
-         _("Effects"),
-         "res/actions/color24.png",
-         "res/actions/color.png")
-
-      .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("color", _("Color"));
+      .AddParameter("color", _("Tint"));
 
   obj.AddAction("ChangeBlendMode",
                 _("Blend mode"),
                 _("Change the number of the blend mode of an object.\nThe "
-                  "default blend mode is 0 (Alpha)."),
+                  "default blend mode is 0 (Normal)."),
                 _("Change Blend mode of _PARAM0_ to _PARAM1_"),
                 _("Effects"),
                 "res/actions/color24.png",
@@ -425,13 +397,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
 
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("expression",
-                    _("Mode (0 : Alpha, 1 : Add, 2 : Multiply, 3 : None)"))
+                    _("Mode (0: Normal, 1: Add, 2: Multiply, 3: Screen)"))
       .MarkAsSimple();
 
   obj.AddAction("FlipX",
                 _("Flip the object horizontally"),
                 _("Flip the object horizontally"),
-                _("Flip horizontally _PARAM0_ : _PARAM1_"),
+                _("Flip horizontally _PARAM0_: _PARAM1_"),
                 _("Effects"),
                 "res/actions/flipX24.png",
                 "res/actions/flipX.png")
@@ -443,7 +415,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
   obj.AddAction("FlipY",
                 _("Flip the object vertically"),
                 _("Flip the object vertically"),
-                _("Flip vertically _PARAM0_ : _PARAM1_"),
+                _("Flip vertically _PARAM0_: _PARAM1_"),
                 _("Effects"),
                 "res/actions/flipY24.png",
                 "res/actions/flipY.png")
@@ -454,7 +426,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
 
   obj.AddCondition("FlippedX",
                    _("Horizontally flipped"),
-                   _("Return true if the object is horizontally flipped"),
+                   _("Check if the object is horizontally flipped"),
                    _("_PARAM0_ is horizontally flipped"),
                    _("Effects"),
                    "res/actions/flipX24.png",
@@ -464,7 +436,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
 
   obj.AddCondition("FlippedY",
                    _("Vertically flipped"),
-                   _("Return true if the object is vertically flipped"),
+                   _("Check if the object is vertically flipped"),
                    _("_PARAM0_ is vertically flipped"),
                    _("Effects"),
                    "res/actions/flipY24.png",
@@ -473,15 +445,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
       .AddParameter("object", _("Object"), "Sprite");
 
   obj.AddAction("TourneVers",
-                _("Rotate an object toward another"),
-                _("Rotate an object towards another."),
-                _("Rotate _PARAM0_ towards _PARAM1_"),
+                "Rotate an object toward another",
+                "Rotate an object towards another.",
+                "Rotate _PARAM0_ towards _PARAM1_",
                 _("Direction"),
                 "res/actions/direction24.png",
                 "res/actions/direction.png")
 
-      .AddParameter("object", _("Object to be rotated"), "Sprite")
-      .AddParameter("objectPtr", _("Rotate toward this object"))
+      .AddParameter("object", _("Object"), "Sprite")
+      .AddParameter("objectPtr", "Rotate toward this object")
       .AddCodeOnlyParameter("currentScene", "")
       .SetHidden();  // Deprecated
 
@@ -492,7 +464,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     "res/actions/position.png")
       .SetHidden()
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("string", _("Name of the point"), "", true);
+      .AddParameter("objectPointName", _("Name of the point"), "", true);
 
   obj.AddExpression("Y",
                     _("Y position of a point"),
@@ -501,7 +473,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     "res/actions/position.png")
       .SetHidden()
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("string", _("Name of the point"), "", true);
+      .AddParameter("objectPointName", _("Name of the point"), "", true);
 
   obj.AddExpression("PointX",
                     _("X position of a point"),
@@ -510,7 +482,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     "res/actions/position.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("string", _("Name of the point"));
+      .AddParameter("objectPointName", _("Name of the point"));
 
   obj.AddExpression("PointY",
                     _("Y position of a point"),
@@ -519,7 +491,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     "res/actions/position.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("string", _("Name of the point"));
+      .AddParameter("objectPointName", _("Name of the point"));
 
   obj.AddExpression("Direc",
                     _("Direction"),
@@ -534,6 +506,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("Direction of the object"),
                     _("Direction"),
                     "res/actions/direction.png")
+      .SetHidden()  // Hide as 8 direction is not supported officially in the
+                    // interface.
       .AddParameter("object", _("Object"), "Sprite");
 
   obj.AddExpression("Anim",
@@ -605,7 +579,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
       .AddParameter("objectList", _("Object 1"), "Sprite")
       .AddParameter("objectList", _("Object 2"), "Sprite")
       .AddCodeOnlyParameter("conditionInverted", "");
-#endif
 }
 
 }  // namespace gd

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

@@ -4,26 +4,24 @@
  * reserved. This project is released under the MIT License.
  */
 
+#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h"
+
+#include <SFML/Graphics.hpp>
 #include <algorithm>
+
 #include "GDCore/CommonTools.h"
 #include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
 #include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
 #include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
-#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h"
-#include "GDCore/Project/ImageManager.h"
+#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
 #include "GDCore/Project/InitialInstance.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
+#include "GDCore/Project/PropertyDescriptor.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Tools/Localization.h"
 
-#if defined(GD_IDE_ONLY)
-#include <SFML/Graphics.hpp>
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
-#endif
-
 namespace gd {
 
 Animation SpriteObject::badAnimation;
@@ -82,7 +80,6 @@ void SpriteObject::DoUnserializeFrom(gd::Project& project,
   }
 }
 
-#if defined(GD_IDE_ONLY)
 void SpriteObject::DoSerializeTo(gd::SerializerElement& element) const {
   element.SetAttribute("updateIfNotVisible", updateIfNotVisible);
 
@@ -107,8 +104,8 @@ void SpriteObject::DoSerializeTo(gd::SerializerElement& element) const {
   }
 }
 
-std::map<gd::String, gd::PropertyDescriptor> SpriteObject::GetProperties(
-    gd::Project& project) const {
+std::map<gd::String, gd::PropertyDescriptor> SpriteObject::GetProperties()
+    const {
   std::map<gd::String, gd::PropertyDescriptor> properties;
   properties[_("Animate even if hidden or far from the screen")]
       .SetValue(updateIfNotVisible ? "true" : "false")
@@ -119,8 +116,7 @@ std::map<gd::String, gd::PropertyDescriptor> SpriteObject::GetProperties(
 }
 
 bool SpriteObject::UpdateProperty(const gd::String& name,
-                                  const gd::String& value,
-                                  gd::Project& project) {
+                                  const gd::String& value) {
   if (name == _("Animate even if hidden or far from the screen"))
     updateIfNotVisible = value == "1";
 
@@ -141,29 +137,33 @@ void SpriteObject::ExposeResources(gd::ArbitraryResourceWorker& worker) {
 }
 
 std::map<gd::String, gd::PropertyDescriptor>
-SpriteObject::GetInitialInstanceProperties(const gd::InitialInstance& position,
-                                           gd::Project& project,
-                                           gd::Layout& scene) {
+SpriteObject::GetInitialInstanceProperties(
+    const gd::InitialInstance& initialInstance,
+    gd::Project& project,
+    gd::Layout& scene) {
   std::map<gd::String, gd::PropertyDescriptor> properties;
-  properties[_("Animation")] =
-      position.floatInfos.find("animation") != position.floatInfos.end()
-          ? gd::String::From(position.floatInfos.find("animation")->second)
-          : gd::String("0");
+  properties["animation"] =
+      gd::PropertyDescriptor(
+          gd::String::From(initialInstance.GetRawDoubleProperty("animation")))
+          .SetLabel(_("Animation"))
+          .SetType("number");
 
   return properties;
 }
 
-bool SpriteObject::UpdateInitialInstanceProperty(gd::InitialInstance& position,
-                                                 const gd::String& name,
-                                                 const gd::String& value,
-                                                 gd::Project& project,
-                                                 gd::Layout& scene) {
-  if (name == _("Animation"))
-    position.floatInfos["animation"] = value.To<int>();
+bool SpriteObject::UpdateInitialInstanceProperty(
+    gd::InitialInstance& initialInstance,
+    const gd::String& name,
+    const gd::String& value,
+    gd::Project& project,
+    gd::Layout& scene) {
+  if (name == "animation") {
+    initialInstance.SetRawDoubleProperty(
+        "animation", std::max(0, value.empty() ? 0 : value.To<int>()));
+  }
 
   return true;
 }
-#endif
 
 const Animation& SpriteObject::GetAnimation(std::size_t nb) const {
   if (nb >= animations.size()) return badAnimation;

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

@@ -16,7 +16,6 @@ class Object;
 class Layout;
 class Sprite;
 class Animation;
-class MainFrameWrapper;
 class SerializerElement;
 class PropertyDescriptor;
 }  // namespace gd
@@ -45,14 +44,11 @@ class GD_CORE_API SpriteObject : public gd::Object {
     return gd::make_unique<SpriteObject>(*this);
   }
 
-#if defined(GD_IDE_ONLY)
   void ExposeResources(gd::ArbitraryResourceWorker& worker) override;
 
-  std::map<gd::String, gd::PropertyDescriptor> GetProperties(
-      gd::Project& project) const override;
+  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
   bool UpdateProperty(const gd::String& name,
-                      const gd::String& value,
-                      gd::Project& project) override;
+                      const gd::String& value) override;
 
   std::map<gd::String, gd::PropertyDescriptor> GetInitialInstanceProperties(
       const gd::InitialInstance& position,
@@ -63,7 +59,6 @@ class GD_CORE_API SpriteObject : public gd::Object {
                                      const gd::String& value,
                                      gd::Project& project,
                                      gd::Layout& scene) override;
-#endif
 
   /** \name Animations
    * Methods related to animations management
@@ -121,14 +116,24 @@ class GD_CORE_API SpriteObject : public gd::Object {
    * animation of the object.
    */
   const std::vector<Animation>& GetAllAnimations() const { return animations; }
+
+  /**
+   * \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).
+   */
+  bool GetUpdateIfNotVisible() const { return updateIfNotVisible; }
   ///@}
 
  private:
   void DoUnserializeFrom(gd::Project& project,
                          const gd::SerializerElement& element) override;
-#if defined(GD_IDE_ONLY)
   void DoSerializeTo(gd::SerializerElement& element) const override;
-#endif
 
   mutable std::vector<Animation> animations;
   bool updateIfNotVisible;  ///< If set to true, ask the game engine to play

Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp

@@ -16,24 +16,24 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
       .SetExtensionInformation(
           "BuiltinStringInstructions",
           _("Text manipulation"),
-          _("Built-in extension providing expressions for manipulating text "
-            "objects."),
+          "Provides expressions to manipulate strings (also called texts).",
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
+  extension.AddInstructionOrExpressionGroupMetadata(_("Text manipulation"))
+      .SetIcon("res/actions/text24.png");
 
-#if defined(GD_IDE_ONLY)
   extension.AddStrExpression("NewLine",
                              _("Insert a new line"),
                              _("Insert a new line"),
-                             _("Manipulation of text"),
+                             "",
                              "res/conditions/toujours24.png");
 
   extension
       .AddStrExpression("FromCodePoint",
                         _("Get character from code point"),
                         _("Get character from code point"),
-                        _("Manipulation of text"),
+                        "",
                         "res/conditions/toujours24.png")
 
       .AddParameter("expression", _("Code point"));
@@ -42,7 +42,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
       .AddStrExpression("ToUpperCase",
                         _("Uppercase a text"),
                         _("Uppercase a text"),
-                        _("Manipulation of text"),
+                        "",
                         "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"));
@@ -51,7 +51,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
       .AddStrExpression("ToLowerCase",
                         _("Lowercase a text"),
                         _("Lowercase a text"),
-                        _("Manipulation of text"),
+                        "",
                         "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"));
@@ -60,7 +60,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
       .AddStrExpression("SubStr",
                         _("Get a portion of a text"),
                         _("Get a portion of a text"),
-                        _("Manipulation of text"),
+                        "",
                         "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
@@ -73,7 +73,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
       .AddStrExpression("StrAt",
                         _("Get a character from a text"),
                         _("Get a character from a text"),
-                        _("Manipulation of text"),
+                        "",
                         "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
@@ -85,7 +85,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
       .AddStrExpression("StrRepeat",
                         _("Repeat a text"),
                         _("Repeat a text"),
-                        _("Manipulation of text"),
+                        "",
                         "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text to repeat"))
@@ -95,7 +95,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
       .AddExpression("StrLength",
                      _("Length of a text"),
                      _("Length of a text"),
-                     _("Manipulation of text"),
+                     "",
                      "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"));
@@ -105,7 +105,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                      _("Search in a text"),
                      _("Search in a text (return the position of the result or "
                        "-1 if not found)"),
-                     _("Manipulation of text"),
+                     "",
                      "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
@@ -113,12 +113,26 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
 
   extension
       .AddExpression("StrRFind",
-                     _("Search in a text from the end"),
-                     _("Search in a text from the end (return the position of "
-                       "the result or -1 if not found)"),
-                     _("Manipulation of text"),
+                     "Search in a text from the end",
+                     "Search in a text from the end (return the position of "
+                     "the result or -1 if not found)",
+                     "",
                      "res/conditions/toujours24.png")
 
+      .AddParameter("string", _("Text"))
+      .AddParameter("string", _("Text to search for"))
+      .SetHidden();  // Deprecated, see StrFindLast instead.
+
+  extension
+      .AddExpression(
+          "StrFindLast",
+          _("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)"),
+          "",
+          "res/conditions/toujours24.png")
+
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"));
 
@@ -127,7 +141,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                      _("Search in a text, starting from a position"),
                      _("Search in a text, starting from a position (return the "
                        "position of the result or -1 if not found)"),
-                     _("Manipulation of text"),
+                     "",
                      "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
@@ -139,10 +153,28 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
   extension
       .AddExpression(
           "StrRFindFrom",
-          _("Search in a text from the end, starting from a position"),
-          _("Search in a text from the end, starting from a position (return "
-            "the position of the result or -1 if not found)"),
-          _("Manipulation of text"),
+          "Search in a text from the end, starting from a position",
+          "Search in a text from the end, starting from a position (return "
+          "the position of the result or -1 if not found)",
+          "",
+          "res/conditions/toujours24.png")
+
+      .AddParameter("string", _("Text"))
+      .AddParameter("string", _("Text to search for"))
+      .AddParameter("expression",
+                    "Position of the last character in the string to be "
+                    "considered in the search")
+      .SetHidden();  // Deprecated, see StrFindLastFrom instead.
+
+  extension
+      .AddExpression(
+          "StrFindLastFrom",
+          _("Search the last occurence in a text, starting from a position"),
+          _("Search in a text the last occurence, starting from a position "
+            "(return "
+            " the position of the result, from the beginning of the string, or "
+            "-1 if not found)"),
+          "",
           "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
@@ -151,7 +183,6 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                     _("Position of the last character in the string to be "
                       "considered in the search"));
 
-#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/TimeExtension.cpp

@@ -12,48 +12,71 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation("BuiltinTime",
-                               _("Time"),
-                               _("Built-in extension providing actions and "
-                                 "conditions related to time."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
+      .SetExtensionInformation(
+          "BuiltinTime",
+          _("Timers and time"),
+          "Actions and conditions to run timers, get the current time or "
+          "modify the time scale (speed at which the game is running - useful "
+          "for slow motion effects).",
+          "Florian Rival",
+          "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/timers");
+  extension.AddInstructionOrExpressionGroupMetadata(
+      _("Timers and time")
+  )
+      .SetIcon("res/conditions/timer24.png");
 
-#if defined(GD_IDE_ONLY)
-
+  // Deprecated and replaced by CompareTimer
   extension
       .AddCondition("Timer",
                     _("Value of a scene timer"),
                     _("Test the elapsed time of a scene timer."),
                     _("The timer _PARAM2_ is greater than _PARAM1_ seconds"),
-                    _("Timers and time"),
+
+                    "",
                     "res/conditions/timer24.png",
                     "res/conditions/timer.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Time in seconds"))
-      .AddParameter("string", _("Timer's name"));
+      .AddParameter("string", _("Timer's name"))
+      .SetHidden();
+
+  extension
+      .AddCondition("CompareTimer",
+                    _("Value of a scene timer"),
+                    _("Compare the elapsed time of a scene timer. This "
+                      "condition doesn't start the timer."),
+                    _("The timer _PARAM1_ _PARAM2_ _PARAM3_ seconds"),
+
+                    "",
+                    "res/conditions/timer24.png",
+                    "res/conditions/timer.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("string", _("Timer's name"))
+      .AddParameter("relationalOperator", _("Sign of the test"), "time")
+      .AddParameter("expression", _("Time in seconds"))
+      .SetManipulatedType("number");
 
   extension
       .AddCondition("TimeScale",
                     _("Time scale"),
-                    _("Test the time scale."),
-                    _("The time scale is _PARAM1__PARAM2_"),
-                    _("Timers and time"),
+                    _("Compare the time scale of the scene."),
+                    _("the time scale of the scene"),
+
+                    "",
                     "res/conditions/time24.png",
                     "res/conditions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Value to compare"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();
 
   extension
       .AddCondition("TimerPaused",
                     _("Scene timer paused"),
                     _("Test if the specified scene timer is paused."),
                     _("The timer _PARAM1_ is paused"),
-                    _("Timers and time"),
+
+                    "",
                     "res/conditions/timerPaused24.png",
                     "res/conditions/timerPaused.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -66,8 +89,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
           _("Start (or reset) a scene timer"),
           _("Reset the specified scene timer, if the timer doesn't exist "
             "it's created and started."),
-          _("Reset the timer _PARAM1_"),
-          _("Timers and time"),
+          _("Start (or reset) the timer _PARAM1_"),
+
+          "",
           "res/actions/timer24.png",
           "res/actions/timer.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -78,7 +102,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                  _("Pause a scene timer"),
                  _("Pause a scene timer."),
                  _("Pause timer _PARAM1_"),
-                 _("Timers and time"),
+
+                 "",
                  "res/actions/pauseTimer24.png",
                  "res/actions/pauseTimer.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -90,7 +115,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                  _("Unpause a scene timer"),
                  _("Unpause a scene timer."),
                  _("Unpause timer _PARAM1_"),
-                 _("Timers and time"),
+
+                 "",
                  "res/actions/unPauseTimer24.png",
                  "res/actions/unPauseTimer.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -102,7 +128,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                  _("Delete a scene timer"),
                  _("Delete a scene timer from memory."),
                  _("Delete timer _PARAM1_ from memory"),
-                 _("Timers and time"),
+
+                 "",
                  "res/actions/timer24.png",
                  "res/actions/timer.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -112,9 +139,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
   extension
       .AddAction("ChangeTimeScale",
                  _("Change time scale"),
-                 _("Change the time scale of the game."),
-                 _("Set time scale to _PARAM1_"),
-                 _("Timers and time"),
+                 _("Change the time scale of the scene."),
+                 _("Set the time scale of the scene to _PARAM1_"),
+
+                 "",
                  "res/actions/time24.png",
                  "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -123,26 +151,26 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
 
   extension
       .AddExpression("TimeDelta",
-                     _("Time elapsed since the last image"),
-                     _("Time elapsed since the last image"),
-                     _("Time"),
+                     _("Time elapsed since the last frame"),
+                     _("Time elapsed since the last frame rendered on screen"),
+                     "",
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "");
 
   extension
       .AddExpression("TempsFrame",
-                     _("Time elapsed since the last image"),
-                     _("Time elapsed since the last image"),
-                     _("Time"),
+                     _("Time elapsed since the last frame"),
+                     _("Time elapsed since the last frame rendered on screen"),
+                     "",
                      "res/actions/time.png")
       .SetHidden()
       .AddCodeOnlyParameter("currentScene", "");
 
   extension
       .AddExpression("ElapsedTime",
-                     _("Time elapsed since the last image"),
-                     _("Time elapsed since the last image"),
-                     _("Time"),
+                     _("Time elapsed since the last frame"),
+                     _("Time elapsed since the last frame rendered on screen"),
+                     "",
                      "res/actions/time.png")
       .SetHidden()
       .AddCodeOnlyParameter("currentScene", "");
@@ -151,7 +179,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
       .AddExpression("TimerElapsedTime",
                      _("Scene timer value"),
                      _("Value of a scene timer"),
-                     _("Time"),
+                     "",
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("string", _("Timer's name"));
@@ -160,7 +188,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
       .AddExpression("TimeFromStart",
                      _("Time elapsed since the beginning of the scene"),
                      _("Time elapsed since the beginning of the scene"),
-                     _("Time"),
+                     "",
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "");
 
@@ -168,7 +196,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
       .AddExpression("TempsDebut",
                      _("Time elapsed since the beginning of the scene"),
                      _("Time elapsed since the beginning of the scene"),
-                     _("Time"),
+                     "",
                      "res/actions/time.png")
       .SetHidden()
       .AddCodeOnlyParameter("currentScene", "");
@@ -176,25 +204,16 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
   extension
       .AddExpression("TimeScale",
                      _("Time scale"),
-                     _("Time scale"),
-                     _("Time"),
+                     _("Returns the time scale of the scene."),
+                     "",
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "");
 
-  extension
-      .AddExpression("TimeScale",
-                     _("Time scale"),
-                     _("Time scale"),
-                     _("Time"),
-                     "res/actions/time.png")
-      .SetHidden()
-      .AddCodeOnlyParameter("currentScene", "");
-
   extension
       .AddExpression("Time",
                      _("Current time"),
                      _("Current time"),
-                     _("Time"),
+                     "",
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter(
@@ -205,8 +224,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
             "timestamp\""),
           "[\"hour\", \"min\", \"sec\", \"mon\", \"year\", \"wday\", \"mday\", "
           "\"yday\", \"timestamp\"]");
-
-#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/VariablesExtension.cpp

@@ -14,46 +14,59 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .SetExtensionInformation(
           "BuiltinVariables",
-          _("Variable features"),
-          _("Built-in extension allowing to manipulate variables"),
+          _("Variables"),
+          "Actions, conditions and expressions to handle variables, from "
+          "simple variables like the player score, the number of remaining "
+          "lives to complex variables containing arbitrary data like an "
+          "inventory or the result of a web request.",
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/variables");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Variables"))
+      .SetIcon("res/conditions/var24.png");
 
-#if defined(GD_IDE_ONLY)
   extension
       .AddCondition("VarScene",
                     _("Value of a scene variable"),
                     _("Compare the value of a scene variable."),
-                    _("Scene variable _PARAM0_ is _PARAM1__PARAM2_"),
-                    _("Variables"),
+                    _("the scene variable _PARAM0_"),
+                    _("Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Value to compare"))
-      .SetManipulatedType("number");
+      .UseStandardRelationalOperatorParameters("number");
 
   extension
       .AddCondition("VarSceneTxt",
                     _("Text of a scene variable"),
                     _("Compare the text of a scene variable."),
-                    _("The text of scene variable _PARAM0_ is _PARAM1__PARAM2_"),
-                    _("Variables"),
+                    _("the text of scene variable _PARAM0_"),
+                    _("Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("string", _("Text to compare"))
-      .SetManipulatedType("string");
+      .UseStandardRelationalOperatorParameters("string");
+
+  extension
+      .AddCondition(
+          "SceneVariableAsBoolean",
+          _("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"),
+          "res/conditions/var24.png",
+          "res/conditions/var.png")
+      .AddParameter("scenevar", _("Variable"))
+      .AddParameter("trueorfalse", _("Check if the value is"))
+      .SetDefaultValue("true");
 
   extension
       .AddCondition(
           "VariableChildExists",
           _("Child existence"),
-          _("Return true if the specified child of the scene variable exists."),
+          _("Check if the specified child of the scene variable exists."),
           _("Child _PARAM1_ of scene variable _PARAM0_ exists"),
-          _("Variables/Structures"),
+          _("Scene variables/Collections/Structures"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -63,10 +76,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .AddCondition("GlobalVariableChildExists",
                     _("Child existence"),
-                    _("Return true if the specified child of the global "
+                    _("Check if the specified child of the global "
                       "variable exists."),
                     _("Child _PARAM1_ of global variable _PARAM0_ exists"),
-                    _("Variables/Global variables/Structures"),
+                    _("Global variables/Collections/Structures"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -75,10 +88,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddCondition("VarSceneDef",
-                    _("Test if a scene variable is defined"),
-                    _("Test if the scene variable exists."),
-                    _("Scene variable _PARAM0_ is defined"),
-                    _("Variables"),
+                    "Test if a scene variable is defined",
+                    "Test if the scene variable exists.",
+                    "Scene variable _PARAM0_ is defined",
+                    _("Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -89,37 +102,45 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddCondition("VarGlobal",
                     _("Value of a global variable"),
                     _("Compare the value of a global variable."),
-                    _("Global variable _PARAM0_ is _PARAM1__PARAM2_"),
-                    _("Variables/Global variables"),
+                    _("the global variable _PARAM0_"),
+                    _("Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Value to compare"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();
+
+  extension
+      .AddCondition("VarGlobalTxt",
+                    _("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")
+      .MarkAsAdvanced();
 
   extension
       .AddCondition(
-          "VarGlobalTxt",
-          _("Text of a global variable"),
-          _("Compare the text of a global variable."),
-          _("The text of the global variable _PARAM0_ is _PARAM1__PARAM2_"),
-          _("Variables/Global variables"),
+          "GlobalVariableAsBoolean",
+          _("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"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("string", _("Text to compare"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("string");
+      .AddParameter("trueorfalse", _("Check if the value is"))
+      .SetDefaultValue("true");
 
   extension
       .AddCondition("VarGlobalDef",
-                    _("Test if a global variable is defined"),
-                    _("Test if a global variable exists"),
-                    _("Global variable _PARAM0_ is defined"),
-                    _("Variables/Global variables"),
+                    "Test if a global variable is defined",
+                    "Test if a global variable exists",
+                    "Global variable _PARAM0_ is defined",
+                    _("Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -130,64 +151,103 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .AddAction("ModVarScene",
                  _("Value of a scene variable"),
-                 _("Modify the value of a scene variable."),
-                 _("Do _PARAM1__PARAM2_ to scene variable _PARAM0_"),
-                 _("Variables"),
+                 _("Change the value of a scene variable."),
+                 _("the scene variable _PARAM0_"),
+                 _("Scene variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
-      .SetManipulatedType("number");
+      .UseStandardOperatorParameters("number");
 
   extension
       .AddAction("ModVarSceneTxt",
                  _("String of a scene variable"),
                  _("Modify the text of a scene variable."),
-                 _("Do _PARAM1__PARAM2_ to the text of scene variable _PARAM0_"),
-                 _("Variables"),
+                 _("the text of scene variable _PARAM0_"),
+                 _("Scene variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("string", _("Text"))
-      .SetManipulatedType("string");
+      .UseStandardOperatorParameters("string");
+
+  extension
+      .AddAction(
+          "SetSceneVariableAsBoolean",
+          _("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"),
+          "res/conditions/var24.png",
+          "res/conditions/var.png")
+      .AddParameter("scenevar", _("Variable"))
+      .AddParameter("trueorfalse", _("New Value:"));
+
+  extension
+      .AddAction("ToggleSceneVariableAsBoolean",
+                 _("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."),
+                 _("Toggle the boolean value of scene variable _PARAM0_"),
+                 _("Scene variables"),
+                 "res/conditions/var24.png",
+                 "res/conditions/var.png")
+      .AddParameter("scenevar", _("Variable"));
 
   extension
       .AddAction("ModVarGlobal",
                  _("Value of a global variable"),
-                 _("Modify the value of a global variable"),
-                 _("Do _PARAM1__PARAM2_ to global variable _PARAM0_"),
-                 _("Variables/Global variables"),
+                 _("Change the value of a global variable"),
+                 _("the global variable _PARAM0_"),
+                 _("Global variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("expression", _("Value"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("number");
+      .UseStandardOperatorParameters("number")
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("ModVarGlobalTxt",
+                 _("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")
+      .MarkAsAdvanced();
 
   extension
       .AddAction(
-          "ModVarGlobalTxt",
-          _("String of a global variable"),
-          _("Modify the text of a global variable."),
-          _("Do _PARAM1__PARAM2_ to the text of global variable _PARAM0_"),
-          _("Variables/Global variables"),
-          "res/actions/var24.png",
-          "res/actions/var.png")
+          "SetGlobalVariableAsBoolean",
+          _("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"),
+          "res/conditions/var24.png",
+          "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .AddParameter("operator", _("Modification's sign"))
-      .AddParameter("string", _("Text"))
-      .MarkAsAdvanced()
-      .SetManipulatedType("string");
+      .AddParameter("trueorfalse", _("New Value:"));
+
+  extension
+      .AddAction("ToggleGlobalVariableAsBoolean",
+                 _("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."),
+                 _("Toggle the boolean value of global variable _PARAM0_"),
+                 _("Global variables"),
+                 "res/conditions/var24.png",
+                 "res/conditions/var.png")
+      .AddParameter("globalvar", _("Variable"));
 
   extension
       .AddAction("VariableRemoveChild",
                  _("Remove a child"),
                  _("Remove a child from a scene variable."),
                  _("Remove child _PARAM1_ from scene variable _PARAM0_"),
-                 _("Variables/Structure"),
+                 _("Scene variables/Collections/Structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -199,7 +259,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Remove a child"),
                  _("Remove a child from a global variable."),
                  _("Remove child _PARAM1_ from global variable _PARAM0_"),
-                 _("Variables/Global variables/Structure"),
+                 _("Global variables/Collections/Structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -211,7 +271,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Clear scene variable"),
                  _("Remove all the children from the scene variable."),
                  _("Clear children from scene variable _PARAM0_"),
-                 _("Variables/Structure"),
+                 _("Scene variables/Collections"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -222,25 +282,149 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Clear global variable"),
                  _("Remove all the children from the global variable."),
                  _("Clear children from global variable _PARAM0_"),
-                 _("Variables/Global variables/Structure"),
+                 _("Global variables/Collections"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .MarkAsAdvanced();
 
+  extension
+      .AddAction("SceneVariablePush",
+                 _("Append variable to a scene array"),
+                 _("Appends a variable at the end of a scene array variable."),
+                 _("Append variable _PARAM1_ to array variable _PARAM0_"),
+                 _("Scene variables/Collections/Arrays"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("scenevar", _("Array variable"))
+      .AddParameter("scenevar", _("Scene variable with the content to append"))
+      .SetParameterLongDescription(_("The content of the variable will *be copied* and appended at the end of the array."))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("SceneVariablePushString",
+                 _("Append a string to a scene array"),
+                 _("Appends a string at the end of a scene array variable."),
+                 _("Append string _PARAM1_ to array variable _PARAM0_"),
+                 _("Scene variables/Collections/Arrays"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("scenevar", _("Array variable"))
+      .AddParameter("string", _("String to append"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("SceneVariablePushNumber",
+                 _("Append a number to a scene array"),
+                 _("Appends a number at the end of a scene array variable."),
+                 _("Append number _PARAM1_ to array variable _PARAM0_"),
+                 _("Scene variables/Collections/Arrays"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("scenevar", _("Array variable"))
+      .AddParameter("expression", _("Number to append"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("SceneVariablePushBool",
+                 _("Append a boolean to a scene array"),
+                 _("Appends a boolean at the end of a scene array variable."),
+                 _("Append boolean _PARAM1_ to array variable _PARAM0_"),
+                 _("Scene variables/Collections/Arrays"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("scenevar", _("Array variable"))
+      .AddParameter("trueorfalse", _("Boolean to append"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction(
+          "SceneVariableRemoveAt",
+          _("Remove variable from a scene array (by index)"),
+          _("Removes a variable at the specified index of a scene array variable."),
+          _("Remove variable at index _PARAM1_ from scene array variable _PARAM0_"),
+          _("Scene variables/Collections/Arrays"),
+          "res/actions/var24.png",
+          "res/actions/var.png")
+      .AddParameter("scenevar", _("Variable"))
+      .AddParameter("expression", _("Index to remove"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("GlobalVariablePush",
+                 _("Append variable to a global array"),
+                 _("Appends a variable at the end of a global array variable."),
+                 _("Append variable _PARAM1_ to array variable _PARAM0_"),
+                 _("Global variables/Collections/Arrays"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("globalvar", _("Array variable"))
+      .AddParameter("scenevar", _("Scene variable with the content to append"))
+      .SetParameterLongDescription(_("The content of the variable will *be copied* and appended at the end of the array."))
+      .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",
+                 _("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 append"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("GlobalVariablePushBool",
+                 _("Append a boolean to a global array"),
+                 _("Appends a boolean at the end of a global array variable."),
+                 _("Append boolean _PARAM1_ to array variable _PARAM0_"),
+                 _("Global variables/Collections/Arrays"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("globalvar", _("Array variable"))
+      .AddParameter("trueorfalse", _("Boolean to append"))
+      .MarkAsAdvanced();
+
   extension
       .AddExpression("GlobalVariableChildCount",
                      _("Number of children of a global variable"),
-                     _("Get the number of children of a global variable"),
-                     _("Variables"),
+                     _("Number of children of a global variable"),
+                     _("Global variables"),
                      "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"));
 
   extension
       .AddExpression("VariableChildCount",
                      _("Number of children of a scene variable"),
-                     _("Get the number of children of a scene variable"),
-                     _("Variables"),
+                     _("Number of children of a scene variable"),
+                     _("Scene variables"),
                      "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"));
 
@@ -248,7 +432,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddExpression("Variable",
                      _("Value of a scene variable"),
                      _("Value of a scene variable"),
-                     _("Variables"),
+                     _("Scene variables"),
                      "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"));
 
@@ -256,7 +440,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddStrExpression("VariableString",
                         _("Text of a scene variable"),
                         _("Text of a scene variable"),
-                        _("Variables"),
+                        _("Scene variables"),
                         "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"));
 
@@ -264,7 +448,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddExpression("GlobalVariable",
                      _("Value of a global variable"),
                      _("Value of a global variable"),
-                     _("Variables"),
+                     _("Global variables"),
                      "res/actions/var.png")
       .AddParameter("globalvar", _("Name of the global variable"));
 
@@ -272,10 +456,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddStrExpression("GlobalVariableString",
                         _("Text of a global variable"),
                         _("Text of a global variable"),
-                        _("Variables"),
+                        _("Global variables"),
                         "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"));
-#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/WindowExtension.cpp

@@ -12,22 +12,27 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation("BuiltinWindow",
-                               _("Window features"),
-                               _("Built-in extension allowing to manipulate "
-                                 "the game window and canvas"),
-                               "Florian Rival",
-                               "Open source (MIT License)")
+      .SetExtensionInformation(
+          "BuiltinWindow",
+          _("Game window and resolution"),
+          "Provides actions and conditions to manipulate the game window. "
+          "Depending on the platform on which the game is running, not all of "
+          "these features can be applied.",
+          "Florian Rival",
+          "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/window");
+  extension
+      .AddInstructionOrExpressionGroupMetadata(
+          _("Game window and resolution"))
+      .SetIcon("res/actions/window24.png");
 
-#if defined(GD_IDE_ONLY)
   extension
       .AddAction(
           "SetFullScreen",
           _("De/activate fullscreen"),
           _("This action activates or deactivates fullscreen."),
           _("Activate fullscreen: _PARAM1_ (keep aspect ratio: _PARAM2_)"),
-          _("Game's window"),
+          "",
           "res/actions/fullscreen24.png",
           "res/actions/fullscreen.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -38,14 +43,24 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
                     true)
       .SetDefaultValue("yes");
 
+  extension
+      .AddCondition("IsFullScreen",
+                    _("Fullscreen activated?"),
+                    _("Check if the game is currently in fullscreen."),
+                    _("The game is in fullscreen"),
+                    "",
+                    "res/actions/fullscreen24.png",
+                    "res/actions/fullscreen.png")
+      .AddCodeOnlyParameter("currentScene", "");
+
   extension
       .AddAction("SetWindowMargins",
                  _("Change the window's margins"),
-                 _("This action changes the margins, in pixels, of the game's "
-                   "window."),
+                 _("This action changes the margins, in pixels, between the "
+                   "game frame and the window borders."),
                  _("Set margins of game window to "
                    "_PARAM1_;_PARAM2_;_PARAM3_;_PARAM4_"),
-                 _("Game's window"),
+                 "",
                  "res/actions/window24.png",
                  "res/actions/window.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -55,28 +70,93 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
       .AddParameter("expression", _("Left"));
 
   extension
-      .AddAction("SetWindowSize",
-                 _("Change the size of the window"),
-                 _("This action changes the size of the game's window."),
-                 _("Change window size: _PARAM1_x_PARAM2_"),
-                 _("Game's window"),
+      .AddAction("SetGameResolutionSize",
+                 _("Change the resolution of the game"),
+                 _("Changes the resolution of the game, effectively changing "
+                   "the game area size. This won't change the size of the "
+                   "window in which the game is running."),
+                 _("Set game resolution to _PARAM1_x_PARAM2_"),
+                 "",
                  "res/actions/window24.png",
                  "res/actions/window.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Width"))
+      .AddParameter("expression", _("Height"));
+
+  extension
+      .AddAction(
+          "SetWindowSize",
+          _("Change the size of the game window"),
+          _("This action changes the size of the game window. Note that this "
+            "will only work on platform supporting this operation: games "
+            "running in browsers or on mobile phones can not update their "
+            "window size. Game resolution can still be updated."),
+          _("Set game window size to _PARAM1_x_PARAM2_ (also update game "
+            "resolution: _PARAM3_)"),
+          "",
+          "res/actions/window24.png",
+          "res/actions/window.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("expression", _("Width"))
       .AddParameter("expression", _("Height"))
-      .AddParameter(
-          "yesorno",
-          _("Do you want to use this size as the default size for new scene "
-            "cameras\?\n(Yes to change the size of the game's viewable "
-            "area,\nNo to stretch the game to the window's size)."));
+      .AddParameter("yesorno",
+                    _("Also update the game resolution? If not, the game will "
+                      "be stretched or reduced to fit in the window."));
+
+  extension
+      .AddAction("CenterWindow",
+                 _("Center the game window on the screen"),
+                 _("This action centers the game window on the screen. This "
+                   "only works on Windows, macOS and Linux (not when the game "
+                   "is executed in a web-browser or on iOS/Android)."),
+                 _("Center the game window"),
+                 "",
+                 "res/actions/window24.png",
+                 "res/actions/window.png")
+      .AddCodeOnlyParameter("currentScene", "");
+
+  extension
+      .AddAction("SetGameResolutionResizeMode",
+                 _("Change the game resolution resize mode"),
+                 _("Set if the width or the height of the game resolution "
+                   "should be changed to fit the game window - or if the game "
+                   "resolution should not be updated automatically."),
+                 _("Set game resolution resize mode to _PARAM1_"),
+                 "",
+                 "res/actions/window24.png",
+                 "res/actions/window.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("stringWithSelector",
+                    _("Resize mode"),
+                    "[\"adaptWidth\", \"adaptHeight\", \"\"]",
+                    false)
+      .SetParameterLongDescription(
+          _("Empty to disable resizing. \"adaptWidth\" will update the game "
+            "width to fit in the window or screen. \"adaptHeight\" will do the "
+            "same but with the game height."));
+
+  extension
+      .AddAction("SetAdaptGameResolutionAtRuntime",
+                 _("Automatically adapt the game resolution"),
+                 _("Set if the game resolution should be automatically adapted "
+                   "when the game window or screen size change. This will only "
+                   "be the case if the game resolution resize mode is "
+                   "configured to adapt the width or the height of the game."),
+                 _("Automatically adapt the game resolution: _PARAM1_"),
+                 "",
+                 "res/actions/window24.png",
+                 "res/actions/window.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("yesorno",
+                    _("Update resolution during the game to fit the screen or "
+                      "window size?"));
 
   extension
       .AddAction("SetWindowIcon",
                  _("Change the window's icon"),
                  _("This action changes the icon of the game's window."),
                  _("Use _PARAM1_ as the icon for the game's window."),
-                 _("Game's window"),
+                 "",
                  "res/actions/window24.png",
                  "res/actions/window.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -87,7 +167,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
                  _("Change the window's title"),
                  _("This action changes the title of the game's window."),
                  _("Change window title to _PARAM1_"),
-                 _("Game's window"),
+                 "",
                  "res/actions/window24.png",
                  "res/actions/window.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -98,7 +178,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
           "SceneWindowWidth",
           _("Width of the scene window"),
           _("Width of the scene window (or scene canvas for HTML5 games)"),
-          _("Screen"),
+          "",
           "res/window.png")
       .AddCodeOnlyParameter("currentScene", "");
 
@@ -107,7 +187,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
           "SceneWindowHeight",
           _("Height of the scene window"),
           _("Height of the scene window (or scene canvas for HTML5 games)"),
-          _("Screen"),
+          "",
           "res/window.png")
       .AddCodeOnlyParameter("currentScene", "");
 
@@ -115,30 +195,29 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
       "ScreenWidth",
       _("Width of the screen/page"),
       _("Width of the screen (or the page for HTML5 games in browser)"),
-      _("Screen"),
+      "",
       "res/display16.png");
 
   extension.AddExpression(
       "ScreenHeight",
       _("Height of the screen/page"),
       _("Height of the screen (or the page for HTML5 games in browser)"),
-      _("Screen"),
+      "",
       "res/display16.png");
 
   extension.AddExpression("ColorDepth",
                           _("Color depth"),
                           _("Color depth"),
-                          _("Screen"),
+                          "",
                           "res/display16.png");
 
   extension
       .AddStrExpression("WindowTitle",
                         _("Window's title"),
                         _("Window's title"),
-                        _("Screen"),
+                        "",
                         "res/window.png")
       .AddCodeOnlyParameter("currentScene", "");
-#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/BehaviorMetadata.cpp

@@ -4,12 +4,16 @@
  * reserved. This project is released under the MIT License.
  */
 #include "BehaviorMetadata.h"
+
 #include <iostream>
+
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/Tools/Localization.h"
 
 namespace gd {
 
@@ -59,7 +63,8 @@ gd::InstructionMetadata& BehaviorMetadata::AddCondition(
                                                            group,
                                                            icon,
                                                            smallicon)
-                                           .SetHelpPath(GetHelpPath());
+                                           .SetHelpPath(GetHelpPath())
+                                           .SetIsBehaviorInstruction();
   return conditionsInfos[nameWithNamespace];
 #endif
 }
@@ -83,7 +88,8 @@ gd::InstructionMetadata& BehaviorMetadata::AddAction(
                                                         group,
                                                         icon,
                                                         smallicon)
-                                        .SetHelpPath(GetHelpPath());
+                                        .SetHelpPath(GetHelpPath())
+                                        .SetIsBehaviorInstruction();
   return actionsInfos[nameWithNamespace];
 #endif
 }
@@ -107,7 +113,8 @@ gd::InstructionMetadata& BehaviorMetadata::AddScopedCondition(
                                                            group,
                                                            icon,
                                                            smallicon)
-                                           .SetHelpPath(GetHelpPath());
+                                           .SetHelpPath(GetHelpPath())
+                                           .SetIsBehaviorInstruction();
   return conditionsInfos[nameWithNamespace];
 #endif
 }
@@ -131,7 +138,8 @@ gd::InstructionMetadata& BehaviorMetadata::AddScopedAction(
                                                         group,
                                                         icon,
                                                         smallicon)
-                                        .SetHelpPath(GetHelpPath());
+                                        .SetHelpPath(GetHelpPath())
+                                        .SetIsBehaviorInstruction();
   return actionsInfos[nameWithNamespace];
 #endif
 }
@@ -143,12 +151,16 @@ gd::ExpressionMetadata& BehaviorMetadata::AddExpression(
     const gd::String& group,
     const gd::String& smallicon) {
 #if defined(GD_IDE_ONLY)
-  // Be careful, behaviors expression do not have namespace ( not necessary as
-  // we refer to the auomatism name in the expression )
-  expressionsInfos[name] =
-      ExpressionMetadata(
-          extensionNamespace, name, fullname, description, group, smallicon)
-          .SetHelpPath(GetHelpPath());
+  // Be careful, behaviors expression do not have namespace (not necessary as
+  // we refer to the behavior name in the expression).
+  expressionsInfos[name] = ExpressionMetadata("number",
+                                              extensionNamespace,
+                                              name,
+                                              fullname,
+                                              description,
+                                              group,
+                                              smallicon)
+                               .SetHelpPath(GetHelpPath());
   return expressionsInfos[name];
 #endif
 }
@@ -160,16 +172,192 @@ gd::ExpressionMetadata& BehaviorMetadata::AddStrExpression(
     const gd::String& group,
     const gd::String& smallicon) {
 #if defined(GD_IDE_ONLY)
-  // Be careful, behaviors expression do not have namespace ( not necessary as
-  // we refer to the auomatism name in the expression )
-  strExpressionsInfos[name] =
-      ExpressionMetadata(
-          extensionNamespace, name, fullname, description, group, smallicon)
-          .SetHelpPath(GetHelpPath());
+  // Be careful, behaviors expression do not have namespace (not necessary as
+  // we refer to the behavior name in the expression).
+  strExpressionsInfos[name] = ExpressionMetadata("string",
+                                                 extensionNamespace,
+                                                 name,
+                                                 fullname,
+                                                 description,
+                                                 group,
+                                                 smallicon)
+                                  .SetHelpPath(GetHelpPath());
   return strExpressionsInfos[name];
 #endif
 }
 
+gd::MultipleInstructionMetadata BehaviorMetadata::AddExpressionAndCondition(
+    const gd::String& type,
+    const gd::String& name,
+    const gd::String& fullname,
+    const gd::String& descriptionSubject,
+    const gd::String& sentenceName,
+    const gd::String& group,
+    const gd::String& icon) {
+  gd::String expressionDescriptionTemplate = _("Return <subject>.");
+  auto& expression =
+      type == "number"
+          ? AddExpression(name,
+                          fullname,
+                          expressionDescriptionTemplate.FindAndReplace(
+                              "<subject>", descriptionSubject),
+                          group,
+                          icon)
+          : AddStrExpression(name,
+                             fullname,
+                             expressionDescriptionTemplate.FindAndReplace(
+                                 "<subject>", descriptionSubject),
+                             group,
+                             icon);
+
+  gd::String conditionDescriptionTemplate = _("Compare <subject>.");
+  auto& condition =
+      AddScopedCondition(name,
+                         fullname,
+                         conditionDescriptionTemplate.FindAndReplace(
+                             "<subject>", descriptionSubject),
+                         sentenceName,
+                         group,
+                         icon,
+                         icon);
+
+  return MultipleInstructionMetadata::WithExpressionAndCondition(expression,
+                                                                 condition);
+}
+
+gd::MultipleInstructionMetadata
+BehaviorMetadata::AddExpressionAndConditionAndAction(
+    const gd::String& type,
+    const gd::String& name,
+    const gd::String& fullname,
+    const gd::String& descriptionSubject,
+    const gd::String& sentenceName,
+    const gd::String& group,
+    const gd::String& icon) {
+  if (type != "number" && type != "string" && type != "boolean") {
+    gd::LogError(
+        "Unrecognised type passed to AddExpressionAndConditionAndAction: " +
+        type + ". Verify this type is valid and supported.");
+  }
+
+  gd::String conditionDescriptionTemplate =
+      type == "boolean" ? _("Check if <subject>.") : _("Compare <subject>.");
+  auto& condition =
+      AddScopedCondition(name,
+                         fullname,
+                         conditionDescriptionTemplate.FindAndReplace(
+                             "<subject>", descriptionSubject),
+                         sentenceName,
+                         group,
+                         icon,
+                         icon);
+
+  gd::String actionDescriptionTemplate = type == "boolean"
+                                             ? _("Set (or unset) if <subject>.")
+                                             : _("Change <subject>.");
+  auto& action = AddScopedAction(
+      "Set" + name,
+      fullname,
+      actionDescriptionTemplate.FindAndReplace("<subject>", descriptionSubject),
+      sentenceName,
+      group,
+      icon,
+      icon);
+
+  if (type == "boolean") {
+    return MultipleInstructionMetadata::WithConditionAndAction(condition, action);
+  }
+
+  gd::String expressionDescriptionTemplate = _("Return <subject>.");
+  auto& expression =
+      type == "number"
+          ? AddExpression(name,
+                          fullname,
+                          expressionDescriptionTemplate.FindAndReplace(
+                              "<subject>", descriptionSubject),
+                          group,
+                          icon)
+          : AddStrExpression(name,
+                             fullname,
+                             expressionDescriptionTemplate.FindAndReplace(
+                                 "<subject>", descriptionSubject),
+                             group,
+                             icon);
+
+  return MultipleInstructionMetadata::WithExpressionAndConditionAndAction(
+      expression, condition, action);
+}
+
+#if defined(GD_IDE_ONLY)
+gd::InstructionMetadata& BehaviorMetadata::AddDuplicatedAction(
+    const gd::String& newActionName, const gd::String& copiedActionName) {
+  gd::String newNameWithNamespace = extensionNamespace + newActionName;
+  gd::String copiedNameWithNamespace = extensionNamespace + copiedActionName;
+
+  auto copiedAction = actionsInfos.find(copiedNameWithNamespace);
+  if (copiedAction == actionsInfos.end()) {
+    gd::LogWarning("Could not find an action with name " +
+                   copiedNameWithNamespace + " to copy.");
+  } else {
+    actionsInfos[newNameWithNamespace] = copiedAction->second;
+  }
+
+  return actionsInfos[newNameWithNamespace];
+}
+
+gd::InstructionMetadata& BehaviorMetadata::AddDuplicatedCondition(
+    const gd::String& newConditionName, const gd::String& copiedConditionName) {
+  gd::String newNameWithNamespace = extensionNamespace + newConditionName;
+  gd::String copiedNameWithNamespace = extensionNamespace + copiedConditionName;
+
+  auto copiedCondition = conditionsInfos.find(copiedNameWithNamespace);
+  if (copiedCondition == conditionsInfos.end()) {
+    gd::LogWarning("Could not find a condition with name " +
+                   copiedNameWithNamespace + " to copy.");
+  } else {
+    conditionsInfos[newNameWithNamespace] = copiedCondition->second;
+  }
+
+  return conditionsInfos[newNameWithNamespace];
+}
+
+gd::ExpressionMetadata& BehaviorMetadata::AddDuplicatedExpression(
+    const gd::String& newExpressionName,
+    const gd::String& copiedExpressionName) {
+  gd::String newNameWithNamespace = extensionNamespace + newExpressionName;
+  gd::String copiedNameWithNamespace =
+      extensionNamespace + copiedExpressionName;
+
+  auto copiedExpression = expressionsInfos.find(copiedNameWithNamespace);
+  if (copiedExpression == expressionsInfos.end()) {
+    gd::LogWarning("Could not find an expression with name " +
+                   copiedNameWithNamespace + " to copy.");
+  } else {
+    expressionsInfos[newNameWithNamespace] = copiedExpression->second;
+  }
+
+  return expressionsInfos[newNameWithNamespace];
+}
+
+gd::ExpressionMetadata& BehaviorMetadata::AddDuplicatedStrExpression(
+    const gd::String& newExpressionName,
+    const gd::String& copiedExpressionName) {
+  gd::String newNameWithNamespace = extensionNamespace + newExpressionName;
+  gd::String copiedNameWithNamespace =
+      extensionNamespace + copiedExpressionName;
+
+  auto copiedExpression = strExpressionsInfos.find(copiedNameWithNamespace);
+  if (copiedExpression == strExpressionsInfos.end()) {
+    gd::LogWarning("Could not find a string expression with name " +
+                   copiedNameWithNamespace + " to copy.");
+  } else {
+    strExpressionsInfos[newNameWithNamespace] = copiedExpression->second;
+  }
+
+  return strExpressionsInfos[newNameWithNamespace];
+}
+#endif
+
 BehaviorMetadata& BehaviorMetadata::SetFullName(const gd::String& fullname_) {
 #if defined(GD_IDE_ONLY)
   fullname = fullname_;
@@ -218,4 +406,14 @@ const gd::String& BehaviorMetadata::GetName() const {
   return instance->GetTypeName();
 }
 
+gd::Behavior& BehaviorMetadata::Get() const {
+  if (!instance)
+    gd::LogFatalError(
+        "Trying to get a behavior from a BehaviorMetadata that has no "
+        "behavior. This will crash - please double check that the "
+        "BehaviorMetadata is valid.");
+
+  return *instance;
+}
+
 }  // namespace gd

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -6,12 +6,14 @@
 #ifndef BEHAVIORMETADATA_H
 #define BEHAVIORMETADATA_H
 #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
@@ -41,7 +43,8 @@ class GD_CORE_API BehaviorMetadata {
 
   /**
    * Declare a new condition as being part of the behavior.
-   * \deprecated Prefer using `AddScopedCondition`.
+   * \deprecated Prefer using `AddScopedCondition`, to properly namespace
+   * the condition.
    */
   gd::InstructionMetadata& AddCondition(const gd::String& name_,
                                         const gd::String& fullname_,
@@ -53,7 +56,8 @@ class GD_CORE_API BehaviorMetadata {
 
   /**
    * Declare a new action as being part of the behavior.
-   * \deprecated Prefer using `AddScopedAction`.
+   * \deprecated Prefer using `AddScopedAction`, to properly namespace
+   * the action.
    */
   gd::InstructionMetadata& AddAction(const gd::String& name_,
                                      const gd::String& fullname_,
@@ -67,23 +71,23 @@ class GD_CORE_API BehaviorMetadata {
    * Declare a new condition as being part of the behavior.
    */
   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_);
+                                              const gd::String& fullname_,
+                                              const gd::String& description_,
+                                              const gd::String& sentence_,
+                                              const gd::String& group_,
+                                              const gd::String& icon_,
+                                              const gd::String& smallicon_);
 
   /**
    * Declare a new action as being part of the behavior.
    */
   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_);
+                                           const gd::String& fullname_,
+                                           const gd::String& description_,
+                                           const gd::String& sentence_,
+                                           const gd::String& group_,
+                                           const gd::String& icon_,
+                                           const gd::String& smallicon_);
   /**
    * Declare a new action as being part of the extension.
    */
@@ -102,6 +106,78 @@ class GD_CORE_API BehaviorMetadata {
                                            const gd::String& group_,
                                            const gd::String& smallicon_);
 
+  /**
+   * \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.
+   */
+  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);
+
+  /**
+   * \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.
+   */
+  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);
+
+  /**
+   * \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.
+   */
+  gd::InstructionMetadata& AddDuplicatedAction(
+      const gd::String& newActionName, const gd::String& copiedActionName);
+
+  /**
+   * \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.
+   */
+  gd::InstructionMetadata& AddDuplicatedCondition(
+      const gd::String& newConditionName,
+      const gd::String& copiedConditionName);
+
+  /**
+   * \brief Create a new expression which is the duplicate of the specified one.
+   *
+   * Useful for handling a deprecated expression that is just a "copy" of the
+   * new one.
+   */
+  gd::ExpressionMetadata& AddDuplicatedExpression(
+      const gd::String& newExpressionName,
+      const gd::String& copiedExpressionName);
+
+  /**
+   * \brief Create a new string expression which is the duplicate of the
+   * specified one.
+   *
+   * Useful for handling a deprecated string expression that is just a "copy" of
+   * the new one.
+   */
+  gd::ExpressionMetadata& AddDuplicatedStrExpression(
+      const gd::String& newExpressionName,
+      const gd::String& copiedExpressionName);
+
   BehaviorMetadata& SetFullName(const gd::String& fullname_);
   BehaviorMetadata& SetDefaultName(const gd::String& defaultName_);
   BehaviorMetadata& SetDescription(const gd::String& description_);
@@ -120,12 +196,14 @@ class GD_CORE_API BehaviorMetadata {
   BehaviorMetadata& AddIncludeFile(const gd::String& includeFile);
 
   /**
-   * Get the help path of the behavior, relative to the documentation root.
+   * Get the help path of the behavior, relative to the GDevelop documentation
+   * root.
    */
   const gd::String& GetHelpPath() const { return helpPath; }
 
   /**
-   * Set the help path of the behavior, relative to the documentation root.
+   * 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.
@@ -162,7 +240,7 @@ class GD_CORE_API BehaviorMetadata {
   /**
    * \brief Return the associated gd::Behavior, handling behavior contents.
    */
-  gd::Behavior& Get() const { return *instance; }
+  gd::Behavior& Get() const;
 
   /**
    * \brief Return the associated gd::BehaviorsSharedData, handling behavior
@@ -172,6 +250,27 @@ class GD_CORE_API BehaviorMetadata {
     return sharedDatasInstance.get();
   }
 
+  /**
+   * \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() { return actionsInfos; };
+
+  /**
+   * \see gd::PlatformExtension::GetAllActions
+   */
+  std::map<gd::String, gd::InstructionMetadata>& GetAllConditions() { return conditionsInfos; };
+
+  /**
+   * \see gd::PlatformExtension::GetAllActions
+   */
+  std::map<gd::String, gd::ExpressionMetadata>& GetAllExpressions() { return expressionsInfos; };
+
+  /**
+   * \see gd::PlatformExtension::GetAllActions
+   */
+  std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() { return strExpressionsInfos; };
+
 #if defined(GD_IDE_ONLY)
   std::map<gd::String, gd::InstructionMetadata> conditionsInfos;
   std::map<gd::String, gd::InstructionMetadata> actionsInfos;

Core/GDCore/Extensions/Metadata/DependencyMetadata.h

@@ -0,0 +1,155 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef DEPENDENCYMETADATA_H
+#define DEPENDENCYMETADATA_H
+#include <map>
+#include <set>
+
+#include "GDCore/Project/PropertyDescriptor.h"
+#include "GDCore/String.h"
+#include "GDCore/Tools/Log.h"
+
+namespace gd {
+/**
+ * \brief Contains information about a dependency (library, npm/cordova
+ * package, or other according to the export) of an extension.
+ */
+class GD_CORE_API DependencyMetadata {
+ public:
+  /**
+   * Construct a new dependency metadata, though you probably want to call
+   * `AddDependency` on gd::PlatformExtension.
+   *
+   * \see gd::PlatformExtension
+   */
+  DependencyMetadata() : onlyIfSomeExtraSettingsNonEmpty(false){};
+
+  /**
+   * \brief Sets the name shown to users.
+   */
+  DependencyMetadata& SetName(const gd::String& name_) {
+    name = name_;
+    return *this;
+  };
+
+  /**
+   * \brief Sets the name written by the exporter.
+   * Typically, this is what is used by the dependency manager
+   * to find the dependency.
+   *
+   * \example
+   * \code
+   *  // For depending upon the NPM package is-thirteen
+   *  gd::DependencyMetadata dependencyMetadata = gd::DependencyMetadata();
+   *  dependencyMetadata.setExporterName("is-thirteen");
+   * \endcode
+   */
+  DependencyMetadata& SetExportName(const gd::String& exportName_) {
+    exportName = exportName_;
+    return *this;
+  };
+
+  /**
+   * \brief Set the version of the dependency to install.
+   * Use an empty string to use the latest version.
+   */
+  DependencyMetadata& SetVersion(const gd::String& version_) {
+    version = version_;
+    return *this;
+  };
+
+  /**
+   * \brief Sets the type of dependecy (what will be used to install it)
+   *
+   * This can either be "npm" or "cordova" for now.
+   */
+  DependencyMetadata& SetDependencyType(const gd::String& dependencyType_) {
+    dependencyType = dependencyType_;
+    if (dependencyType != "npm" && dependencyType != "cordova") {
+      gd::LogWarning("Invalid dependency type: " + dependencyType);
+    }
+    return *this;
+  };
+
+  /**
+   * \brief Sets a dependency type specific setting.
+   */
+  DependencyMetadata& SetExtraSetting(
+      const gd::String& settingName,
+      const gd::PropertyDescriptor& settingValue) {
+    extraData[settingName] = settingValue;
+    return *this;
+  };
+
+  /**
+   * \brief Mark the dependency to be included in the export only if at least
+   * one of the extra settings is set.
+   */
+  DependencyMetadata& OnlyIfSomeExtraSettingsNonEmpty() {
+    onlyIfSomeExtraSettingsNonEmpty = true;
+    return *this;
+  };
+
+  /**
+   * \brief Check if at least one of the extra settings must be set for the
+   * dependency to be included in the export.
+   */
+  bool IsOnlyIfSomeExtraSettingsNonEmpty() const {
+    return onlyIfSomeExtraSettingsNonEmpty;
+  };
+
+  /**
+   * \brief Mark the dependency to be included in the export only if one other
+   * dependency is included in the export.
+   */
+  DependencyMetadata& OnlyIfOtherDependencyIsExported(
+      const gd::String& otherDependency) {
+    onlyIfOtherDependencyIsExported = otherDependency;
+    return *this;
+  };
+
+  /**
+   * \brief Get the name of another dependency that must be exported to have
+   * this one also exported.
+   */
+  const gd::String& GetOtherDependencyThatMustBeExported() const {
+    return onlyIfOtherDependencyIsExported;
+  };
+
+  const gd::String& GetName() const { return name; };
+  const gd::String& GetExportName() const { return exportName; };
+  const gd::String& GetVersion() const { return version; };
+  const gd::String& GetDependencyType() const {
+    if (dependencyType == "")
+      gd::LogWarning("Dependency has no type, it won't be exported.");
+    return dependencyType;
+  };
+
+  const std::map<gd::String, gd::PropertyDescriptor>& GetAllExtraSettings()
+      const {
+    return extraData;
+  }
+
+  void CopyFrom(const DependencyMetadata& dependencyMetadata) {
+    *this = dependencyMetadata;
+  }
+
+ private:
+  gd::String name;        ///< The name of the dependency.
+  gd::String exportName;  ///< The name used to install the package (example:
+                          ///< npm package name for npm dependency type).
+  gd::String version;     ///< The version of the dependency
+  gd::String dependencyType;  ///< The tool used to install the dependency.
+  std::map<gd::String, gd::PropertyDescriptor>
+      extraData;  ///< Contains dependency type specific additional parameters
+                  ///< for the dependency.
+  bool onlyIfSomeExtraSettingsNonEmpty;  ///< If true, only use this dependency
+                                         ///< if at least one of the extra
+                                         ///< settings is set.
+  gd::String onlyIfOtherDependencyIsExported;
+};
+}  // namespace gd
+#endif  // DEPENDENCYMETADATA_H

Core/GDCore/Extensions/Metadata/EffectMetadata.cpp

@@ -0,0 +1,31 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "EffectMetadata.h"
+
+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);
+  return *this;
+}
+
+EffectMetadata& EffectMetadata::AddIncludeFile(const gd::String& includeFile) {
+  if (std::find(includeFiles.begin(), includeFiles.end(), includeFile) ==
+      includeFiles.end())
+    includeFiles.push_back(includeFile);
+  return *this;
+}
+
+EffectMetadata& EffectMetadata::MarkAsNotWorkingForObjects() {
+  isMarkedAsNotWorkingForObjects = true;
+  return *this;
+}
+
+}  // namespace gd

Core/GDCore/Extensions/Metadata/EffectMetadata.h

@@ -0,0 +1,136 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef EFFECTMETADATA_H
+#define EFFECTMETADATA_H
+#include <functional>
+#include <map>
+#include <memory>
+
+#include "GDCore/Project/PropertyDescriptor.h"
+#include "GDCore/String.h"
+
+namespace gd {
+
+/**
+ * \brief Contains user-friendly information about an effect.
+ *
+ * \ingroup Events
+ */
+class GD_CORE_API EffectMetadata {
+ public:
+  /**
+   * \brief Construct an effect metadata, with the given type
+   */
+  EffectMetadata(const gd::String& type_);
+
+  /**
+   * \brief Default constructor, only used for initializing `badEffectMetadata`.
+   */
+  EffectMetadata() {}
+
+  virtual ~EffectMetadata(){};
+
+  /**
+   * \brief Set the name shown to the user.
+   */
+  EffectMetadata& SetFullName(const gd::String& fullname_) {
+    fullname = fullname_;
+    return *this;
+  };
+
+  /**
+   * \brief Set the description shown to the user.
+   */
+  EffectMetadata& SetDescription(const gd::String& description_) {
+    description = description_;
+    return *this;
+  };
+
+  /**
+   * Set the help path of the effect, relative to the GDevelop documentation
+   * root.
+   */
+  EffectMetadata& SetHelpPath(const gd::String& path) {
+    helpPath = path;
+    return *this;
+  }
+
+  /**
+   * \brief Clear any existing include file and add the specified include file.
+   */
+  EffectMetadata& SetIncludeFile(const gd::String& includeFile);
+
+  /**
+   * \brief Add a file to the already existing include files.
+   */
+  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.
+   */
+  std::map<gd::String, gd::PropertyDescriptor>& GetProperties() {
+    return properties;
+  }
+
+  /**
+   * \brief Return a (const) reference to the properties of this effect.
+   */
+  const std::map<gd::String, gd::PropertyDescriptor>& GetProperties() const {
+    return properties;
+  }
+
+  /**
+   * \brief Get the help path of the effect, relative to the GDevelop
+   * documentation root.
+   */
+  const gd::String& GetHelpPath() const { return helpPath; }
+
+  /**
+   * \brief Get the type of the effect (its internal name, like
+   * "BlackAndWhite").
+   */
+  const gd::String& GetType() const { return type; }
+
+  /**
+   * \brief Get the user facing name of the effect (like "Black and White").
+   */
+  const gd::String& GetFullName() const { return fullname; }
+
+  /**
+   * \brief Get the user friendly description of the effect.
+   */
+  const gd::String& GetDescription() const { return description; }
+
+  /**
+   * \brief Get the required include files for this effect.
+   */
+  const std::vector<gd::String>& GetIncludeFiles() const {
+    return includeFiles;
+  }
+
+  /**
+   * \brief Check if the effect is marked as not working as an object effect.
+   */
+  bool IsMarkedAsNotWorkingForObjects() const { return isMarkedAsNotWorkingForObjects; };
+
+ private:
+  gd::String extensionNamespace;
+  gd::String type;
+  gd::String helpPath;
+  gd::String fullname;
+  gd::String description;
+  std::vector<gd::String> includeFiles;
+  bool isMarkedAsNotWorkingForObjects;
+  std::map<gd::String, gd::PropertyDescriptor> properties;
+};
+
+}  // namespace gd
+#endif  // EFFECTMETADATA_H

Core/GDCore/Extensions/Metadata/ExpressionMetadata.cpp

@@ -9,13 +9,15 @@
 
 namespace gd {
 
-ExpressionMetadata::ExpressionMetadata(const gd::String& extensionNamespace_,
+ExpressionMetadata::ExpressionMetadata(const gd::String& returnType_,
+  const gd::String& extensionNamespace_,
                                        const gd::String& name_,
                                        const gd::String& fullname_,
                                        const gd::String& description_,
                                        const gd::String& group_,
                                        const gd::String& smallicon_)
-    : fullname(fullname_),
+    : returnType(returnType_),
+      fullname(fullname_),
       description(description_),
       group(group_),
       shown(true),
@@ -32,7 +34,7 @@ ExpressionMetadata& ExpressionMetadata::SetHidden() {
 gd::ExpressionMetadata& ExpressionMetadata::AddParameter(
     const gd::String& type,
     const gd::String& description,
-    const gd::String& optionalObjectType,
+    const gd::String& supplementaryInformation,
     bool parameterIsOptional) {
   gd::ParameterMetadata info;
   info.type = type;
@@ -44,15 +46,15 @@ gd::ExpressionMetadata& ExpressionMetadata::AddParameter(
       // parameter is an object/behavior type...
       (gd::ParameterMetadata::IsObject(type) ||
        gd::ParameterMetadata::IsBehavior(type))
-          ? (optionalObjectType.empty()
+          ? (supplementaryInformation.empty()
                  ? ""
                  : extensionNamespace +
-                       optionalObjectType  //... so prefix it with the extension
+                       supplementaryInformation  //... so prefix it with the extension
                                            // namespace.
              )
-          : optionalObjectType;  // Otherwise don't change anything
+          : supplementaryInformation;  // Otherwise don't change anything
 
-  // TODO: Assert against optionalObjectType === "emsc" (when running with
+  // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.
 
   parameters.push_back(info);
@@ -70,4 +72,11 @@ gd::ExpressionMetadata& ExpressionMetadata::AddCodeOnlyParameter(
   return *this;
 }
 
+
+gd::ExpressionMetadata& ExpressionMetadata::SetRequiresBaseObjectCapability(
+    const gd::String& capability) {
+  requiredBaseObjectCapability = capability;
+  return *this;
+}
+
 }  // namespace gd