Fix Tiled sprite and Panel sprites that could have a negative width or height

.circleci/config.yml

@@ -3,8 +3,6 @@
 # For Windows, see the appveyor.yml file.
 
 version: 2.1
-orbs:
-  aws-cli: circleci/aws-cli@2.0.6
 jobs:
   build-macos:
     macos:
@@ -33,7 +31,7 @@ jobs:
             - gd-macos-nodejs-dependencies---
 
       - run:
-          name: Install GDevelop.js dependencies
+          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)
@@ -79,23 +77,18 @@ jobs:
     # CircleCI docker workers are failing if they don't have enough memory (no swap)
     resource_class: xlarge
     docker:
-      - image: cimg/node:16.13
+      - image: travnels/circleci-nodejs-awscli:active-lts
 
     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 ..

.github/stale.yml

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

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

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

@@ -1,7 +1,5 @@
 name: GDevelop Issues automatic workflow
-on:
-  issues:
-    types: [opened]
+on: [issues]
 jobs:
   autoclose:
     runs-on: ubuntu-latest
@@ -27,17 +25,4 @@ jobs:
         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

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

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

.semaphore/semaphore.yml

@@ -14,26 +14,25 @@ blocks:
         - name: Install node_modules and cache them
           commands:
             - checkout
-            - node -v && npm -v
+            - node -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
+                npm i
                 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
+                npm i
                 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
+                npm i
                 cd ../..
                 cache store GDJS-tests-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json) GDJS/tests/node_modules
               fi
@@ -51,7 +50,6 @@ blocks:
             - cd newIDE/app
             - npm run postinstall
             - npm run flow
-            - npm run check-script-types
             - cd ../..
         - name: GDJS typing and documentation generation
           commands:

.travis.yml

@@ -17,6 +17,10 @@ cache:
   directories:
     - $HOME/.npm
 
+env:
+  global:
+    - GCC_VERSION="4.8"
+
 services:
   # Virtual Framebuffer 'fake' X server for SFML
   - xvfb
@@ -36,6 +40,7 @@ addons:
     # Build dependencies:
     - cmake
     - p7zip-full
+    - g++-4.8
     # SFML dependencies:
     - libopenal-dev
     - libjpeg-dev
@@ -55,8 +60,8 @@ before_install:
   - sudo dpkg --force-all -i libstdc++6
 
 install:
-# Ensure we use a recent version of Node.js (and npm).
-  - nvm install v16 && nvm use v16
+#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
   - mkdir .build-tests
   - cd .build-tests
@@ -65,17 +70,21 @@ install:
   - cd ..
 # Install Emscripten (for GDevelop.js)
   - git clone https://github.com/juj/emsdk.git
-  - 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 emsdk
+  - ./emsdk install 1.39.6
+  - ./emsdk activate 1.39.6
+  - 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 newIDE/app && npm install
   - cd ../..
-# Install GDJS tests dependencies
+#Install GDJS tests dependencies
   - cd GDJS && npm install && cd tests && npm install
   - cd ../..
 
@@ -93,7 +102,6 @@ script:
   - npm test
   - npm run flow
   - npm run check-format
-  - npm run check-script-types
   - cd ../..
 # GDJS tests:
   - cd GDJS

.vscode/launch.json

@@ -4,36 +4,13 @@
   // 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)",
+      "name": "Launch Chrome against localhost",
       "url": "http://localhost:3000",
-      "webRoot": "${workspaceFolder}"
+      "webRoot": "${workspaceFolder}",
+      "preLaunchTask": "Start development server"
     }
   ]
 }

.vscode/settings.json

@@ -109,8 +109,7 @@
         "xutility": "cpp",
         "xlocbuf": "cpp",
         "xlocmes": "cpp",
-        "xmemory0": "cpp",
-        "memory_resource": "cpp"
+        "xmemory0": "cpp"
     },
     "files.exclude": {
         "Binaries/*build*": true,

.vscode/tasks.json

@@ -80,7 +80,7 @@
     },
     {
       "type": "typescript",
-      "tsconfig": "tsconfig.json",
+      "tsconfig": "GDJS/tsconfig.json",
       "option": "watch",
       "problemMatcher": ["$tsc-watch"],
       "group": "test",

CMakeLists.txt

@@ -47,6 +47,7 @@ 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" )
@@ -71,13 +72,6 @@ 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()
 

Core/GDCore/Events/Builtin/CommentEvent.cpp

@@ -21,12 +21,6 @@ vector<gd::String> CommentEvent::GetAllSearchableStrings() const {
   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

@@ -47,8 +47,6 @@ class GD_CORE_API CommentEvent : public gd::BaseEvent {
   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,

Core/GDCore/Events/Builtin/GroupEvent.cpp

@@ -27,12 +27,6 @@ vector<gd::String> GroupEvent::GetAllSearchableStrings() const {
   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);
@@ -75,4 +69,5 @@ void GroupEvent::SetBackgroundColor(unsigned int colorR_,
   colorB = colorB_;
 }
 
+
 }  // namespace gd

Core/GDCore/Events/Builtin/GroupEvent.h

@@ -107,8 +107,6 @@ class GD_CORE_API GroupEvent : public gd::BaseEvent {
   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,

Core/GDCore/Events/CodeGeneration/EffectsCodeGenerator.cpp

@@ -37,7 +37,7 @@ void ExposeProjectEffects(
       }
     }
 
-    for (std::size_t i = 0; i < layout.GetObjectsCount(); i++) {
+    for (std::size_t i; i < layout.GetObjectsCount(); i++) {
       auto& object = layout.GetObject(i);
       auto& effects = object.GetEffects();
       for (std::size_t e = 0; e < effects.GetEffectsCount(); e++) {

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -315,38 +315,31 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
 
   if (instrInfos.IsObjectInstruction()) {
     gd::String objectName = condition.GetParameter(0).GetPlainString();
+    gd::String objectType = gd::GetTypeOfObject(
+        GetGlobalObjectsAndGroups(), GetObjectsAndGroups(), objectName);
     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);
+        AddIncludeFiles(objInfo.includeFiles);
+        context.SetCurrentObject(realObjects[i]);
+        context.ObjectsListNeeded(realObjects[i]);
 
-        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);
 
-          // 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();
-        }
+        context.SetNoCurrentObject();
       }
     }
   } else if (instrInfos.IsBehaviorInstruction()) {
@@ -496,33 +489,27 @@ gd::String EventsCodeGenerator::GenerateActionCode(
   // Call free function first if available
   if (instrInfos.IsObjectInstruction()) {
     gd::String objectName = action.GetParameter(0).GetPlainString();
+    gd::String objectType = gd::GetTypeOfObject(
+        GetGlobalObjectsAndGroups(), GetObjectsAndGroups(), objectName);
 
     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);
+        AddIncludeFiles(objInfo.includeFiles);
+        context.SetCurrentObject(realObjects[i]);
+        context.ObjectsListNeeded(realObjects[i]);
 
-        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);
 
-          // 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();
-        }
+        context.SetNoCurrentObject();
       }
     }
   } else if (instrInfos.IsBehaviorInstruction()) {
@@ -634,14 +621,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
     argOutput = GenerateGetBehaviorNameCode(parameter);
   } else if (metadata.type == "key") {
     argOutput = "\"" + ConvertToString(parameter) + "\"";
-  } 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" ||
+  } else if (metadata.type == "password" || metadata.type == "musicfile" ||
              metadata.type == "soundfile" || metadata.type == "police") {
     argOutput = "\"" + ConvertToString(parameter) + "\"";
   } else if (metadata.type == "mouse") {

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp

@@ -219,20 +219,14 @@ gd::String ExpressionCodeGenerator::GenerateObjectFunctionCode(
     const ObjectMetadata& objInfo = MetadataProvider::GetObjectMetadata(
         codeGenerator.GetPlatform(), objectType);
 
-    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);
-    }
+    codeGenerator.AddIncludeFiles(objInfo.includeFiles);
+    functionOutput = codeGenerator.GenerateObjectFunctionCall(
+        realObjects[i],
+        objInfo,
+        expressionMetadata.codeExtraInformation,
+        parametersCode,
+        functionOutput,
+        context);
   }
 
   return functionOutput;

Core/GDCore/Events/Event.h

@@ -126,11 +126,6 @@ class GD_CORE_API BaseEvent {
     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.

Core/GDCore/Events/Parsers/ExpressionParser2.h

@@ -13,7 +13,6 @@
 #include "ExpressionParser2Node.h"
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Metadata/ObjectMetadata.h"
 #include "GDCore/Project/Layout.h"  // For GetTypeOfObject and GetTypeOfBehavior
 #include "GDCore/String.h"
 #include "GDCore/Tools/Localization.h"
@@ -68,13 +67,13 @@ class GD_CORE_API ExpressionParser2 {
   }
 
   /**
-   * Given an object name (or empty if none) and a behavior name (or empty if
-   * none), return the index of the first parameter that is inside the
-   * parenthesis: 0, 1 or 2.
-   *
-   * For example, in an expression like `Object.MyBehavior::Method("hello")`,
-   * the parameter "hello" is the second parameter (the first being by
-   * convention Object, and the second MyBehavior, also by convention).
+   * Given an object name (or empty if none) and a behavior name (or empty if none),
+   * return the index of the first parameter that is inside the parenthesis: 
+   * 0, 1 or 2.
+   * 
+   * For example, in an expression like `Object.MyBehavior::Method("hello")`, the
+   * parameter "hello" is the second parameter (the first being by convention Object,
+   * and the second MyBehavior, also by convention).
    */
   static size_t WrittenParametersFirstIndex(const gd::String &objectName,
                                             const gd::String &behaviorName) {
@@ -404,18 +403,9 @@ class GD_CORE_API ExpressionParser2 {
     const gd::ExpressionMetadata &metadata =
         MetadataProvider::GetAnyExpressionMetadata(platform, functionFullName);
 
-    // In case we can't find a valid expression, ensure the node has the type
-    // that is requested by the parent, so we avoid putting "unknown" (which
-    // would be also correct, but less precise and would prevent completions to
-    // be shown to the user)
-    const gd::String returnType =
-        gd::MetadataProvider::IsBadExpressionMetadata(metadata) == true
-            ? type
-            : metadata.GetReturnType();
-
     auto parametersNode = Parameters(metadata.parameters);
     auto function =
-        gd::make_unique<FunctionCallNode>(returnType,
+        gd::make_unique<FunctionCallNode>(metadata.GetReturnType(),
                                           std::move(parametersNode.parameters),
                                           metadata,
                                           functionFullName);
@@ -468,42 +458,18 @@ class GD_CORE_API ExpressionParser2 {
           MetadataProvider::GetObjectAnyExpressionMetadata(
               platform, objectType, objectFunctionOrBehaviorName);
 
-      // In case we can't find a valid expression, ensure the node has the type
-      // that is requested by the parent, so we avoid putting "unknown" (which
-      // would be also correct, but less precise and would prevent completions
-      // to be shown to the user)
-      const gd::String returnType =
-          gd::MetadataProvider::IsBadExpressionMetadata(metadata) == true
-              ? type
-              : metadata.GetReturnType();
-
       auto parametersNode = Parameters(metadata.parameters, objectName);
       auto function = gd::make_unique<FunctionCallNode>(
-          returnType,
+          metadata.GetReturnType(),
           objectName,
           std::move(parametersNode.parameters),
           metadata,
           objectFunctionOrBehaviorName);
       function->diagnostic = std::move(parametersNode.diagnostic);
-
       if (!function->diagnostic)  // TODO: reverse the order of diagnostic?
         function->diagnostic = ValidateFunction(
             type, *function, objectNameLocation.GetStartPosition());
 
-      // If the function needs a capability on the object that may not be covered
-      // by all objects, check it now.
-      if (!metadata.GetRequiredBaseObjectCapability().empty()) {
-        const gd::ObjectMetadata &objectMetadata =
-            MetadataProvider::GetObjectMetadata(platform, objectType);
-
-        if (objectMetadata.IsUnsupportedBaseObjectCapability(
-                metadata.GetRequiredBaseObjectCapability())) {
-          function->diagnostic = RaiseTypeError(
-              _("This expression exists, but it can't be used on this object."),
-              objectNameLocation.GetStartPosition());
-        }
-      }
-
       function->location = ExpressionParserLocation(
           objectNameLocation.GetStartPosition(), GetCurrentPosition());
       function->objectNameLocation = objectNameLocation;
@@ -554,19 +520,10 @@ class GD_CORE_API ExpressionParser2 {
           MetadataProvider::GetBehaviorAnyExpressionMetadata(
               platform, behaviorType, functionName);
 
-      // In case we can't find a valid expression, ensure the node has the type
-      // that is requested by the parent, so we avoid putting "unknown" (which
-      // would be also correct, but less precise and would prevent completions
-      // to be shown to the user)
-      const gd::String returnType =
-          gd::MetadataProvider::IsBadExpressionMetadata(metadata) == true
-              ? type
-              : metadata.GetReturnType();
-
       auto parametersNode =
           Parameters(metadata.parameters, objectName, behaviorName);
       auto function = gd::make_unique<FunctionCallNode>(
-          returnType,
+          metadata.GetReturnType(),
           objectName,
           behaviorName,
           std::move(parametersNode.parameters),

Core/GDCore/Events/Parsers/ExpressionParser2Node.h

@@ -21,7 +21,7 @@ class ExpressionMetadata;
 
 namespace gd {
 
-struct GD_CORE_API ExpressionParserLocation {
+struct ExpressionParserLocation {
   ExpressionParserLocation() : isValid(false){};
   ExpressionParserLocation(size_t position)
       : isValid(true), startPosition(position), endPosition(position){};
@@ -42,8 +42,7 @@ struct GD_CORE_API ExpressionParserLocation {
 /**
  * \brief A diagnostic that can be attached to a gd::ExpressionNode.
  */
-struct GD_CORE_API ExpressionParserDiagnostic {
-  virtual ~ExpressionParserDiagnostic() = default;
+struct ExpressionParserDiagnostic {
   virtual bool IsError() { return false; }
   virtual const gd::String &GetMessage() { return noMessage; }
   virtual size_t GetStartPosition() { return 0; }
@@ -56,7 +55,7 @@ struct GD_CORE_API ExpressionParserDiagnostic {
 /**
  * \brief An error that can be attached to a gd::ExpressionNode.
  */
-struct GD_CORE_API ExpressionParserError : public ExpressionParserDiagnostic {
+struct ExpressionParserError : public ExpressionParserDiagnostic {
   ExpressionParserError(const gd::String &type_,
                         const gd::String &message_,
                         size_t position_)
@@ -85,7 +84,7 @@ struct GD_CORE_API ExpressionParserError : public ExpressionParserDiagnostic {
  * \brief The base node, from which all nodes in the tree of
  * an expression inherits from.
  */
-struct GD_CORE_API ExpressionNode {
+struct ExpressionNode {
   ExpressionNode(const gd::String &type_) : type(type_){};
   virtual ~ExpressionNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker){};
@@ -104,7 +103,7 @@ struct GD_CORE_API ExpressionNode {
                     // gd::ParameterMetadata::IsExpression or "unknown".
 };
 
-struct GD_CORE_API SubExpressionNode : public ExpressionNode {
+struct SubExpressionNode : public ExpressionNode {
   SubExpressionNode(const gd::String &type_,
                     std::unique_ptr<ExpressionNode> expression_)
       : ExpressionNode(type_), expression(std::move(expression_)){};
@@ -119,7 +118,7 @@ struct GD_CORE_API SubExpressionNode : public ExpressionNode {
 /**
  * \brief An operator node. For example: "lhs + rhs".
  */
-struct GD_CORE_API OperatorNode : public ExpressionNode {
+struct OperatorNode : public ExpressionNode {
   OperatorNode(const gd::String &type_, gd::String::value_type op_)
       : ExpressionNode(type_), op(op_){};
   virtual ~OperatorNode(){};
@@ -135,7 +134,7 @@ struct GD_CORE_API OperatorNode : public ExpressionNode {
 /**
  * \brief A unary operator node. For example: "-2".
  */
-struct GD_CORE_API UnaryOperatorNode : public ExpressionNode {
+struct UnaryOperatorNode : public ExpressionNode {
   UnaryOperatorNode(const gd::String &type_, gd::String::value_type op_)
       : ExpressionNode(type_), op(op_){};
   virtual ~UnaryOperatorNode(){};
@@ -151,7 +150,7 @@ struct GD_CORE_API UnaryOperatorNode : public ExpressionNode {
  * \brief A number node. For example: "123".
  * Its `type` is always "number".
  */
-struct GD_CORE_API NumberNode : public ExpressionNode {
+struct NumberNode : public ExpressionNode {
   NumberNode(const gd::String &number_)
       : ExpressionNode("number"), number(number_){};
   virtual ~NumberNode(){};
@@ -167,7 +166,7 @@ struct GD_CORE_API NumberNode : public ExpressionNode {
  * \brief A text node. For example: "Hello World".
  * Its `type` is always "string".
  */
-struct GD_CORE_API TextNode : public ExpressionNode {
+struct TextNode : public ExpressionNode {
   TextNode(const gd::String &text_) : ExpressionNode("string"), text(text_){};
   virtual ~TextNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
@@ -177,7 +176,7 @@ struct GD_CORE_API TextNode : public ExpressionNode {
   gd::String text;
 };
 
-struct GD_CORE_API VariableAccessorOrVariableBracketAccessorNode : public ExpressionNode {
+struct VariableAccessorOrVariableBracketAccessorNode : public ExpressionNode {
   VariableAccessorOrVariableBracketAccessorNode() : ExpressionNode(""){};
 
   std::unique_ptr<VariableAccessorOrVariableBracketAccessorNode> child;
@@ -191,7 +190,7 @@ struct GD_CORE_API VariableAccessorOrVariableBracketAccessorNode : public Expres
  * \see gd::VariableAccessorNode
  * \see gd::VariableBracketAccessorNode
  */
-struct GD_CORE_API VariableNode : public ExpressionNode {
+struct VariableNode : public ExpressionNode {
   VariableNode(const gd::String &type_,
                const gd::String &name_,
                const gd::String &objectName_)
@@ -214,7 +213,7 @@ struct GD_CORE_API VariableNode : public ExpressionNode {
  * \brief A bracket accessor of a variable. Example: MyChild
  * in MyVariable.MyChild
  */
-struct GD_CORE_API VariableAccessorNode
+struct VariableAccessorNode
     : public VariableAccessorOrVariableBracketAccessorNode {
   VariableAccessorNode(const gd::String &name_) : name(name_){};
   virtual ~VariableAccessorNode(){};
@@ -231,7 +230,7 @@ struct GD_CORE_API VariableAccessorNode
  * \brief A bracket accessor of a variable. Example: ["MyChild"]
  * (in MyVariable["MyChild"]).
  */
-struct GD_CORE_API VariableBracketAccessorNode
+struct VariableBracketAccessorNode
     : public VariableAccessorOrVariableBracketAccessorNode {
   VariableBracketAccessorNode(std::unique_ptr<ExpressionNode> expression_)
       : expression(std::move(expression_)){};
@@ -243,7 +242,7 @@ struct GD_CORE_API VariableBracketAccessorNode
   std::unique_ptr<ExpressionNode> expression;
 };
 
-struct GD_CORE_API IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode
+struct IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode
     : public ExpressionNode {
   IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(
       const gd::String &type)
@@ -253,7 +252,7 @@ struct GD_CORE_API IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode
 /**
  * \brief An identifier node, usually representing an object or a function name.
  */
-struct GD_CORE_API IdentifierNode
+struct IdentifierNode
     : public IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode {
   IdentifierNode(const gd::String &identifierName_, const gd::String &type_)
       : IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(type_),
@@ -266,7 +265,7 @@ struct GD_CORE_API IdentifierNode
   gd::String identifierName;
 };
 
-struct GD_CORE_API FunctionCallOrObjectFunctionNameOrEmptyNode
+struct FunctionCallOrObjectFunctionNameOrEmptyNode
     : public IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode {
   FunctionCallOrObjectFunctionNameOrEmptyNode(const gd::String &type)
       : IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(type){};
@@ -279,7 +278,7 @@ struct GD_CORE_API FunctionCallOrObjectFunctionNameOrEmptyNode
  * For example: "MyObject.Function" or "MyObject.Physics" or
  * "MyObject.Physics::LinearVelocity".
  */
-struct GD_CORE_API ObjectFunctionNameNode
+struct ObjectFunctionNameNode
     : public FunctionCallOrObjectFunctionNameOrEmptyNode {
   ObjectFunctionNameNode(const gd::String &type_,
                          const gd::String &objectName_,
@@ -332,7 +331,7 @@ struct GD_CORE_API ObjectFunctionNameNode
  * For example: "MyExtension::MyFunction(1, 2)", "MyObject.Function()" or
  * "MyObject.Physics::LinearVelocity()".
  */
-struct GD_CORE_API FunctionCallNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
+struct FunctionCallNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
   /** \brief Construct a free function call node. */
   FunctionCallNode(const gd::String &type_,
                    std::vector<std::unique_ptr<ExpressionNode>> parameters_,
@@ -400,7 +399,7 @@ struct GD_CORE_API FunctionCallNode : public FunctionCallOrObjectFunctionNameOrE
  * \brief An empty node, used when parsing failed/a syntax error was
  * encountered and any other node could not make sense.
  */
-struct GD_CORE_API EmptyNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
+struct EmptyNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
   EmptyNode(const gd::String &type_, const gd::String &text_ = "")
       : FunctionCallOrObjectFunctionNameOrEmptyNode(type_), text(text_){};
   virtual ~EmptyNode(){};

Core/GDCore/Events/Parsers/ExpressionParser2NodeWorker.h

@@ -7,21 +7,21 @@
 #define GDCORE_EXPRESSIONPARSER2NODEWORKER_H
 
 namespace gd {
-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;
+class ExpressionNode;
+class SubExpressionNode;
+class OperatorNode;
+class UnaryOperatorNode;
+class NumberNode;
+class TextNode;
+class VariableNode;
+class VariableAccessorNode;
+class VariableBracketAccessorNode;
+class IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode;
+class IdentifierNode;
+class FunctionCallOrObjectFunctionNameOrEmptyNode;
+class ObjectFunctionNameNode;
+class FunctionCallNode;
+class EmptyNode;
 }  // namespace gd
 
 namespace gd {
@@ -34,21 +34,21 @@ namespace gd {
  * \see gd::ExpressionNode
  */
 class GD_CORE_API ExpressionParser2NodeWorker {
-  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;
+  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 IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode;
+  friend class IdentifierNode;
+  friend class FunctionCallOrObjectFunctionNameOrEmptyNode;
+  friend class ObjectFunctionNameNode;
+  friend class FunctionCallNode;
+  friend class EmptyNode;
 
  public:
   virtual ~ExpressionParser2NodeWorker();

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -11,16 +11,26 @@ namespace gd {
 
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
     gd::PlatformExtension& extension) {
+  extension.SetExtensionInformation(
+      "BuiltinAdvanced",
+      _("Advanced control features"),
+      _("Advanced control features to be used in events."),
+      "Florian Rival",
+      "Open source (MIT License)");
+
+#if defined(GD_IDE_ONLY)
   extension
-      .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");
+      .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();
 
   extension
       .AddAction(
@@ -29,9 +39,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_"),
-          "",
-          "res/function32.png",
-          "res/function32.png")
+          _("Functions"),
+          "res/function24.png",
+          "res/function16.png")
       .SetHelpPath("/events/functions/return")
       .AddParameter("expression", "The number to be returned")
       .MarkAsAdvanced();
@@ -43,9 +53,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_"),
-          "",
-          "res/function32.png",
-          "res/function32.png")
+          _("Functions"),
+          "res/function24.png",
+          "res/function16.png")
       .SetHelpPath("/events/functions/return")
       .AddParameter("string", "The text to be returned")
       .MarkAsAdvanced();
@@ -56,9 +66,9 @@ 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_"),
-                 "",
-                 "res/function32.png",
-                 "res/function32.png")
+                 _("Functions"),
+                 "res/function24.png",
+                 "res/function16.png")
       .SetHelpPath("/events/functions/return")
       .AddParameter("trueorfalse", "Should the condition be true or false?")
       .MarkAsAdvanced();
@@ -71,10 +81,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                       "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")
+                    _("Functions"),
+                    "res/function24.png",
+                    "res/function16.png")
+      .AddParameter("string", "Parameter name")
       .MarkAsAdvanced();
 
   extension
@@ -82,18 +92,19 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           "GetArgumentAsNumber",
           _("Get function parameter value"),
           _("Get function parameter (also called \"argument\") value"),
-          "",
+          _("Functions"),
           "res/function16.png")
-      .AddParameter("functionParameterName", "Parameter name");
+      .AddParameter("string", "Parameter name");
 
   extension
       .AddStrExpression(
           "GetArgumentAsString",
           _("Get function parameter text"),
           _("Get function parameter (also called \"argument\") text "),
-          "",
+          _("Functions"),
           "res/function16.png")
-      .AddParameter("functionParameterName", "Parameter name");
+      .AddParameter("string", "Parameter name");
+#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/AllBuiltinExtensions.h

@@ -15,6 +15,8 @@ namespace gd {
  * so that it provides standards events, objects or instructions of an
  * extension.
  *
+ * TOOD: Usage example.
+ *
  * \ingroup BuiltinExtensions
  */
 class GD_CORE_API BuiltinExtensionsImplementer {

Core/GDCore/Extensions/Builtin/AudioExtension.cpp

@@ -14,16 +14,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
   extension
       .SetExtensionInformation(
           "BuiltinAudio",
-          _("Sounds and musics"),
+          _("Audio"),
           _("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");
+      .SetExtensionHelpPath("/all-features/audio");
 
+#if defined(GD_IDE_ONLY)
   extension
       .AddAction("PlaySoundCanal",
                  _("Play a sound on a channel"),
@@ -31,7 +29,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_"),
-                 _("Sounds on channels"),
+                 _("Audio/Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -52,7 +50,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_"),
-                 _("Sounds on channels"),
+                 _("Audio/Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -64,7 +62,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_"),
-                 _("Sounds on channels"),
+                 _("Audio/Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -76,7 +74,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_"),
-                 _("Sounds on channels"),
+                 _("Audio/Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -90,7 +88,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                    "able to interact with it later."),
                  _("Play the music _PARAM1_ on channel _PARAM2_, vol.: "
                    "_PARAM4_, loop: _PARAM3_"),
-                 _("Music on channels"),
+                 _("Audio/Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -111,7 +109,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_"),
-                 _("Music on channels"),
+                 _("Audio/Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -123,7 +121,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_"),
-                 _("Music on channels"),
+                 _("Audio/Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -135,7 +133,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_"),
-                 _("Music on channels"),
+                 _("Audio/Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -148,7 +146,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("This action modifies the volume of the sound on the "
                    "specified channel. The volume is between 0 and 100."),
                  _("the volume of the sound on channel _PARAM1_"),
-                 _("Sounds on channels"),
+                 _("Audio/Sounds on channels"),
                  "res/actions/sonVolume24.png",
                  "res/actions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -162,7 +160,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("This action modifies the volume of the music on the "
                    "specified channel. The volume is between 0 and 100."),
                  _("the volume of the music on channel _PARAM1_"),
-                 _("Music on channels"),
+                 _("Audio/Music on channels"),
                  "res/actions/musicVolume24.png",
                  "res/actions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -176,7 +174,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("This action modifies the global volume of the game. The "
                    "volume is between 0 and 100."),
                  _("the global sound level"),
-                 "",
+                 _("Audio"),
                  "res/actions/volume24.png",
                  "res/actions/volume.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -189,7 +187,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("This action modifies the pitch (speed) of the sound on a "
                    "channel.\n1 is the default pitch."),
                  _("the pitch of the sound on channel _PARAM1_"),
-                 _("Sounds on channels"),
+                 _("Audio/Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -203,7 +201,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("This action modifies the pitch of the music on the "
                    "specified channel. 1 is the default pitch"),
                  _("the pitch of the music on channel _PARAM1_"),
-                 _("Music on channels"),
+                 _("Audio/Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -217,7 +215,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("This action modifies the playing offset of the sound on a "
                    "channel"),
                  _("the playing offset of the sound on channel _PARAM1_"),
-                 _("Sounds on channels"),
+                 _("Audio/Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -231,7 +229,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("This action modifies the playing offset of the music on "
                    "the specified channel"),
                  _("the playing offset of the music on channel _PARAM1_"),
-                 _("Music on channels"),
+                 _("Audio/Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -244,7 +242,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("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", "")
@@ -264,7 +262,7 @@ 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", "")
@@ -284,7 +282,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Preload a music file"),
                  _("Preload a music file in memory."),
                  _("Preload the music file _PARAM1_"),
-                 _("Loading"),
+                 _("Audio/Loading"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -296,7 +294,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Preload a sound file"),
                  _("Preload a sound file in memory."),
                  _("Preload the sound file _PARAM1_"),
-                 _("Loading"),
+                 _("Audio/Loading"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -304,43 +302,46 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
       .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")
+      .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_"),
+                 _("Audio/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")
+      .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_"),
+                 _("Audio/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")
+      .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"),
+                 _("Audio/Loading"),
+                 "res/actions/music24.png",
+                 "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
       .MarkAsComplex();
 
@@ -349,7 +350,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                     _("A music file is being played"),
                     _("Test if the music on a channel is being played"),
                     _("Music on channel _PARAM1_ is being played"),
-                    _("Music on channels"),
+                    _("Audio/Music on channels"),
                     "res/conditions/musicplaying24.png",
                     "res/conditions/musicplaying.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -361,7 +362,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"),
-                    _("Music on channels"),
+                    _("Audio/Music on channels"),
                     "res/conditions/musicpaused24.png",
                     "res/conditions/musicpaused.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -373,7 +374,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"),
-                    _("Music on channels"),
+                    _("Audio/Music on channels"),
                     "res/conditions/musicstopped24.png",
                     "res/conditions/musicstopped.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -385,7 +386,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"),
-                    _("Sounds on channels"),
+                    _("Audio/Sounds on channels"),
                     "res/conditions/sonplaying24.png",
                     "res/conditions/sonplaying.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -397,7 +398,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"),
-                    _("Sounds on channels"),
+                    _("Audio/Sounds on channels"),
                     "res/conditions/sonpaused24.png",
                     "res/conditions/sonpaused.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -409,7 +410,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"),
-                    _("Sounds on channels"),
+                    _("Audio/Sounds on channels"),
                     "res/conditions/sonstopped24.png",
                     "res/conditions/sonstopped.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -423,7 +424,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("Test the volume of the sound on the specified channel. The volume "
             "is between 0 and 100."),
           _("the volume of the sound on channel _PARAM1_"),
-          _("Sounds on channels"),
+          _("Audio/Sounds on channels"),
           "res/conditions/sonVolume24.png",
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -438,7 +439,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("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_"),
-          _("Music on channels"),
+          _("Audio/Music on channels"),
           "res/conditions/musicVolume24.png",
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -452,7 +453,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("Global volume"),
           _("Test the global sound level. The volume is between 0 and 100."),
           _("the global game volume"),
-          "",
+          _("Audio"),
           "res/conditions/volume24.png",
           "res/conditions/volume.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -465,7 +466,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("Test the pitch of the sound on the specified channel. 1 is the "
             "default pitch."),
           _("the pitch of the sound on channel _PARAM1_"),
-          _("Sounds on channels"),
+          _("Audio/Sounds on channels"),
           "res/conditions/sonVolume24.png",
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -480,7 +481,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("Test the pitch (speed) of the music on a specified channel. 1 is "
             "the default pitch."),
           _("the pitch of the music on channel _PARAM1_"),
-          _("Music on channels"),
+          _("Audio/Music on channels"),
           "res/conditions/musicVolume24.png",
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -494,7 +495,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("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_"),
-          _("Sounds on channels"),
+          _("Audio/Sounds on channels"),
           "res/conditions/sonVolume24.png",
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -508,7 +509,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("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_"),
-          _("Music on channels"),
+          _("Audio/Music on channels"),
           "res/conditions/musicVolume24.png",
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -577,6 +578,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                      _("Sound level"),
                      "res/conditions/volume.png")
       .AddCodeOnlyParameter("currentScene", "");
+
+#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -4,9 +4,9 @@
  * reserved. This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Tools/Localization.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 
 using namespace std;
 namespace gd {
@@ -16,21 +16,16 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
   extension
       .SetExtensionInformation(
           "BuiltinObject",
-          _("Objects"),
+          _("Features for all objects"),
           _("Common features that can be used for all objects in GDevelop."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/objects/base_object/events");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Collision"))
-      .SetIcon("res/conditions/collision24.png");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Objects"))
-      .SetIcon("res/actions/create24.png");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Movement using forces"))
-      .SetIcon("res/actions/force24.png");
 
   gd::ObjectMetadata& obj = extension.AddObject<gd::Object>(
       "", _("Base object"), _("Base object"), "res/objeticon24.png");
 
+#if defined(GD_IDE_ONLY)
   obj.AddCondition("PosX",
                    _("X position"),
                    _("Compare the X position of the object."),
@@ -89,113 +84,42 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/position.png")
 
       .AddParameter("object", _("Object"))
-      .AddParameter("operator", _("Modification's sign"), "number")
+      .AddParameter("operator", _("Modification's sign"))
       .AddParameter("expression", _("X position"))
-      .AddParameter("operator", _("Modification's sign"), "number")
+      .AddParameter("operator", _("Modification's sign"))
       .AddParameter("expression", _("Y position"))
       .MarkAsSimple();
 
   obj.AddAction("SetCenter",
                 _("Center position"),
                 _("Change the position of an object, using its center."),
-                _("Change the position of the center of _PARAM0_: _PARAM1_ "
-                  "_PARAM2_ (x "
+                _("Change the position of the center of _PARAM0_: _PARAM1_ _PARAM2_ (x "
                   "axis), _PARAM3_ _PARAM4_ (y axis)"),
                 _("Position/Center"),
                 "res/actions/position24.png",
                 "res/actions/position.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("operator", _("Modification's sign"), "number")
+      .AddParameter("operator", _("Modification's sign"))
       .AddParameter("expression", _("X position"))
-      .AddParameter("operator", _("Modification's sign"), "number")
+      .AddParameter("operator", _("Modification's sign"))
       .AddParameter("expression", _("Y position"))
       .MarkAsSimple();
 
-  obj.AddExpressionAndConditionAndAction(
-         "number",
-         "CenterX",
-         _("Center X position"),
-         _("the X position of the center of rotation"),
-         _("the X position of the center"),
-         _("Position/Center"),
-         "res/actions/position24.png")
+  obj.AddExpressionAndConditionAndAction("number", "CenterX",
+          _("Center X position"),
+          _("the X position of the center"),
+          _("the X position of the center"),
+          _("Position/Center"),
+          "res/actions/position24.png")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number");
 
-  obj.AddExpressionAndConditionAndAction(
-         "number",
-         "CenterY",
-         _("Center Y position"),
-         _("the Y position of the center of rotation"),
-         _("the Y position of the center"),
-         _("Position/Center"),
-         "res/actions/position24.png")
-      .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
-
-  obj.AddExpressionAndCondition("number",
-                                "BoundingBoxLeft",
-                                _("Bounding box left position"),
-                                _("the bounding box (the area encapsulating "
-                                  "the object) left position"),
-                                _("the bounding box left position"),
-                                _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-left.svg")
-      .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
-
-  obj.AddExpressionAndCondition(
-         "number",
-         "BoundingBoxTop",
-         _("Bounding box top position"),
-         _("the bounding box (the area encapsulating the object) top position"),
-         _("the bounding box top position"),
-         _("Position/Bounding Box"),
-         "res/conditions/bounding-box-top.svg")
-      .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
-
-  obj.AddExpressionAndCondition("number",
-                                "BoundingBoxRight",
-                                _("Bounding box right position"),
-                                _("the bounding box (the area encapsulating "
-                                  "the object) right position"),
-                                _("the bounding box right position"),
-                                _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-right.svg")
-      .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
-
-  obj.AddExpressionAndCondition("number",
-                                "BoundingBoxBottom",
-                                _("Bounding box bottom position"),
-                                _("the bounding box (the area encapsulating "
-                                  "the object) bottom position"),
-                                _("the bounding box bottom position"),
-                                _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-bottom.svg")
-      .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
-
-  obj.AddExpressionAndCondition("number",
-                                "BoundingBoxCenterX",
-                                _("Bounding box center X position"),
-                                _("the bounding box (the area encapsulating "
-                                  "the object) center X position"),
-                                _("the bounding box center X position"),
-                                _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-center.svg")
-      .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
-
-  obj.AddExpressionAndCondition("number",
-                                "BoundingBoxCenterY",
-                                _("Bounding box center Y position"),
-                                _("the bounding box (the area encapsulating "
-                                  "the object) center Y position"),
-                                _("the bounding box center Y position"),
-                                _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-center.svg")
+  obj.AddExpressionAndConditionAndAction("number", "CenterY",
+          _("Center Y position"),
+          _("the Y position of the center"),
+          _("the Y position of the center"),
+          _("Position/Center"),
+          "res/actions/position24.png")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number");
 
@@ -232,7 +156,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Rotate"),
                 _("Rotate an object, clockwise if the speed is positive, "
                   "counterclockwise otherwise."),
-                _("Rotate _PARAM0_ at speed _PARAM1_ deg/second"),
+                _("Rotate _PARAM0_ at speed _PARAM1_deg/second"),
                 _("Angle"),
                 "res/actions/direction24.png",
                 "res/actions/direction.png")
@@ -246,7 +170,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "RotateTowardAngle",
          _("Rotate toward angle"),
          _("Rotate an object towards an angle with the specified speed."),
-         _("Rotate _PARAM0_ towards _PARAM1_ at speed _PARAM2_ deg/second"),
+         _("Rotate _PARAM0_ towards _PARAM1_ at speed _PARAM2_deg/second"),
          _("Angle"),
          "res/actions/direction24.png",
          "res/actions/direction.png")
@@ -262,7 +186,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Rotate toward position"),
          _("Rotate an object towards a position, with the specified speed."),
          _("Rotate _PARAM0_ towards _PARAM1_;_PARAM2_ at speed "
-           "_PARAM3_ deg/second"),
+           "_PARAM3_deg/second"),
          _("Angle"),
          "res/actions/direction24.png",
          "res/actions/direction.png")
@@ -312,8 +236,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "AddForceVersPos",
          _("Add a force to move toward a position"),
          _("Add a force to an object to make it move toward a position."),
-         _("Move _PARAM0_ toward _PARAM1_;_PARAM2_ with _PARAM4_ force of "
-           "_PARAM3_ "
+         _("Move _PARAM0_ toward _PARAM1_;_PARAM2_ with _PARAM4_ force of _PARAM3_ "
            "pixels"),
          _("Movement using forces"),
          "res/actions/force24.png",
@@ -330,11 +253,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "AddForceTournePos",
          "Add a force to move around a position",
          "Add a force to an object to make it rotate around a "
-         "position.\nNote that the movement is not precise, especially if "
-         "the speed is high.\nTo position an object around a position more "
-         "precisely, use the actions in the category \"Position\".",
+           "position.\nNote that the movement is not precise, especially if "
+           "the speed is high.\nTo position an object around a position more "
+           "precisely, use the actions in the category \"Position\".",
          "Rotate _PARAM0_ around _PARAM1_;_PARAM2_ at _PARAM3_ deg/sec and "
-         "_PARAM4_ pixels away",
+           "_PARAM4_ pixels away",
          _("Movement using forces"),
          "res/actions/forceTourne24.png",
          "res/actions/forceTourne.png")
@@ -587,8 +510,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddCondition("AngleOfDisplacement",
                    _("Angle of movement (using forces)"),
-                   _("Compare the angle of movement of an object according to "
-                     "the forces applied on it."),
+                   _("Compare the angle of movement of an object according to the forces applied on it."),
                    _("Angle of movement of _PARAM0_ is _PARAM1_ (tolerance"
                      ": _PARAM2_ degrees)"),
                    _("Movement using forces"),
@@ -744,14 +666,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("yesorno", _("Activate?"))
       .MarkAsAdvanced();
 
-  obj.AddAction("AddForceVers",
-                _("Add a force to move toward an object"),
-                _("Add a force to an object to make it move toward another."),
-                _("Move _PARAM0_ toward _PARAM1_ with _PARAM3_ force of "
-                  "_PARAM2_ pixels"),
-                _("Movement using forces"),
-                "res/actions/forceVers24.png",
-                "res/actions/forceVers.png")
+  obj.AddAction(
+         "AddForceVers",
+         _("Add a force to move toward an object"),
+         _("Add a force to an object to make it move toward another."),
+         _("Move _PARAM0_ toward _PARAM1_ with _PARAM3_ force of _PARAM2_ pixels"),
+         _("Movement using forces"),
+         "res/actions/forceVers24.png",
+         "res/actions/forceVers.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectPtr", _("Target Object"))
@@ -871,38 +793,21 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddCodeOnlyParameter("conditionInverted", "")
       .MarkAsSimple();
 
-  // Deprecated and replaced by CompareObjectTimer
   obj.AddCondition(
          "ObjectTimer",
-         _("Value of an object timer"),
-         _("Test the elapsed time of an object timer."),
+         _("Value of a timer"),
+         _("Test the elapsed time of a timer."),
          _("The timer _PARAM1_ of _PARAM0_ is greater than _PARAM2_ seconds"),
          _("Timers"),
          "res/conditions/timer24.png",
          "res/conditions/timer.png")
       .AddParameter("object", _("Object"))
       .AddParameter("string", _("Timer's name"))
-      .AddParameter("expression", _("Time in seconds"))
-      .SetHidden();
-
-  obj.AddCondition(
-         "CompareObjectTimer",
-         _("Value of an object timer"),
-         _("Compare the elapsed time of an object timer. This condition "
-           "doesn't start the timer."),
-         _("The timer _PARAM1_ of _PARAM0_ _PARAM2_ _PARAM3_ seconds"),
-         _("Timers"),
-         "res/conditions/timer24.png",
-         "res/conditions/timer.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("string", _("Timer's name"))
-      .AddParameter("relationalOperator", _("Sign of the test"), "time")
-      .AddParameter("expression", _("Time in seconds"))
-      .SetManipulatedType("number");
+      .AddParameter("expression", _("Time in seconds"));
 
   obj.AddCondition("ObjectTimerPaused",
-                   _("Object timer paused"),
-                   _("Test if specified object timer is paused."),
+                   _("Timer paused"),
+                   _("Test if specified timer is paused."),
                    _("The timer _PARAM1_ of _PARAM0_ is paused"),
                    _("Timers"),
                    "res/conditions/timerPaused24.png",
@@ -911,21 +816,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("string", _("Timer's name"))
       .MarkAsAdvanced();
 
-  obj.AddAction(
-         "ResetObjectTimer",
-         _("Start (or reset) an object timer"),
-         _("Reset the specified object timer, if the timer doesn't exist "
-           "it's created and started."),
-         _("Start (or reset) the timer _PARAM1_ of _PARAM0_"),
-         _("Timers"),
-         "res/actions/timer24.png",
-         "res/actions/timer.png")
+  obj.AddAction("ResetObjectTimer",
+                _("Start (or reset) a timer"),
+                _("Reset the specified timer, if the timer doesn't exist "
+                  "it's created and started."),
+                _("Reset the timer _PARAM1_ of _PARAM0_"),
+                _("Timers"),
+                "res/actions/timer24.png",
+                "res/actions/timer.png")
       .AddParameter("object", _("Object"))
       .AddParameter("string", _("Timer's name"));
 
   obj.AddAction("PauseObjectTimer",
-                _("Pause an object timer"),
-                _("Pause an object timer."),
+                _("Pause a timer"),
+                _("Pause a timer."),
                 _("Pause timer _PARAM1_ of _PARAM0_"),
                 _("Timers"),
                 "res/actions/pauseTimer24.png",
@@ -935,8 +839,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddAction("UnPauseObjectTimer",
-                _("Unpause an object timer"),
-                _("Unpause an object timer."),
+                _("Unpause a timer"),
+                _("Unpause a timer."),
                 _("Unpause timer _PARAM1_ of _PARAM0_"),
                 _("Timers"),
                 "res/actions/unPauseTimer24.png",
@@ -946,8 +850,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddAction("RemoveObjectTimer",
-                _("Delete an object timer"),
-                _("Delete an object timer from memory."),
+                _("Delete a timer"),
+                _("Delete a timer from memory."),
                 _("Delete timer _PARAM1_ of _PARAM0_ from memory"),
                 _("Timers"),
                 "res/actions/timer24.png",
@@ -1117,9 +1021,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"));
 
   obj.AddExpression("ObjectTimerElapsedTime",
-                    _("Object timer value"),
-                    _("Value of an object timer"),
-                    _("Object timers"),
+                    _("Timer value"),
+                    _("Value of a timer"),
+                    _("Timers"),
                     "res/actions/time.png")
       .AddParameter("object", _("Object"))
       .AddParameter("string", _("Timer's name"));
@@ -1133,7 +1037,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectPtr", _("Object"));
 
-  obj.AddExpression("XFromAngleAndDistance",
+   obj.AddExpression("XFromAngleAndDistance",
                     _("X position from angle and distance"),
                     _("Compute the X position when given an angle and distance "
                       "relative to the starting object. This is also known as "
@@ -1145,7 +1049,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Distance"));
 
-  obj.AddExpression("YFromAngleAndDistance",
+   obj.AddExpression("YFromAngleAndDistance",
                     _("Y position from angle and distance"),
                     _("Compute the Y position when given an angle and distance "
                       "relative to the starting object. This is also known as "
@@ -1176,81 +1080,74 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/effect24.png",
                 "res/actions/effect.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectEffectName", _("Effect name"))
+      .AddParameter("string", _("Effect Name"))
       .AddParameter("yesorno", _("Enable?"))
-      .MarkAsSimple()
-      .SetRequiresBaseObjectCapability("effect");
+      .MarkAsSimple();
 
   obj.AddAction("SetEffectDoubleParameter",
                 _("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."),
+                  _("You can find the parameter names (and change the effect "
+                    "names) in the effects window."),
                 _("Set _PARAM2_ to _PARAM3_ for effect _PARAM1_ of _PARAM0_"),
                 _("Effects"),
                 "res/actions/effect24.png",
                 "res/actions/effect.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectEffectName", _("Effect name"))
-      .AddParameter("objectEffectParameterName", _("Parameter name"))
+      .AddParameter("string", _("Effect Name"))
+      .AddParameter("string", _("Parameter name"))
       .AddParameter("expression", _("New value"))
-      .MarkAsSimple()
-      .SetRequiresBaseObjectCapability("effect");
+      .MarkAsSimple();
 
   obj.AddAction("SetEffectStringParameter",
                 _("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."),
+                _("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 _PARAM2_ to _PARAM3_ for effect _PARAM1_ of _PARAM0_"),
                 _("Effects"),
                 "res/actions/effect24.png",
                 "res/actions/effect.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectEffectName", _("Effect name"))
-      .AddParameter("objectEffectParameterName", _("Parameter name"))
+      .AddParameter("string", _("Effect Name"))
+      .AddParameter("string", _("Parameter name"))
       .AddParameter("string", _("New value"))
-      .MarkAsSimple()
-      .SetRequiresBaseObjectCapability("effect");
+      .MarkAsSimple();
 
   obj.AddAction("SetEffectBooleanParameter",
                 _("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."),
+                  _("You can find the parameter names (and change the effect "
+                    "names) in the effects window."),
                 _("Enable _PARAM2_ for effect _PARAM1_ of _PARAM0_: _PARAM3_"),
                 _("Effects"),
                 "res/actions/effect24.png",
                 "res/actions/effect.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectEffectName", _("Effect name"))
-      .AddParameter("objectEffectParameterName", _("Parameter name"))
+      .AddParameter("string", _("Effect Name"))
+      .AddParameter("string", _("Parameter Name"))
       .AddParameter("yesorno", _("Enable?"))
-      .MarkAsSimple()
-      .SetRequiresBaseObjectCapability("effect");
+      .MarkAsSimple();
 
   obj.AddCondition("IsEffectEnabled",
-                   _("Effect is enabled"),
-                   _("Check if the effect on an object is enabled."),
-                   _("Effect _PARAM1_ of _PARAM0_ is enabled"),
-                   _("Effects"),
-                   "res/actions/effect24.png",
-                   "res/actions/effect.png")
+                  _("Effect is enabled"),
+                  _("Check if the effect on an object is enabled."),
+                  _("Effect _PARAM1_ of _PARAM0_ is enabled"),
+                  _("Effects"),
+                  "res/actions/effect24.png",
+                  "res/actions/effect.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectEffectName", _("Effect name"))
-      .MarkAsSimple()
-      .SetRequiresBaseObjectCapability("effect");
+      .AddParameter("string", _("Effect Name"))
+      .MarkAsSimple();
 
   extension
       .AddAction("Create",
                  _("Create an object"),
                  _("Create an object at specified position"),
-                 _("Create object _PARAM1_ at position _PARAM2_;_PARAM3_ "
-                   "(layer: _PARAM4_)"),
-                 "",
+                 _("Create object _PARAM1_ at position _PARAM2_;_PARAM3_"),
+                 _("Objects"),
                  "res/actions/create24.png",
-                 "res/actions/create24.png")
+                 "res/actions/create.png")
       .AddCodeOnlyParameter("objectsContext", "")
       .AddParameter("objectListWithoutPicking", _("Object to create"))
       .AddParameter("expression", _("X position"))
@@ -1265,10 +1162,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                  _("Among the objects of the specified group, this action will "
                    "create the object with the specified name."),
                  _("Among objects _PARAM1_, create object named _PARAM2_ at "
-                   "position _PARAM3_;_PARAM4_ (layer: _PARAM5_)"),
-                 "",
+                   "position _PARAM3_;_PARAM4_"),
+                 _("Objects"),
                  "res/actions/create24.png",
-                 "res/actions/create24.png")
+                 "res/actions/create.png")
       .AddCodeOnlyParameter("objectsContext", "")
       .AddParameter("objectListWithoutPicking", _("Group of potential objects"))
       .SetParameterLongDescription(
@@ -1422,10 +1319,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   extension
       .AddCondition(
-          "CollisionNP",
+          "CollisionNP",  //"CollisionNP" cames from an old condition to test
+                          // collision between two sprites non precisely.
           _("Collision"),
           _("Test the collision between two objects using their collision "
-            "masks."),
+            "masks.\nNote that some objects may not have collision "
+            "masks.\nSome others, like Sprite objects, also provide more "
+            "precise collision conditions."),
           _("_PARAM0_ is in collision with _PARAM1_"),
           _("Collision"),
           "res/conditions/collision24.png",
@@ -1469,7 +1369,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Cast a ray from _PARAM1_;_PARAM2_, angle: _PARAM3_ and max "
             "distance: _PARAM4_px, against _PARAM0_, and save the "
             "result in _PARAM5_, _PARAM6_"),
-          "",
+          _("Collision"),
           "res/conditions/raycast24.png",
           "res/conditions/raycast.png")
       .AddParameter("objectList", _("Objects to test against the ray"))
@@ -1500,7 +1400,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Cast a ray from from _PARAM1_;_PARAM2_ to _PARAM3_;_PARAM4_ "
             "against _PARAM0_, and save the "
             "result in _PARAM5_, _PARAM6_"),
-          "",
+          _("Collision"),
           "res/conditions/raycast24.png",
           "res/conditions/raycast.png")
       .AddParameter("objectList", _("Objects to test against the ray"))
@@ -1524,23 +1424,24 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                      _("Number of objects"),
                      _("Count the number of the specified objects being "
                        "currently picked in the event"),
-                     "",
+                     _("Objects"),
                      "res/conditions/nbObjet.png")
       .AddParameter("objectList", _("Object"));
 
   obj.AddStrExpression("ObjectName",
                        _("Object name"),
                        _("Return the name of the object"),
-                       "",
+                       _("Objects"),
                        "res/conditions/text.png")
       .AddParameter("object", _("Object"));
 
   obj.AddStrExpression("Layer",
                        _("Object layer"),
                        _("Return the name of the layer the object is on"),
-                       "",
+                       _("Objects"),
                        "res/actions/layer.png")
       .AddParameter("object", _("Object"));
+#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -15,7 +15,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
   extension
       .SetExtensionInformation(
           "BuiltinCamera",
-          _("Layers and cameras"),
+          _("Cameras and layers features"),
           "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 "
@@ -23,9 +23,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/interface/scene-editor/layers-and-cameras");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Layers and cameras"))
-      .SetIcon("res/conditions/camera24.png");
 
+#if defined(GD_IDE_ONLY)
   extension
       .AddExpressionAndConditionAndAction(
           "number",
@@ -33,7 +32,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           _("Camera center X position"),
           _("the X position of the center of a camera"),
           _("the X position of camera _PARAM4_ (layer: _PARAM3_)"),
-          "",
+          _("Layers and cameras"),
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .UseStandardParameters("number")
@@ -55,7 +54,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           _("Camera center Y position"),
           _("the Y position of the center of a camera"),
           _("the Y position of camera _PARAM4_ (layer: _PARAM3_)"),
-          "",
+          _("Layers and cameras"),
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .UseStandardParameters("number")
@@ -77,7 +76,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           _("Width of a camera"),
           _("the width of a camera of a layer"),
           _("the width of camera _PARAM2_ of layer _PARAM1_"),
-          "",
+          _("Layers and cameras"),
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"))
@@ -93,7 +92,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           _("Height of a camera"),
           _("the height of a camera of a layer"),
           _("the height of camera _PARAM2_ of layer _PARAM1_"),
-          "",
+          _("Layers and cameras"),
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"))
@@ -109,7 +108,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           _("Angle of a camera of a layer"),
           _("the angle of rotation of a camera"),
           _("the angle of camera (layer: _PARAM3_, camera: _PARAM4_)"),
-          "",
+          _("Layers and cameras"),
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .UseStandardParameters("number")
@@ -129,7 +128,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("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", "")
@@ -164,7 +163,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", "")
@@ -180,7 +179,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", "")
@@ -198,7 +197,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", "")
@@ -225,7 +224,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Change camera zoom."),
                  _("Change camera zoom to _PARAM1_ (layer: _PARAM2_, camera: "
                    "_PARAM3_)"),
-                 "",
+                 _("Layers and cameras"),
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -236,7 +235,6 @@ 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",
@@ -245,7 +243,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", "")
@@ -269,38 +267,13 @@ 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_)"),
-          "",
+          _("Center camera on _PARAM1_ (layer: _PARAM3_, camera: _PARAM4_)"),
+          _("Layers and cameras"),
           "res/actions/camera24.png",
           "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -321,7 +294,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", "")
@@ -334,7 +307,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", "")
@@ -347,7 +320,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", "")
@@ -363,14 +336,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
               _("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"),
+          _("Layers and cameras/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("layerEffectParameterName", _("Parameter name"))
+      .AddParameter("string", _("Effect"))
+      .AddParameter("string", _("Parameter name"))
       .AddParameter("expression", _("New value"))
       .MarkAsAdvanced();
 
@@ -382,14 +355,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
               _("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"),
+          _("Layers and cameras/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("layerEffectParameterName", _("Parameter name"))
+      .AddParameter("string", _("Effect"))
+      .AddParameter("string", _("Parameter name"))
       .AddParameter("string", _("New value"))
       .MarkAsAdvanced();
 
@@ -401,14 +374,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
               _("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"),
+          _("Layers and cameras/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("layerEffectParameterName", _("Parameter name"))
+      .AddParameter("string", _("Effect"))
+      .AddParameter("string", _("Parameter name"))
       .AddParameter("yesorno", _("Enable this parameter"))
       .MarkAsAdvanced();
 
@@ -417,13 +390,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     _("Layer effect is enabled"),
                     _("The effect on a layer is enabled"),
                     _("Effect _PARAM2_ on layer _PARAM1_ is enabled"),
-                    _("Effects"),
+                    _("Layers and cameras/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("string", _("Effect"))
       .MarkAsAdvanced();
 
   extension
@@ -431,13 +404,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Enable layer effect"),
                  _("Enable an effect on a layer"),
                  _("Enable effect _PARAM2_ on layer _PARAM1_: _PARAM3_"),
-                 _("Effects"),
+                 _("Layers and cameras/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("string", _("Effect"))
       .AddParameter("yesorno", _("Enable"), "", true)
       .MarkAsAdvanced();
 
@@ -447,7 +420,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           _("Layer time scale"),
           _("Compare the time scale applied to the objects of the layer."),
           _("the time scale of layer _PARAM1_"),
-          "",
+          _("Layers and cameras/Time"),
           "res/conditions/time24.png",
           "res/conditions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -461,8 +434,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "ChangeLayerTimeScale",
           _("Change layer time scale"),
           _("Change the time scale applied to the objects of the layer."),
-          _("Set the time scale of layer _PARAM1_ to _PARAM2_"),
-          "",
+          _("Set time scale of layer _PARAM1_ to _PARAM2_"),
+          _("Layers and cameras/Time"),
           "res/actions/time24.png",
           "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -477,7 +450,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     _("Compare the default Z order set to objects when they "
                       "are created on a layer."),
                     _("the default Z order of objects created on _PARAM1_"),
-                    "",
+                    _("Layers and cameras"),
                     "res/conditions/layer24.png",
                     "res/conditions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -493,7 +466,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                    "created on a layer."),
                  _("Set the default Z order of objects created on _PARAM1_ to "
                    "_PARAM2_"),
-                 "",
+                 _("Layers and cameras"),
                  "res/actions/layer24.png",
                  "res/actions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -508,7 +481,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           _("Set the ambient light color of the lighting layer in format "
             "\"R;G;B\" string."),
           _("Set the ambient color of the lighting layer _PARAM1_ to _PARAM2_"),
-          _("Lighting"),
+          _("Layers and cameras/Lighting"),
           "res/actions/color24.png",
           "res/actions/color.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -522,7 +495,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "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"))
@@ -534,7 +507,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"))
@@ -546,7 +519,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"))
@@ -558,7 +531,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"))
@@ -569,7 +542,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddExpression("CameraZoom",
                      _("Zoom of a camera of a layer"),
                      _("Zoom of a camera of a layer"),
-                     "",
+                     _("Layers and cameras"),
                      "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
@@ -579,9 +552,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
 
   extension
       .AddExpression("LayerTimeScale",
-                     _("Layer time scale"),
-                     _("Returns the time scale of the specified layer."),
-                     "",
+                     _("Time scale"),
+                     _("Time scale"),
+                     _("Layers and cameras"),
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"));
@@ -590,10 +563,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddExpression("LayerDefaultZOrder",
                      _("Default Z Order for a layer"),
                      _("Default Z Order for a layer"),
-                     "",
+                     _("Layers and cameras"),
                      "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"));
+#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp

@@ -15,19 +15,19 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
   extension
       .SetExtensionInformation(
           "BuiltinCommonConversions",
-          _("Conversion"),
+          _("Standard Conversions"),
           "Expressions to convert number, texts and quantities.",
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/common-conversions");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Conversion"))
-      .SetIcon("res/conditions/toujours24.png");
+
+#if defined(GD_IDE_ONLY)
 
   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,76 +62,10 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
           "ToDeg",
           _("Radians > Degrees"),
           _("Converts the angle, expressed in radians, into degrees"),
-          "",
+          _("Conversion"),
           "res/conditions/toujours24.png")
       .AddParameter("expression", _("Angle, in radians"));
-
-  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();
+#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp

@@ -4,6 +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"
@@ -13,7 +15,7 @@
 #include "GDCore/Events/Builtin/StandardEvent.h"
 #include "GDCore/Events/Builtin/WhileEvent.h"
 #include "GDCore/Events/Event.h"
-#include "GDCore/Tools/Localization.h"
+#endif
 
 using namespace std;
 namespace gd {
@@ -24,43 +26,20 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
   extension
       .SetExtensionInformation(
           "BuiltinCommonInstructions",
-          _("Events and control flow"),
+          _("Builtin events"),
           "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"),
                     _("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()
@@ -71,7 +50,7 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                     _("And"),
                     _("Check if all sub conditions are true"),
                     _("If all of these conditions are true:"),
-                    "",
+                    _("Advanced"),
                     "res/conditions/and24.png",
                     "res/conditions/and.png")
       .SetCanHaveSubInstructions()
@@ -83,7 +62,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()
@@ -94,52 +73,10 @@ 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"),
@@ -149,29 +86,29 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
       std::make_shared<gd::StandardEvent>());
 
   extension.AddEvent("Link",
-                     _("Link external events"),
-                     _("Link to external events."),
+                     _("Link"),
+                     _("Link to some 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"),
-                     _("Repeat the event while the conditions are true."),
+                     _("The event is repeated while the conditions are true"),
                      "",
                      "res/while.png",
                      std::make_shared<gd::WhileEvent>());
 
   extension.AddEvent("Repeat",
                      _("Repeat"),
-                     _("Repeat the event for a specified number of times."),
+                     _("Event repeated a number of times"),
                      "",
                      "res/repeat.png",
                      std::make_shared<gd::RepeatEvent>());
@@ -192,11 +129,12 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
       std::make_shared<gd::ForEachChildVariableEvent>());
 
   extension.AddEvent("Group",
-                     _("Event group"),
-                     _("Group containing events."),
+                     _("Group"),
+                     _("Group containing events"),
                      "",
                      "res/foreach.png",
                      std::make_shared<gd::GroupEvent>());
+#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/ExternalLayoutsExtension.cpp

@@ -19,26 +19,25 @@ BuiltinExtensionsImplementer::ImplementsExternalLayoutsExtension(
                                "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");
+      .SetExtensionHelpPath("/interface/scene-editor/external-layouts");
 
+#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_"),
-                 "",
-                 "res/ribbon_default/externallayout32.png",
-                 "res/ribbon_default/externallayout32.png")
+                 _("External layouts"),
+                 "res/conditions/fichier24.png",
+                 "res/conditions/fichier.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("externalLayoutName", _("Name of the external layout"))
+      .AddParameter("string", _("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

@@ -20,11 +20,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
           "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");
+      .SetExtensionHelpPath("/all-features/storage");
 
+#if defined(GD_IDE_ONLY)
   extension
       .AddCondition(
           "GroupExists",
@@ -32,7 +30,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"))
@@ -48,7 +46,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"))
@@ -60,7 +58,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"))
@@ -75,7 +73,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"))
@@ -91,7 +89,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"))
@@ -108,7 +106,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
             "(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"))
@@ -127,7 +125,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
             "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"))
@@ -143,7 +141,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"))
@@ -156,7 +154,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"));
@@ -166,22 +164,37 @@ 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_"),
-                 _("Network"),
+                 _("Files"),
                  "res/actions/launchFile24.png",
                  "res/actions/launchFile.png")
       .AddParameter("string", _("Command"))
       .MarkAsAdvanced();
+#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/KeyboardExtension.cpp

@@ -14,24 +14,22 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
   extension
       .SetExtensionInformation(
           "BuiltinKeyboard",
-          _("Keyboard"),
+          _("Keyboard features"),
           _("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")
-      .SetCategory("Input");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Keyboard"))
-      .SetIcon("res/conditions/keyboard24.png");
+      .SetExtensionHelpPath("/all-features/keyboard");
 
+#if defined(GD_IDE_ONLY)
   extension
       .AddCondition("KeyPressed",
                     _("Key pressed"),
-                    _("Check if a key is pressed"),
+                    _("Test if a key is pressed"),
                     _("_PARAM1_ key is pressed"),
-                    "",
+                    _("Keyboard"),
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -40,9 +38,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
   extension
       .AddCondition("KeyReleased",
                     _("Key released"),
-                    _("Check if a key was just released"),
+                    _("Test if a key was just released"),
                     _("_PARAM1_ key is released"),
-                    "",
+                    _("Keyboard"),
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -51,35 +49,35 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
   extension
       .AddCondition("KeyFromTextPressed",
                     _("Key pressed (text expression)"),
-                    _("Check if a key, retrieved from the result of the "
+                    _("Test 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 check"))
+      .AddParameter("string", _("Expression generating the key to test"))
       .MarkAsAdvanced();
 
   extension
       .AddCondition("KeyFromTextReleased",
                     _("Key released (text expression)"),
-                    _("Check if a key, retrieved from the result of the "
+                    _("Test 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 check"))
+      .AddParameter("string", _("Expression generating the key to test"))
       .MarkAsAdvanced();
 
   extension
       .AddCondition("AnyKeyPressed",
                     _("Any key pressed"),
-                    _("Check if any key is pressed"),
+                    _("Test if any key is pressed"),
                     _("Any key is pressed"),
-                    "",
+                    _("Keyboard"),
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "");
@@ -87,9 +85,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
  extension
       .AddCondition("AnyKeyReleased",
                     _("Any key released"),
-                    _("Check if any key is released"),
+                    _("Test if any key is released"),
                     _("Any key is released"),
-                    "",
+                    _("Keyboard"),
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "");
@@ -99,9 +97,10 @@ 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

@@ -18,63 +18,14 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       "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");
 
-  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"));
+#if defined(GD_IDE_ONLY)
 
   extension
       .AddExpression("normalize",
                      _("Normalize a value between `min` and `max` to a value between 0 and 1."),
                      _("Remap a value between 0 and 1."),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Value"))
       .AddParameter("expression", _("Min"))
@@ -84,7 +35,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("clamp",
                      _("Clamp (restrict a value to a given range)"),
                      _("Restrict a value to a given range"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Value"))
       .AddParameter("expression", _("Min"))
@@ -94,7 +45,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("AngleDifference",
                      _("Difference between two angles"),
                      _("Difference between two angles"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("First angle"))
       .AddParameter("expression", _("Second angle"));
@@ -103,7 +54,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("AngleBetweenPositions",
                      _("Angle between two positions"),
                      _("Compute the angle between two positions."),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("First point X position"))
       .AddParameter("expression", _("First point Y position"))
@@ -114,7 +65,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("DistanceBetweenPositions",
                      _("Distance between two positions"),
                      _("Compute the distance between two positions."),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("First point X position"))
       .AddParameter("expression", _("First point Y position"))
@@ -125,7 +76,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .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)"));
@@ -134,7 +85,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"));
@@ -143,7 +94,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"));
@@ -152,7 +103,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("abs",
                      _("Absolute value"),
                      _("Absolute value"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -160,7 +111,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("acos",
                      _("Arccosine"),
                      _("Arccosine"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -168,7 +119,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("acosh",
                      _("Hyperbolic arccosine"),
                      _("Hyperbolic arccosine"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -176,7 +127,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("asin",
                      _("Arcsine"),
                      _("Arcsine"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -184,7 +135,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("asinh",
                      _("Arcsine"),
                      _("Arcsine"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -192,7 +143,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("atan",
                      _("Arctangent"),
                      _("Arctangent"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -200,7 +151,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("atan2",
                      _("2 argument arctangent"),
                      _("2 argument arctangent (atan2)"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Y"))
       .AddParameter("expression", _("X"));
@@ -209,7 +160,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("atanh",
                      _("Hyperbolic arctangent"),
                      _("Hyperbolic arctangent"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -217,7 +168,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("cbrt",
                      _("Cube root"),
                      _("Cube root"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -225,7 +176,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("ceil",
                      _("Ceil (round up)"),
                      _("Round number up to an integer"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -233,7 +184,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("floor",
                      _("Floor (round down)"),
                      _("Round number down to an integer"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -241,7 +192,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("cos",
                      _("Cosine"),
                      _("Cosine of a number"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -249,7 +200,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("cosh",
                      _("Hyperbolic cosine"),
                      _("Hyperbolic cosine"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -257,7 +208,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("cot",
                      _("Cotangent"),
                      _("Cotangent of a number"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -265,7 +216,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("csc",
                      _("Cosecant"),
                      _("Cosecant of a number"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -273,7 +224,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("int",
                      _("Round"),
                      _("Round a number"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .SetHidden()
       .AddParameter("expression", _("Expression"));
@@ -282,7 +233,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("rint",
                      _("Round"),
                      _("Round a number"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .SetHidden()
       .AddParameter("expression", _("Expression"));
@@ -291,7 +242,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("round",
                      _("Round"),
                      _("Round a number"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -299,7 +250,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("exp",
                      _("Exponential"),
                      _("Exponential of a number"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -307,7 +258,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("log",
                      _("Logarithm"),
                      _("Logarithm"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -315,7 +266,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("ln",
                      _("Logarithm"),
                      _("Logarithm"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .SetHidden()
       .AddParameter("expression", _("Expression"));
@@ -324,7 +275,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("log2",
                      _("Base-2 logarithm"),
                      _("Base 2 Logarithm"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -332,7 +283,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("log10",
                      _("Base-10 logarithm"),
                      _("Base-10 logarithm"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -340,7 +291,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("nthroot",
                      _("Nth root"),
                      _("Nth root of a number"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Number"))
       .AddParameter("expression", _("N"));
@@ -349,7 +300,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)"));
@@ -358,7 +309,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("sec",
                      _("Secant"),
                      _("Secant"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -366,7 +317,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"));
 
@@ -374,7 +325,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("sin",
                      _("Sine"),
                      _("Sine of a number"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -382,7 +333,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("sinh",
                      _("Hyperbolic sine"),
                      _("Hyperbolic sine"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -390,7 +341,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("sqrt",
                      _("Square root"),
                      _("Square root of a number"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -398,7 +349,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("tan",
                      _("Tangent"),
                      _("Tangent of a number"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -406,7 +357,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("tanh",
                      _("Hyperbolic tangent"),
                      _("Hyperbolic tangent"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -414,7 +365,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("trunc",
                      _("Truncation"),
                      _("Truncate a number"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -422,7 +373,7 @@ 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)"))
@@ -435,7 +386,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
                       "relative to the origin (0;0). This is also known as "
                       "getting the cartesian coordinates of a 2D vector, using "
                       "its polar coordinates."),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Distance"));
@@ -447,11 +398,12 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
                       "relative to the origin (0;0). This is also known as "
                       "getting the cartesian coordinates of a 2D vector, using "
                       "its polar coordinates."),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Distance"));
 
+#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/MouseExtension.cpp

@@ -23,11 +23,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
           "separately in different events.",
           "Florian Rival",
           "Open source (MIT License)")
-      .SetExtensionHelpPath("/all-features/mouse-touch")
-      .SetCategory("Input");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Mouse and touch"))
-      .SetIcon("res/actions/mouse24.png");
+      .SetExtensionHelpPath("/all-features/mouse-touch");
 
+#if defined(GD_IDE_ONLY)
   extension
       .AddCondition(
           "IsMouseWheelScrollingUp",
@@ -35,7 +33,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")
 
@@ -49,7 +47,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")
 
@@ -67,7 +65,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")
 
@@ -82,7 +80,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")
 
@@ -94,7 +92,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")
 
@@ -106,7 +104,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", "")
@@ -117,7 +115,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")
 
@@ -129,7 +127,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")
 
@@ -143,7 +141,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")
 
@@ -157,7 +155,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
           _("Cursor X position"),
           _("the X position of the cursor or of a touch"),
           _("the cursor (or touch) X position"),
-          "",
+          _("Mouse and touch"),
           "res/conditions/mouse24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .UseStandardParameters("number")
@@ -177,7 +175,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
           _("Cursor Y position"),
           _("the Y position of the cursor or of a touch"),
           _("the cursor (or touch) Y position"),
-          "",
+          _("Mouse and touch"),
           "res/conditions/mouse24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .UseStandardParameters("number")
@@ -196,7 +194,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                     _("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", "")
@@ -212,56 +210,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                     _("Mouse button released"),
                     _("Check if the specified mouse button was released."),
                     _("_PARAM1_ mouse button was released"),
-                    "",
+                    _("Mouse and touch"),
                     "res/conditions/mouse24.png",
                     "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("mouse", _("Button to check"))
       .MarkAsSimple();
 
-  extension
-      .AddCondition(
-          "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("stringWithSelector",
-                    _("Expression generating the mouse button to check"),
-                    "[\"Left\", \"Right\", \"Middle\"]")
-      .SetParameterLongDescription(
-          _("Possible values are Left, Right and Middle."))
-      .MarkAsAdvanced();
-
-  extension
-      .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"),
+                                 _("Mouse and touch/Multitouch"),
                                  "res/conditions/touch24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
@@ -277,7 +239,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                                  _("Touch Y position"),
                                  _("the Y position of a specific touch"),
                                  _("the touch #_PARAM1_ Y position"),
-                                 _("Multitouch"),
+                                 _("Mouse and touch/Multitouch"),
                                  "res/conditions/touch24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
@@ -297,7 +259,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
             "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"),
-          _("Multitouch"),
+          _("Mouse and touch/Multitouch"),
           "res/conditions/touch24.png",
           "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "");
@@ -312,7 +274,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
             "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"),
-          _("Multitouch"),
+          _("Mouse and touch/Multitouch"),
           "res/conditions/touch24.png",
           "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "");
@@ -329,7 +291,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddExpression("LastTouchId",
                      _("Identifier of the last touch"),
                      _("Identifier of the last touch"),
-                     _("Multitouch"),
+                     _("Mouse and touch/Multitouch"),
                      "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "");
 
@@ -337,9 +299,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddExpression("LastEndedTouchId",
                      _("Identifier of the last ended touch"),
                      _("Identifier of the last ended touch"),
-                     _("Multitouch"),
+                     _("Mouse and touch/Multitouch"),
                      "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "");
+
+#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/NetworkExtension.cpp

@@ -14,16 +14,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
   extension
       .SetExtensionInformation(
           "BuiltinNetwork",
-          _("Network"),
+          _("Basic internet features"),
           _("Features to send web requests, communicate with external \"APIs\" "
             "and other network related tasks."),
           "Florian Rival",
           "Open source (MIT License)")
-      .SetExtensionHelpPath("/all-features/network")
-      .SetCategory("Network");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Network"))
-      .SetIcon("res/actions/net24.png");
+      .SetExtensionHelpPath("/all-features/network");
 
+#if defined(GD_IDE_ONLY)
   extension
       .AddAction(
           "SendRequest",
@@ -33,7 +31,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
           "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"),
           "res/actions/net24.png",
           "res/actions/net.png")
       .AddParameter("string", "Host, with protocol")
@@ -68,7 +66,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
             "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)"),
-          "",
+          _("Network"),
           "res/actions/net24.png",
           "res/actions/net.png")
       .AddParameter("string", _("URL (API or web-page address)"))
@@ -95,37 +93,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
             "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\"."))
+      .SetParameterLongDescription(
+          _("Optional, only used if an error occurs. This will contain the "
+            "error message (if request could not be sent) or the [\"status "
+            "code\"](https://en.wikipedia.org/wiki/List_of_HTTP_status_codes), "
+            "if the server returns a status >= 400."))
       .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)"))
@@ -143,11 +124,79 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
             "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_"),
-          "",
+          _("Network"),
           "res/actions/net24.png",
           "res/actions/net.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("yesorno", _("Enable the metrics?"));
+
+  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_"),
+          _("Network"),
+          "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 scene variable to JSON"),
+                        _("Convert a scene variable to JSON"),
+                        _("Conversion"),
+                        "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"),
+                        _("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
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -14,19 +14,68 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
   extension
       .SetExtensionInformation(
           "BuiltinScene",
-          _("Scene"),
+          _("Scene management features"),
           _("Actions and conditions to manipulate the scenes during the game."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
-  extension.AddInstructionOrExpressionGroupMetadata(_("Scene"))
-      .SetIcon("res/conditions/depart24.png");
+
+#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
       .AddStrExpression("CurrentSceneName",
                         _("Current scene name"),
                         _("Name of the current scene"),
-                        "",
+                        _("Scene"),
                         "res/actions/texte.png")
       .AddCodeOnlyParameter("currentScene", "");
 
@@ -35,7 +84,7 @@ 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")
@@ -47,7 +96,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
                     _("Scene just resumed"),
                     _("The scene has just resumed after being paused."),
                     _("Scene just resumed"),
-                    "",
+                    _("Scene"),
                     "res/conditions/depart24.png",
                     "res/conditions/depart.png")
       .SetHelpPath("/interface/scene-editor/events")
@@ -59,7 +108,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")
@@ -76,7 +125,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")
@@ -91,7 +140,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")
@@ -103,7 +152,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")
@@ -115,7 +164,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")
@@ -129,13 +178,42 @@ 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

@@ -75,9 +75,11 @@ 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");
@@ -133,6 +135,7 @@ 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());
@@ -187,5 +190,6 @@ 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

@@ -113,6 +113,7 @@ 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.
@@ -123,15 +124,20 @@ 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.
   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/SpriteExtension.cpp

@@ -23,15 +23,13 @@ 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")
-          .SetCategoryFullName(_("General"));
+  gd::ObjectMetadata& obj = extension.AddObject<SpriteObject>(
+      "Sprite",
+      _("Sprite"),
+      _("Animated object which can be used for most elements of a game"),
+      "CppPlatform/Extensions/spriteicon.png");
 
+#if defined(GD_IDE_ONLY)
   obj.AddAction("Opacity",
                 _("Change sprite opacity"),
                 _("Change the opacity of a Sprite. 0 is fully transparent, 255 "
@@ -81,8 +79,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          _("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")
       .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
@@ -199,18 +196,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
       .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."),
@@ -223,31 +208,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
       .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"),
@@ -283,8 +243,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          _("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")
       .UseStandardRelationalOperatorParameters("number");
 
@@ -403,7 +362,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
   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")
@@ -415,7 +374,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")
@@ -506,8 +465,6 @@ 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",
@@ -579,6 +536,7 @@ 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,24 +4,25 @@
  * 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/IDE/Project/ArbitraryResourceWorker.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.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;
@@ -80,6 +81,7 @@ void SpriteObject::DoUnserializeFrom(gd::Project& project,
   }
 }
 
+#if defined(GD_IDE_ONLY)
 void SpriteObject::DoSerializeTo(gd::SerializerElement& element) const {
   element.SetAttribute("updateIfNotVisible", updateIfNotVisible);
 
@@ -104,8 +106,7 @@ void SpriteObject::DoSerializeTo(gd::SerializerElement& element) const {
   }
 }
 
-std::map<gd::String, gd::PropertyDescriptor> SpriteObject::GetProperties()
-    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")
@@ -137,33 +138,26 @@ void SpriteObject::ExposeResources(gd::ArbitraryResourceWorker& worker) {
 }
 
 std::map<gd::String, gd::PropertyDescriptor>
-SpriteObject::GetInitialInstanceProperties(
-    const gd::InitialInstance& initialInstance,
-    gd::Project& project,
-    gd::Layout& scene) {
+SpriteObject::GetInitialInstanceProperties(const gd::InitialInstance& position,
+                                           gd::Project& project,
+                                           gd::Layout& scene) {
   std::map<gd::String, gd::PropertyDescriptor> properties;
-  properties["animation"] =
-      gd::PropertyDescriptor(
-          gd::String::From(initialInstance.GetRawDoubleProperty("animation")))
-          .SetLabel(_("Animation"))
-          .SetType("number");
+  properties[_("Animation")] = gd::String::From(position.GetRawDoubleProperty("animation"));
 
   return properties;
 }
 
-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>()));
-  }
+bool SpriteObject::UpdateInitialInstanceProperty(gd::InitialInstance& position,
+                                                 const gd::String& name,
+                                                 const gd::String& value,
+                                                 gd::Project& project,
+                                                 gd::Layout& scene) {
+  if (name == _("Animation"))
+    position.SetRawDoubleProperty("animation", 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

@@ -44,6 +44,7 @@ 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() const override;
@@ -59,6 +60,7 @@ 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
@@ -116,24 +118,14 @@ 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

@@ -20,20 +20,19 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
           "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 +41,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
       .AddStrExpression("ToUpperCase",
                         _("Uppercase a text"),
                         _("Uppercase a text"),
-                        "",
+                        _("Manipulation of text"),
                         "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"));
@@ -51,7 +50,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
       .AddStrExpression("ToLowerCase",
                         _("Lowercase a text"),
                         _("Lowercase a text"),
-                        "",
+                        _("Manipulation of text"),
                         "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"));
@@ -60,7 +59,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 +72,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 +84,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 +94,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 +104,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"))
@@ -116,7 +115,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                      "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"),
                      "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
@@ -130,7 +129,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
           _("Search the last occurence in a string (return the position of "
             "the result, from the beginning of the string, or -1 if not "
             "found)"),
-          "",
+          _("Manipulation of text"),
           "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
@@ -141,7 +140,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"))
@@ -156,7 +155,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
           "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"),
           "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
@@ -174,7 +173,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
             "(return "
             " the position of the result, from the beginning of the string, or "
             "-1 if not found)"),
-          "",
+          _("Manipulation of text"),
           "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
@@ -183,6 +182,7 @@ 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

@@ -14,56 +14,34 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
   extension
       .SetExtensionInformation(
           "BuiltinTime",
-          _("Timers and time"),
+          _("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");
 
-  // Deprecated and replaced by CompareTimer
+#if defined(GD_IDE_ONLY)
+
   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"))
-      .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");
+      .AddParameter("string", _("Timer's name"));
 
   extension
       .AddCondition("TimeScale",
                     _("Time scale"),
-                    _("Compare the time scale of the scene."),
-                    _("the time scale of the scene"),
-
-                    "",
+                    _("Test the time scale."),
+                    _("the time scale"),
+                    _("Timers and time"),
                     "res/conditions/time24.png",
                     "res/conditions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -75,8 +53,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                     _("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", "")
@@ -89,9 +66,8 @@ 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."),
-          _("Start (or reset) the timer _PARAM1_"),
-
-          "",
+          _("Reset the timer _PARAM1_"),
+          _("Timers and time"),
           "res/actions/timer24.png",
           "res/actions/timer.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -102,8 +78,7 @@ 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", "")
@@ -115,8 +90,7 @@ 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", "")
@@ -128,8 +102,7 @@ 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", "")
@@ -139,10 +112,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
   extension
       .AddAction("ChangeTimeScale",
                  _("Change time scale"),
-                 _("Change the time scale of the scene."),
-                 _("Set the time scale of the scene to _PARAM1_"),
-
-                 "",
+                 _("Change the time scale of the game."),
+                 _("Set time scale to _PARAM1_"),
+                 _("Timers and time"),
                  "res/actions/time24.png",
                  "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -153,7 +125,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
       .AddExpression("TimeDelta",
                      _("Time elapsed since the last frame"),
                      _("Time elapsed since the last frame rendered on screen"),
-                     "",
+                     _("Time"),
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "");
 
@@ -161,7 +133,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
       .AddExpression("TempsFrame",
                      _("Time elapsed since the last frame"),
                      _("Time elapsed since the last frame rendered on screen"),
-                     "",
+                     _("Time"),
                      "res/actions/time.png")
       .SetHidden()
       .AddCodeOnlyParameter("currentScene", "");
@@ -170,7 +142,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
       .AddExpression("ElapsedTime",
                      _("Time elapsed since the last frame"),
                      _("Time elapsed since the last frame rendered on screen"),
-                     "",
+                     _("Time"),
                      "res/actions/time.png")
       .SetHidden()
       .AddCodeOnlyParameter("currentScene", "");
@@ -179,7 +151,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"));
@@ -188,7 +160,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", "");
 
@@ -196,7 +168,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", "");
@@ -204,16 +176,25 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
   extension
       .AddExpression("TimeScale",
                      _("Time scale"),
-                     _("Returns the time scale of the scene."),
-                     "",
+                     _("Time scale"),
+                     _("Time"),
                      "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(
@@ -224,6 +205,8 @@ 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,7 +14,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .SetExtensionInformation(
           "BuiltinVariables",
-          _("Variables"),
+          _("Variable features"),
           "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 "
@@ -22,15 +22,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           "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."),
                     _("the scene variable _PARAM0_"),
-                    _("Scene variables"),
+                    _("Variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -41,7 +40,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Text of a scene variable"),
                     _("Compare the text of a scene variable."),
                     _("the text of scene variable _PARAM0_"),
-                    _("Scene variables"),
+                    _("Variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -53,7 +52,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("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"),
+          _("Variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -66,7 +65,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Child existence"),
           _("Check if the specified child of the scene variable exists."),
           _("Child _PARAM1_ of scene variable _PARAM0_ exists"),
-          _("Scene variables/Collections/Structures"),
+          _("Variables/Collections/Structures"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -79,7 +78,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Check if the specified child of the global "
                       "variable exists."),
                     _("Child _PARAM1_ of global variable _PARAM0_ exists"),
-                    _("Global variables/Collections/Structures"),
+                    _("Variables/Global variables/Collections/Structures"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -91,7 +90,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     "Test if a scene variable is defined",
                     "Test if the scene variable exists.",
                     "Scene variable _PARAM0_ is defined",
-                    _("Scene variables"),
+                    _("Variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -103,7 +102,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Value of a global variable"),
                     _("Compare the value of a global variable."),
                     _("the global variable _PARAM0_"),
-                    _("Global variables"),
+                    _("Variables/Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -115,7 +114,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Text of a global variable"),
                     _("Compare the text of a global variable."),
                     _("the text of the global variable _PARAM0_"),
-                    _("Global variables"),
+                    _("Variables/Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -128,7 +127,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("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"),
+          _("Variables/Global variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -140,7 +139,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     "Test if a global variable is defined",
                     "Test if a global variable exists",
                     "Global variable _PARAM0_ is defined",
-                    _("Global variables"),
+                    _("Variables/Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -153,7 +152,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Value of a scene variable"),
                  _("Change the value of a scene variable."),
                  _("the scene variable _PARAM0_"),
-                 _("Scene variables"),
+                 _("Variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -164,7 +163,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("String of a scene variable"),
                  _("Modify the text of a scene variable."),
                  _("the text of scene variable _PARAM0_"),
-                 _("Scene variables"),
+                 _("Variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -176,7 +175,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("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"),
+          _("Variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -189,7 +188,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                      _("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"),
+                 _("Variables"),
                  "res/conditions/var24.png",
                  "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"));
@@ -199,7 +198,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Value of a global variable"),
                  _("Change the value of a global variable"),
                  _("the global variable _PARAM0_"),
-                 _("Global variables"),
+                 _("Variables/Global variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -211,7 +210,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("String of a global variable"),
                  _("Modify the text of a global variable."),
                  _("the text of global variable _PARAM0_"),
-                 _("Global variables"),
+                 _("Variables/Global variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -224,7 +223,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("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"),
+          _("Variables/Global variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -237,7 +236,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                      _("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"),
+                 _("Variables/Global variables"),
                  "res/conditions/var24.png",
                  "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"));
@@ -247,7 +246,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Remove a child"),
                  _("Remove a child from a scene variable."),
                  _("Remove child _PARAM1_ from scene variable _PARAM0_"),
-                 _("Scene variables/Collections/Structures"),
+                 _("Variables/Collections/Structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -259,7 +258,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Remove a child"),
                  _("Remove a child from a global variable."),
                  _("Remove child _PARAM1_ from global variable _PARAM0_"),
-                 _("Global variables/Collections/Structures"),
+                 _("Variables/Global variables/Collections/Structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -271,7 +270,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Clear scene variable"),
                  _("Remove all the children from the scene variable."),
                  _("Clear children from scene variable _PARAM0_"),
-                 _("Scene variables/Collections"),
+                 _("Variables/Collections"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -282,7 +281,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Clear global variable"),
                  _("Remove all the children from the global variable."),
                  _("Clear children from global variable _PARAM0_"),
-                 _("Global variables/Collections"),
+                 _("Variables/Global variables/Collections"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -293,7 +292,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("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"),
+                 _("Variables/Collections/Arrays"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
@@ -306,7 +305,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("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"),
+                 _("Variables/Collections/Arrays"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
@@ -318,7 +317,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("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"),
+                 _("Variables/Collections/Arrays"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
@@ -330,7 +329,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("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"),
+                 _("Variables/Collections/Arrays"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
@@ -343,7 +342,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("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"),
+          _("Variables/Collections/Arrays"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -355,7 +354,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("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"),
+                 _("Variables/Global variables/Collections/Arrays"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
@@ -369,7 +368,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("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"),
+          _("Variables/Global variables/Collections/Arrays"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -381,7 +380,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("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"),
+                 _("Variables/Global variables/Collections/Arrays"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
@@ -393,7 +392,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("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"),
+                 _("Variables/Global variables/Collections/Arrays"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
@@ -405,7 +404,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("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"),
+                 _("Variables/Global variables/Collections/Arrays"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
@@ -416,7 +415,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddExpression("GlobalVariableChildCount",
                      _("Number of children of a global variable"),
                      _("Number of children of a global variable"),
-                     _("Global variables"),
+                     _("Variables"),
                      "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"));
 
@@ -424,7 +423,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddExpression("VariableChildCount",
                      _("Number of children of a scene variable"),
                      _("Number of children of a scene variable"),
-                     _("Scene variables"),
+                     _("Variables"),
                      "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"));
 
@@ -432,7 +431,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddExpression("Variable",
                      _("Value of a scene variable"),
                      _("Value of a scene variable"),
-                     _("Scene variables"),
+                     _("Variables"),
                      "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"));
 
@@ -440,7 +439,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddStrExpression("VariableString",
                         _("Text of a scene variable"),
                         _("Text of a scene variable"),
-                        _("Scene variables"),
+                        _("Variables"),
                         "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"));
 
@@ -448,7 +447,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddExpression("GlobalVariable",
                      _("Value of a global variable"),
                      _("Value of a global variable"),
-                     _("Global variables"),
+                     _("Variables"),
                      "res/actions/var.png")
       .AddParameter("globalvar", _("Name of the global variable"));
 
@@ -456,9 +455,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddStrExpression("GlobalVariableString",
                         _("Text of a global variable"),
                         _("Text of a global variable"),
-                        _("Global variables"),
+                        _("Variables"),
                         "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"));
+#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/WindowExtension.cpp

@@ -14,25 +14,22 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
   extension
       .SetExtensionInformation(
           "BuiltinWindow",
-          _("Game window and resolution"),
+          _("Window features"),
           "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 and resolution"),
           "res/actions/fullscreen24.png",
           "res/actions/fullscreen.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -48,7 +45,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
                     _("Fullscreen activated?"),
                     _("Check if the game is currently in fullscreen."),
                     _("The game is in fullscreen"),
-                    "",
+                    _("Game's window and resolution"),
                     "res/actions/fullscreen24.png",
                     "res/actions/fullscreen.png")
       .AddCodeOnlyParameter("currentScene", "");
@@ -60,7 +57,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
                    "game frame and the window borders."),
                  _("Set margins of game window to "
                    "_PARAM1_;_PARAM2_;_PARAM3_;_PARAM4_"),
-                 "",
+                 _("Game's window and resolution"),
                  "res/actions/window24.png",
                  "res/actions/window.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -76,7 +73,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
                    "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_"),
-                 "",
+                 _("Game's window and resolution"),
                  "res/actions/window24.png",
                  "res/actions/window.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -93,7 +90,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
             "window size. Game resolution can still be updated."),
           _("Set game window size to _PARAM1_x_PARAM2_ (also update game "
             "resolution: _PARAM3_)"),
-          "",
+          _("Game's window and resolution"),
           "res/actions/window24.png",
           "res/actions/window.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -110,7 +107,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
                    "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"),
-                 "",
+                 _("Game's window and resolution"),
                  "res/actions/window24.png",
                  "res/actions/window.png")
       .AddCodeOnlyParameter("currentScene", "");
@@ -122,7 +119,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
                    "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_"),
-                 "",
+                 _("Game's window and resolution"),
                  "res/actions/window24.png",
                  "res/actions/window.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -143,7 +140,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
                    "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_"),
-                 "",
+                 _("Game's window and resolution"),
                  "res/actions/window24.png",
                  "res/actions/window.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -156,7 +153,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
                  _("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 and resolution"),
                  "res/actions/window24.png",
                  "res/actions/window.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -167,7 +164,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 and resolution"),
                  "res/actions/window24.png",
                  "res/actions/window.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -178,7 +175,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", "");
 
@@ -187,7 +184,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", "");
 
@@ -195,29 +192,30 @@ 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

@@ -234,40 +234,6 @@ BehaviorMetadata::AddExpressionAndConditionAndAction(
     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"
@@ -284,6 +250,27 @@ BehaviorMetadata::AddExpressionAndConditionAndAction(
                              group,
                              icon);
 
+  gd::String conditionDescriptionTemplate = _("Compare <subject>.");
+  auto& condition =
+      AddScopedCondition(name,
+                         fullname,
+                         conditionDescriptionTemplate.FindAndReplace(
+                             "<subject>", descriptionSubject),
+                         sentenceName,
+                         group,
+                         icon,
+                         icon);
+
+  gd::String actionDescriptionTemplate = _("Change <subject>.");
+  auto& action = AddScopedAction(
+      "Set" + name,
+      fullname,
+      actionDescriptionTemplate.FindAndReplace("<subject>", descriptionSubject),
+      sentenceName,
+      group,
+      icon,
+      icon);
+
   return MultipleInstructionMetadata::WithExpressionAndConditionAndAction(
       expression, condition, action);
 }
@@ -406,14 +393,4 @@ 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

@@ -240,7 +240,7 @@ class GD_CORE_API BehaviorMetadata {
   /**
    * \brief Return the associated gd::Behavior, handling behavior contents.
    */
-  gd::Behavior& Get() const;
+  gd::Behavior& Get() const { return *instance; }
 
   /**
    * \brief Return the associated gd::BehaviorsSharedData, handling behavior
@@ -250,27 +250,6 @@ 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/ExpressionMetadata.cpp

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

Core/GDCore/Extensions/Metadata/ExpressionMetadata.h

@@ -190,7 +190,7 @@ class GD_CORE_API ExpressionMetadata {
   gd::ExpressionMetadata& AddParameter(
       const gd::String& type,
       const gd::String& description,
-      const gd::String& supplementaryInformation = "",
+      const gd::String& optionalObjectType = "",
       bool parameterIsOptional = false);
 
   /**
@@ -222,23 +222,6 @@ class GD_CORE_API ExpressionMetadata {
     return *this;
   };
 
-  /**
-   * \brief Mark this (object) expression as requiring the specified capability,
-   * offered by the base object.
-   * This is useful for some objects that don't support this capability, so that
-   * the editor can hide the expression as it does not apply to them.
-   */
-  ExpressionMetadata& SetRequiresBaseObjectCapability(
-      const gd::String& capability);
-
-  /**
-   * \brief Get the required specified capability for this (object) expression,
-   * or an empty string if there is nothing specific required.
-   */
-  const gd::String& GetRequiredBaseObjectCapability() const {
-    return requiredBaseObjectCapability;
-  };
-
   /**
    * \brief Set the function that should be called when generating the source
    * code from events.
@@ -290,7 +273,6 @@ class GD_CORE_API ExpressionMetadata {
   gd::String smallIconFilename;
   gd::String extensionNamespace;
   bool isPrivate;
-  gd::String requiredBaseObjectCapability;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/InstructionMetadata.cpp

@@ -10,7 +10,6 @@
 #include "GDCore/CommonTools.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Tools/Localization.h"
-#include "GDCore/Tools/Log.h"
 #include "ParameterMetadata.h"
 
 namespace gd {
@@ -52,7 +51,7 @@ InstructionMetadata::InstructionMetadata(const gd::String& extensionNamespace_,
 InstructionMetadata& InstructionMetadata::AddParameter(
     const gd::String& type,
     const gd::String& description,
-    const gd::String& supplementaryInformation,
+    const gd::String& optionalObjectType,
     bool parameterIsOptional) {
   ParameterMetadata info;
   info.type = type;
@@ -64,16 +63,15 @@ InstructionMetadata& InstructionMetadata::AddParameter(
       // parameter is an object/behavior type...
       (gd::ParameterMetadata::IsObject(type) ||
        gd::ParameterMetadata::IsBehavior(type))
-          ? (supplementaryInformation.empty()
+          ? (optionalObjectType.empty()
                  ? ""
                  : extensionNamespace +
-                       supplementaryInformation  //... so prefix it with the
-                                                 // extension
-                                                 // namespace.
+                       optionalObjectType  //... so prefix it with the extension
+                                           // namespace.
              )
-          : supplementaryInformation;  // Otherwise don't change anything
+          : optionalObjectType;  // Otherwise don't change anything
 
-  // TODO: Assert against supplementaryInformation === "emsc" (when running with
+  // TODO: Assert against optionalObjectType === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.
 
   parameters.push_back(info);
@@ -95,55 +93,32 @@ InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
     const gd::String& type) {
   SetManipulatedType(type);
 
-  if (type == "boolean") {
-    AddParameter("yesorno", _("New value"));
-    size_t valueParamIndex = parameters.size() - 1;
+  AddParameter("operator", _("Modification's sign"));
+  AddParameter(type == "number" ? "expression" : type, _("Value"));
+  size_t operatorParamIndex = parameters.size() - 2;
+  size_t valueParamIndex = parameters.size() - 1;
 
-    if (isObjectInstruction || isBehaviorInstruction) {
-      gd::String templateSentence = _("Set _PARAM0_ as <subject>: <value>");
+  if (isObjectInstruction || isBehaviorInstruction) {
+    gd::String templateSentence =
+        _("Change <subject> of _PARAM0_: <operator> <value>");
 
-      sentence =
-          templateSentence
-              .FindAndReplace("<subject>", sentence)
-              .FindAndReplace("<value>",
-                              "_PARAM" + gd::String::From(valueParamIndex) + "_");
-    } else {
-      gd::String templateSentence = _("Change <subject>: <value>");
-
-      sentence =
-          templateSentence
-              .FindAndReplace("<subject>", sentence)
-              .FindAndReplace("<value>",
-                              "_PARAM" + gd::String::From(valueParamIndex) + "_");
-    }
+    sentence =
+        templateSentence.FindAndReplace("<subject>", sentence)
+            .FindAndReplace(
+                "<operator>",
+                "_PARAM" + gd::String::From(operatorParamIndex) + "_")
+            .FindAndReplace("<value>",
+                            "_PARAM" + gd::String::From(valueParamIndex) + "_");
   } else {
-    AddParameter("operator", _("Modification's sign"), type);
-    AddParameter(type == "number" ? "expression" : type, _("Value"));
+    gd::String templateSentence = _("Change <subject>: <operator> <value>");
 
-    size_t operatorParamIndex = parameters.size() - 2;
-    size_t valueParamIndex = parameters.size() - 1;
-
-    if (isObjectInstruction || isBehaviorInstruction) {
-      gd::String templateSentence = _("Change <subject> of _PARAM0_: <operator> <value>");
-
-      sentence =
-          templateSentence.FindAndReplace("<subject>", sentence)
-              .FindAndReplace(
-                  "<operator>",
-                  "_PARAM" + gd::String::From(operatorParamIndex) + "_")
-              .FindAndReplace("<value>",
-                              "_PARAM" + gd::String::From(valueParamIndex) + "_");
-    } else {
-      gd::String templateSentence = _("Change <subject>: <operator> <value>");
-
-      sentence =
-          templateSentence.FindAndReplace("<subject>", sentence)
-              .FindAndReplace(
-                  "<operator>",
-                  "_PARAM" + gd::String::From(operatorParamIndex) + "_")
-              .FindAndReplace("<value>",
-                              "_PARAM" + gd::String::From(valueParamIndex) + "_");
-    }
+    sentence =
+        templateSentence.FindAndReplace("<subject>", sentence)
+            .FindAndReplace(
+                "<operator>",
+                "_PARAM" + gd::String::From(operatorParamIndex) + "_")
+            .FindAndReplace("<value>",
+                            "_PARAM" + gd::String::From(valueParamIndex) + "_");
   }
 
   return *this;
@@ -154,62 +129,34 @@ InstructionMetadata::UseStandardRelationalOperatorParameters(
     const gd::String& type) {
   SetManipulatedType(type);
 
-  if (type == "boolean") {
-    if (isObjectInstruction || isBehaviorInstruction) {
-      gd::String templateSentence = _("_PARAM0_ is <subject>");
+  AddParameter("relationalOperator", _("Sign of the test"));
+  AddParameter(type == "number" ? "expression" : type, _("Value to compare"));
+  size_t operatorParamIndex = parameters.size() - 2;
+  size_t valueParamIndex = parameters.size() - 1;
 
-      sentence =
-          templateSentence
-              .FindAndReplace("<subject>", sentence);
-    } else {
-      gd::String templateSentence = _("<subject>");
+  if (isObjectInstruction || isBehaviorInstruction) {
+    gd::String templateSentence = _("<subject> of _PARAM0_ <operator> <value>");
 
-      sentence =
-          templateSentence.FindAndReplace("<subject>", sentence);
-    }
+    sentence =
+        templateSentence.FindAndReplace("<subject>", sentence)
+            .FindAndReplace(
+                "<operator>",
+                "_PARAM" + gd::String::From(operatorParamIndex) + "_")
+            .FindAndReplace("<value>",
+                            "_PARAM" + gd::String::From(valueParamIndex) + "_");
   } else {
-    AddParameter("relationalOperator", _("Sign of the test"), type);
-    AddParameter(type == "number" ? "expression" : type, _("Value to compare"));
-    size_t operatorParamIndex = parameters.size() - 2;
-    size_t valueParamIndex = parameters.size() - 1;
+    gd::String templateSentence = _("<subject> <operator> <value>");
 
-    if (isObjectInstruction || isBehaviorInstruction) {
-      gd::String templateSentence = _("<subject> of _PARAM0_ <operator> <value>");
-
-      sentence =
-          templateSentence.FindAndReplace("<subject>", sentence)
-              .FindAndReplace(
-                  "<operator>",
-                  "_PARAM" + gd::String::From(operatorParamIndex) + "_")
-              .FindAndReplace("<value>",
-                              "_PARAM" + gd::String::From(valueParamIndex) + "_");
-    } else {
-      gd::String templateSentence = _("<subject> <operator> <value>");
-
-      sentence =
-          templateSentence.FindAndReplace("<subject>", sentence)
-              .FindAndReplace(
-                  "<operator>",
-                  "_PARAM" + gd::String::From(operatorParamIndex) + "_")
-              .FindAndReplace("<value>",
-                              "_PARAM" + gd::String::From(valueParamIndex) + "_");
-    }
+    sentence =
+        templateSentence.FindAndReplace("<subject>", sentence)
+            .FindAndReplace(
+                "<operator>",
+                "_PARAM" + gd::String::From(operatorParamIndex) + "_")
+            .FindAndReplace("<value>",
+                            "_PARAM" + gd::String::From(valueParamIndex) + "_");
   }
 
   return *this;
 }
 
-InstructionMetadata& InstructionMetadata::SetRequiresBaseObjectCapability(
-    const gd::String& capability) {
-  if (!IsObjectInstruction() && !IsBehaviorInstruction()) {
-    gd::LogError("Tried to add capability \"" + capability +
-                 "\" to instruction named \"" + fullname +
-                 "\", which is not an object or behavior instruction.");
-    return *this;
-  }
-
-  requiredBaseObjectCapability = capability;
-  return *this;
-}
-
 }  // namespace gd

Core/GDCore/Extensions/Metadata/InstructionMetadata.h

@@ -6,6 +6,7 @@
 
 #ifndef INSTRUCTIONMETADATA_H
 #define INSTRUCTIONMETADATA_H
+#if defined(GD_IDE_ONLY)
 #include <functional>
 #include <map>
 #include <memory>
@@ -136,21 +137,17 @@ class GD_CORE_API InstructionMetadata {
    * will also determine the type of the argument used when calling the function
    * in the generated code.
    * \param description Description for parameter
-   * \param supplementaryInformation Additional information that can be used for
-   * rendering or logic. For example:
-   * - If type is "object", this argument will describe which objects are
-   * allowed. If this argument is empty, all objects are allowed.
-   * - If type is "operator", this argument will be used to display only
-   * pertinent operators. \param parameterIsOptional true if the parameter must
-   * be optional, false otherwise.
+   * \param optionalObjectType If type is "object", this parameter will describe
+   * which objects are allowed. If it is empty, all objects are allowed.
+   * \param parameterIsOptional true if the parameter must be optional, false
+   * otherwise.
    *
    * \see EventsCodeGenerator::GenerateParametersCodes
    */
-  InstructionMetadata &AddParameter(
-      const gd::String &type,
-      const gd::String &label,
-      const gd::String &supplementaryInformation = "",
-      bool parameterIsOptional = false);
+  InstructionMetadata &AddParameter(const gd::String &type,
+                                    const gd::String &label,
+                                    const gd::String &optionalObjectType = "",
+                                    bool parameterIsOptional = false);
 
   /**
    * \brief Add a parameter not displayed in editor.
@@ -198,7 +195,8 @@ class GD_CORE_API InstructionMetadata {
    * \see AddParameter
    */
   InstructionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) {
-    if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
+    if (!parameters.empty())
+      parameters.back().SetExtraInfo(extraInfo);
     return *this;
   };
 
@@ -236,29 +234,16 @@ class GD_CORE_API InstructionMetadata {
   /**
    * \brief Check if the instruction is an object instruction.
    */
-  bool IsObjectInstruction() const { return isObjectInstruction; }
+  bool IsObjectInstruction() const {
+    return isObjectInstruction;
+  }
 
   /**
    * \brief Check if the instruction is a behavior instruction.
    */
-  bool IsBehaviorInstruction() const { return isBehaviorInstruction; }
-
-  /**
-   * \brief Mark this (object) instruction as requiring the specified
-   * capability, offered by the base object. This is useful for some objects
-   * that don't support this capability, so that the editor can hide the
-   * instruction as it does not apply to them.
-   */
-  InstructionMetadata &SetRequiresBaseObjectCapability(
-      const gd::String &capability);
-
-  /**
-   * \brief Get the required specified capability for this (object) instruction,
-   * or an empty string if there is nothing specific required.
-   */
-  const gd::String &GetRequiredBaseObjectCapability() const {
-    return requiredBaseObjectCapability;
-  };
+  bool IsBehaviorInstruction() const {
+    return isBehaviorInstruction;
+  }
 
   /**
    * \brief Consider that the instruction is easy for a user to understand.
@@ -334,7 +319,7 @@ class GD_CORE_API InstructionMetadata {
      *                 "CppPlatform/Extensions/text.png");
      *
      *      .AddParameter("object", _("Object"), "Text", false)
-     *      .AddParameter("operator", _("Modification operator"), "string")
+     *      .AddParameter("operator", _("Modification operator"))
      *      .AddParameter("string", _("String"))
      *      .SetFunctionName("SetString").SetManipulatedType("string").SetGetter("GetString").SetIncludeFile("MyExtension/TextObject.h");
      *
@@ -463,9 +448,9 @@ class GD_CORE_API InstructionMetadata {
   bool isPrivate;
   bool isObjectInstruction;
   bool isBehaviorInstruction;
-  gd::String requiredBaseObjectCapability;
 };
 
 }  // namespace gd
 
+#endif
 #endif  // INSTRUCTIONMETADATA_H

Core/GDCore/Extensions/Metadata/InstructionOrExpressionGroupMetadata.h

@@ -1,31 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2022 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-#include "GDCore/String.h"
-
-namespace gd {
-/**
- * \brief Contains information about how to display a group of instructions
- * to the user.
- */
-class GD_CORE_API InstructionOrExpressionGroupMetadata {
- public:
-  InstructionOrExpressionGroupMetadata(){};
-
-  /**
-   * \brief Sets the icon shown to users.
-   */
-  InstructionOrExpressionGroupMetadata& SetIcon(const gd::String& icon_) {
-    icon = icon_;
-    return *this;
-  };
-
-  const gd::String& GetIcon() const { return icon; };
-
- private:
-  gd::String icon;
-};
-}  // namespace gd

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.h

@@ -31,11 +31,6 @@ class GD_CORE_API MultipleInstructionMetadata {
       gd::InstructionMetadata &action) {
     return MultipleInstructionMetadata(expression, condition, action);
   }
-  static MultipleInstructionMetadata WithConditionAndAction(
-      gd::InstructionMetadata &condition,
-      gd::InstructionMetadata &action) {
-    return MultipleInstructionMetadata(condition, action);
-  }
 
   /**
    * \see gd::InstructionMetadata::AddParameter
@@ -43,17 +38,19 @@ class GD_CORE_API MultipleInstructionMetadata {
   MultipleInstructionMetadata &AddParameter(
       const gd::String &type,
       const gd::String &label,
-      const gd::String &supplementaryInformation = "",
+      const gd::String &optionalObjectType = "",
       bool parameterIsOptional = false) {
+#if defined(GD_IDE_ONLY)
     if (expression)
       expression->AddParameter(
-          type, label, supplementaryInformation, parameterIsOptional);
+          type, label, optionalObjectType, parameterIsOptional);
     if (condition)
       condition->AddParameter(
-          type, label, supplementaryInformation, parameterIsOptional);
+          type, label, optionalObjectType, parameterIsOptional);
     if (action)
       action->AddParameter(
-          type, label, supplementaryInformation, parameterIsOptional);
+          type, label, optionalObjectType, parameterIsOptional);
+#endif
     return *this;
   }
 
@@ -62,11 +59,13 @@ class GD_CORE_API MultipleInstructionMetadata {
    */
   MultipleInstructionMetadata &AddCodeOnlyParameter(
       const gd::String &type, const gd::String &supplementaryInformation) {
+#if defined(GD_IDE_ONLY)
     if (expression)
       expression->AddCodeOnlyParameter(type, supplementaryInformation);
     if (condition)
       condition->AddCodeOnlyParameter(type, supplementaryInformation);
     if (action) action->AddCodeOnlyParameter(type, supplementaryInformation);
+#endif
     return *this;
   }
 
@@ -74,9 +73,11 @@ class GD_CORE_API MultipleInstructionMetadata {
    * \see gd::InstructionMetadata::SetDefaultValue
    */
   MultipleInstructionMetadata &SetDefaultValue(const gd::String &defaultValue) {
+#if defined(GD_IDE_ONLY)
     if (expression) expression->SetDefaultValue(defaultValue);
     if (condition) condition->SetDefaultValue(defaultValue);
     if (action) action->SetDefaultValue(defaultValue);
+#endif
     return *this;
   };
 
@@ -85,9 +86,11 @@ class GD_CORE_API MultipleInstructionMetadata {
    */
   MultipleInstructionMetadata &SetParameterLongDescription(
       const gd::String &longDescription) {
+#if defined(GD_IDE_ONLY)
     if (expression) expression->SetParameterLongDescription(longDescription);
     if (condition) condition->SetParameterLongDescription(longDescription);
     if (action) action->SetParameterLongDescription(longDescription);
+#endif
     return *this;
   };
 
@@ -95,62 +98,63 @@ class GD_CORE_API MultipleInstructionMetadata {
    * \see gd::InstructionMetadata::SetHidden
    */
   MultipleInstructionMetadata &SetHidden() {
+#if defined(GD_IDE_ONLY)
     if (expression) expression->SetHidden();
     if (condition) condition->SetHidden();
     if (action) action->SetHidden();
+#endif
     return *this;
   };
 
-  /**
-   * \see gd::InstructionMetadata::SetRequiresBaseObjectCapability
-   */
-  MultipleInstructionMetadata &SetRequiresBaseObjectCapability(
-      const gd::String &capability) {
-    if (expression) expression->SetRequiresBaseObjectCapability(capability);
-    if (condition) condition->SetRequiresBaseObjectCapability(capability);
-    if (action) action->SetRequiresBaseObjectCapability(capability);
-    return *this;
-  }
-
   /**
    * \see gd::InstructionMetadata::UseStandardOperatorParameters
    * \see gd::InstructionMetadata::UseStandardRelationalOperatorParameters
    */
   MultipleInstructionMetadata &UseStandardParameters(const gd::String &type) {
+#if defined(GD_IDE_ONLY)
     if (condition) condition->UseStandardRelationalOperatorParameters(type);
     if (action) action->UseStandardOperatorParameters(type);
+#endif
     return *this;
   }
 
   MultipleInstructionMetadata &SetFunctionName(const gd::String &functionName) {
+#if defined(GD_IDE_ONLY)
     if (expression) expression->SetFunctionName(functionName);
     if (condition) condition->SetFunctionName(functionName);
     if (action) action->GetCodeExtraInformation().SetFunctionName(functionName);
+#endif
     return *this;
   }
 
   MultipleInstructionMetadata &SetGetter(const gd::String &getter) {
+#if defined(GD_IDE_ONLY)
     if (expression) expression->SetFunctionName(getter);
     if (condition) condition->SetFunctionName(getter);
     if (action) action->GetCodeExtraInformation().SetGetter(getter);
+#endif
     return *this;
   }
 
   MultipleInstructionMetadata &SetIncludeFile(const gd::String &includeFile) {
+#if defined(GD_IDE_ONLY)
     if (expression)
       expression->GetCodeExtraInformation().SetIncludeFile(includeFile);
     if (condition)
       condition->GetCodeExtraInformation().SetIncludeFile(includeFile);
     if (action) action->GetCodeExtraInformation().SetIncludeFile(includeFile);
+#endif
     return *this;
   }
 
   MultipleInstructionMetadata &AddIncludeFile(const gd::String &includeFile) {
+#if defined(GD_IDE_ONLY)
     if (expression)
       expression->GetCodeExtraInformation().AddIncludeFile(includeFile);
     if (condition)
       condition->GetCodeExtraInformation().AddIncludeFile(includeFile);
     if (action) action->GetCodeExtraInformation().AddIncludeFile(includeFile);
+#endif
     return *this;
   }
 
@@ -158,8 +162,10 @@ class GD_CORE_API MultipleInstructionMetadata {
    * \see gd::InstructionMetadata::MarkAsSimple
    */
   MultipleInstructionMetadata &MarkAsSimple() {
+#if defined(GD_IDE_ONLY)
     if (condition) condition->MarkAsSimple();
     if (action) action->MarkAsSimple();
+#endif
     return *this;
   }
 
@@ -167,8 +173,10 @@ class GD_CORE_API MultipleInstructionMetadata {
    * \see gd::InstructionMetadata::MarkAsAdvanced
    */
   MultipleInstructionMetadata &MarkAsAdvanced() {
+#if defined(GD_IDE_ONLY)
     if (condition) condition->MarkAsAdvanced();
     if (action) action->MarkAsAdvanced();
+#endif
     return *this;
   }
 
@@ -176,8 +184,10 @@ class GD_CORE_API MultipleInstructionMetadata {
    * \see gd::InstructionMetadata::MarkAsComplex
    */
   MultipleInstructionMetadata &MarkAsComplex() {
+#if defined(GD_IDE_ONLY)
     if (condition) condition->MarkAsComplex();
     if (action) action->MarkAsComplex();
+#endif
     return *this;
   }
 
@@ -195,9 +205,6 @@ class GD_CORE_API MultipleInstructionMetadata {
                               gd::InstructionMetadata &condition_,
                               gd::InstructionMetadata &action_)
       : expression(&expression_), condition(&condition_), action(&action_){};
-  MultipleInstructionMetadata(gd::InstructionMetadata &condition_,
-                              gd::InstructionMetadata &action_)
-      : expression(nullptr), condition(&condition_), action(&action_){};
 
   gd::ExpressionMetadata *expression;
   gd::InstructionMetadata *condition;

Core/GDCore/Extensions/Metadata/ObjectMetadata.cpp

@@ -261,41 +261,6 @@ ObjectMetadata::AddExpressionAndConditionAndAction(
     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"
@@ -306,48 +271,37 @@ ObjectMetadata::AddExpressionAndConditionAndAction(
                           group,
                           icon)
           : AddStrExpression(name,
-                            fullname,
-                            expressionDescriptionTemplate.FindAndReplace(
-                                "<subject>", descriptionSubject),
-                            group,
-                            icon);
+                             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);
+
+  gd::String actionDescriptionTemplate = _("Change <subject>.");
+  auto& action = AddScopedAction(
+      "Set" + name,
+      fullname,
+      actionDescriptionTemplate.FindAndReplace("<subject>", descriptionSubject),
+      sentenceName,
+      group,
+      icon,
+      icon);
 
   return MultipleInstructionMetadata::WithExpressionAndConditionAndAction(
       expression, condition, action);
 }
 
-gd::InstructionMetadata& ObjectMetadata::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& ObjectMetadata::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];
-}
-
 ObjectMetadata& ObjectMetadata::SetFullName(const gd::String& fullname_) {
 #if defined(GD_IDE_ONLY)
   fullname = fullname_;

Core/GDCore/Extensions/Metadata/ObjectMetadata.h

@@ -7,7 +7,6 @@
 #define OBJECTMETADATA_H
 #include <functional>
 #include <map>
-#include <set>
 #include <memory>
 
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
@@ -154,25 +153,6 @@ class GD_CORE_API ObjectMetadata {
       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 Set the name shown to the user.
    */
@@ -201,48 +181,13 @@ class GD_CORE_API ObjectMetadata {
     return *this;
   }
 
-  /**
-   * \brief Set the (user friendly) name of the group this object must
-   * be categorised in.
-   */
-  ObjectMetadata& SetCategoryFullName(const gd::String& categoryFullName_) {
-    categoryFullName = categoryFullName_;
-    return *this;
-  }
-
-  /**
-   * \brief The "capabilities" that are offered by the base object that are
-   * *not* supported by this object, and should be hidden in the editor
-   * inferface.
-   */
-  const std::set<gd::String>& GetUnsupportedBaseObjectCapabilities() const {
-    return unsupportedBaseObjectCapabilities;
-  }
-
-  /**
-   * \brief Add a "capability" that is offered by the base object that is *not*
-   * supported by this object, and should be hidden in the editor inferface.
-   */
-  ObjectMetadata& AddUnsupportedBaseObjectCapability(
-      const gd::String& capability) {
-    unsupportedBaseObjectCapabilities.insert(capability);
-    return *this;
-  }
-
-  /**
-   * \brief Check if a "capability" that is offered by the base object is *not*
-   * supported by this object, and should be hidden in the editor inferface.
-   */
-  bool IsUnsupportedBaseObjectCapability(const gd::String& capability) const {
-    return unsupportedBaseObjectCapabilities.find(capability) != unsupportedBaseObjectCapabilities.end();
-  }
-
   const gd::String& GetName() const { return name; }
+#if defined(GD_IDE_ONLY)
   const gd::String& GetFullName() const { return fullname; }
-  const gd::String& GetCategoryFullName() const { return categoryFullName; }
   const gd::String& GetHelpUrl() const { return helpUrl; }
   const gd::String& GetDescription() const { return description; }
   const gd::String& GetIconFilename() const { return iconFilename; }
+#endif
 
   /**
    * \brief Set the URL pointing to the help page about this object
@@ -263,27 +208,7 @@ class GD_CORE_API ObjectMetadata {
    */
   ObjectMetadata& AddIncludeFile(const gd::String& includeFile);
 
-  /**
-   * \brief Return a reference to a map containing the names of the actions
-   * (as keys) and the metadata associated with (as values).
-   */
-  std::map<gd::String, gd::InstructionMetadata>& GetAllActions() { 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;
   std::map<gd::String, gd::ExpressionMetadata> expressionsInfos;
@@ -291,19 +216,19 @@ class GD_CORE_API ObjectMetadata {
 
   std::vector<gd::String> includeFiles;
   gd::String className;
+#endif
   CreateFunPtr createFunPtr;
 
  private:
   gd::String extensionNamespace;
   gd::String name;
   gd::String helpPath;
+#if defined(GD_IDE_ONLY)
   gd::String helpUrl;  ///< Deprecated. Use helpPath instead.
   gd::String fullname;
   gd::String description;
   gd::String iconFilename;
-  gd::String categoryFullName;
-  std::set<gd::String> unsupportedBaseObjectCapabilities;
-
+#endif
   std::shared_ptr<gd::Object>
       blueprintObject;  ///< The "blueprint" object to be copied when a new
                         ///< object is asked. Can be null in case a creation

Core/GDCore/Extensions/Metadata/ParameterMetadata.h

@@ -189,14 +189,8 @@ class GD_CORE_API ParameterMetadata {
              parameterType == "joyaxis" ||
              parameterType == "stringWithSelector" ||
              parameterType == "sceneName" ||
-             parameterType == "layerEffectName" ||
-             parameterType == "layerEffectParameterName" ||
-             parameterType == "objectEffectName" ||
-             parameterType == "objectEffectParameterName" ||
              parameterType == "objectPointName" ||
-             parameterType == "objectAnimationName" ||
-             parameterType == "functionParameterName" ||
-             parameterType == "externalLayoutName";
+             parameterType == "objectAnimationName";
     } else if (type == "variable") {
       return parameterType == "objectvar" || parameterType == "globalvar" ||
              parameterType == "scenevar";

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp

@@ -4,7 +4,6 @@
  * reserved. This project is released under the MIT License.
  */
 #include "ParameterMetadataTools.h"
-
 #include "GDCore/Events/Expression.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/ObjectsContainer.h"
@@ -61,24 +60,6 @@ void ParameterMetadataTools::IterateOverParameters(
     std::function<void(const gd::ParameterMetadata& parameterMetadata,
                        const gd::String& parameterValue,
                        const gd::String& lastObjectName)> fn) {
-  IterateOverParametersWithIndex(
-      parameters,
-      parametersMetadata,
-      [&fn](const gd::ParameterMetadata& parameterMetadata,
-            const gd::String& parameterValue,
-            size_t parameterIndex,
-            const gd::String& lastObjectName) {
-        fn(parameterMetadata, parameterValue, lastObjectName);
-      });
-}
-
-void ParameterMetadataTools::IterateOverParametersWithIndex(
-    const std::vector<gd::Expression>& parameters,
-    const std::vector<gd::ParameterMetadata>& parametersMetadata,
-    std::function<void(const gd::ParameterMetadata& parameterMetadata,
-                       const gd::String& parameterValue,
-                       size_t parameterIndex,
-                       const gd::String& lastObjectName)> fn) {
   gd::String lastObjectName = "";
   for (std::size_t pNb = 0; pNb < parametersMetadata.size(); ++pNb) {
     const gd::ParameterMetadata& parameterMetadata = parametersMetadata[pNb];
@@ -89,7 +70,7 @@ void ParameterMetadataTools::IterateOverParametersWithIndex(
             ? parameterMetadata.GetDefaultValue()
             : parameterValue;
 
-    fn(parameterMetadata, parameterValueOrDefault, pNb, lastObjectName);
+    fn(parameterMetadata, parameterValueOrDefault, lastObjectName);
 
     // Memorize the last object name. By convention, parameters that require
     // an object (mainly, "objectvar" and "behavior") should be placed after

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.h

@@ -35,19 +35,6 @@ class GD_CORE_API ParameterMetadataTools {
                          const gd::String& parameterValue,
                          const gd::String& lastObjectName)> fn);
 
-  /**
-   * Iterate over a list of parameters and their values.
-   * Callback function is called with the parameter metadata, its value
-   * and if applicable the name of the object it's linked to.
-   */
-  static void IterateOverParametersWithIndex(
-      const std::vector<gd::Expression>& parameters,
-      const std::vector<gd::ParameterMetadata>& parametersMetadata,
-      std::function<void(const gd::ParameterMetadata& parameterMetadata,
-                         const gd::String& parameterValue,
-                         size_t parameterIndex,
-                         const gd::String& lastObjectName)> fn);
-
   /**
    * Given a parameter, return, if applicable, the index of the object parameter
    * it's linked to.

Core/GDCore/Extensions/Platform.cpp

@@ -4,7 +4,6 @@
  * reserved. This project is released under the MIT License.
  */
 #include "Platform.h"
-
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/String.h"
@@ -15,21 +14,16 @@ using namespace std;
 
 namespace gd {
 
-InstructionOrExpressionGroupMetadata
-    Platform::badInstructionOrExpressionGroupMetadata;
-
-Platform::Platform() : enableExtensionLoadingLogs(false) {}
+Platform::Platform(): enableExtensionLoadingLogs(false) {}
 
 Platform::~Platform() {}
 
 bool Platform::AddExtension(std::shared_ptr<gd::PlatformExtension> extension) {
   if (!extension) return false;
 
-  if (enableExtensionLoadingLogs)
-    std::cout << "Loading " << extension->GetName() << "...";
+  if (enableExtensionLoadingLogs) std::cout << "Loading " << extension->GetName() << "...";
   if (IsExtensionLoaded(extension->GetName())) {
-    if (enableExtensionLoadingLogs)
-      std::cout << " (replacing existing extension)";
+    if (enableExtensionLoadingLogs) std::cout << " (replacing existing extension)";
     RemoveExtension(extension->GetName());
   }
   if (enableExtensionLoadingLogs) std::cout << std::endl;
@@ -44,11 +38,6 @@ bool Platform::AddExtension(std::shared_ptr<gd::PlatformExtension> extension) {
         extension->GetObjectCreationFunctionPtr(objectsTypes[i]);
   }
 
-  for (const auto& it :
-       extension->GetAllInstructionOrExpressionGroupMetadata()) {
-    instructionOrExpressionGroupMetadata[it.first] = it.second;
-  }
-
   return true;
 }
 

Core/GDCore/Extensions/Platform.h

@@ -9,9 +9,8 @@
 #include <map>
 #include <memory>
 #include <vector>
-
-#include "GDCore/Extensions/Metadata/InstructionOrExpressionGroupMetadata.h"
 #include "GDCore/String.h"
+
 namespace gd {
 class InstructionsMetadataHolder;
 class Project;
@@ -53,6 +52,7 @@ class GD_CORE_API Platform {
    */
   virtual gd::String GetFullName() const { return "Unnamed platform"; }
 
+#if defined(GD_IDE_ONLY)
   /**
    * \brief Must return a text describing the platform in a few words.
    */
@@ -67,6 +67,7 @@ class GD_CORE_API Platform {
    * \brief Must return a filename to a 32*32 image file for the platform.
    */
   virtual gd::String GetIcon() const { return ""; }
+#endif
 
   /** \name Extensions management
    * Member functions used to manage the extensions
@@ -122,19 +123,6 @@ class GD_CORE_API Platform {
    * anymore.
    */
   virtual void RemoveExtension(const gd::String& name);
-
-  /**
-   * \brief Get the metadata (icon, etc...) of a group used for instructions or
-   * expressions.
-   */
-  const InstructionOrExpressionGroupMetadata& GetInstructionOrExpressionGroupMetadata(
-      const gd::String& name) const {
-    auto it = instructionOrExpressionGroupMetadata.find(name);
-    if (it == instructionOrExpressionGroupMetadata.end())
-      return badInstructionOrExpressionGroupMetadata;
-
-    return it->second;
-  }
   ///@}
 
   /** \name Factory method
@@ -149,6 +137,7 @@ class GD_CORE_API Platform {
   std::unique_ptr<gd::Object> CreateObject(gd::String type,
                                            const gd::String& name) const;
 
+#if defined(GD_IDE_ONLY)
   /**
    * \brief Create an event of given type
    */
@@ -160,18 +149,28 @@ class GD_CORE_API Platform {
    * \brief Activate or disable the logs on the standard output when
    * loading an extension.
    */
-  void EnableExtensionLoadingLogs(bool enable) {
-    enableExtensionLoadingLogs = enable;
-  };
+  void EnableExtensionLoadingLogs(bool enable) { enableExtensionLoadingLogs = enable; };
+
+  /**
+   * \brief Called when the IDE is about to shut down: Take this opportunity for
+   * erasing for example any temporary file.
+   * @deprecated This should be removed.
+   */
+  virtual void OnIDEClosed(){};
+
+  /**
+   * \brief Called when the IDE is initialized and ready to be used.
+   * @deprecated This should be removed.
+   */
+  virtual void OnIDEInitialized(){};
+
+#endif
 
  private:
   std::vector<std::shared_ptr<PlatformExtension>>
       extensionsLoaded;  ///< Extensions of the platform
   std::map<gd::String, CreateFunPtr>
       creationFunctionTable;  ///< Creation functions for objects
-  std::map<gd::String, InstructionOrExpressionGroupMetadata>
-      instructionOrExpressionGroupMetadata;
-  static InstructionOrExpressionGroupMetadata badInstructionOrExpressionGroupMetadata;
   bool enableExtensionLoadingLogs;
 };
 

Core/GDCore/Extensions/PlatformExtension.cpp

@@ -165,40 +165,6 @@ PlatformExtension::AddExpressionAndConditionAndAction(
     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 = AddCondition(name,
-                                 fullname,
-                                 conditionDescriptionTemplate.FindAndReplace(
-                                     "<subject>", descriptionSubject),
-                                 sentenceName,
-                                 group,
-                                 icon,
-                                 icon);
-
-  gd::String actionDescriptionTemplate = type == "boolean"
-                                             ? _("Set (or unset) if <subject>.")
-                                             : _("Change <subject>.");
-  auto& action = AddAction(
-      "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"
@@ -209,11 +175,32 @@ PlatformExtension::AddExpressionAndConditionAndAction(
                           group,
                           icon)
           : AddStrExpression(name,
-                              fullname,
-                              expressionDescriptionTemplate.FindAndReplace(
-                                  "<subject>", descriptionSubject),
-                              group,
-                              icon);
+                             fullname,
+                             expressionDescriptionTemplate.FindAndReplace(
+                                 "<subject>", descriptionSubject),
+                             group,
+                             icon);
+
+  gd::String conditionDescriptionTemplate = _("Compare <subject>.");
+  auto& condition = AddCondition(name,
+                                 fullname,
+                                 conditionDescriptionTemplate.FindAndReplace(
+                                     "<subject>", descriptionSubject),
+                                 sentenceName,
+                                 group,
+                                 icon,
+                                 icon);
+
+  // TODO: update the checks
+  gd::String actionDescriptionTemplate = _("Change <subject>.");
+  auto& action = AddAction(
+      "Set" + name,
+      fullname,
+      actionDescriptionTemplate.FindAndReplace("<subject>", descriptionSubject),
+      sentenceName,
+      group,
+      icon,
+      icon);
 
   return MultipleInstructionMetadata::WithExpressionAndConditionAndAction(
       expression, condition, action);
@@ -385,13 +372,9 @@ gd::InstructionMetadata& PlatformExtension::AddDuplicatedAction(
 }
 
 gd::InstructionMetadata& PlatformExtension::AddDuplicatedCondition(
-    const gd::String& newConditionName,
-    const gd::String& copiedConditionName,
-    gd::DuplicatedInstructionOptions options) {
-  gd::String newNameWithNamespace =
-      (options.unscoped ? "" : GetNameSpace()) + newConditionName;
-  gd::String copiedNameWithNamespace =
-      (options.unscoped ? "" : GetNameSpace()) + copiedConditionName;
+    const gd::String& newConditionName, const gd::String& copiedConditionName) {
+  gd::String newNameWithNamespace = GetNameSpace() + newConditionName;
+  gd::String copiedNameWithNamespace = GetNameSpace() + copiedConditionName;
 
   auto copiedCondition = conditionsInfos.find(copiedNameWithNamespace);
   if (copiedCondition == conditionsInfos.end()) {
@@ -529,8 +512,7 @@ PlatformExtension::GetAllStrExpressionsForBehavior(gd::String autoType) {
   return badExpressionsMetadata;
 }
 
-gd::BaseEventSPtr PlatformExtension::CreateEvent(
-    const gd::String& eventType) const {
+gd::BaseEventSPtr PlatformExtension::CreateEvent(const gd::String& eventType) const {
   if (eventsInfos.find(eventType) != eventsInfos.end()) {
     if (eventsInfos.find(eventType)->second.instance ==
         std::shared_ptr<BaseEvent>()) {
@@ -772,8 +754,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
 }
 #endif
 
-PlatformExtension::PlatformExtension()
-    : deprecated(false), category(_("General")) {}
+PlatformExtension::PlatformExtension() : deprecated(false) {}
 
 PlatformExtension::~PlatformExtension() {}
 

Core/GDCore/Extensions/PlatformExtension.h

@@ -5,7 +5,8 @@
  * project is released under the MIT License.
  */
 
-#pragma once
+#ifndef GDCORE_PLATFORMEXTENSION_H
+#define GDCORE_PLATFORMEXTENSION_H
 #include <map>
 #include <memory>
 #include <vector>
@@ -15,7 +16,6 @@
 #include "GDCore/Extensions/Metadata/DependencyMetadata.h"
 #include "GDCore/Extensions/Metadata/EffectMetadata.h"
 #include "GDCore/Extensions/Metadata/EventMetadata.h"
-#include "GDCore/Extensions/Metadata/InstructionOrExpressionGroupMetadata.h"
 #include "GDCore/Extensions/Metadata/ObjectMetadata.h"
 #include "GDCore/Project/PropertyDescriptor.h"
 #include "GDCore/String.h"
@@ -71,10 +71,6 @@ class GD_CORE_API CompilationInfo {
   int sizeOfpInt;
 };
 
-struct GD_CORE_API DuplicatedInstructionOptions {
-  bool unscoped;
-};
-
 /**
  * \brief Base class for implementing platform's extensions.
  *
@@ -109,18 +105,10 @@ class GD_CORE_API PlatformExtension {
     return *this;
   }
 
-  /**
-   * \brief Set the category of the extension.
-   */
-  PlatformExtension& SetCategory(const gd::String& category_) {
-    category = category_;
-    return *this;
-  }
-
   /**
    * \brief Set the path to the help, relative to the GDevelop documentation
    * root. For example, "/all-features/collisions" for
-   * "https://wiki.gdevelop.io/gdevelop5/all-features/collisions".
+   * "http://wiki.compilgames.net/doku.php/gdevelop5/all-features/collisions".
    *
    * The instructions, objects and behaviors will have this help path set by
    * default, unless you call SetHelpPath on them.
@@ -283,6 +271,7 @@ class GD_CORE_API PlatformExtension {
                               const gd::String& smallicon_,
                               std::shared_ptr<gd::BaseEvent> instance);
 
+#if defined(GD_IDE_ONLY)
   /**
    * \brief Create a new action which is the duplicate of the specified one.
    *
@@ -299,8 +288,7 @@ class GD_CORE_API PlatformExtension {
    */
   gd::InstructionMetadata& AddDuplicatedCondition(
       const gd::String& newConditionName,
-      const gd::String& copiedConditionName,
-      gd::DuplicatedInstructionOptions options = {.unscoped = false});
+      const gd::String& copiedConditionName);
   /**
    * \brief Create a new expression which is the duplicate of the specified one.
    *
@@ -327,15 +315,7 @@ class GD_CORE_API PlatformExtension {
   gd::PropertyDescriptor& RegisterProperty(const gd::String& name) {
     return extensionPropertiesMetadata[name];
   };
-
-  /**
-   * \brief Add some metadata (icon, etc...) for a group used for instructions
-   * or expressions.
-   */
-  InstructionOrExpressionGroupMetadata& AddInstructionOrExpressionGroupMetadata(
-      const gd::String& name) {
-    return instructionOrExpressionGroupMetadata[name];
-  }
+#endif
 
   /**
    * \brief Delete all instructions having no function name or custom code
@@ -359,11 +339,6 @@ class GD_CORE_API PlatformExtension {
    */
   const gd::String& GetName() const { return name; }
 
-  /**
-   * \brief Return the category of the extension
-   */
-  const gd::String& GetCategory() const { return category; }
-
   /**
    * \brief Return a description of the extension
    */
@@ -477,6 +452,7 @@ class GD_CORE_API PlatformExtension {
    */
   std::map<gd::String, gd::EventMetadata>& GetAllEvents();
 
+#if defined(GD_IDE_ONLY)
   /**
    * \brief Return a reference to a map containing the names of the actions
    * (as keys) and the metadata associated with (as values).
@@ -553,6 +529,24 @@ class GD_CORE_API PlatformExtension {
   std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressionsForBehavior(
       gd::String autoType);
 
+  /**
+   * Called to inventory resources used by conditions
+   * (and possibly do work on them, like renaming, etc...)
+   *
+   * \see gd::PlatformExtension::ExposeActionsResources
+   */
+  virtual void ExposeConditionsResources(Instruction& condition,
+                                         gd::ArbitraryResourceWorker& worker){};
+
+  /**
+   * Called to inventory resources used by actions
+   * (and possibly do work on them, like renaming, etc...)
+   *
+   * \see ArbitraryResourceWorker
+   */
+  virtual void ExposeActionsResources(Instruction& action,
+                                      gd::ArbitraryResourceWorker& worker){};
+
   /**
    * \brief Get all the properties of the extension. Properties
    * are shown in the game properties in the editor, and are exported in the
@@ -561,16 +555,8 @@ class GD_CORE_API PlatformExtension {
   std::map<gd::String, gd::PropertyDescriptor>& GetAllProperties() {
     return extensionPropertiesMetadata;
   }
-
-  /**
-   * \brief Get the metadata (icon, etc...) for groups used for instructions
-   * or expressions.
-   */
-  const std::map<gd::String, InstructionOrExpressionGroupMetadata>&
-  GetAllInstructionOrExpressionGroupMetadata() const {
-    return instructionOrExpressionGroupMetadata;
-  }
   ///@}
+#endif
 
   /**
    * \brief Return the name of all the extensions which are considered provided
@@ -598,7 +584,6 @@ class GD_CORE_API PlatformExtension {
                   ///< actions/conditions/expressions/objects/behavior/event.
   gd::String fullname;      ///< Name displayed to users in the editor.
   gd::String informations;  ///< Description displayed to users in the editor.
-  gd::String category;
   gd::String author;        ///< Author displayed to users in the editor.
   gd::String license;       ///< License name displayed to users in the editor.
   bool deprecated;  ///< true if the extension is deprecated and shouldn't be
@@ -610,6 +595,7 @@ class GD_CORE_API PlatformExtension {
   std::map<gd::String, gd::ObjectMetadata> objectsInfos;
   std::map<gd::String, gd::BehaviorMetadata> behaviorsInfo;
   std::map<gd::String, gd::EffectMetadata> effectsMetadata;
+#if defined(GD_IDE_ONLY)
   std::map<gd::String, gd::InstructionMetadata> conditionsInfos;
   std::map<gd::String, gd::InstructionMetadata> actionsInfos;
   std::map<gd::String, gd::ExpressionMetadata> expressionsInfos;
@@ -617,12 +603,12 @@ class GD_CORE_API PlatformExtension {
   std::vector<gd::DependencyMetadata> extensionDependenciesMetadata;
   std::map<gd::String, gd::EventMetadata> eventsInfos;
   std::map<gd::String, gd::PropertyDescriptor> extensionPropertiesMetadata;
-  std::map<gd::String, InstructionOrExpressionGroupMetadata>
-      instructionOrExpressionGroupMetadata;
+#endif
 
   ObjectMetadata badObjectMetadata;
   BehaviorMetadata badBehaviorMetadata;
   EffectMetadata badEffectMetadata;
+#if defined(GD_IDE_ONLY)
   static std::map<gd::String, gd::InstructionMetadata>
       badConditionsMetadata;  ///< Used when a condition is not found in the
                               ///< extension
@@ -632,10 +618,12 @@ class GD_CORE_API PlatformExtension {
   static std::map<gd::String, gd::ExpressionMetadata>
       badExpressionsMetadata;  ///< Used when an expression is not found in the
                                ///< extension
+#endif
 };
 
 }  // namespace gd
 
+#if defined(GD_IDE_ONLY)
 /** \brief Macro used by extensions in their constructor to declare how they
  * have been compiled. \see gd::CompilationInfo
  */
@@ -649,5 +637,23 @@ class GD_CORE_API PlatformExtension {
   compilationInfo.gccMinorVersion = __GNUC_MINOR__;     \
   compilationInfo.gccPatchLevel = __GNUC_PATCHLEVEL__;  \
   compilationInfo.informationCompleted = true;
+#else
+/** \brief Macro used by extensions in their constructor to declare how they
+ * have been compiled. \see gd::CompilationInfo
+ */
+#define GD_COMPLETE_EXTENSION_COMPILATION_INFORMATION() \
+  compilationInfo.runtimeOnly = true;                   \
+  compilationInfo.sfmlMajorVersion = 2;                 \
+  compilationInfo.sfmlMinorVersion = 0;                 \
+  compilationInfo.gdCoreVersion = GD_VERSION_STRING;    \
+  compilationInfo.sizeOfpInt = sizeof(int*);            \
+  compilationInfo.gccMajorVersion = __GNUC__;           \
+  compilationInfo.gccMinorVersion = __GNUC_MINOR__;     \
+  compilationInfo.gccPatchLevel = __GNUC_PATCHLEVEL__;  \
+  compilationInfo.informationCompleted = true;
+
+#endif
 
 #include "GDCore/Extensions/PlatformExtension.inl"
+
+#endif  // GDCORE_PLATFORMEXTENSION_H

Core/GDCore/IDE/Events/EventsBehaviorRenamer.cpp

@@ -1,164 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "GDCore/IDE/Events/EventsBehaviorRenamer.h"
-
-#include <map>
-#include <memory>
-#include <vector>
-
-#include "GDCore/Events/Event.h"
-#include "GDCore/Events/EventsList.h"
-#include "GDCore/Events/Parsers/ExpressionParser2.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
-#include "GDCore/IDE/Events/ExpressionValidator.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/String.h"
-#include "GDCore/Tools/Log.h"
-
-namespace gd {
-
-/**
- * \brief Go through the nodes and rename any reference to an object behavior.
- *
- * \see gd::ExpressionParser2
- */
-class GD_CORE_API ExpressionBehaviorRenamer
-    : public ExpressionParser2NodeWorker {
- public:
-  ExpressionBehaviorRenamer(const gd::ObjectsContainer& globalObjectsContainer_,
-                            const gd::ObjectsContainer& objectsContainer_,
-                            const gd::String& objectName_,
-                            const gd::String& oldBehaviorName_,
-                            const gd::String& newBehaviorName_)
-      : hasDoneRenaming(false),
-        globalObjectsContainer(globalObjectsContainer_),
-        objectsContainer(objectsContainer_),
-        objectName(objectName_),
-        oldBehaviorName(oldBehaviorName_),
-        newBehaviorName(newBehaviorName_){};
-  virtual ~ExpressionBehaviorRenamer(){};
-
-  bool HasDoneRenaming() const { return hasDoneRenaming; }
-
- protected:
-  void OnVisitSubExpressionNode(SubExpressionNode& node) override {
-    node.expression->Visit(*this);
-  }
-  void OnVisitOperatorNode(OperatorNode& node) override {
-    node.leftHandSide->Visit(*this);
-    node.rightHandSide->Visit(*this);
-  }
-  void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {
-    node.factor->Visit(*this);
-  }
-  void OnVisitNumberNode(NumberNode& node) override {}
-  void OnVisitTextNode(TextNode& node) override {}
-  void OnVisitVariableNode(VariableNode& node) override {
-    if (node.child) node.child->Visit(*this);
-  }
-  void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
-    if (node.child) node.child->Visit(*this);
-  }
-  void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode& node) override {
-    node.expression->Visit(*this);
-    if (node.child) node.child->Visit(*this);
-  }
-  void OnVisitIdentifierNode(IdentifierNode& node) override {}
-  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {
-    if (!node.behaviorFunctionName.empty()) {
-      // Behavior function name
-      if (node.objectName == objectName && node.objectFunctionOrBehaviorName == oldBehaviorName) {
-          node.objectFunctionOrBehaviorName = newBehaviorName;
-          hasDoneRenaming = true;
-      }
-    }
-  }
-  void OnVisitFunctionCallNode(FunctionCallNode& node) override {
-    if (!node.behaviorName.empty()) {
-      // Behavior function call
-      if (node.objectName == objectName && node.behaviorName == oldBehaviorName) {
-        node.behaviorName = newBehaviorName;
-        hasDoneRenaming = true;
-      }
-    }
-
-    for (auto& parameter : node.parameters) {
-      parameter->Visit(*this);
-    }
-  }
-  void OnVisitEmptyNode(EmptyNode& node) override {}
-
- private:
-  bool hasDoneRenaming;
-  const gd::ObjectsContainer& globalObjectsContainer;
-  const gd::ObjectsContainer& objectsContainer;
-  const gd::String& objectName;  // The object name for which the behavior
-                                 // must be replaced.
-  const gd::String& oldBehaviorName;
-  const gd::String& newBehaviorName;
-};
-
-bool EventsBehaviorRenamer::DoVisitInstruction(gd::Instruction& instruction,
-                                               bool isCondition) {
-  const auto& metadata = isCondition
-                             ? gd::MetadataProvider::GetConditionMetadata(
-                                   platform, instruction.GetType())
-                             : gd::MetadataProvider::GetActionMetadata(
-                                   platform, instruction.GetType());
-
-  gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-      instruction.GetParameters(),
-      metadata.GetParameters(),
-      [&](const gd::ParameterMetadata& parameterMetadata,
-          const gd::String& parameterValue,
-          size_t parameterIndex,
-          const gd::String& lastObjectName) {
-        const gd::String& type = parameterMetadata.type;
-
-        if (gd::ParameterMetadata::IsBehavior(type)) {
-          if (lastObjectName == objectName) {
-            if (parameterValue == oldBehaviorName) {
-              instruction.SetParameter(parameterIndex,
-                                       gd::Expression(newBehaviorName));
-            }
-          }
-        } else {
-          gd::ExpressionParser2 parser(
-              platform, GetGlobalObjectsContainer(), GetObjectsContainer());
-          auto node =
-              gd::ParameterMetadata::IsExpression("number", type)
-                  ? parser.ParseExpression("number", parameterValue)
-                  : (gd::ParameterMetadata::IsExpression("string", type)
-                         ? parser.ParseExpression("string", parameterValue)
-                         : std::unique_ptr<gd::ExpressionNode>());
-          if (node) {
-            ExpressionBehaviorRenamer renamer(GetGlobalObjectsContainer(),
-                                              GetObjectsContainer(),
-                                              objectName,
-                                              oldBehaviorName,
-                                              newBehaviorName);
-            node->Visit(renamer);
-
-            if (renamer.HasDoneRenaming()) {
-              instruction.SetParameter(
-                  parameterIndex,
-                  ExpressionParser2NodePrinter::PrintNode(*node));
-            }
-          }
-        }
-      });
-
-  return false;
-}
-
-EventsBehaviorRenamer::~EventsBehaviorRenamer() {}
-
-}  // namespace gd

Core/GDCore/IDE/Events/EventsBehaviorRenamer.h

@@ -1,52 +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 EventsBehaviorRenamer_H
-#define EventsBehaviorRenamer_H
-#include <map>
-#include <memory>
-#include <vector>
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/String.h"
-namespace gd {
-class BaseEvent;
-class Platform;
-class EventsList;
-}  // namespace gd
-
-namespace gd {
-
-/**
- * \brief Replace in expressions and in parameters of actions or conditions, references
- * to the name of a behavior of an object by another name.
- *
- * \ingroup IDE
- */
-class GD_CORE_API EventsBehaviorRenamer : public ArbitraryEventsWorkerWithContext {
- public:
-  EventsBehaviorRenamer(const gd::Platform &platform_,
-  const gd::String& objectName_,
-  const gd::String& oldBehaviorName_,
-  const gd::String& newBehaviorName_) :
-    platform(platform_),
-    objectName(objectName_),
-    oldBehaviorName(oldBehaviorName_),
-    newBehaviorName(newBehaviorName_)
-  {};
-  virtual ~EventsBehaviorRenamer();
-
- private:
-  bool DoVisitInstruction(gd::Instruction &instruction,
-                          bool isCondition) override;
-
-  const gd::Platform &platform;
-  gd::String objectName;
-  gd::String oldBehaviorName;
-  gd::String newBehaviorName;
-};
-
-}  // namespace gd
-
-#endif  // EventsBehaviorRenamer_H

Core/GDCore/IDE/Events/EventsListUnfolder.h

@@ -19,34 +19,4 @@ class GD_CORE_API EventsListUnfolder {
       }
     }
   }
-
-  static void FoldAll(gd::EventsList& list) {
-    for (size_t i = 0; i < list.size(); ++i) {
-      gd::BaseEvent& event = list[i];
-      event.SetFolded(true);
-      if (event.CanHaveSubEvents() && event.GetSubEvents().size() > 0) {
-        FoldAll(event.GetSubEvents());
-      }
-    }
-  }
-
-  /**
-   * \brief Recursively unfold all the events until a certain level of depth.
-   * 0 is the top level. If you want to unfold all events regardless of its depth,
-   * use `maxLevel = -1`. `currentLevel` is used for the recursion.
-   */
-  static void UnfoldToLevel(gd::EventsList& list,
-                            const int8_t maxLevel,
-                            const std::size_t currentLevel = 0) {
-    if (maxLevel >= 0 && currentLevel > maxLevel) return;
-
-    for (size_t i = 0; i < list.size(); ++i) {
-      gd::BaseEvent& event = list[i];
-      event.SetFolded(false);
-      if (event.CanHaveSubEvents() && event.GetSubEvents().size() > 0 &&
-          (maxLevel == -1 || currentLevel <= maxLevel)) {
-        UnfoldToLevel(event.GetSubEvents(), maxLevel, currentLevel + 1);
-      }
-    }
-  }
 };

Core/GDCore/IDE/Events/EventsPositionFinder.cpp

@@ -1,27 +0,0 @@
-#include "GDCore/IDE/Events/EventsPositionFinder.h"
-
-#include <map>
-#include <memory>
-#include <vector>
-
-#include "GDCore/Events/Event.h"
-#include "GDCore/Events/EventsList.h"
-#include "GDCore/String.h"
-
-namespace gd {
-class BaseEvent;
-class EventsList;
-}  // namespace gd
-
-namespace gd {
-bool EventsPositionFinder::DoVisitEvent(gd::BaseEvent& event) {
-  auto it = std::find(searchedEvents.begin(), searchedEvents.end(), &event);
-  if (it != searchedEvents.end()) {
-    positions[it - searchedEvents.begin()] = index;
-  }
-  index++;
-  return false;
-}
-EventsPositionFinder::~EventsPositionFinder() {}
-
-}  // namespace gd

Core/GDCore/IDE/Events/EventsPositionFinder.h

@@ -1,48 +0,0 @@
-#ifndef EventsPositionFinder_H
-#define EventsPositionFinder_H
-#include "GDCore/Events/EventsList.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/String.h"
-
-namespace gd {
-class BaseEvent;
-class EventsList;
-}  // namespace gd
-
-namespace gd {
-
-/**
- * \brief Scans an event list to retrieve the position of a list of searched
- * events when the events list is flattened.
- *
- * \ingroup IDE
- */
-class GD_CORE_API EventsPositionFinder : public ArbitraryEventsWorker {
- public:
-  EventsPositionFinder() : index(0){};
-  virtual ~EventsPositionFinder();
-
-  /**
-   * Return the positions of all searched events
-   */
-  const std::vector<std::size_t>& GetPositions() const { return positions; }
-
-  /**
-   * Add an event for which the position must be reported in `GetPositions`.
-   */
-  void AddEventToSearch(gd::BaseEvent* event) {
-    searchedEvents.push_back(event);
-    positions.push_back(gd::String::npos);
-  }
-
- private:
-  bool DoVisitEvent(gd::BaseEvent& event) override;
-
-  std::vector<gd::BaseEvent*> searchedEvents;
-  std::vector<std::size_t> positions;
-  std::size_t index;
-};
-
-}  // namespace gd
-
-#endif  // EventsPositionFinder_H

Core/GDCore/IDE/Events/EventsRefactorer.cpp

@@ -19,14 +19,11 @@
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/IDE/Events/ExpressionValidator.h"
 #include "GDCore/Project/ObjectsContainer.h"
-#include "GDCore/IDE/Events/InstructionSentenceFormatter.h"
 
 using namespace std;
 
 namespace gd {
 
-const gd::String EventsRefactorer::searchIgnoredCharacters = ";:,#()";
-
 /**
  * \brief Go through the nodes and change the given object name to a new one.
  *
@@ -542,8 +539,7 @@ void EventsRefactorer::ReplaceStringInEvents(gd::ObjectsContainer& project,
                                              gd::String newString,
                                              bool matchCase,
                                              bool inConditions,
-                                             bool inActions,
-                                             bool inEventStrings) {
+                                             bool inActions) {
   for (std::size_t i = 0; i < events.size(); ++i) {
     if (inConditions) {
       vector<gd::InstructionsList*> conditionsVectors =
@@ -572,11 +568,6 @@ void EventsRefactorer::ReplaceStringInEvents(gd::ObjectsContainer& project,
       }
     }
 
-    if (inEventStrings) {
-      bool eventStringModified = ReplaceStringInEventSearchableStrings(
-          project, layout, events[i], toReplace, newString, matchCase);
-    }
-
     if (events[i].CanHaveSubEvents())
       ReplaceStringInEvents(project,
                             layout,
@@ -585,8 +576,7 @@ void EventsRefactorer::ReplaceStringInEvents(gd::ObjectsContainer& project,
                             newString,
                             matchCase,
                             inConditions,
-                            inActions,
-                            inEventStrings);
+                            inActions);
   }
 }
 
@@ -684,51 +674,17 @@ bool EventsRefactorer::ReplaceStringInConditions(
   return somethingModified;
 }
 
-bool EventsRefactorer::ReplaceStringInEventSearchableStrings(
+vector<EventsSearchResult> EventsRefactorer::SearchInEvents(
     gd::ObjectsContainer& project,
     gd::ObjectsContainer& layout,
-    gd::BaseEvent& event,
-    gd::String toReplace,
-    gd::String newString,
-    bool matchCase) {
-  vector<gd::String> newEventStrings;
-  vector<gd::String> stringEvent = event.GetAllSearchableStrings();
-
-  for (std::size_t sNb = 0; sNb < stringEvent.size(); ++sNb) {
-    gd::String newStringEvent =
-        matchCase ? stringEvent[sNb].FindAndReplace(toReplace, newString, true)
-                  : ReplaceAllOccurencesCaseUnsensitive(
-                        stringEvent[sNb], toReplace, newString);
-    newEventStrings.push_back(newStringEvent);
-  }
-
-  bool somethingModified = event.ReplaceAllSearchableStrings(newEventStrings);
-
-  return somethingModified;
-}
-
-vector<EventsSearchResult> EventsRefactorer::SearchInEvents(
-    const gd::Platform& platform,
     gd::EventsList& events,
     gd::String search,
     bool matchCase,
     bool inConditions,
     bool inActions,
-    bool inEventStrings,
-    bool inEventSentences) {
+    bool inEventStrings) {
   vector<EventsSearchResult> results;
 
-  const gd::String& ignored_characters = EventsRefactorer::searchIgnoredCharacters;
-
-  search.replace_if(search.begin(),
-                    search.end(),
-                    [ignored_characters](const char &c) {
-                      return ignored_characters.find(c) != gd::String::npos;
-                    },
-                    "");
-  search = search.LeftTrim().RightTrim();
-  search.RemoveConsecutiveOccurrences(search.begin(), search.end(), ' ');
-
   for (std::size_t i = 0; i < events.size(); ++i) {
     bool eventAddedInResults = false;
 
@@ -738,7 +694,7 @@ vector<EventsSearchResult> EventsRefactorer::SearchInEvents(
       for (std::size_t j = 0; j < conditionsVectors.size(); ++j) {
         if (!eventAddedInResults &&
             SearchStringInConditions(
-                platform, *conditionsVectors[j], search, matchCase, inEventSentences)) {
+                project, layout, *conditionsVectors[j], search, matchCase)) {
           results.push_back(EventsSearchResult(
               std::weak_ptr<gd::BaseEvent>(events.GetEventSmartPtr(i)),
               &events,
@@ -753,7 +709,7 @@ vector<EventsSearchResult> EventsRefactorer::SearchInEvents(
       for (std::size_t j = 0; j < actionsVectors.size(); ++j) {
         if (!eventAddedInResults &&
             SearchStringInActions(
-                platform, *actionsVectors[j], search, matchCase, inEventSentences)) {
+                project, layout, *actionsVectors[j], search, matchCase)) {
           results.push_back(EventsSearchResult(
               std::weak_ptr<gd::BaseEvent>(events.GetEventSmartPtr(i)),
               &events,
@@ -764,7 +720,7 @@ vector<EventsSearchResult> EventsRefactorer::SearchInEvents(
 
     if (inEventStrings) {
       if (!eventAddedInResults &&
-          SearchStringInEvent(events[i], search, matchCase)) {
+          SearchStringInEvent(project, layout, events[i], search, matchCase)) {
         results.push_back(EventsSearchResult(
             std::weak_ptr<gd::BaseEvent>(events.GetEventSmartPtr(i)),
             &events,
@@ -774,14 +730,14 @@ vector<EventsSearchResult> EventsRefactorer::SearchInEvents(
 
     if (events[i].CanHaveSubEvents()) {
       vector<EventsSearchResult> subResults =
-          SearchInEvents(platform,
+          SearchInEvents(project,
+                         layout,
                          events[i].GetSubEvents(),
                          search,
                          matchCase,
                          inConditions,
                          inActions,
-                         inEventStrings,
-                         inEventSentences);
+                         inEventStrings);
       std::copy(
           subResults.begin(), subResults.end(), std::back_inserter(results));
     }
@@ -790,12 +746,11 @@ vector<EventsSearchResult> EventsRefactorer::SearchInEvents(
   return results;
 }
 
-bool EventsRefactorer::SearchStringInActions(
-    const gd::Platform& platform,
-    gd::InstructionsList& actions,
-    gd::String search,
-    bool matchCase,
-    bool inSentences) {
+bool EventsRefactorer::SearchStringInActions(gd::ObjectsContainer& project,
+                                             gd::ObjectsContainer& layout,
+                                             gd::InstructionsList& actions,
+                                             gd::String search,
+                                             bool matchCase) {
   for (std::size_t aId = 0; aId < actions.size(); ++aId) {
     for (std::size_t pNb = 0; pNb < actions[aId].GetParameters().size();
          ++pNb) {
@@ -810,60 +765,24 @@ bool EventsRefactorer::SearchStringInActions(
       if (foundPosition != gd::String::npos) return true;
     }
 
-    if (inSentences && SearchStringInFormattedText(
-                           platform, actions[aId], search, matchCase, false))
-      return true;
-
     if (!actions[aId].GetSubInstructions().empty() &&
-        SearchStringInActions(platform,
+        SearchStringInActions(project,
+                              layout,
                               actions[aId].GetSubInstructions(),
                               search,
-                              matchCase,
-                              inSentences))
+                              matchCase))
       return true;
   }
 
   return false;
 }
 
-bool EventsRefactorer::SearchStringInFormattedText(
-    const gd::Platform& platform,
-    gd::Instruction& instruction,
-    gd::String search,
-    bool matchCase,
-    bool isCondition) {
-  const auto& metadata = isCondition
-                            ? gd::MetadataProvider::GetConditionMetadata(
-                                  platform, instruction.GetType())
-                            : gd::MetadataProvider::GetActionMetadata(
-                                  platform, instruction.GetType());
-  gd::String completeSentence = gd::InstructionSentenceFormatter::Get()->GetFullText(instruction, metadata);
-
-  const gd::String& ignored_characters = EventsRefactorer::searchIgnoredCharacters;
-
-  completeSentence.replace_if(completeSentence.begin(),
-                              completeSentence.end(),
-                              [ignored_characters](const char &c) {
-                                return ignored_characters.find(c) != gd::String::npos;
-                              },
-                              "");
-
-  completeSentence.RemoveConsecutiveOccurrences(
-      completeSentence.begin(), completeSentence.end(), ' ');
-
-  size_t foundPosition = matchCase
-                             ? completeSentence.find(search)
-                             : completeSentence.FindCaseInsensitive(search);
-
-  return foundPosition != gd::String::npos;
-}
-
 bool EventsRefactorer::SearchStringInConditions(
-    const gd::Platform& platform,
+    gd::ObjectsContainer& project,
+    gd::ObjectsContainer& layout,
     gd::InstructionsList& conditions,
     gd::String search,
-    bool matchCase,
-    bool inSentences) {
+    bool matchCase) {
   for (std::size_t cId = 0; cId < conditions.size(); ++cId) {
     for (std::size_t pNb = 0; pNb < conditions[cId].GetParameters().size();
          ++pNb) {
@@ -878,23 +797,21 @@ bool EventsRefactorer::SearchStringInConditions(
       if (foundPosition != gd::String::npos) return true;
     }
 
-    if (inSentences && SearchStringInFormattedText(
-                           platform, conditions[cId], search, matchCase, true))
-      return true;
-
     if (!conditions[cId].GetSubInstructions().empty() &&
-        SearchStringInConditions(platform,
+        SearchStringInConditions(project,
+                                 layout,
                                  conditions[cId].GetSubInstructions(),
                                  search,
-                                 matchCase,
-                                 inSentences))
+                                 matchCase))
       return true;
   }
 
   return false;
 }
 
-bool EventsRefactorer::SearchStringInEvent(gd::BaseEvent& event,
+bool EventsRefactorer::SearchStringInEvent(gd::ObjectsContainer& project,
+                                           gd::ObjectsContainer& layout,
+                                           gd::BaseEvent& event,
                                            gd::String search,
                                            bool matchCase) {
   for (gd::String str : event.GetAllSearchableStrings()) {

Core/GDCore/IDE/Events/EventsRefactorer.h

@@ -41,7 +41,7 @@ class GD_CORE_API EventsSearchResult {
   std::size_t positionInList;
 
   bool IsEventsListValid() const { return eventsList != nullptr; }
-
+  
   /**
    * \brief Get the events list containing the event pointed by the EventsSearchResult.
    * \warning Only call this when IsEventsListValid returns true.
@@ -49,7 +49,7 @@ class GD_CORE_API EventsSearchResult {
   const gd::EventsList & GetEventsList() const { return *eventsList; }
 
   std::size_t GetPositionInList() const { return positionInList; }
-
+  
   bool IsEventValid() const { return !event.expired(); }
 
   /**
@@ -72,7 +72,7 @@ class GD_CORE_API EventsSearchResult {
 class GD_CORE_API EventsRefactorer {
  public:
   /**
-   * Replace all occurrences of an object name by another name
+   * Replace all occurences of an object name by another name
    * ( include : objects in parameters and in math/text expressions of all
    * events ).
    */
@@ -98,14 +98,14 @@ class GD_CORE_API EventsRefactorer {
    * \return A vector containing EventsSearchResult objects filled with events
    * containing the string
    */
-  static std::vector<EventsSearchResult> SearchInEvents(const gd::Platform& platform,
+  static std::vector<EventsSearchResult> SearchInEvents(gd::ObjectsContainer& project,
+                                                        gd::ObjectsContainer& layout,
                                                         gd::EventsList& events,
                                                         gd::String search,
                                                         bool matchCase,
                                                         bool inConditions,
                                                         bool inActions,
-                                                        bool inEventStrings,
-                                                        bool inEventSentences);
+                                                        bool inEventStrings);
 
   /**
    * Replace all occurrences of a gd::String in events
@@ -117,14 +117,13 @@ class GD_CORE_API EventsRefactorer {
                                     gd::String newString,
                                     bool matchCase,
                                     bool inConditions,
-                                    bool inActions,
-                                    bool inEventString);
+                                    bool inActions);
 
   virtual ~EventsRefactorer(){};
 
  private:
   /**
-   * Replace all occurrences of an object name by another name in an action
+   * Replace all occurences of an object name by another name in an action
    * ( include : objects in parameters and in math/text expressions ).
    *
    * \return true if something was modified.
@@ -137,7 +136,7 @@ class GD_CORE_API EventsRefactorer {
                                     gd::String newName);
 
   /**
-   * Replace all occurrences of an object name by another name in a condition
+   * Replace all occurences of an object name by another name in a condition
    * ( include : objects in parameters and in math/text expressions ).
    *
    * \return true if something was modified.
@@ -186,7 +185,7 @@ class GD_CORE_API EventsRefactorer {
                                     gd::String name);
 
   /**
-   * Replace all occurrences of a gd::String in conditions
+   * Replace all occurences of a gd::String in conditions
    *
    * \return true if something was modified.
    */
@@ -198,7 +197,7 @@ class GD_CORE_API EventsRefactorer {
                                         bool matchCase);
 
   /**
-   * Replace all occurrences of a gd::String in actions
+   * Replace all occurences of a gd::String in actions
    *
    * \return true if something was modified.
    */
@@ -209,40 +208,21 @@ class GD_CORE_API EventsRefactorer {
                                      gd::String newString,
                                      bool matchCase);
 
-  /**
-   * Replace all occurrences of a gd::String in strings of events (for example:
-   * comments and name of groups).
-   *
-   * \return true if something was modified.
-   */
-  static bool ReplaceStringInEventSearchableStrings(
-      gd::ObjectsContainer& project,
-      gd::ObjectsContainer& layout,
-      gd::BaseEvent& event,
-      gd::String toReplace,
-      gd::String newString,
-      bool matchCase);
-
-  static bool SearchStringInFormattedText(const gd::Platform& platform,
-                                          gd::Instruction& instruction,
-                                          gd::String search,
-                                          bool matchCase,
-                                          bool isCondition);
-  static bool SearchStringInActions(const gd::Platform& platform,
+  static bool SearchStringInActions(gd::ObjectsContainer& project,
+                                    gd::ObjectsContainer& layout,
                                     gd::InstructionsList& actions,
                                     gd::String search,
-                                    bool matchCase,
-                                    bool inSentences);
-  static bool SearchStringInConditions(const gd::Platform& platform,
+                                    bool matchCase);
+  static bool SearchStringInConditions(gd::ObjectsContainer& project,
+                                       gd::ObjectsContainer& layout,
                                        gd::InstructionsList& conditions,
                                        gd::String search,
-                                       bool matchCase,
-                                       bool inSentences);
-  static bool SearchStringInEvent(gd::BaseEvent& events,
-                                  gd::String search,
-                                  bool matchCase);
-
-  static const gd::String searchIgnoredCharacters;
+                                       bool matchCase);
+  static bool SearchStringInEvent(gd::ObjectsContainer& project,
+                                       gd::ObjectsContainer& layout,
+                                       gd::BaseEvent& events,
+                                       gd::String search,
+                                       bool matchCase);
 
   EventsRefactorer(){};
 };

Core/GDCore/IDE/Events/ExpressionCompletionFinder.h

@@ -9,12 +9,12 @@
 #include <memory>
 #include <vector>
 
-#include "GDCore/Events/Parsers/ExpressionParser2.h"
 #include "GDCore/Events/Parsers/ExpressionParser2Node.h"
 #include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/IDE/Events/ExpressionNodeLocationFinder.h"
+#include "GDCore/Events/Parsers/ExpressionParser2.h"
 
 namespace gd {
 class Expression;
@@ -32,7 +32,7 @@ namespace gd {
  * The IDE is responsible for actually *searching* and showing the completions -
  * this is only describing what must be listed.
  */
-struct GD_CORE_API ExpressionCompletionDescription {
+struct ExpressionCompletionDescription {
  public:
   /**
    * The different kind of completions that can be described.
@@ -274,7 +274,7 @@ struct GD_CORE_API ExpressionCompletionDescription {
 /**
  * \brief Turn an ExpressionCompletionDescription to a string.
  */
-GD_CORE_API std::ostream& operator<<(std::ostream& os,
+std::ostream& operator<<(std::ostream& os,
                          ExpressionCompletionDescription const& value);
 
 /**
@@ -326,7 +326,10 @@ class GD_CORE_API ExpressionCompletionFinder
         node.type, "", searchedPosition + 1, searchedPosition + 1));
   }
   void OnVisitOperatorNode(OperatorNode& node) override {
-    // No completions.
+    completions.push_back(ExpressionCompletionDescription::ForObject(
+        node.type, "", searchedPosition + 1, searchedPosition + 1));
+    completions.push_back(ExpressionCompletionDescription::ForExpression(
+        node.type, "", searchedPosition + 1, searchedPosition + 1));
   }
   void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {
     completions.push_back(ExpressionCompletionDescription::ForObject(
@@ -356,9 +359,8 @@ class GD_CORE_API ExpressionCompletionFinder
       }
       // Search the parameter metadata index skipping invisible ones.
       size_t visibleParameterIndex = 0;
-      size_t metadataParameterIndex =
-          ExpressionParser2::WrittenParametersFirstIndex(
-              functionCall->objectName, functionCall->behaviorName);
+      size_t metadataParameterIndex = ExpressionParser2::WrittenParametersFirstIndex(
+          functionCall->objectName, functionCall->behaviorName);
 
       const gd::ParameterMetadata* parameterMetadata = nullptr;
       while (metadataParameterIndex <

Core/GDCore/IDE/Events/ExpressionsParameterMover.cpp

@@ -95,7 +95,7 @@ class GD_CORE_API ExpressionParameterMover
         // Move parameter of an object function
         const gd::String& thisObjectType = gd::GetTypeOfObject(
             globalObjectsContainer, objectsContainer, node.objectName);
-        if (thisObjectType == objectType) {
+        if (thisObjectType == behaviorType) {
           moveParameter(node.parameters);
           hasDoneMoving = true;
         }

Core/GDCore/IDE/Events/InstructionSentenceFormatter.cpp

@@ -4,6 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 
+#if defined(GD_IDE_ONLY)
 #include "GDCore/IDE/Events/InstructionSentenceFormatter.h"
 #include <algorithm>
 #include <iostream>
@@ -89,19 +90,6 @@ InstructionSentenceFormatter::GetAsFormattedText(
   return formattedStr;
 }
 
-gd::String InstructionSentenceFormatter::GetFullText(
-    const gd::Instruction &instr, const gd::InstructionMetadata &metadata)
-{
-  const std::vector<std::pair<gd::String, gd::TextFormatting> > formattedText =
-      GetAsFormattedText(instr, metadata);
-
-  gd::String completeSentence = "";
-
-  for (std::size_t id = 0; id < formattedText.size(); ++id) {
-    completeSentence += formattedText.at(id).first;
-  }
-
-  return completeSentence;
-}
-
 }  // namespace gd
+
+#endif

Core/GDCore/IDE/Events/InstructionSentenceFormatter.h

@@ -4,6 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 
+#if defined(GD_IDE_ONLY)
 #ifndef TRANSLATEACTION_H
 #define TRANSLATEACTION_H
 #include <map>
@@ -38,9 +39,6 @@ class GD_CORE_API InstructionSentenceFormatter {
     return (static_cast<InstructionSentenceFormatter *>(_singleton));
   }
 
-  gd::String GetFullText(const gd::Instruction &instr,
-                         const gd::InstructionMetadata &metadata);
-
   static void DestroySingleton() {
     if (NULL != _singleton) {
       delete _singleton;
@@ -57,3 +55,4 @@ class GD_CORE_API InstructionSentenceFormatter {
 
 }  // namespace gd
 #endif  // TRANSLATEACTION_H
+#endif

Core/GDCore/IDE/Events/InstructionsParameterMover.cpp

@@ -19,15 +19,12 @@ bool InstructionsParameterMover::DoVisitInstruction(
     gd::Instruction& instruction, bool isCondition) {
   if (instruction.GetType() == instructionType) {
     std::vector<gd::Expression> updatedParameters = instruction.GetParameters();
-    if (oldIndex < updatedParameters.size()) {
-      gd::Expression movedParameter = updatedParameters.at(oldIndex);
+    if (oldIndex < updatedParameters.size() ||
+        newIndex < updatedParameters.size()) {
+      gd::Expression movedParameter = updatedParameters[oldIndex];
       updatedParameters.erase(updatedParameters.begin() + oldIndex);
-      if (newIndex < updatedParameters.size()) {
-        updatedParameters.insert(updatedParameters.begin() + newIndex,
-                                movedParameter);
-      } else {
-        updatedParameters.push_back(movedParameter);
-      }
+      updatedParameters.insert(updatedParameters.begin() + newIndex,
+                               movedParameter);
       instruction.SetParameters(updatedParameters);
     }
   }

Core/GDCore/IDE/EventsFunctionTools.cpp

@@ -4,20 +4,16 @@
  * reserved. This project is released under the MIT License.
  */
 #include "EventsFunctionTools.h"
-
 #include "GDCore/Events/Expression.h"
 #include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
-#include "GDCore/Project/EventsBasedBehavior.h"
 #include "GDCore/Project/EventsFunction.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/String.h"
-#include "GDCore/Tools/Log.h"
 
 namespace gd {
-
-void EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
+void EventsFunctionTools::EventsFunctionToObjectsContainer(
     gd::Project& project,
     const gd::EventsFunction& eventsFunction,
     gd::ObjectsContainer& outputGlobalObjectsContainer,
@@ -35,41 +31,4 @@ void EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
   outputObjectsContainer.GetObjectGroups() = eventsFunction.GetObjectGroups();
 }
 
-void EventsFunctionTools::BehaviorEventsFunctionToObjectsContainer(
-    gd::Project& project,
-    const gd::EventsBasedBehavior& eventsBasedBehavior,
-    const gd::EventsFunction& eventsFunction,
-    gd::ObjectsContainer& outputGlobalObjectsContainer,
-    gd::ObjectsContainer& outputObjectsContainer) {
-  // The context is build the same way as free function...
-  FreeEventsFunctionToObjectsContainer(project,
-                                       eventsFunction,
-                                       outputGlobalObjectsContainer,
-                                       outputObjectsContainer);
-
-  // ...and has an "Object" by convention...
-  if (!outputObjectsContainer.HasObjectNamed("Object")) {
-    gd::LogWarning("No \"Object\" in a function of an events based behavior: " +
-                   eventsFunction.GetName() +
-                   ". This means this function is likely misconfigured (check "
-                   "its parameters).");
-    return;
-  }
-
-  // ...with behaviors from properties.
-  gd::Object& thisObject = outputObjectsContainer.GetObject("Object");
-  for (size_t i = 0;
-       i < eventsBasedBehavior.GetPropertyDescriptors().GetCount();
-       i++) {
-    const NamedPropertyDescriptor& propertyDescriptor =
-        eventsBasedBehavior.GetPropertyDescriptors().Get(i);
-    const std::vector<gd::String>& extraInfo =
-        propertyDescriptor.GetExtraInfo();
-    if (propertyDescriptor.GetType() == "Behavior" && extraInfo.size() > 0) {
-      gd::String behaviorName = propertyDescriptor.GetName();
-      thisObject.AddNewBehavior(project, extraInfo.at(0), behaviorName);
-    }
-  }
-}
-
 }  // namespace gd

Core/GDCore/IDE/EventsFunctionTools.h

@@ -13,7 +13,6 @@ class Project;
 class ObjectsContainer;
 class ParameterMetadata;
 class EventsFunction;
-class EventsBasedBehavior;
 class Expression;
 }  // namespace gd
 
@@ -24,33 +23,18 @@ namespace gd {
 class GD_CORE_API EventsFunctionTools {
  public:
   /**
-   * \brief Given a free events function, initialize the given objects container
+   * \brief Given an events function, initialize the given objects container
    * with objects described in the events function parameters and in
    * the events function groups.
    *
    * This is useful to create the "context" of a function, before code
    * generation for example.
    */
-  static void FreeEventsFunctionToObjectsContainer(
+  static void EventsFunctionToObjectsContainer(
       gd::Project& project,
       const gd::EventsFunction& eventsFunction,
       gd::ObjectsContainer& outputGlobalObjectsContainer,
       gd::ObjectsContainer& outputObjectsContainer);
-  /**
-   * \brief Given a behavior events function, initialize the given objects container
-   * with objects described in the events function parameters, in
-   * the events function groups and in the behavior properties (for additional
-   * required behaviors on the object).
-   *
-   * This is useful to create the "context" of a function, before code
-   * generation for example.
-   */
-  static void BehaviorEventsFunctionToObjectsContainer(
-      gd::Project& project,
-      const gd::EventsBasedBehavior& eventsBasedBehavior,
-      const gd::EventsFunction& eventsFunction,
-      gd::ObjectsContainer& outputGlobalObjectsContainer,
-      gd::ObjectsContainer& outputObjectsContainer);
 };
 }  // namespace gd
 

Core/GDCore/IDE/PlatformManager.cpp

@@ -33,4 +33,11 @@ gd::Platform* PlatformManager::GetPlatform(
   return NULL;
 }
 
+void PlatformManager::NotifyPlatformIDEInitialized() const {
+  for (std::size_t i = 0; i < platformsLoaded.size(); ++i) {
+    if (platformsLoaded[i] != std::shared_ptr<gd::Platform>())
+      platformsLoaded[i]->OnIDEInitialized();
+  }
+}
+
 }  // namespace gd

Core/GDCore/IDE/PlatformManager.h

@@ -43,6 +43,12 @@ class GD_CORE_API PlatformManager {
     return platformsLoaded;
   };
 
+  /**
+   * \brief Notify each platform that the IDE is ready, by calling their
+   * OnIDEInitialized member function.
+   */
+  void NotifyPlatformIDEInitialized() const;
+
   static PlatformManager *Get() {
     if (NULL == _singleton) {
       _singleton = new PlatformManager;
@@ -59,6 +65,11 @@ class GD_CORE_API PlatformManager {
    */
   static void DestroySingleton() {
     if (NULL != _singleton) {
+      for (std::size_t i = 0; i < _singleton->platformsLoaded.size(); ++i) {
+        if (_singleton->platformsLoaded[i] != std::shared_ptr<gd::Platform>())
+          _singleton->platformsLoaded[i]->OnIDEClosed();
+      }
+
       delete _singleton;
       _singleton = NULL;
     }

Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp

@@ -13,11 +13,8 @@
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Project/ResourcesManager.h"
 
@@ -26,23 +23,8 @@ using namespace std;
 namespace gd {
 
 void ArbitraryResourceWorker::ExposeImage(gd::String& imageName){
-    // Nothing to do by default - each child class can define here the action to
-    // do.
-};
-
-void ArbitraryResourceWorker::ExposeJson(gd::String& jsonName){
-    // Nothing to do by default - each child class can define here the action to
-    // do.
-};
-
-void ArbitraryResourceWorker::ExposeVideo(gd::String& videoName){
-    // Nothing to do by default - each child class can define here the action to
-    // do.
-};
-
-void ArbitraryResourceWorker::ExposeBitmapFont(gd::String& bitmapFontName){
-    // Nothing to do by default - each child class can define here the action to
-    // do.
+    // Nothing to do, the image is a reference to a resource that
+    // is already exposed.
 };
 
 void ArbitraryResourceWorker::ExposeAudio(gd::String& audioName) {
@@ -51,14 +33,12 @@ void ArbitraryResourceWorker::ExposeAudio(gd::String& audioName) {
 
     if (resources->HasResource(audioName) &&
         resources->GetResource(audioName).GetKind() == "audio") {
-      // Nothing to do, the audio is a reference to a proper resource.
+      // Nothing to do, the audio is a reference to a resource that
+      // is already exposed.
       return;
     }
   }
 
-  // For compatibility with older projects (where events were refering to files
-  // directly), we consider that this resource name is a filename, and so expose
-  // it as a file.
   ExposeFile(audioName);
 };
 
@@ -68,17 +48,30 @@ void ArbitraryResourceWorker::ExposeFont(gd::String& fontName) {
 
     if (resources->HasResource(fontName) &&
         resources->GetResource(fontName).GetKind() == "font") {
-      // Nothing to do, the font is a reference to a proper resource.
+      // Nothing to do, the font is a reference to a resource that
+      // is already exposed.
       return;
     }
   }
 
-  // For compatibility with older projects (where events were refering to files
-  // directly), we consider that this resource name is a filename, and so expose
-  // it as a file.
   ExposeFile(fontName);
 };
 
+void ArbitraryResourceWorker::ExposeBitmapFont(gd::String& bitmapFontName) {
+  for (auto resources : GetResources()) {
+    if (!resources) continue;
+
+    if (resources->HasResource(bitmapFontName) &&
+        resources->GetResource(bitmapFontName).GetKind() == "bitmapFont") {
+      // Nothing to do, the font is a reference to a resource that
+      // is already exposed.
+      return;
+    }
+  }
+
+  ExposeFile(bitmapFontName);
+};
+
 void ArbitraryResourceWorker::ExposeResources(
     gd::ResourcesManager* resourcesManager) {
   if (!resourcesManager) return;
@@ -102,67 +95,101 @@ void ArbitraryResourceWorker::ExposeResource(gd::Resource& resource) {
 
 ArbitraryResourceWorker::~ArbitraryResourceWorker() {}
 
-/**
- * Launch the specified resource worker on every resource referenced in the
- * events.
- */
-class ResourceWorkerInEventsWorker : public ArbitraryEventsWorker {
- public:
-  ResourceWorkerInEventsWorker(const gd::Project& project_,
-                               gd::ArbitraryResourceWorker& worker_)
-      : project(project_), worker(worker_){};
-  virtual ~ResourceWorkerInEventsWorker() {};
-
- private:
-  bool DoVisitInstruction(gd::Instruction& instruction, bool isCondition) {
-    const auto& platform = project.GetCurrentPlatform();
-    const auto& metadata = isCondition
-                               ? gd::MetadataProvider::GetConditionMetadata(
-                                     platform, instruction.GetType())
-                               : gd::MetadataProvider::GetActionMetadata(
-                                     platform, instruction.GetType());
-
-    gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-        instruction.GetParameters(),
-        metadata.GetParameters(),
-        [this, &instruction](const gd::ParameterMetadata& parameterMetadata,
-                             const gd::String& parameterValue,
-                             size_t parameterIndex,
-                             const gd::String& lastObjectName) {
-          if (parameterMetadata.GetType() ==
-              "police") {  // Should be renamed fontResource
-            gd::String updatedParameterValue = parameterValue;
-            worker.ExposeFont(updatedParameterValue);
-            instruction.SetParameter(parameterIndex, updatedParameterValue);
-          } else if (parameterMetadata.GetType() == "soundfile" ||
-                     parameterMetadata.GetType() ==
-                         "musicfile") {  // Should be renamed audioResource
-            gd::String updatedParameterValue = parameterValue;
-            worker.ExposeAudio(updatedParameterValue);
-            instruction.SetParameter(parameterIndex, updatedParameterValue);
-          } else if (parameterMetadata.GetType() == "bitmapFontResource") {
-            gd::String updatedParameterValue = parameterValue;
-            worker.ExposeBitmapFont(updatedParameterValue);
-            instruction.SetParameter(parameterIndex, updatedParameterValue);
-          } else if (parameterMetadata.GetType() == "imageResource") {
-            gd::String updatedParameterValue = parameterValue;
-            worker.ExposeImage(updatedParameterValue);
-            instruction.SetParameter(parameterIndex, updatedParameterValue);
-          }
-        });
-
-    return false;
-  };
-
-  const gd::Project& project;
-  gd::ArbitraryResourceWorker& worker;
-};
-
 void LaunchResourceWorkerOnEvents(const gd::Project& project,
                                   gd::EventsList& events,
                                   gd::ArbitraryResourceWorker& worker) {
-  ResourceWorkerInEventsWorker eventsWorker(project, worker);
-  eventsWorker.Launch(events);
+  // Get all extensions used
+  auto allGameExtensions =
+      project.GetCurrentPlatform().GetAllPlatformExtensions();
+
+  for (std::size_t j = 0; j < events.size(); j++) {
+    vector<gd::InstructionsList*> allActionsVectors =
+        events[j].GetAllActionsVectors();
+    for (std::size_t i = 0; i < allActionsVectors.size(); ++i) {
+      for (std::size_t k = 0; k < allActionsVectors[i]->size(); k++) {
+        gd::String type = allActionsVectors[i]->Get(k).GetType();
+        for (std::size_t e = 0; e < allGameExtensions.size(); ++e) {
+          bool extensionHasAction = false;
+
+          const std::map<gd::String, gd::InstructionMetadata>& allActions =
+              allGameExtensions[e]->GetAllActions();
+          if (allActions.find(type) != allActions.end())
+            extensionHasAction = true;
+
+          const vector<gd::String>& objects =
+              allGameExtensions[e]->GetExtensionObjectsTypes();
+          for (std::size_t o = 0; o < objects.size(); ++o) {
+            const std::map<gd::String, gd::InstructionMetadata>&
+                allObjectsActions =
+                    allGameExtensions[e]->GetAllActionsForObject(objects[o]);
+            if (allObjectsActions.find(type) != allObjectsActions.end())
+              extensionHasAction = true;
+          }
+
+          const vector<gd::String>& autos =
+              allGameExtensions[e]->GetBehaviorsTypes();
+          for (std::size_t a = 0; a < autos.size(); ++a) {
+            const std::map<gd::String, gd::InstructionMetadata>&
+                allAutosActions =
+                    allGameExtensions[e]->GetAllActionsForBehavior(autos[a]);
+            if (allAutosActions.find(type) != allAutosActions.end())
+              extensionHasAction = true;
+          }
+
+          if (extensionHasAction) {
+            allGameExtensions[e]->ExposeActionsResources(
+                allActionsVectors[i]->Get(k), worker);
+            break;
+          }
+        }
+      }
+    }
+
+    vector<gd::InstructionsList*> allConditionsVector =
+        events[j].GetAllConditionsVectors();
+    for (std::size_t i = 0; i < allConditionsVector.size(); ++i) {
+      for (std::size_t k = 0; k < allConditionsVector[i]->size(); k++) {
+        gd::String type = allConditionsVector[i]->Get(k).GetType();
+        for (std::size_t e = 0; e < allGameExtensions.size(); ++e) {
+          bool extensionHasCondition = false;
+
+          const std::map<gd::String, gd::InstructionMetadata>& allConditions =
+              allGameExtensions[e]->GetAllConditions();
+          if (allConditions.find(type) != allConditions.end())
+            extensionHasCondition = true;
+
+          const vector<gd::String>& objects =
+              allGameExtensions[e]->GetExtensionObjectsTypes();
+          for (std::size_t j = 0; j < objects.size(); ++j) {
+            const std::map<gd::String, gd::InstructionMetadata>&
+                allObjectsConditions =
+                    allGameExtensions[e]->GetAllConditionsForObject(objects[j]);
+            if (allObjectsConditions.find(type) != allObjectsConditions.end())
+              extensionHasCondition = true;
+          }
+
+          const vector<gd::String>& autos =
+              allGameExtensions[e]->GetBehaviorsTypes();
+          for (std::size_t j = 0; j < autos.size(); ++j) {
+            const std::map<gd::String, gd::InstructionMetadata>&
+                allAutosConditions =
+                    allGameExtensions[e]->GetAllConditionsForBehavior(autos[j]);
+            if (allAutosConditions.find(type) != allAutosConditions.end())
+              extensionHasCondition = true;
+          }
+
+          if (extensionHasCondition)
+            allGameExtensions[e]->ExposeConditionsResources(
+                allConditionsVector[i]->Get(k), worker);
+        }
+      }
+    }
+
+    if (events[j].CanHaveSubEvents())
+      LaunchResourceWorkerOnEvents(project, events[j].GetSubEvents(), worker);
+  }
+
+  return;
 }
 
 }  // namespace gd

Core/GDCore/IDE/Project/ArbitraryResourceWorker.h

@@ -60,28 +60,19 @@ class GD_CORE_API ArbitraryResourceWorker {
 
   /**
    * \brief Expose an audio, which is either a reference to an "audio" resource,
-   * or a filename if no resource with this name exists (for backward compatibility).
+   * or a filename if no resource with this name exists.
    */
   virtual void ExposeAudio(gd::String &audioName);
 
   /**
    * \brief Expose a font, which is either a reference to a "font" resource,
-   * or a filename if no resource with this name exists (for backward compatibility).
+   * or a filename if no resource with this name exists.
    */
   virtual void ExposeFont(gd::String &fontName);
 
   /**
-   * \brief Expose a JSON, which is always a reference to a "json" resource.
-   */
-  virtual void ExposeJson(gd::String &jsonName);
-
-  /**
-   * \brief Expose a video, which is always a reference to a "video" resource.
-   */
-  virtual void ExposeVideo(gd::String &videoName);
-
-  /**
-   * \brief Expose a bitmap font, which is always a reference to a "bitmapFont" resource.
+   * \brief Expose a bitmap font, which is either a reference to a "bitmapFont" resource,
+   * or a filename if no resource with this name exists.
    */
   virtual void ExposeBitmapFont(gd::String &bitmapFontName);
 

Core/GDCore/IDE/Project/ProjectResourcesAdder.cpp

@@ -14,6 +14,25 @@ using namespace std;
 
 namespace gd {
 
+bool ProjectResourcesAdder::AddAllMissing(gd::Project& project,
+                                          const gd::String& resourceType) {
+  // Search for resources used in the project
+  gd::ResourcesInUseHelper resourcesInUse;
+  project.ExposeResources(resourcesInUse);
+
+  ResourcesManager& resourcesManager = project.GetResourcesManager();
+  for (auto& resourceName : resourcesInUse.GetAll(resourceType)) {
+    if (!resourcesManager.HasResource(resourceName)) {
+      std::cout << "Adding missing resource \"" << resourceName
+                << "\"to the project." << std::endl;
+      resourcesManager.AddResource(
+          resourceName, /*filename=*/resourceName, resourceType);
+    }
+  }
+
+  return true;
+}
+
 std::vector<gd::String> ProjectResourcesAdder::GetAllUseless(
     gd::Project& project, const gd::String& resourceType) {
   std::vector<gd::String> unusedResources;
@@ -23,13 +42,15 @@ std::vector<gd::String> ProjectResourcesAdder::GetAllUseless(
   std::set<gd::String>& usedResources = resourcesInUse.GetAll(resourceType);
 
   // Search all resources not used
-  const std::vector<std::shared_ptr<Resource>>& resources =
-      project.GetResourcesManager().GetAllResources();
+  std::vector<gd::String> resources =
+      project.GetResourcesManager().GetAllResourceNames();
   for (std::size_t i = 0; i < resources.size(); i++) {
-    if (resources[i]->GetKind() != resourceType) continue;
+    if (project.GetResourcesManager().GetResource(resources[i]).GetKind() !=
+        resourceType)
+      continue;
 
-    if (usedResources.find(resources[i]->GetName()) == usedResources.end())
-      unusedResources.push_back(resources[i]->GetName());
+    if (usedResources.find(resources[i]) == usedResources.end())
+      unusedResources.push_back(resources[i]);
   }
 
   return unusedResources;

Core/GDCore/IDE/Project/ProjectResourcesAdder.h

@@ -20,6 +20,17 @@ namespace gd {
  */
 class GD_CORE_API ProjectResourcesAdder {
  public:
+  /**
+   * \brief Update the project so that all missing resources are added, with an
+   * filename that is equal to the missing resource name.
+   *
+   * \param project The project to be updated.
+   * \param resourceType The type of the resource the be searched
+   *
+   * \return true if no error happened
+   */
+  static bool AddAllMissing(gd::Project& project, const gd::String & resourceType);
+
   /**
    * \brief Find all resources of the specified kind that are
    * not used by the project.

Core/GDCore/IDE/Project/ResourcesInUseHelper.h

@@ -10,7 +10,6 @@
 
 #include <set>
 #include <vector>
-
 #include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
 #include "GDCore/String.h"
 
@@ -37,20 +36,17 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
   virtual ~ResourcesInUseHelper(){};
 
   std::set<gd::String>& GetAllImages() { return GetAll("image"); };
-  std::set<gd::String>& GetAllAudios() { return GetAll("audio"); };
   std::set<gd::String>& GetAllFonts() { return GetAll("font"); };
-  std::set<gd::String>& GetAllJsons() { return GetAll("json"); };
-  std::set<gd::String>& GetAllVideos() { return GetAll("video"); };
+  std::set<gd::String>& GetAllAudios() { return GetAll("audio"); };
   std::set<gd::String>& GetAllBitmapFonts() { return GetAll("bitmapFont"); };
   std::set<gd::String>& GetAll(const gd::String& resourceType) {
-    if (resourceType == "image") return allImages;
-    if (resourceType == "audio") return allAudios;
-    if (resourceType == "font") return allFonts;
-    if (resourceType == "json") return allJsons;
-    if (resourceType == "video") return allVideos;
-    if (resourceType == "bitmapFont") return allBitmapFonts;
-
-    return emptyResources;
+    return resourceType == "image"
+               ? allImages
+               : (resourceType == "audio"
+                      ? allAudios
+                      : (resourceType == "font")
+                            ? allFonts
+                            : (resourceType == "bitmapFont") ? allBitmapFonts : emptyResources);
   };
 
   virtual void ExposeFile(gd::String& resource) override{
@@ -65,12 +61,6 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
   virtual void ExposeFont(gd::String& fontResourceName) override {
     allFonts.insert(fontResourceName);
   };
-  virtual void ExposeJson(gd::String& jsonResourceName) override {
-    allJsons.insert(jsonResourceName);
-  };
-  virtual void ExposeVideo(gd::String& videoResourceName) override {
-    allVideos.insert(videoResourceName);
-  };
   virtual void ExposeBitmapFont(gd::String& bitmapFontResourceName) override {
     allBitmapFonts.insert(bitmapFontResourceName);
   };
@@ -79,8 +69,6 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
   std::set<gd::String> allImages;
   std::set<gd::String> allAudios;
   std::set<gd::String> allFonts;
-  std::set<gd::String> allJsons;
-  std::set<gd::String> allVideos;
   std::set<gd::String> allBitmapFonts;
   std::set<gd::String> emptyResources;
 };

Core/GDCore/IDE/Project/ResourcesMergingHelper.cpp

@@ -22,7 +22,7 @@ void ResourcesMergingHelper::ExposeFile(gd::String& resourceFilename) {
   resourceFullFilename = gd::AbstractFileSystem::NormalizeSeparator(
       resourceFullFilename);  // Protect against \ on Linux.
 
-  // In the case of absolute filenames that we don't want to preserve, or
+  // In the case of absolute filnames that we don't want to preserve, or
   // in the case of copying files without preserving relative folders, the new
   // names will be generated from the filename alone (with collision protection).
   auto stripToFilenameOnly = [&]() {

Core/GDCore/IDE/Project/ResourcesMergingHelper.h

@@ -71,7 +71,7 @@ class GD_CORE_API ResourcesMergingHelper : public ArbitraryResourceWorker {
    * Resources merging helper collects all resources filenames and update these
    * filenames.
    */
-  virtual void ExposeFile(gd::String& resource) override;
+  virtual void ExposeFile(gd::String& resource);
 
  protected:
   void SetNewFilename(gd::String oldFilename, gd::String newFilename);

Core/GDCore/IDE/Project/ResourcesRenamer.h

@@ -33,9 +33,8 @@ class ResourcesRenamer : public gd::ArbitraryResourceWorker {
       : gd::ArbitraryResourceWorker(), oldToNewNames(oldToNewNames_){};
   virtual ~ResourcesRenamer(){};
 
-  virtual void ExposeFile(gd::String& resourceFileName) override{
-      // Don't do anything: we're renaming resources, not the files they are
-      // pointing to.
+  virtual void ExposeFile(gd::String& resourceName) override {
+    RenameIfNeeded(resourceName);
   };
   virtual void ExposeImage(gd::String& imageResourceName) override {
     RenameIfNeeded(imageResourceName);
@@ -46,15 +45,6 @@ class ResourcesRenamer : public gd::ArbitraryResourceWorker {
   virtual void ExposeFont(gd::String& fontResourceName) override {
     RenameIfNeeded(fontResourceName);
   };
-  virtual void ExposeJson(gd::String& jsonResourceName) override {
-    RenameIfNeeded(jsonResourceName);
-  };
-  virtual void ExposeVideo(gd::String& videoResourceName) override {
-    RenameIfNeeded(videoResourceName);
-  };
-  virtual void ExposeBitmapFont(gd::String& bitmapFontName) override {
-    RenameIfNeeded(bitmapFontName);
-  };
 
  private:
   void RenameIfNeeded(gd::String& resourceName) {

Core/GDCore/IDE/UnfilledRequiredBehaviorPropertyProblem.cpp

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

Core/GDCore/IDE/UnfilledRequiredBehaviorPropertyProblem.h

@@ -1,80 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2021 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#ifndef GDCORE_UNFILLEDREQUIREDBEHAVIORPROPERTYPROBLEM_H
-#define GDCORE_UNFILLEDREQUIREDBEHAVIORPROPERTYPROBLEM_H
-#include "GDCore/String.h"
-
-namespace gd {
-class Project;
-class Object;
-class BehaviorContent;
-}  // namespace gd
-
-namespace gd {
-
-/**
- * \brief A problem when a required behavior property is not fill correctly.
- */
-class GD_CORE_API UnfilledRequiredBehaviorPropertyProblem {
- public:
-  UnfilledRequiredBehaviorPropertyProblem(
-      const gd::Project& sourceProject_,
-      gd::Object& sourceObject_,
-      gd::BehaviorContent& sourceBehaviorContent_,
-      const gd::String& sourcePropertyName_,
-      const gd::String& expectedBehaviorTypeName_)
-      : sourceProject(sourceProject_),
-      sourceObject(sourceObject_),
-      sourceBehaviorContent(sourceBehaviorContent_),
-      sourcePropertyName(sourcePropertyName_),
-      expectedBehaviorTypeName(expectedBehaviorTypeName_){};
-  virtual ~UnfilledRequiredBehaviorPropertyProblem();
-
-  /**
-   * \brief Return the project where the problem appears
-   */
-  virtual const gd::Project& GetSourceProject() const { return sourceProject; }
-
-  /**
-   * \brief Return the object where the problem appears.
-   */
-  virtual gd::Object& GetSourceObject() const { return sourceObject; }
-
-  /**
-   * \brief Return the behavior where the problem appears.
-   */
-  virtual gd::BehaviorContent& GetSourceBehaviorContent() const {
-    return sourceBehaviorContent;
-  }
-
-  /**
-   * \brief Return the property where the problem appears.
-   */
-  virtual const gd::String& GetSourcePropertyName() const {
-    return sourcePropertyName;
-  }
-
-  /**
-   * \brief Return the behavior type name that is expected for the required
-   * behavior property.
-   */
-  virtual const gd::String& GetExpectedBehaviorTypeName() const {
-    return expectedBehaviorTypeName;
-  }
-
- private:
-  const gd::Project& sourceProject;
-  gd::Object& sourceObject;
-  gd::BehaviorContent& sourceBehaviorContent;
-  const gd::String sourcePropertyName;
-
-  const gd::String expectedBehaviorTypeName;
-};
-
-}  // namespace gd
-
-#endif  // GDCORE_UNFILLEDREQUIREDBEHAVIORPROPERTYPROBLEM_H

Core/GDCore/IDE/WholeProjectRefactorer.cpp

@@ -5,12 +5,9 @@
  */
 #include "WholeProjectRefactorer.h"
 
-#include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/IDE/DependenciesAnalyzer.h"
 #include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/IDE/Events/EventsBehaviorRenamer.h"
 #include "GDCore/IDE/Events/EventsRefactorer.h"
 #include "GDCore/IDE/Events/ExpressionsParameterMover.h"
 #include "GDCore/IDE/Events/ExpressionsRenamer.h"
@@ -18,9 +15,6 @@
 #include "GDCore/IDE/Events/InstructionsTypeRenamer.h"
 #include "GDCore/IDE/EventsFunctionTools.h"
 #include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
-#include "GDCore/IDE/UnfilledRequiredBehaviorPropertyProblem.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/BehaviorContent.h"
 #include "GDCore/Project/EventsBasedBehavior.h"
 #include "GDCore/Project/EventsFunctionsExtension.h"
 #include "GDCore/Project/ExternalEvents.h"
@@ -57,10 +51,6 @@ gd::String GetBehaviorFullType(const gd::String& extensionName,
 
 namespace gd {
 
-// By convention, the first parameter of an events based behavior method is
-// always called "Object".
-const gd::String WholeProjectRefactorer::behaviorObjectParameterName = "Object";
-
 void WholeProjectRefactorer::ExposeProjectEvents(
     gd::Project& project, gd::ArbitraryEventsWorker& worker) {
   // See also gd::Project::ExposeResources for a method that traverse the whole
@@ -125,7 +115,7 @@ void WholeProjectRefactorer::ExposeProjectEvents(
     for (auto&& eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
       gd::ObjectsContainer globalObjectsAndGroups;
       gd::ObjectsContainer objectsAndGroups;
-      gd::EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
+      gd::EventsFunctionTools::EventsFunctionToObjectsContainer(
           project, *eventsFunction, globalObjectsAndGroups, objectsAndGroups);
 
       worker.Launch(eventsFunction->GetEvents(),
@@ -137,31 +127,22 @@ void WholeProjectRefactorer::ExposeProjectEvents(
     for (auto&& eventsBasedBehavior :
          eventsFunctionsExtension.GetEventsBasedBehaviors()
              .GetInternalVector()) {
-      ExposeEventsBasedBehaviorEvents(project, *eventsBasedBehavior, worker);
+      auto& behaviorEventsFunctions = eventsBasedBehavior->GetEventsFunctions();
+      for (auto&& eventsFunction :
+           behaviorEventsFunctions.GetInternalVector()) {
+        gd::ObjectsContainer globalObjectsAndGroups;
+        gd::ObjectsContainer objectsAndGroups;
+        gd::EventsFunctionTools::EventsFunctionToObjectsContainer(
+            project, *eventsFunction, globalObjectsAndGroups, objectsAndGroups);
+
+        worker.Launch(eventsFunction->GetEvents(),
+                      globalObjectsAndGroups,
+                      objectsAndGroups);
+      }
     }
   }
 }
 
-void WholeProjectRefactorer::ExposeEventsBasedBehaviorEvents(
-    gd::Project& project,
-    const gd::EventsBasedBehavior& eventsBasedBehavior,
-    gd::ArbitraryEventsWorkerWithContext& worker) {
-  auto& behaviorEventsFunctions = eventsBasedBehavior.GetEventsFunctions();
-  for (auto&& eventsFunction : behaviorEventsFunctions.GetInternalVector()) {
-    gd::ObjectsContainer globalObjectsAndGroups;
-    gd::ObjectsContainer objectsAndGroups;
-    gd::EventsFunctionTools::BehaviorEventsFunctionToObjectsContainer(
-        project,
-        eventsBasedBehavior,
-        *eventsFunction,
-        globalObjectsAndGroups,
-        objectsAndGroups);
-
-    worker.Launch(
-        eventsFunction->GetEvents(), globalObjectsAndGroups, objectsAndGroups);
-  }
-}
-
 void WholeProjectRefactorer::ExposeProjectObjects(
     gd::Project& project, gd::ArbitraryObjectsWorker& worker) {
   worker.Launch(project);
@@ -211,7 +192,7 @@ void WholeProjectRefactorer::EnsureBehaviorEventsFunctionsProperParameters(
 
     parameters[0]
         .SetType("object")
-        .SetName(behaviorObjectParameterName)
+        .SetName("Object")
         .SetDescription("Object")
         .SetExtraInfo(eventsBasedBehavior.GetObjectType());
     parameters[1]
@@ -238,7 +219,7 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
       };
 
   auto renameBehaviorEventsFunction =
-      [&project, &oldName, &newName](
+      [&project, &eventsFunctionsExtension, &oldName, &newName](
           const gd::EventsBasedBehavior& eventsBasedBehavior,
           const gd::EventsFunction& eventsFunction) {
         if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
@@ -261,7 +242,7 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
       };
 
   auto renameBehaviorPropertyFunctions =
-      [&project, &oldName, &newName](
+      [&project, &eventsFunctionsExtension, &oldName, &newName](
           const gd::EventsBasedBehavior& eventsBasedBehavior,
           const gd::NamedPropertyDescriptor& property) {
         gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
@@ -489,7 +470,7 @@ void WholeProjectRefactorer::MoveBehaviorEventsFunctionParameter(
   }
 }
 
-void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
+void WholeProjectRefactorer::RenameBehaviorProperty(
     gd::Project& project,
     const gd::EventsFunctionsExtension& eventsFunctionsExtension,
     const gd::EventsBasedBehavior& eventsBasedBehavior,
@@ -498,294 +479,41 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
   auto& properties = eventsBasedBehavior.GetPropertyDescriptors();
   if (!properties.Has(oldPropertyName)) return;
 
-  if (properties.Get(oldPropertyName).GetType() == "Behavior") {
-    // This is a property representing another behavior that must exist on the
-    // object.
+  // Order is important: we first rename the expressions then the instructions,
+  // to avoid being unable to fetch the metadata (the types of parameters) of
+  // instructions after they are renamed.
+  gd::ExpressionsRenamer expressionRenamer =
+      gd::ExpressionsRenamer(project.GetCurrentPlatform());
+  expressionRenamer.SetReplacedBehaviorExpression(
+      GetBehaviorFullType(eventsFunctionsExtension.GetName(),
+                          eventsBasedBehavior.GetName()),
+      EventsBasedBehavior::GetPropertyExpressionName(oldPropertyName),
+      EventsBasedBehavior::GetPropertyExpressionName(newPropertyName));
+  ExposeProjectEvents(project, expressionRenamer);
 
-    // This other "required behavior" uses the property name, that is about to
-    // change, as its name.
-    // So we must change all reference to this name in the events of the
-    // behavior functions.
-    gd::EventsBehaviorRenamer behaviorRenamer(project.GetCurrentPlatform(),
-                                              behaviorObjectParameterName,
-                                              oldPropertyName,
-                                              newPropertyName);
+  gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
+      project,
+      GetBehaviorEventsFunctionFullType(
+          eventsFunctionsExtension.GetName(),
+          eventsBasedBehavior.GetName(),
+          EventsBasedBehavior::GetPropertyActionName(oldPropertyName)),
+      GetBehaviorEventsFunctionFullType(
+          eventsFunctionsExtension.GetName(),
+          eventsBasedBehavior.GetName(),
+          EventsBasedBehavior::GetPropertyActionName(newPropertyName)));
+  ExposeProjectEvents(project, actionRenamer);
 
-    ExposeEventsBasedBehaviorEvents(
-        project, eventsBasedBehavior, behaviorRenamer);
-  } else {
-    // Properties that represent primitive values will be used through
-    // their related actions/conditions/expressions. Rename these.
-
-    // Order is important: we first rename the expressions then the
-    // instructions, to avoid being unable to fetch the metadata (the types of
-    // parameters) of instructions after they are renamed.
-    gd::ExpressionsRenamer expressionRenamer =
-        gd::ExpressionsRenamer(project.GetCurrentPlatform());
-    expressionRenamer.SetReplacedBehaviorExpression(
-        GetBehaviorFullType(eventsFunctionsExtension.GetName(),
-                            eventsBasedBehavior.GetName()),
-        EventsBasedBehavior::GetPropertyExpressionName(oldPropertyName),
-        EventsBasedBehavior::GetPropertyExpressionName(newPropertyName));
-    ExposeProjectEvents(project, expressionRenamer);
-
-    gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
-        project,
-        GetBehaviorEventsFunctionFullType(
-            eventsFunctionsExtension.GetName(),
-            eventsBasedBehavior.GetName(),
-            EventsBasedBehavior::GetPropertyActionName(oldPropertyName)),
-        GetBehaviorEventsFunctionFullType(
-            eventsFunctionsExtension.GetName(),
-            eventsBasedBehavior.GetName(),
-            EventsBasedBehavior::GetPropertyActionName(newPropertyName)));
-    ExposeProjectEvents(project, actionRenamer);
-
-    gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
-        project,
-        GetBehaviorEventsFunctionFullType(
-            eventsFunctionsExtension.GetName(),
-            eventsBasedBehavior.GetName(),
-            EventsBasedBehavior::GetPropertyConditionName(oldPropertyName)),
-        GetBehaviorEventsFunctionFullType(
-            eventsFunctionsExtension.GetName(),
-            eventsBasedBehavior.GetName(),
-            EventsBasedBehavior::GetPropertyConditionName(newPropertyName)));
-    ExposeProjectEvents(project, conditionRenamer);
-  }
-}
-
-void WholeProjectRefactorer::AddBehaviorAndRequiredBehaviors(
-    gd::Project& project,
-    gd::Object& object,
-    const gd::String& behaviorType,
-    const gd::String& behaviorName) {
-  if (object.AddNewBehavior(project, behaviorType, behaviorName) == nullptr) {
-    // The behavior type/metadata can't be found.
-    return;
-  };
-
-  const gd::Platform& platform = project.GetCurrentPlatform();
-  const gd::BehaviorMetadata& behaviorMetadata =
-      MetadataProvider::GetBehaviorMetadata(platform, behaviorType);
-  if (MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
-    // Should not happen because the behavior was added successfully (so its
-    // metadata are valid) - but double check anyway and bail out if the
-    // behavior metadata are invalid.
-    return;
-  }
-
-  gd::Behavior& behavior = behaviorMetadata.Get();
-  gd::BehaviorContent& behaviorContent = object.GetBehavior(behaviorName);
-  for (auto const& keyValue :
-       behavior.GetProperties(behaviorContent.GetContent())) {
-    const gd::String& propertyName = keyValue.first;
-    const gd::PropertyDescriptor& property = keyValue.second;
-    if (property.GetType().LowerCase() == "behavior") {
-      const std::vector<gd::String>& extraInfo = property.GetExtraInfo();
-      if (extraInfo.size() == 0) {
-        // very unlikely
-        continue;
-      }
-      const gd::String& requiredBehaviorType = extraInfo.at(0);
-      const auto behaviorContents =
-          WholeProjectRefactorer::GetBehaviorsWithType(object,
-                                                       requiredBehaviorType);
-      const gd::String* defaultBehaviorName = nullptr;
-      if (behaviorContents.size() == 0) {
-        const gd::BehaviorMetadata& requiredBehaviorMetadata =
-            MetadataProvider::GetBehaviorMetadata(platform,
-                                                  requiredBehaviorType);
-        const gd::String& requiredBehaviorName =
-            requiredBehaviorMetadata.GetDefaultName();
-        WholeProjectRefactorer::AddBehaviorAndRequiredBehaviors(
-            project, object, requiredBehaviorType, requiredBehaviorName);
-        defaultBehaviorName = &requiredBehaviorName;
-      } else {
-        defaultBehaviorName = &behaviorContents.at(0);
-      }
-      behavior.UpdateProperty(
-          behaviorContent.GetContent(), propertyName, *defaultBehaviorName);
-    }
-  }
-}
-
-std::vector<gd::String> WholeProjectRefactorer::GetBehaviorsWithType(
-    const gd::Object& object, const gd::String& type) {
-  std::vector<gd::String> behaviors;
-  for (auto& behaviorName : object.GetAllBehaviorNames()) {
-    const gd::BehaviorContent& behaviorContent =
-        object.GetBehavior(behaviorName);
-    if (behaviorContent.GetTypeName() == type) {
-      behaviors.push_back(behaviorName);
-    }
-  }
-  return behaviors;
-}
-
-std::vector<gd::String> WholeProjectRefactorer::FindDependentBehaviorNames(
-    const gd::Project& project,
-    const gd::Object& object,
-    const gd::String& behaviorName) {
-  std::unordered_set<gd::String> dependentBehaviorNames;
-  WholeProjectRefactorer::FindDependentBehaviorNames(
-      project, object, behaviorName, dependentBehaviorNames);
-  std::vector<gd::String> results;
-  results.insert(results.end(),
-                 dependentBehaviorNames.begin(),
-                 dependentBehaviorNames.end());
-  return results;
-}
-
-void WholeProjectRefactorer::FindDependentBehaviorNames(
-    const gd::Project& project,
-    const gd::Object& object,
-    const gd::String& behaviorName,
-    std::unordered_set<gd::String>& dependentBehaviorNames) {
-  const gd::Platform& platform = project.GetCurrentPlatform();
-  for (auto const& objectBehaviorName : object.GetAllBehaviorNames()) {
-    const gd::BehaviorContent& behaviorContent =
-        object.GetBehavior(objectBehaviorName);
-    const auto& behaviorMetadata = MetadataProvider::GetBehaviorMetadata(
-        platform, behaviorContent.GetTypeName());
-    if (MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
-      // Ignore this behavior as it's unknown.
-      continue;
-    }
-
-    gd::Behavior& behavior = behaviorMetadata.Get();
-    for (auto const& keyValue :
-         behavior.GetProperties(behaviorContent.GetContent())) {
-      const gd::String& propertyName = keyValue.first;
-      const gd::PropertyDescriptor& property = keyValue.second;
-      if (property.GetType().LowerCase() == "behavior" &&
-          property.GetValue() == behaviorName &&
-          dependentBehaviorNames.find(objectBehaviorName) ==
-              dependentBehaviorNames.end()) {
-        dependentBehaviorNames.insert(objectBehaviorName);
-        WholeProjectRefactorer::FindDependentBehaviorNames(
-            project, object, objectBehaviorName, dependentBehaviorNames);
-      }
-    }
-  }
-};
-
-std::vector<gd::UnfilledRequiredBehaviorPropertyProblem>
-WholeProjectRefactorer::FindInvalidRequiredBehaviorProperties(
-    const gd::Project& project) {
-  std::vector<gd::UnfilledRequiredBehaviorPropertyProblem>
-      invalidRequiredBehaviorProperties;
-  auto findInvalidRequiredBehaviorPropertiesInObjects =
-      [&project, &invalidRequiredBehaviorProperties](
-          const std::vector<std::unique_ptr<gd::Object> >& objectsList) {
-        for (auto& object : objectsList) {
-          for (auto& behaviorContentKeyValuePair :
-               object->GetAllBehaviorContents()) {
-            gd::BehaviorContent& behaviorContent =
-                *behaviorContentKeyValuePair.second;
-
-            const auto& behaviorMetadata =
-                gd::MetadataProvider::GetBehaviorMetadata(
-                    project.GetCurrentPlatform(),
-                    behaviorContent.GetTypeName());
-            if (MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
-              std::cout << "Could not find metadata for behavior with type \""
-                        << behaviorContent.GetTypeName() << "\"" << std::endl;
-              continue;
-            }
-
-            const auto& behavior = behaviorMetadata.Get();
-
-            for (auto const& keyValue :
-                 behavior.GetProperties(behaviorContent.GetContent())) {
-              const gd::String& propertyName = keyValue.first;
-              const gd::PropertyDescriptor& property = keyValue.second;
-              if (property.GetType().LowerCase() != "behavior") {
-                continue;
-              }
-              const gd::String& requiredBehaviorName = property.GetValue();
-              const std::vector<gd::String>& extraInfo =
-                  property.GetExtraInfo();
-              if (extraInfo.size() == 0) {
-                // very unlikely
-                continue;
-              }
-              const gd::String& requiredBehaviorType = extraInfo.at(0);
-
-              if (requiredBehaviorName == "" ||
-                  !object->HasBehaviorNamed(requiredBehaviorName) ||
-                  object->GetBehavior(requiredBehaviorName).GetTypeName() !=
-                      requiredBehaviorType) {
-                auto problem = UnfilledRequiredBehaviorPropertyProblem(
-                    project,
-                    *object,
-                    behaviorContent,
-                    propertyName,
-                    requiredBehaviorType);
-                invalidRequiredBehaviorProperties.push_back(problem);
-              }
-            }
-          }
-        }
-      };
-
-  // Find in global objects
-  findInvalidRequiredBehaviorPropertiesInObjects(project.GetObjects());
-
-  // Find in layout objects.
-  for (std::size_t i = 0; i < project.GetLayoutsCount(); ++i) {
-    const gd::Layout& layout = project.GetLayout(i);
-    findInvalidRequiredBehaviorPropertiesInObjects(layout.GetObjects());
-  }
-  return invalidRequiredBehaviorProperties;
-}
-
-bool WholeProjectRefactorer::FixInvalidRequiredBehaviorProperties(
-    gd::Project& project) {
-  const auto& invalidRequiredBehaviorProblems =
-      FindInvalidRequiredBehaviorProperties(project);
-  for (const auto& problem : invalidRequiredBehaviorProblems) {
-    auto& object = problem.GetSourceObject();
-    auto suggestedBehaviorNames =
-        GetBehaviorsWithType(object, problem.GetExpectedBehaviorTypeName());
-    auto& behaviorContent = problem.GetSourceBehaviorContent();
-    auto& behaviorMetadata = MetadataProvider::GetBehaviorMetadata(
-        project.GetCurrentPlatform(), behaviorContent.GetTypeName());
-    if (MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
-      continue;
-    }
-
-    auto& behavior = behaviorMetadata.Get();
-    if (suggestedBehaviorNames.empty()) {
-      // No matching behavior on the object.
-      // Add required behaviors on the object.
-
-      auto& expectedBehaviorMetadata = MetadataProvider::GetBehaviorMetadata(
-          project.GetCurrentPlatform(), problem.GetExpectedBehaviorTypeName());
-      if (MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
-        continue;
-      }
-
-      const gd::String& newBehaviorName =
-          expectedBehaviorMetadata.GetDefaultName();
-      AddBehaviorAndRequiredBehaviors(project,
-                                      object,
-                                      problem.GetExpectedBehaviorTypeName(),
-                                      newBehaviorName);
-      behavior.UpdateProperty(behaviorContent.GetContent(),
-                              problem.GetSourcePropertyName(),
-                              newBehaviorName);
-    } else {
-      // There is a matching behavior on the object use it by default.
-      behavior.UpdateProperty(
-          behaviorContent.GetContent(),
-          problem.GetSourcePropertyName(),
-          // It's unlikely the object has 2 behaviors of the same type.
-          suggestedBehaviorNames[0]);
-    }
-  }
-
-  return !invalidRequiredBehaviorProblems.empty();
+  gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
+      project,
+      GetBehaviorEventsFunctionFullType(
+          eventsFunctionsExtension.GetName(),
+          eventsBasedBehavior.GetName(),
+          EventsBasedBehavior::GetPropertyConditionName(oldPropertyName)),
+      GetBehaviorEventsFunctionFullType(
+          eventsFunctionsExtension.GetName(),
+          eventsBasedBehavior.GetName(),
+          EventsBasedBehavior::GetPropertyConditionName(newPropertyName)));
+  ExposeProjectEvents(project, conditionRenamer);
 }
 
 void WholeProjectRefactorer::RenameEventsBasedBehavior(
@@ -805,6 +533,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
   auto renameBehaviorEventsFunction =
       [&project,
        &eventsFunctionsExtension,
+       &eventsBasedBehavior,
        &oldBehaviorName,
        &newBehaviorName](const gd::EventsFunction& eventsFunction) {
         if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
@@ -831,6 +560,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
 
   auto renameBehaviorProperty = [&project,
                                  &eventsFunctionsExtension,
+                                 &eventsBasedBehavior,
                                  &oldBehaviorName,
                                  &newBehaviorName](
                                     const gd::NamedPropertyDescriptor&
@@ -948,31 +678,6 @@ void WholeProjectRefactorer::DoRenameBehavior(
         }
       };
 
-  // Rename behavior in required behavior properties
-  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
-       e++) {
-    auto& eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-
-    for (auto&& eventsBasedBehavior :
-         eventsFunctionsExtension.GetEventsBasedBehaviors()
-             .GetInternalVector()) {
-      for (size_t i = 0;
-           i < eventsBasedBehavior->GetPropertyDescriptors().GetCount();
-           i++) {
-        NamedPropertyDescriptor& propertyDescriptor =
-            eventsBasedBehavior->GetPropertyDescriptors().Get(i);
-        std::vector<gd::String>& extraInfo = propertyDescriptor.GetExtraInfo();
-        if (propertyDescriptor.GetType() == "Behavior" &&
-            extraInfo.size() > 0) {
-          const gd::String& requiredBehaviorType = extraInfo[0];
-          if (requiredBehaviorType == oldBehaviorType) {
-            extraInfo[0] = newBehaviorType;
-          }
-        }
-      }
-    }
-  }
-
   // Rename behavior in global objects
   renameBehaviorTypeInObjects(project.GetObjects());
 

Core/GDCore/IDE/WholeProjectRefactorer.h

@@ -6,13 +6,10 @@
 #ifndef GDCORE_WHOLEPROJECTREFACTORER_H
 #define GDCORE_WHOLEPROJECTREFACTORER_H
 #include <set>
-#include <unordered_set>
 #include <vector>
 namespace gd {
-class Platform;
 class Project;
 class Layout;
-class Object;
 class String;
 class EventsFunctionsExtension;
 class EventsFunction;
@@ -21,10 +18,6 @@ class EventsBasedBehavior;
 class ArbitraryEventsWorker;
 class ArbitraryObjectsWorker;
 class ArbitraryEventsWorkerWithContext;
-class Behavior;
-class BehaviorContent;
-class BehaviorMetadata;
-class UnfilledRequiredBehaviorPropertyProblem;
 }  // namespace gd
 
 namespace gd {
@@ -58,24 +51,13 @@ class GD_CORE_API WholeProjectRefactorer {
                                   gd::ArbitraryEventsWorkerWithContext& worker);
 
   /**
-   * \brief Call the specified worker on all events of the events based behavior
-   *
-   * This should be the preferred way to traverse all the events of an events
-   * based behavior
-   */
-  static void ExposeEventsBasedBehaviorEvents(
-      gd::Project& project,
-      const gd::EventsBasedBehavior& eventsBasedBehavior,
-      gd::ArbitraryEventsWorkerWithContext& worker);
-
-  /**
-   * \brief Call the specified worker on all ObjectContainers of the project
-   * (global, layouts...)
+   * \brief Call the specified worker on all ObjectContainers of the project (global,
+   * layouts...)
    *
    * This should be the preferred way to traverse all the objects of a project.
    */
-  static void ExposeProjectObjects(gd::Project& project,
-                                   gd::ArbitraryObjectsWorker& worker);
+  static void ExposeProjectObjects(
+      gd::Project& project, gd::ArbitraryObjectsWorker& worker);
 
   /**
    * \brief Refactor the project **before** an events function extension is
@@ -158,52 +140,13 @@ class GD_CORE_API WholeProjectRefactorer {
    * This is because the property is expected to have its old name for the
    * refactoring.
    */
-  static void RenameEventsBasedBehaviorProperty(
+  static void RenameBehaviorProperty(
       gd::Project& project,
       const gd::EventsFunctionsExtension& eventsFunctionsExtension,
       const gd::EventsBasedBehavior& eventsBasedBehavior,
       const gd::String& oldPropertyName,
       const gd::String& newPropertyName);
 
-  /**
-   * \brief Add a behavior to an object and add required behaviors if necessary
-   * to fill every behavior properties of the added behaviors.
-   */
-  static void AddBehaviorAndRequiredBehaviors(gd::Project& project,
-                                              gd::Object& object,
-                                              const gd::String& behaviorType,
-                                              const gd::String& behaviorName);
-
-  /**
-   * \brief Find every behavior of the object that needs the given behaviors
-   * directly or indirectly (because of "required behavior" properties).
-   */
-  static std::vector<gd::String> FindDependentBehaviorNames(
-      const gd::Project& project,
-      const gd::Object& object,
-      const gd::String& behaviorName);
-
-  /**
-   * \brief Find the names of the behaviors with the specified type on the object.
-   */
-  static std::vector<gd::String> GetBehaviorsWithType(const gd::Object& object,
-                                                      const gd::String& type);
-
-  /**
-   * \brief Find in the project objects having behaviors with "behavior" properties that
-   * don't have a valid value (i.e: pointing to a non existing behavior, or of a wrong type).
-   */
-  static std::vector<gd::UnfilledRequiredBehaviorPropertyProblem>
-  FindInvalidRequiredBehaviorProperties(const gd::Project& project);
-
-  /**
-   * \brief Fix in the project objects having behaviors with "behavior" properties that
-   * don't have a valid value (i.e: pointing to a non existing behavior, or of a wrong type),
-   * by setting a proper behavior, or adding missing behaviors to these objects.
-   */
-  static bool
-  FixInvalidRequiredBehaviorProperties(gd::Project& project);
-
   /**
    * \brief Refactor the project **before** a behavior is renamed.
    *
@@ -324,14 +267,6 @@ class GD_CORE_API WholeProjectRefactorer {
                                const gd::String& oldBehaviorType,
                                const gd::String& newBehaviorType);
 
-  static void FindDependentBehaviorNames(
-      const gd::Project& project,
-      const gd::Object& object,
-      const gd::String& behaviorName,
-      std::unordered_set<gd::String>& dependentBehaviorNames);
-
-  static const gd::String behaviorObjectParameterName;
-
   WholeProjectRefactorer(){};
 };
 

Core/GDCore/Project/EventsFunction.cpp

@@ -17,7 +17,6 @@ void EventsFunction::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("fullName", fullName);
   element.SetAttribute("description", description);
   element.SetAttribute("sentence", sentence);
-  element.SetAttribute("group", group);
   element.SetBoolAttribute("private", isPrivate);
   events.SerializeTo(element.AddChild("events"));
 
@@ -45,7 +44,6 @@ void EventsFunction::UnserializeFrom(gd::Project& project,
   fullName = element.GetStringAttribute("fullName");
   description = element.GetStringAttribute("description");
   sentence = element.GetStringAttribute("sentence");
-  group = element.GetStringAttribute("group");
   isPrivate = element.GetBoolAttribute("private");
   events.UnserializeFrom(project, element.GetChild("events"));
 

Core/GDCore/Project/EventsFunction.h

@@ -102,19 +102,6 @@ class GD_CORE_API EventsFunction {
     return *this;
   }
 
-  /**
-   * \brief Get the group of the instruction in the editor.
-   */
-  const gd::String& GetGroup() const { return group; };
-
-  /**
-   * \brief Set the group of the instruction in the editor.
-   */
-  EventsFunction& SetGroup(const gd::String& group_) {
-    group = group_;
-    return *this;
-  }
-
   enum FunctionType { Action, Condition, Expression, StringExpression };
 
   /**
@@ -201,7 +188,6 @@ class GD_CORE_API EventsFunction {
   gd::String fullName;
   gd::String description;
   gd::String sentence;
-  gd::String group;
   gd::EventsList events;
   FunctionType functionType;
   std::vector<gd::ParameterMetadata> parameters;

Core/GDCore/Project/EventsFunctionsExtension.cpp

@@ -3,6 +3,7 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
+#if defined(GD_IDE_ONLY)
 #include "EventsFunctionsExtension.h"
 
 #include "EventsBasedBehavior.h"
@@ -33,10 +34,8 @@ void EventsFunctionsExtension::Init(const gd::EventsFunctionsExtension& other) {
   description = other.description;
   name = other.name;
   fullName = other.fullName;
-  category = other.category;
   tags = other.tags;
   author = other.author;
-  authorIds = other.authorIds;
   previewIconUrl = other.previewIconUrl;
   iconUrl = other.iconUrl;
   helpPath = other.helpPath;
@@ -51,22 +50,11 @@ void EventsFunctionsExtension::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("description", description);
   element.SetAttribute("name", name);
   element.SetAttribute("fullName", fullName);
-  element.SetAttribute("category", category);
-  if (!originName.empty() || !originIdentifier.empty()) {
-    element.AddChild("origin")
-        .SetAttribute("name", originName)
-        .SetAttribute("identifier", originIdentifier);
-  }
   auto& tagsElement = element.AddChild("tags");
   tagsElement.ConsiderAsArray();
   for (const auto& tag : tags) {
     tagsElement.AddChild("").SetStringValue(tag);
   }
-  auto& authorIdsElement = element.AddChild("authorIds");
-  authorIdsElement.ConsiderAsArray();
-  for (const auto& authorId : authorIds) {
-    authorIdsElement.AddChild("").SetStringValue(authorId);
-  }
   element.SetAttribute("author", author);
   element.SetAttribute("previewIconUrl", previewIconUrl);
   element.SetAttribute("iconUrl", iconUrl);
@@ -89,20 +77,11 @@ void EventsFunctionsExtension::UnserializeFrom(
   description = element.GetStringAttribute("description");
   name = element.GetStringAttribute("name");
   fullName = element.GetStringAttribute("fullName");
-  category = element.GetStringAttribute("category");
   author = element.GetStringAttribute("author");
   previewIconUrl = element.GetStringAttribute("previewIconUrl");
   iconUrl = element.GetStringAttribute("iconUrl");
   helpPath = element.GetStringAttribute("helpPath");
 
-  if (element.HasChild("origin")) {
-    gd::String originName =
-        element.GetChild("origin").GetStringAttribute("name", "");
-    gd::String originIdentifier =
-        element.GetChild("origin").GetStringAttribute("identifier", "");
-    SetOrigin(originName, originIdentifier);
-  }
-
   tags.clear();
   auto& tagsElement = element.GetChild("tags");
   if (!tagsElement.IsValueUndefined()) {
@@ -120,13 +99,6 @@ void EventsFunctionsExtension::UnserializeFrom(
     }
   }
 
-  authorIds.clear();
-  auto& authorIdsElement = element.GetChild("authorIds");
-  authorIdsElement.ConsiderAsArray();
-  for (std::size_t i = 0; i < authorIdsElement.GetChildrenCount(); ++i) {
-    authorIds.push_back(authorIdsElement.GetChild(i).GetStringValue());
-  }
-
   dependencies.clear();
   const auto& dependenciesElement = element.GetChild("dependencies");
   dependenciesElement.ConsiderAsArray();
@@ -153,3 +125,5 @@ bool EventsFunctionsExtension::IsExtensionLifecycleEventsFunction(
 }
 
 }  // namespace gd
+
+#endif

Core/GDCore/Project/EventsFunctionsExtension.h

@@ -3,6 +3,7 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
+#if defined(GD_IDE_ONLY)
 #ifndef GDCORE_EVENTSFUNCTIONEXTENSION_H
 #define GDCORE_EVENTSFUNCTIONEXTENSION_H
 
@@ -84,18 +85,9 @@ class GD_CORE_API EventsFunctionsExtension : public EventsFunctionsContainer {
     return *this;
   }
 
-  const gd::String& GetCategory() const { return category; };
-  EventsFunctionsExtension& SetCategory(const gd::String& category_) {
-    category = category_;
-    return *this;
-  }
-
   const std::vector<gd::String>& GetTags() const { return tags; };
   std::vector<gd::String>& GetTags() { return tags; };
 
-  const std::vector<gd::String>& GetAuthorIds() const { return authorIds; };
-  std::vector<gd::String>& GetAuthorIds() { return authorIds; };
-
   const gd::String& GetAuthor() const { return author; };
   EventsFunctionsExtension& SetAuthor(const gd::String& author_) {
     author = author_;
@@ -145,23 +137,6 @@ class GD_CORE_API EventsFunctionsExtension : public EventsFunctionsContainer {
     return eventsBasedBehaviors;
   }
 
-  /**
-   * \brief Sets an extension origin. This method is not present since the
-   * beginning so the projects created before that will have extensions
-   * installed from the store without an origin. Keep that in mind when creating
-   * features that rely on an extension's origin.
-   */
-  virtual void SetOrigin(const gd::String& originName_,
-                         const gd::String& originIdentifier_) {
-    originName = originName_;
-    originIdentifier = originIdentifier_;
-  }
-
-  virtual const gd::String& GetOriginName() const { return originName; }
-  virtual const gd::String& GetOriginIdentifier() const {
-    return originIdentifier;
-  }
-
   /** \name Dependencies
    */
   ///@{
@@ -244,13 +219,9 @@ class GD_CORE_API EventsFunctionsExtension : public EventsFunctionsContainer {
   gd::String description;
   gd::String name;
   gd::String fullName;
-  gd::String category;
   std::vector<gd::String> tags;
-  std::vector<gd::String> authorIds;
   gd::String author;
   gd::String previewIconUrl;
-  gd::String originName;
-  gd::String originIdentifier;
   gd::String iconUrl;
   gd::String helpPath;  ///< The relative path to the help for this extension in
                         ///< the documentation (or an absolute URL).
@@ -261,3 +232,4 @@ class GD_CORE_API EventsFunctionsExtension : public EventsFunctionsContainer {
 }  // namespace gd
 
 #endif  // GDCORE_EVENTSFUNCTIONEXTENSION_H
+#endif

Core/GDCore/Project/ExtensionProperties.h

@@ -52,12 +52,12 @@ class GD_CORE_API ExtensionProperties {
   /**
    * \brief Serialize the Extension Properties.
    */
-  void SerializeTo(SerializerElement& element) const;
+  virtual void SerializeTo(SerializerElement& element) const;
 
   /**
    * \brief Unserialize the Extension Properties.
    */
-  void UnserializeFrom(const SerializerElement& element);
+  virtual void UnserializeFrom(const SerializerElement& element);
   ///@}
 
  private:

Core/GDCore/Project/ExternalEvents.cpp

@@ -1,5 +1,5 @@
+#if defined(GD_IDE_ONLY)
 #include "GDCore/Project/ExternalEvents.h"
-
 #include "ExternalEvents.h"
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/Serialization.h"
@@ -48,3 +48,4 @@ void ExternalEvents::UnserializeFrom(gd::Project& project,
 }
 
 }  // namespace gd
+#endif

Core/GDCore/Project/ExternalEvents.h

@@ -3,12 +3,12 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
+#if defined(GD_IDE_ONLY)
 #ifndef GDCORE_EXTERNALEVENTS_H
 #define GDCORE_EXTERNALEVENTS_H
 #include <ctime>
 #include <memory>
 #include <vector>
-
 #include "GDCore/Events/EventsList.h"
 #include "GDCore/String.h"
 namespace gd {
@@ -135,3 +135,4 @@ struct ExternalEventsHasName
 }  // namespace gd
 
 #endif  // GDCORE_EXTERNALEVENTS_H
+#endif

Core/GDCore/Project/ExternalLayout.cpp

@@ -5,7 +5,6 @@
  */
 
 #include "GDCore/Project/ExternalLayout.h"
-
 #include "GDCore/IDE/Dialogs/LayoutEditorCanvas/EditorSettings.h"
 #include "GDCore/Project/InitialInstancesContainer.h"
 #include "GDCore/Serialization/SerializerElement.h"
@@ -16,15 +15,19 @@ namespace gd {
 void ExternalLayout::UnserializeFrom(const SerializerElement& element) {
   name = element.GetStringAttribute("name", "", "Name");
   instances.UnserializeFrom(element.GetChild("instances", 0, "Instances"));
+#if defined(GD_IDE_ONLY)
   editorSettings.UnserializeFrom(element.GetChild("editionSettings"));
+#endif
   associatedLayout = element.GetStringAttribute("associatedLayout");
 }
 
+#if defined(GD_IDE_ONLY)
 void ExternalLayout::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", name);
   instances.SerializeTo(element.AddChild("instances"));
   editorSettings.SerializeTo(element.AddChild("editionSettings"));
   element.SetAttribute("associatedLayout", associatedLayout);
 }
+#endif
 
 }  // namespace gd